From: Bdale Garbee <bdale@gag.com>
Date: Sun, 18 Mar 2012 19:53:57 +0000 (+0100)
Subject: enable hardening build flags
X-Git-Tag: debian/1.4-4
X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=cb6480b325ebe23e757e524e5fe3cde83ef4df5f

enable hardening build flags
---

diff --git a/debian/changelog b/debian/changelog
index 6e0552f..8156a05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gzip (1.4-4) unstable; urgency=low
+
+  * enable hardening build flags, closes: #664499
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 18 Mar 2012 20:16:45 +0100
+
 gzip (1.4-3) unstable; urgency=low
 
   * patch from upstream for sys_stat.in.h to fix mingw32 builds, 
diff --git a/debian/rules b/debian/rules
index eb3b6c3..83be2e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,13 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
 ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
-CFLAGS=-g -O2 -Wall -DUNALIGNED_OK
-else
-CFLAGS=-g -O2 -Wall
+CFLAGS += -DUNALIGNED_OK
 endif
 
 reconf-stamp:
@@ -27,7 +30,7 @@ configure: configure-stamp
 configure-stamp: reconf-stamp
 	dh_testdir
 	mkdir -p build
-	cd build && ../configure \
+	cd build && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ../configure \
 		--prefix=/usr --bindir=/bin \
 		--infodir=`pwd`/debian/gzip/usr/share/info \
 		--mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)