[apache2] 01/01: switch to buildflags.mk, enable bindnow

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 21f6462720083d129003ff1ba35fc7de4b3ffcab
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 12 20:04:17 2013 +0200

    switch to buildflags.mk, enable bindnow
---
 debian/changelog |    2 ++
 debian/rules     |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8f3c82..220e737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apache2 (2.4.6-3) UNRELEASED; urgency=low
   * Improve comment for LogLevel in apache2.conf. Closes: #718677
   * Fix comment in ports.conf. Closes: #718650
   * Fix htcacheclean path and function name in init script. Closes: #718909
+  * Enable bindnow hardening compiler option, patch by Felix Geyer.
+    Closes: #714872
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 23 Jul 2013 21:24:07 +0200
 
diff --git a/debian/rules b/debian/rules
index adbf36d..9a3bf41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,17 @@ DEB_BUILD_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
+include /usr/share/dpkg/buildflags.mk
+
 LSB_RELEASE := $(shell lsb_release -i -s)
 SERVER_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*([\d\.]+)/')
 DEBIAN_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*(.+)/')
 MODULE_DIR := /usr/lib/apache2/modules/
 API = $(shell perl -ne 'print $$1 if m/define\s+MODULE_MAGIC_NUMBER_MAJOR\s+?(.*)$$/' < include/ap_mmn.h)
-AP2_CFLAGS = -pipe $(shell dpkg-buildflags --get CFLAGS)
-AP2_LDFLAGS = -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS)
-AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(shell dpkg-buildflags --get CPPFLAGS)
+AP2_CFLAGS = -pipe $(CFLAGS)
+AP2_LDFLAGS = -Wl,--as-needed $(LDFLAGS)
+AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(CPPFLAGS)
 AP2_LTFLAGS = --no-silent
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git