From 654077fff8011074ce337e3d9863227b3ae74045 Mon Sep 17 00:00:00 2001 From: Christian Perrier Date: Wed, 19 Nov 2014 21:51:16 +0100 Subject: [PATCH] Enforce hardened builds to workaround cdbs sometimes not building with hardening flags as in 1:4.2-2+b1 Thanks to Dr. Markus Waldeck for pointing the issue and Simon Ruderich For providing a working patch. --- debian/changelog | 9 +++++++++ debian/control | 1 + debian/rules | 2 ++ 3 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1605eaa3..b0599c08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +shadow (1:4.2-3) UNRELEASED; urgency=low + + * Enforce hardened builds to workaround cdbs sometimes not building + with hardening flags as in 1:4.2-2+b1 + Thanks to Dr. Markus Waldeck for pointing the issue and Simon Ruderich + For providing a working patch. + + -- Christian Perrier Wed, 19 Nov 2014 21:50:10 +0100 + shadow (1:4.2-2) unstable; urgency=low * The "Soumaintrain" release diff --git a/debian/control b/debian/control index c76a02f9..6f06f5ba 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Shadow package maintainers , Nicolas FRANCOIS (Nekral) Build-Depends: dh-autoreconf, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3), bison, libaudit-dev [linux-any] + ,hardening-wrapper Vcs-Git: git://anonscm.debian.org/git/pkg-shadow/shadow.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shadow/shadow.git;a=summary Homepage: http://pkg-shadow.alioth.debian.org/ diff --git a/debian/rules b/debian/rules index 51c0f5de..60b062f1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +export DEB_BUILD_HARDENING=1 + # Enable PIE, BINDNOW, and possible future flags. export DEB_BUILD_MAINT_OPTIONS = hardening=+all