Updated for hardening errors, fixed watch file, tidied up URLs in control,

renamed remove-cflags to hardening patch

debian/changelog

@@ -1,3 +1,16 @@
+uronode (2.5.1-2) unstable; urgency=medium
+
+  * debian/control
+    - Updated Standards Version to 3.9.7
+    - Changed VCS-* to secure URIs
+  * debian/patches/hardening
+    - patch renamed (previously called remove-cflags)
+    - patch adds CPPFlags and LDFlags to compiler instructions
+  * debian/rules
+    - Exporting hardening=+all to enable fPIE and bindnow
+
+ -- Dave Hibberd <d@vehibberd.com>  Tue, 05 Apr 2016 00:48:49 +0100
+
 uronode (2.5.1-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -5,8 +5,8 @@ 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
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/uronode.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/uronode.git
-Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/uronode.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/uronode.git
 Homepage: http://uronode.sourceforge.net/
 
 Package: uronode

debian/patches/hardening

@@ -0,0 +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
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,8 +3,8 @@
+ 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 =
+ LIBS = -lax25 -lax25io
+ 
+ include Makefile.include
+@@ -24,7 +24,7 @@
+ DIGI_OBJS =		$(DIGI_SRC:.c=.o)
+ CALIBRATE_OBJS =	$(CALIBRATE_SRC:.c=.o)
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
+ 
+ install: installbin installman installhelp installconf
+ 	install -b -m 755    -D -d	$(VAR_DIR)

debian/patches/remove-cflags

@@ -1,17 +0,0 @@
-Description: Remove CFLAGS and LDFLAGS to fix Lintian hardening errors
-Author: Dave Hibberd <d@vehibberd.com>
-Last-Update: 2015-09-07
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3,8 +3,8 @@
- 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 =
- LIBS = -lax25 -lax25io
- 
- include Makefile.include

debian/patches/series

@@ -1,4 +1,4 @@
-remove-cflags
+hardening
 folder-update
 install-dir-creation
 makefile-install-locations

debian/rules

@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@

debian/watch

@@ -1,5 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg$// \
+
-	http://sf.net/uronode/uronode-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+http://sf.net/uronode/uronode-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-	export REPACK_SH=debian/repack.sh 
-	debian sh debian/repack.stub