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

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

Author: kelmo-guest
Date: Sun May 13 14:01:45 2012
New Revision: 1752

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1752
Log:
Really enable hardened build flags, thanks Simon Ruderich
<simon at ruderich.org>. (Closes: #657332)

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=1752&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Sun May 13 14:01:45 2012
@@ -1,6 +1,11 @@
 wpa (1.0-2) UNRELEASED; urgency=low
 
+  [ Stefan Lippers-Hollmann ]
   * NOT RELEASED YET
+
+  [ Kel Modderman ]
+  * Really enable hardened build flags, thanks Simon Ruderich
+    <simon at ruderich.org>. (Closes: #657332)
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sat, 12 May 2012 13:19:41 +0200
 

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1752&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Sun May 13 14:01:45 2012
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-CFLAGS   = -MMD -Wall
-CFLAGS   += $(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS =  $(shell dpkg-buildflags --get CXXFLAGS)
+# The build system doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to
+# enable the missing (hardening) flags
+CFLAGS   += -MMD -Wall $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
 UCFLAGS  = -MMD -Wall -g -Os
-LDFLAGS  =  $(shell dpkg-buildflags --get LDFLAGS)
+
 BINDIR   = /sbin
-V = 0
+V = 1
 
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -15,7 +16,7 @@
 	CC=$(DEB_HOST_GNU_TYPE)-gcc
 endif
 
-export CC CFLAGS CPPFLAGS CXXFLAGS LDFLAGS BINDIR V
+export CC BINDIR V
 
 DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 HOSTAPD_DOT_CONFIG            := debian/config/hostapd/$(DEB_HOST_ARCH_OS)