Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock

Please unblock eb/4.4.3-6 to enable hardening flags for wheezy.

Changes:

  * debian/rules: Use dpkg-buildflags to support hardening flags

See also the attached debdiff.

unblock eb/4.4.3-6

Thanks,
--
Tatsuya Kinoshita
diffstat for eb-4.4.3 eb-4.4.3

 changelog |    6 ++++++
 rules     |   14 ++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff -Nru eb-4.4.3/debian/changelog eb-4.4.3/debian/changelog
--- eb-4.4.3/debian/changelog   2012-05-25 22:45:44.000000000 +0900
+++ eb-4.4.3/debian/changelog   2012-07-08 15:20:28.000000000 +0900
@@ -1,3 +1,9 @@
+eb (4.4.3-6) unstable; urgency=low
+
+  * debian/rules: Use dpkg-buildflags to support hardening flags
+
+ -- Tatsuya Kinoshita <[email protected]>  Sun, 08 Jul 2012 15:20:19 +0900
+
 eb (4.4.3-5) unstable; urgency=low
 
   * Don't install examples/Makefile which is arch-dependent (closes: #674490)
diff -Nru eb-4.4.3/debian/rules eb-4.4.3/debian/rules
--- eb-4.4.3/debian/rules       2012-04-16 04:38:04.000000000 +0900
+++ eb-4.4.3/debian/rules       2012-07-08 15:20:15.000000000 +0900
@@ -10,13 +10,11 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) 
dpkg-buildflags
+CFLAGS=$(shell $(dpkg_buildflags) --get CFLAGS)
+CPPFLAGS=$(shell $(dpkg_buildflags) --get CPPFLAGS)
+LDFLAGS=$(shell $(dpkg_buildflags) --get LDFLAGS)
 
 SUBDIRS_INDEP = doc
 SUBDIRS_ARCH = eb libebutils ebappendix ebfont ebinfo ebrefile ebstopcode 
ebzip po-eb po-ebutils m4
@@ -24,7 +22,7 @@
 
 config.status: configure
        dh_testdir
-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
--prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
CFLAGS="$(CFLAGS)" --with-pkgdocdir=/usr/share/doc/eb-doc
+       CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" 
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
--prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
--with-pkgdocdir=/usr/share/doc/eb-doc
 
 build: build-indep build-arch
 

Attachment: pgp31uzdU89ux.pgp
Description: PGP signature

Reply via email to