Drop hardening-wrapper in favor of passing flags via CC

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 5db81d6788db0105ee466effa26a0d3309208d69..b7d3da09b468af8bfcd3c4db075d1b7782f947cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.6.18.3-2) UNRELEASED; urgency=medium
+
+  * Drop hardening-wrapper in favor of passing flags via CC.
+    (Closes: #836642)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Mon, 05 Sep 2016 22:35:28 -0400
+
 openafs (1.6.18.3-1) unstable; urgency=medium
 
   * New upstream release 1.6.18.3:

diff --git a/debian/control b/debian/control
index 39c121361354f65747cdad1a52338e150925a8cd..777ffa54a4ac1b1d26379d7a8f9ed1f61515bf8f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Benjamin Kaduk <kaduk@mit.edu>
 Uploaders: Russ Allbery <rra@debian.org>, Sam Hartman <hartmans@debian.org>,
  Anders Kaseorg <andersk@mit.edu>
 Build-Depends: debhelper (>= 9), autoconf, automake, bison, comerr-dev,
- cpio, flex, hardening-wrapper, libfuse-dev, libkrb5-dev, libncurses5-dev,
+ cpio, flex, libfuse-dev, libkrb5-dev, libncurses5-dev,
  libpam0g-dev, libxml2-utils, perl, pkg-config, dh-systemd
 Build-Depends-Indep: dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen,
  xsltproc

diff --git a/debian/rules b/debian/rules
index 7543c6447e08d84c8c9dfc1c73b6318651c4ff34..efa32157fb85cd06b357b31ea4df9e309fc05f91 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 
-# Enable hardening flags in hardening-wrapper.  This is a temporary
-# workaround until upstream supports using user-provided CFLAGS, CPPFLAGS,
-# and LDFLAGS.
-export DEB_BUILD_HARDENING = 1
-
 # Tell Autoconf the correct system types.
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -94,6 +89,9 @@ get-orig-source:
 
 # Handle the renaming of the up man page to afs-up here since the man pages
 # are generated from POD source by regen.sh.
+#
+# As a temporary workaround until upstream supports using
+# user-provided CFLAGS, CPPFLAGS, and LDFLAGS, we pass these via CC.
 override_dh_auto_configure:
        @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi
        echo '$(DEBIAN)'-debian > .version
@@ -102,7 +100,7 @@ override_dh_auto_configure:
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local     \
            sh configure                                                   \
-           CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
+           CC='$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)'                    \
            --with-afs-sysname=$(SYS_NAME) --disable-kernel-module         \
            --prefix=/usr --mandir=\$${prefix}/share/man                   \
            --sysconfdir=/etc --libexecdir=/usr/lib --with-krb5            \