Package: heirloom-mailx
Version: 12.5-2
Severity: important
Tags: patch
User: hardening-disc...@lists.alioth.debian.org
Usertags: goal-hardening

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


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

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

iQIcBAEBCAAGBQJUEMOOAAoJEJmGUYuaqqClvOsP/Rzz/fXy1M8CfhBNT/zMwr43
Vc1F5mBtvxbDZhKtkq0G7CGkmuYysqeVIN7CcK62rBn+nRNTglDsbj3HUfW09dxL
Itf1uX6/KMowBecRt0BcjgVdCtIjt+lAqGbWsQXddJ4t3DEyLZzD11/gFyeLihZy
53zRjZ/5xn8vUPPAOMrS8QIuzxmH6xYRjRvwqWcZDfwstdPGCqrIPBhRGZ3sxEjF
SkiiFreA/KUQptDB4PwZaOp22c2OfsqPpKmODJ5OHT/Yi5HiBqzG+IbP989ql3P0
fT35w4wgOPdnMsL3HVeGPJ1fB0tKKo9RqMNzoW0ePw1rfqoGDvMdyUrzuFUTHj2d
+XDZhG5iLeqvew1r9kyp70skkpR6lz5zELQFkd2jmNEhG4cMC3VhDO1tjWXc/jZ5
9BL/w69ctMLTtj9vRvNv2Iv9I+8MmAUjWIIFRsrSM55r3hipsKr3Tn3sT0jF6pFQ
g6VGgueugxE5ZYhcm5FKx5wE4go3I1PA82LfMDX5Sle+mWN84Ri/5AHCCVUzyZdd
E1EvD681dThZ9WSye6Ba5tEFIDA/5emlvf7W9nj8Y1Wv7xCcB2iCIIHUT4VFALuv
u7CzTyswOjWWAFLbM8WZZ+75YRKPg6I4Kw7TGud7mQnzkjN7yhjOqZestC4XsSs0
F/DzETpQGwvHcV8JrxXF
=uy6g
-----END PGP SIGNATURE-----
diff -Nru heirloom-mailx-12.5/debian/changelog heirloom-mailx-12.5/debian/changelog
--- heirloom-mailx-12.5/debian/changelog	2012-04-14 20:25:21.000000000 +0200
+++ heirloom-mailx-12.5/debian/changelog	2014-09-10 23:25:46.000000000 +0200
@@ -1,3 +1,10 @@
+heirloom-mailx (12.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use dpkg-buildflags and pass *FLAGS to Makefile
+
+ -- Guillaume Delacour <g...@iroqwa.org>  Wed, 10 Sep 2014 23:16:59 +0200
+
 heirloom-mailx (12.5-2) unstable; urgency=low
 
   * now Provides: mail-reader (Closes: #663384), imap-client
diff -Nru heirloom-mailx-12.5/debian/rules heirloom-mailx-12.5/debian/rules
--- heirloom-mailx-12.5/debian/rules	2012-04-14 20:21:44.000000000 +0200
+++ heirloom-mailx-12.5/debian/rules	2014-09-10 23:24:08.000000000 +0200
@@ -5,13 +5,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS=-Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS+=-O0
-else
-	CFLAGS+=-O2
-endif
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=-Wall
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -22,7 +19,8 @@
 	$(MAKE) \
 		PREFIX=/usr \
 		CFLAGS="$(CFLAGS)" \
-		CPPFLAGS=-D_GNU_SOURCE \
+		CPPFLAGS="$(CPPFLAGS) -D_GNU_SOURCE" \
+		LDFLAGS="$(LDFLAGS)" \
 		UCBINSTALL=/usr/bin/install \
 		IPv6=-DHAVE_IPv6_FUNCS \
 		STRIP=true

Reply via email to