[hdf4] 01/03: Enable PIE hardening flags. (closes: #859413)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository hdf4.

commit 96088a47b7d3e5f1f5b992f4a4f9ce4900a02d37
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 3 14:27:28 2017 +0200

    Enable PIE hardening flags. (closes: #859413)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6663989..4e061e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libhdf4 (4.2.12-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Enable PIE hardening flags.
+    (closes: #859413)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Apr 2017 14:26:32 +0200
+
 libhdf4 (4.2.12-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 1464561..e6a73bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #
 
 # Enable hardening build flags
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -24,9 +24,9 @@ CC   := gcc
 CXX  := g++
 LIBS := -ljpeg -lz -lm
 
-CFLAGS  = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get CFLAGS)
-CFLAGS += $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get CPPFLAGS)
-LDFLAGS = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS)
+CFLAGS  = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)
+CFLAGS += $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)
+LDFLAGS = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    DH_VERBOSE=1

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