[pkg-wpa-devel] r1826 - in /wpa/trunk/debian: changelog rules

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Sat Dec 28 22:44:35 2013
New Revision: 1826

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1826
Log:
fix hardening flags, thanks a lot to Florent Daigniere
<nextgens at freenetproject.org> (Closes: #725865).

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/rules

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1826&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Sat Dec 28 22:44:35 2013
@@ -20,7 +20,8 @@
     fixes.
   * debian/README.source: drop trailing whitespace.
   * compress binaries with xz.
-  * fix hardening flags.
+  * fix hardening flags, thanks a lot to Florent Daigniere
+    <nextgens at freenetproject.org> (Closes: #725865).
   * debian/control: fold dependencies.
   * bump standards version to 3.9.5, no changes necessary.
   * reflect reality and adapt the maintainer mail address not to claim

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1826&op=diff
==============================================================================
--- wpa/trunk/debian/rules	(original)
+++ wpa/trunk/debian/rules	Sat Dec 28 22:44:35 2013
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/buildflags.mk
 
 # The build system doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to
 # enable the missing (hardening) flags
@@ -7,9 +10,9 @@
 DEB_LDFLAGS_MAINT_APPEND  = -Wl,--as-needed
 export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_APPEND
 
-UCFLAGS  = -MMD -Wall -g -Os
+UCFLAGS   = -MMD -Wall $(shell dpkg-buildflags --get CFLAGS | sed s/[\ \t]*\-O[0-9s][\ \t]*/\ \-Os\ /) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
 
-BINDIR   = /sbin
+BINDIR    = /sbin
 V = 1
 
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)