[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682097: unblock: dbskkd-cdb/1:2.00-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock dbskkd-cdb/1:2.00-5 to enable hardening flags for wheezy.

Changes:

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

See also the attached debdiff.

unblock dbskkd-cdb/1:2.00-5

Thanks,
--
Tatsuya Kinoshita
diffstat for dbskkd-cdb-2.00 dbskkd-cdb-2.00

 changelog |    6 ++++++
 rules     |   10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff -Nru dbskkd-cdb-2.00/debian/changelog dbskkd-cdb-2.00/debian/changelog
--- dbskkd-cdb-2.00/debian/changelog	2012-04-18 22:55:37.000000000 +0900
+++ dbskkd-cdb-2.00/debian/changelog	2012-07-08 11:35:51.000000000 +0900
@@ -1,3 +1,9 @@
+dbskkd-cdb (1:2.00-5) unstable; urgency=low
+
+  * debian/rules: Use dpkg-buildflags to support hardening flags
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sun, 08 Jul 2012 11:34:47 +0900
+
 dbskkd-cdb (1:2.00-4) unstable; urgency=low
 
   * debian/copyright: Switch to copyright-format-1.0.
diff -Nru dbskkd-cdb-2.00/debian/rules dbskkd-cdb-2.00/debian/rules
--- dbskkd-cdb-2.00/debian/rules	2012-04-18 22:53:28.000000000 +0900
+++ dbskkd-cdb-2.00/debian/rules	2012-07-08 11:33:32.000000000 +0900
@@ -4,16 +4,20 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-CFLAGS := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+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)
 
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	$(MAKE) CC='gcc $(CFLAGS)' \
+	$(MAKE) CC='gcc $(CFLAGS) $(CPPFLAGS)' \
                 COMPAT='-DJISYO_FILE=\"/usr/share/skk/SKK-JISYO.cdb\"' \
-		CDBLIB=-lcdb
+		CDBLIB='$(LDFLAGS) -lcdb'
 	touch $@
 
 build-indep: build-indep-stamp

Attachment: pgpoR1RxrkaG9.pgp
Description: PGP signature


Reply to: