New debian changelog, patches refreshed, hardening updates

This commit is contained in:
Hibby 2017-01-21 14:34:52 +00:00
parent 374dc15bb0
commit 5580c32dc0
4 changed files with 24 additions and 20 deletions

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
uronode (2.6-1) UNRELEASED; urgency=medium
* New Upstream import
- Patches refreshed
* debian/control
- Updated Standards version to 3.9.8
* debian/patches/hardening
- Added options for CXXFLAGS and CPPFLAGS
-- Dave Hibberd <d@vehibberd.com> Sat, 21 Jan 2017 14:34:19 +0000
uronode (2.5.1-2) unstable; urgency=medium
* debian/control

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper (>= 9), libax25-dev, zlib1g-dev
Standards-Version: 3.9.7
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/uronode.git
Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/uronode.git
Homepage: http://uronode.sourceforge.net/

View File

@ -1,17 +1,10 @@
Description: Update the folders in which Uronode is installed
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2015-10-16
Last-Update: 2017-01-21
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-
+NON_INTERACTIVE="1"
_sleep()
{
[ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
@@ -14,13 +14,13 @@
@@ -20,13 +20,13 @@
_sleep 2
make distclean > make.debug

View File

@ -1,27 +1,27 @@
Description: Fix Lintian hardening errors caused by flags not being passed to compiler,
use debhelper compiler flags
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2016-04-05
Last-Update: 2017-01-21
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,8 +3,8 @@
@@ -3,7 +3,9 @@
CC = gcc
LD = gcc
# CFLAGS = -O2 -g -s -Wstrict-prototypes
-CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
-LDFLAGS =
+#CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
+#LDFLAGS =
# CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
-CFLAGS = -DUNIX -g3 -DDEBUG
+# CFLAGS = -DUNIX -g3 -DDEBUG
+CXXFLAGS =
+CPPFLAGS =
LDFLAGS =
LIBS = -lax25 -lax25io
include Makefile.include
@@ -24,7 +24,7 @@
@@ -24,7 +26,7 @@
DIGI_OBJS = $(DIGI_SRC:.c=.o)
CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
.c.o:
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(CXXFLAGS) -c $<
install: installbin installman installhelp installconf
install -b -m 755 -D -d $(VAR_DIR)