]> git.proxmox.com Git - mirror_frr.git/commitdiff
debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags
authorMartin Winter <mwinter@opensourcerouting.org>
Tue, 10 Oct 2017 01:17:09 +0000 (18:17 -0700)
committerMartin Winter <mwinter@opensourcerouting.org>
Sat, 18 Nov 2017 01:55:33 +0000 (17:55 -0800)
* hardening-wrapper is obsolete
* Fixes Issue #967

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
debianpkg/backports/ubuntu12.04/debian/control
debianpkg/backports/ubuntu12.04/debian/rules
debianpkg/backports/ubuntu14.04/debian/control
debianpkg/backports/ubuntu14.04/debian/rules
debianpkg/changelog.in
debianpkg/control
debianpkg/rules

index 9dc5eea5c3657e3ba1c3c240bb3fa377a5b5d4b8..17ceeb038148bc070886a902426cd7287a0d4dfc 100644 (file)
@@ -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
index 7cafadcc49c05f1b7346f710f68f8c74921cbcd0..4dd24bdf569d9003b543d9d361d2fdf8f58e9cd1 100755 (executable)
@@ -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:
index ccbe23fddb0857e7503d28d11d6fff9ae5e52599..c22bd3bd58469d3fb4f68b3c2a23dbd2ea313cc1 100644 (file)
@@ -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
index 4d9a22046cac4f18a63eb7a9dedc0865581e7323..257c5c41bb80dec0eb3667ca6093dad31cb953da 100755 (executable)
@@ -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:
index 4002f7e14d374f2aebf82642559f69b0900e6e27..c4cc170af349594b8e05228739a73cd9e94205c3 100644 (file)
@@ -22,6 +22,7 @@ frr (3.0-0) 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
 
index 2b637a6a6ff18ad79e3869adf58656ce1b92f347..077eaf98283f7bbeb5d592618e1699d00d719788 100644 (file)
@@ -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/
 
index fb5512bac90d564708b00d73ecd774bd595dad2c..11c5e3784c6f17a80d87ec8a20fcba04d6250940 100755 (executable)
@@ -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: