Control: tags -1 + patch Hi,
Please find a patch attached. The patch sets compat to 9 and sets DEB_BUILD_MAINT_OPTIONS to enable hardening during the build while removing the dependency on hardening-wrapper. Thanks, Iain.
From a01c6b0d122bf6d1411d6cecc48ca1ea929e4847 Mon Sep 17 00:00:00 2001 From: "Iain R. Learmonth" <i...@fsfe.org> Date: Sun, 18 Sep 2016 17:24:23 +0100 Subject: [PATCH] Removes dependency on hardening-wrapper Debian Bug: https://bugs.debian.org/836762 This commit bumps compat level to 9, allowing for DEB_BUILD_MAINT_OPTIONS to be used to specify that hardening is desired, allowing for dpkg-buildflags to intelligently set the hardening options passed to gcc etc. --- debian/changelog | 7 +++++++ debian/compat | 2 +- debian/control | 2 +- debian/rules | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04d530b..e29e0b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tor (0.2.9.2-alpha-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Removes dependency on hardening-wrapper. (Closes: #836762) + + -- Iain R. Learmonth <i...@debian.org> Sun, 18 Sep 2016 17:23:15 +0100 + tor (0.2.9.2-alpha-1) experimental; urgency=medium * New upstream version. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 5ea8d70..e4de923 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tor Section: net Priority: optional Maintainer: Peter Palfrader <wea...@debian.org> -Build-Depends: debhelper (>= 8.1.0~), quilt, libssl-dev, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor, libseccomp-dev [amd64 i386], dh-systemd [linux-any], libsystemd-dev [linux-any], pkg-config [linux-any], dh-autoreconf +Build-Depends: debhelper (>= 9), quilt, libssl-dev, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor, libseccomp-dev [amd64 i386], dh-systemd [linux-any], libsystemd-dev [linux-any], pkg-config [linux-any], dh-autoreconf Build-Conflicts: libnacl-dev, libseccomp-dev [!amd64 !i386] Standards-Version: 3.9.4 Homepage: https://www.torproject.org/ diff --git a/debian/rules b/debian/rules index 80b5006..af002ae 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ DH_VERBOSE ?= 1 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + # allow building against libdmalloc4 - it better be installed ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS))) confflags += --with-dmalloc -- 2.9.3
signature.asc
Description: PGP signature
