From: Russ Allbery Date: Thu, 3 Jan 2013 17:20:07 +0000 (-0800) Subject: Use hardening-wrapper to harden the binaries X-Git-Tag: debian/1.6.2_pre2-1~1 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ee58a96577c129ed43d8dd3ecc4a891cb7d4ea24;p=packages%2Fo%2Fopenafs.git Use hardening-wrapper to harden the binaries * Build-Depend on hardening-wrapper and enable it to work around the current upstream munging of CFLAGS and LDFLAGS. (Closes: #659663) --- diff --git a/debian/changelog b/debian/changelog index b17638698..060785de8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ openafs (1.6.2~pre2-1) UNRELEASED; urgency=low read and write to a file, the reading client may see first couple bytes of a file as nulls. - Support newer glibc versions. + * Build-Depend on hardening-wrapper and enable it to work around the + current upstream munging of CFLAGS and LDFLAGS. (Closes: #659663) * Fix server installation instructions in README.servers, which used the early demand-attach syntax before separate demand-attach binaries were built. Thanks, Björn Torkelsson. (Closes: #693311) diff --git a/debian/control b/debian/control index 565bcea14..537d9cf01 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Russ Allbery Uploaders: Sam Hartman Build-Depends: debhelper (>= 9), autoconf, automake, bison, comerr-dev, cpio, dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen, flex, - libfuse-dev, libkrb5-dev, libncurses5-dev, libpam0g-dev, libxml2-utils, - perl, pkg-config, xsltproc + hardening-wrapper, libfuse-dev, libkrb5-dev, libncurses5-dev, + libpam0g-dev, libxml2-utils, perl, pkg-config, xsltproc Standards-Version: 3.9.4 Homepage: http://www.openafs.org/ Vcs-Git: git://anonscm.debian.org/pkg-k5-afs/openafs.git diff --git a/debian/rules b/debian/rules index e8cc6cb45..9cd935d11 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,10 @@ #!/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)