[Pkg-ofed-commits] [perftest] 01/02: Enable hardening and fix ignorance of CFLAGS

[Benjamin Drung]

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

bdrung pushed a commit to branch master
in repository perftest.

commit 3a1f1859965254cb8e053d1ec40d99687a5239e1
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon Aug 22 11:56:17 2016 +0200

    Enable hardening and fix ignorance of CFLAGS
---
 debian/patches/fix-cflags.patch | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/debian/patches/fix-cflags.patch b/debian/patches/fix-cflags.patch
new file mode 100644
index 0000000..5257e6f
--- /dev/null
+++ b/debian/patches/fix-cflags.patch
@@ -0,0 +1,16 @@
+Description: Do not ignore given CFLAGS
+ The configure script ignores the CFLAGS provided by the user, because it sets
+ the CFLAGS variable. This prevents us to set hardening flags.
+Author: Benjamin Drung <benjamin.drung at profitbricks.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,7 +189,7 @@
+         AC_DEFINE([HAVE_GID_ATTR], [1], [Enable GID Attribute query feature])
+ fi
+ 
+-CFLAGS="-g -Wall -D_GNU_SOURCE -O3"
++CFLAGS="-g -Wall -D_GNU_SOURCE -O3 $CFLAGS"
+ AC_SUBST([LIBUMAD])
+ AC_SUBST([LIBMATH])
+ AC_CONFIG_FILES([Makefile])
diff --git a/debian/patches/series b/debian/patches/series
index a86d3e9..e55b20d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-spelling-errors-in-binaries.patch
 Fix-typos-in-s390x-support.patch
 Fix-typo-destory.patch
+fix-cflags.patch
diff --git a/debian/rules b/debian/rules
index baa138d..5376477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ --with autoreconf

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