From 264ed72aeebe99e9c2a8d5740ca66ce7b1231ea9 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 5 Sep 2016 22:35:41 -0400 Subject: [PATCH] Drop hardening-wrapper in favor of passing flags via CC Signed-off-by: Anders Kaseorg --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 10 ++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5db81d678..b7d3da09b 100644 --- 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 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 39c121361..777ffa54a 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Benjamin Kaduk Uploaders: Russ Allbery , Sam Hartman , Anders Kaseorg 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 7543c6447..efa32157f 100755 --- 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 \ -- 2.39.5