Package: fair
Version: 0.5.3-1
Severity: normal
Tags: patch

Hoi Guus, Joost,

Attached patch enabled build-time hardening of the fair binaries. I have
tested this on dogars and donfan and found no issues.


Cheers,
Thijs
diff -Nru fair-0.5.3/debian/changelog fair-0.5.3/debian/changelog
--- fair-0.5.3/debian/changelog	2011-12-04 13:43:47.000000000 +0100
+++ fair-0.5.3/debian/changelog	2013-10-04 17:02:28.000000000 +0200
@@ -1,3 +1,10 @@
+fair (0.5.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable compiler hardening of built binaries.
+
+ -- Thijs Kinkhorst <th...@debian.org>  Fri, 04 Oct 2013 17:01:47 +0200
+
 fair (0.5.3-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru fair-0.5.3/debian/control fair-0.5.3/debian/control
--- fair-0.5.3/debian/control	2011-12-04 13:43:52.000000000 +0100
+++ fair-0.5.3/debian/control	2013-10-04 17:00:15.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Guus Sliepen <g...@debian.org>
 Uploaders: Joost van Baal <joos...@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libavl-dev (>= 0.3.5-3)
+Build-Depends: debhelper (>= 5), autotools-dev, libavl-dev (>= 0.3.5-3), dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.2
 
 Package: fair
diff -Nru fair-0.5.3/debian/rules fair-0.5.3/debian/rules
--- fair-0.5.3/debian/rules	2011-12-04 13:52:35.000000000 +0100
+++ fair-0.5.3/debian/rules	2013-10-04 17:00:49.000000000 +0200
@@ -9,6 +9,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 config.status: configure
 	dh_testdir
@@ -19,7 +22,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
 
 
 build: build-arch build-indep

Reply via email to