[Glibc-bsd-commits] r6094 - trunk/freebsd-buildutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-07-19 09:15:46 +0000 (Tue, 19 Jul 2016)
New Revision: 6094

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/rules
Log:
* Add Build-Depends: dpkg-dev (>= 1.16.1.1) and use buildflags.mk
  to set CFLAGS, respecting DEB_BUILD_OPTIONS flags such as noopt
* Enable hardening=+all, which includes PIE, relro and stack protector


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2016-07-19 09:00:00 UTC (rev 6093)
+++ trunk/freebsd-buildutils/debian/changelog	2016-07-19 09:15:46 UTC (rev 6094)
@@ -1,3 +1,11 @@
+freebsd-buildutils (10.3~svn296373-4) UNRELEASED; urgency=medium
+
+  * Add Build-Depends: dpkg-dev (>= 1.16.1.1) and use buildflags.mk
+    to set CFLAGS, respecting DEB_BUILD_OPTIONS flags such as noopt
+  * Enable hardening=+all, which includes PIE, relro and stack protector
+
+ -- Steven Chamberlain <stevenc at debian.org>  Tue, 19 Jul 2016 10:13:07 +0100
+
 freebsd-buildutils (10.3~svn296373-3) unstable; urgency=medium
 
   * Update my email address in Uploaders

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2016-07-19 09:00:00 UTC (rev 6093)
+++ trunk/freebsd-buildutils/debian/control	2016-07-19 09:15:46 UTC (rev 6094)
@@ -7,6 +7,7 @@
  Robert Millan <rmh at debian.org>,
  Steven Chamberlain <stevenc at debian.org>,
 Build-Depends: debhelper (>= 9), flex | flex-old, bison,
+ dpkg-dev (>= 1.16.1.1),
  libbsd-dev (>= 0.3.0),
  freebsd-glue (>= 0.2.20),
  bmake,

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2016-07-19 09:00:00 UTC (rev 6093)
+++ trunk/freebsd-buildutils/debian/rules	2016-07-19 09:15:46 UTC (rev 6094)
@@ -11,6 +11,10 @@
 CC := $(DEB_HOST_GNU_TYPE)-gcc
 endif
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -54,7 +58,7 @@
 	BSD_MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
+export CFLAGS += -O2 -g -Wall -D_GNU_SOURCE \
          -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
          -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
          -I$(CURDIR)/build-tree/src/sys \