[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-56-g6e04541

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 6e04541e6ef23c4b6d91518dfd23f52510d77fb4
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Jan 8 09:48:55 2012 -0800

    Patch from Pierre Chifflier to enable hardening
    
    I suspect there's some overlap here with what I did for #611192, but it looks
    straightforward enough to give it a try

diff --git a/debian/changelog b/debian/changelog
index 51a2f71..ea31f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 isc-dhcp (4.2.2-4) UNRELEASED; urgency=low
 
   * debian/control: remove transitional packages
+  * debian/rules: apply the intent of Pierre Chifflier's patch to enable
+    hardening options (closes: #644413)
 
- -- Andrew Pollock <apollock at debian.org>  Sun, 08 Jan 2012 09:38:31 -0800
+ -- Andrew Pollock <apollock at debian.org>  Sun, 08 Jan 2012 09:47:17 -0800
 
 isc-dhcp (4.2.2-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d568535..1b5c5c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,25 +17,25 @@ CROSS=
 endif
 
 export DEB_BUILD_HARDENING=1
+DPKG_EXPORT_BUILDFLAGS = 1
 
 DESTDIR = `pwd`/debian/tmp
 
 PACKAGE = isc-dhcp
 
 include /usr/share/dpatch/dpatch.make
+-include /usr/share/dpkg/buildflags.mk
 
 INSTALL = install
 INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
 
-CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -Wall
+CFLAGS += -Wall
 
 CFLAGS += -D_PATH_DHCLIENT_SCRIPT='"/sbin/dhclient-script"'
 CFLAGS += -D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
 CFLAGS += -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
 CFLAGS += -DNOMINUM
 
-export CFLAGS
-
 patched-ldap/build-stamp:
 	dh_testdir
 

-- 
ISC DHCP packaging for Debian