Source: bandwidthd
Version: 2.0.1+cvs20090917-7
Severity: important
Tags: patch
User: [email protected]
Usertags: goal-hardening

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256



Hello,

Please enable hardened build flags with dpkg-buildflags (patch
attached). dpkg-buildflags handle "noopt" from DEB_BUILD_OPTIONS.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJUHpHRAAoJEJmGUYuaqqClNhQP/jYNArIMFtGuoXbnZ5dS54p+
WjybNeG948asYMeLoDT86QRYl/RYiprPqXy1dNf5/zV8qoTX5i+S39X49sKbfRQE
HIEzsJOqp/+PPKK0fBZ7Yf+ScTiQMiJAnvaxTtfy6kiP++OLXl/J+Zzw0AsusEwH
wGe9i+zMFuH0yEB5qr9Pst2foiPmXmK+gE7mtEe4AGdTPKRFcg9JW5TZsL8b5MFC
6PxA5LnOP2MyAoxpDJKiAFS775/fihBY2ppUz86oEh1JnjX9WFsdy5QrWqoo8LfG
trc9eUSIysksjSL79akyUikia6AOQr0NxxO6LDdQIjMXVgin4BcfW9pi/g5a9A4g
XU4Na6H9viLfs/y5bnfHnhl5uhygy3OVWpgh+1KvdwCzWA2PBnu0zjJ+zAo8bdSb
+rg5LK4KsxrLlHEsVrBud6pigLuEPxfEIXrlqlEcSwOtkCJF2E7OiaUtCZ/Ry6jI
tNVFqp21C3q6ppP31QF4VJFGga4OoLdw5cQhpfA8ARiwewrcurxy3qan3Ge8khVe
SMyzaKEipSehDxyySKL/5zgiXyOWTDro5Sbal+GI3LHApxMD4TlQv8YEMpKF3OuX
ccQ9khGMrdD+PRJGjEmYJKVByPK+pokcTrkk9YIQLBwuy/YIuW9obLjXWV+KMGEA
azkJz++xs3S+l314ZhUP
=Prxd
-----END PGP SIGNATURE-----
diff -Nru bandwidthd-2.0.1+cvs20090917/debian/changelog bandwidthd-2.0.1+cvs20090917/debian/changelog
--- bandwidthd-2.0.1+cvs20090917/debian/changelog	2013-07-20 18:25:40.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/changelog	2014-09-21 10:39:48.000000000 +0200
@@ -1,3 +1,10 @@
+bandwidthd (2.0.1+cvs20090917-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use dpkg-buildflags and pass *FLAGS to configure
+
+ -- Guillaume Delacour <[email protected]>  Sun, 21 Sep 2014 10:27:23 +0200
+
 bandwidthd (2.0.1+cvs20090917-7) unstable; urgency=low
 
   * Move php5-gd to Recommends and also recommend php5 (Closes: #717042)
diff -Nru bandwidthd-2.0.1+cvs20090917/debian/rules bandwidthd-2.0.1+cvs20090917/debian/rules
--- bandwidthd-2.0.1+cvs20090917/debian/rules	2013-06-14 00:41:25.000000000 +0200
+++ bandwidthd-2.0.1+cvs20090917/debian/rules	2014-09-21 10:28:19.000000000 +0200
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 configureoptions = --prefix=/usr --bindir=/usr/sbin/ --sysconfdir=/etc/bandwidthd/ --localstatedir=/var/lib/
 
 p_bwdstatic = bandwidthd
@@ -15,17 +18,6 @@
 build_bwdpgsql = debian/bandwidthd-pgsql
 
 
-CFLAGS = -Wall
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -41,7 +33,7 @@
 	cp -f /usr/share/misc/config.sub config.sub
 	dh_autoreconf
 	chmod +x configure
-	./configure $(configureoptions) --disable-pgsql
+	$(shell dpkg-buildflags --export=cmdline) ./configure $(configureoptions) --disable-pgsql
 	touch $@
 	
 configure-bwdpgsql: configure-bwdpgsql-stamp

Reply via email to