From 461bb6d23be87b4b79d978696e45b23f484682e1 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Tue, 5 Apr 2016 00:38:50 +0100 Subject: [PATCH] Updated for hardening errors, fixed watch file, tidied up URLs in control, renamed remove-cflags to hardening patch --- debian/changelog | 13 +++++++++++++ debian/control | 4 ++-- debian/patches/hardening | 27 +++++++++++++++++++++++++++ debian/patches/remove-cflags | 17 ----------------- debian/patches/series | 2 +- debian/rules | 1 + debian/watch | 6 ++---- 7 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 debian/patches/hardening delete mode 100644 debian/patches/remove-cflags diff --git a/debian/changelog b/debian/changelog index dc06a45..b3776c5 100644 --- a/debian/changelog +++ b/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 Tue, 05 Apr 2016 00:48:49 +0100 + uronode (2.5.1-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 31e4445..df58be6 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd 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-Git: http://anonscm.debian.org/git/pkg-hamradio/uronode.git +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/ Package: uronode diff --git a/debian/patches/hardening b/debian/patches/hardening new file mode 100644 index 0000000..a629022 --- /dev/null +++ b/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 +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) diff --git a/debian/patches/remove-cflags b/debian/patches/remove-cflags deleted file mode 100644 index 2ffdb5d..0000000 --- a/debian/patches/remove-cflags +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove CFLAGS and LDFLAGS to fix Lintian hardening errors -Author: Dave Hibberd -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 diff --git a/debian/patches/series b/debian/patches/series index 5113b0a..330f0f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -remove-cflags +hardening folder-update install-dir-creation makefile-install-locations diff --git a/debian/rules b/debian/rules index c7d34ed..dff3261 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ diff --git a/debian/watch b/debian/watch index b17055a..d7102b4 100644 --- a/debian/watch +++ b/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))) - export REPACK_SH=debian/repack.sh - debian sh debian/repack.stub + +http://sf.net/uronode/uronode-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))