tags 682097 - moreinfo retitle 682097 unblock: dbskkd-cdb/1:2.00-6 thanks Please unblock dbskkd-cdb/1:2.00-6 to enable hardening flags for wheezy. On August 31, 2012 at 9:17PM +0100, adam (at adam-barratt.org.uk) wrote: >> -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) > > That seems to lose -Wall? Revived the -Wall option for CFLAGS in dbskkd-cdb/1:2.00-6, even though enabling/disabling -Wall does not hurt the package. See also the attached debdiff. unblock dbskkd-cdb/1:2.00-6 Thanks, -- Tatsuya Kinoshita
diffstat for dbskkd-cdb-2.00 dbskkd-cdb-2.00
changelog | 12 ++++++++++++
rules | 10 +++++++---
2 files changed, 19 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-09-01 20:16:05.000000000 +0900
@@ -1,3 +1,15 @@
+dbskkd-cdb (1:2.00-6) unstable; urgency=low
+
+ * debian/rules: Revive the -Wall option for CFLAGS
+
+ -- Tatsuya Kinoshita <tats@debian.org> Sat, 01 Sep 2012 20:16:04 +0900
+
+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-09-01 20:20:38.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=-Wall $(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:
pgpv3KQ9a54u2.pgp
Description: PGP signature