From 0af4dcc0661bd396369a8c4b088c7f7720ed0163 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Mon, 9 Oct 2017 18:17:09 -0700 Subject: [PATCH] debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags * hardening-wrapper is obsolete * Fixes Issue #967 Signed-off-by: Martin Winter --- debianpkg/backports/ubuntu12.04/debian/control | 2 +- debianpkg/backports/ubuntu12.04/debian/rules | 5 +++-- debianpkg/backports/ubuntu14.04/debian/control | 2 +- debianpkg/backports/ubuntu14.04/debian/rules | 5 +++-- debianpkg/changelog.in | 1 + debianpkg/control | 2 +- debianpkg/rules | 5 +++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debianpkg/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control index 9dc5eea5c3..17ceeb0381 100644 --- a/debianpkg/backports/ubuntu12.04/debian/control +++ b/debianpkg/backports/ubuntu12.04/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobody Uploaders: Nobody XSBC-Original-Maintainer: -Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, pkg-config, python (>= 2.7), python-ipaddr +Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, pkg-config, python (>= 2.7), python-ipaddr Standards-Version: 3.9.6 Homepage: http://www.frrouting.org/ XS-Testsuite: autopkgtest diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules index 7cafadcc49..4dd24bdf56 100755 --- a/debianpkg/backports/ubuntu12.04/debian/rules +++ b/debianpkg/backports/ubuntu12.04/debian/rules @@ -27,7 +27,7 @@ #################################### export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DH_OPTIONS=-v ifeq ($(WANT_SNMP), 1) @@ -137,7 +137,8 @@ override_dh_auto_configure: $(USE_CUMULUS) \ $(USE_PIM) \ --enable-dependency-tracking \ - $(USE_BGP_VNC); \ + $(USE_BGP_VNC) \ + $(shell dpkg-buildflags --export=configure); \ fi override_dh_auto_build: diff --git a/debianpkg/backports/ubuntu14.04/debian/control b/debianpkg/backports/ubuntu14.04/debian/control index ccbe23fddb..c22bd3bd58 100644 --- a/debianpkg/backports/ubuntu14.04/debian/control +++ b/debianpkg/backports/ubuntu14.04/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobody Uploaders: Nobody XSBC-Original-Maintainer: -Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, pkg-config, python (>= 2.7), python-ipaddr +Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, pkg-config, python (>= 2.7), python-ipaddr Standards-Version: 3.9.6 Homepage: http://www.frrouting.org/ XS-Testsuite: autopkgtest diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules index 4d9a22046c..257c5c41bb 100755 --- a/debianpkg/backports/ubuntu14.04/debian/rules +++ b/debianpkg/backports/ubuntu14.04/debian/rules @@ -27,7 +27,7 @@ #################################### export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DH_OPTIONS=-v ifeq ($(WANT_SNMP), 1) @@ -137,7 +137,8 @@ override_dh_auto_configure: $(USE_CUMULUS) \ $(USE_PIM) \ --enable-dependency-tracking \ - $(USE_BGP_VNC); \ + $(USE_BGP_VNC) \ + $(shell dpkg-buildflags --export=configure); \ fi override_dh_auto_build: diff --git a/debianpkg/changelog.in b/debianpkg/changelog.in index 187708351d..049e3eef8e 100644 --- a/debianpkg/changelog.in +++ b/debianpkg/changelog.in @@ -16,6 +16,7 @@ frr (@VERSION@) RELEASED; urgency=medium * New Enabled: PIM Sparse Mode * New Enabled: NHRP RFC 2332 * New Enabled: Label Manager + * Switched from hardening-wrapper to dpkg-buildflags. -- FRRouting-Dev Wed, 05 Apr 2017 22:23:42 -0500 diff --git a/debianpkg/control b/debianpkg/control index 60a64722bd..a9a9b0708e 100644 --- a/debianpkg/control +++ b/debianpkg/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobody Uploaders: Nobody XSBC-Original-Maintainer: -Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr +Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr Standards-Version: 3.9.6 Homepage: http://www.frrouting.org/ diff --git a/debianpkg/rules b/debianpkg/rules index fb5512bac9..11c5e3784c 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -27,7 +27,7 @@ #################################### export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DH_OPTIONS=-v ifeq ($(WANT_SNMP), 1) @@ -138,7 +138,8 @@ override_dh_auto_configure: $(USE_CUMULUS) \ $(USE_PIM) \ --enable-dependency-tracking \ - $(USE_BGP_VNC); \ + $(USE_BGP_VNC) \ + $(shell dpkg-buildflags --export=configure); \ fi override_dh_auto_build: -- 2.39.5