debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags

* hardening-wrapper is obsolete
* Fixes Issue #967

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/debianpkg/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control
index 9dc5eea5c3657e3ba1c3c240bb3fa377a5b5d4b8..17ceeb038148bc070886a902426cd7287a0d4dfc 100644 (file)
--- a/debianpkg/backports/ubuntu12.04/debian/control
+++ b/debianpkg/backports/ubuntu12.04/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-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 7cafadcc49c05f1b7346f710f68f8c74921cbcd0..4dd24bdf569d9003b543d9d361d2fdf8f58e9cd1 100755 (executable)
--- 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 ccbe23fddb0857e7503d28d11d6fff9ae5e52599..c22bd3bd58469d3fb4f68b3c2a23dbd2ea313cc1 100644 (file)
--- a/debianpkg/backports/ubuntu14.04/debian/control
+++ b/debianpkg/backports/ubuntu14.04/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-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 4d9a22046cac4f18a63eb7a9dedc0865581e7323..257c5c41bb80dec0eb3667ca6093dad31cb953da 100755 (executable)
--- 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 187708351d46e595cd1ff7afbb2f269c2b0f308d..049e3eef8e8744a9b0905028645d2826d05e8eeb 100644 (file)
--- 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 <dev@lists.frrouting.org>  Wed, 05 Apr 2017 22:23:42 -0500
 

diff --git a/debianpkg/control b/debianpkg/control
index 60a64722bd77961cefb539f78ff08079f1de683f..a9a9b0708e625f6365e17730e3cc46bda47caaf3 100644 (file)
--- a/debianpkg/control
+++ b/debianpkg/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-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 fb5512bac90d564708b00d73ecd774bd595dad2c..11c5e3784c6f17a80d87ec8a20fcba04d6250940 100755 (executable)
--- 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: