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

Bug#682087: unblock: skksearch/0.0-21



tags 682087 - moreinfo
retitle 682087 unblock: skksearch/0.0-21
thanks

Please unblock skksearch/0.0-21 to enable hardening flags for wheezy.

On July 27, 2012 at 10:41PM +0200,
jcristau (at debian.org) wrote:

>> Note that the diff has increased because of renaming debian/patches/*,
>> but there isn't a new patch.
>>
> It would have been helpful to not do the rename while we're frozen.

Reverted the debian/patches/* changes in skksearch/0.0-21.

> This removes -Wall from CFLAGS as far as I can tell.

Revived the -Wall option for CFLAGS in skksearch/0.0-21.

See also the attached debdiff.

unblock skksearch/0.0-21

Thanks,
--
Tatsuya Kinoshita
diffstat for skksearch-0.0 skksearch-0.0

 changelog |   18 ++++++++++++++++++
 control   |    6 +++---
 copyright |    4 ++--
 rules     |    9 +++++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff -Nru skksearch-0.0/debian/changelog skksearch-0.0/debian/changelog
--- skksearch-0.0/debian/changelog	2011-05-10 21:43:02.000000000 +0900
+++ skksearch-0.0/debian/changelog	2012-09-01 20:54:03.000000000 +0900
@@ -1,3 +1,21 @@
+skksearch (0.0-21) unstable; urgency=low
+
+  * debian/rules: Revive the -Wall option for CFLAGS
+  * debian/control: Fix Vcs-Browser
+  * debian/patches/*: Revert the previous changes
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sat, 01 Sep 2012 20:53:26 +0900
+
+skksearch (0.0-20) unstable; urgency=low
+
+  * Use dpkg-buildflags to support hardening flags
+  * debian/patches/*: Add DEP-3 header fields, and renumbered
+  * Update copyright-format version to 1.0
+  * Update Vcs-* to anonscm.debian.org
+  * Update Standards-Version to 3.9.3
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sun, 08 Jul 2012 13:28:30 +0900
+
 skksearch (0.0-19) unstable; urgency=low
 
   [ Tatsuya Kinoshita ]
diff -Nru skksearch-0.0/debian/control skksearch-0.0/debian/control
--- skksearch-0.0/debian/control	2011-05-03 23:35:48.000000000 +0900
+++ skksearch-0.0/debian/control	2012-09-01 20:36:25.000000000 +0900
@@ -3,9 +3,9 @@
 Priority: extra
 Maintainer: Tatsuya Kinoshita <tats@debian.org>
 Build-Depends: cdbs, debhelper (>= 6), libdb-dev, libcdb-dev
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/collab-maint/skksearch.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/skksearch.git
+Standards-Version: 3.9.3
+Vcs-Git: git://anonscm.debian.org/collab-maint/skksearch.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/skksearch.git
 
 Package: skksearch
 Architecture: any
diff -Nru skksearch-0.0/debian/copyright skksearch-0.0/debian/copyright
--- skksearch-0.0/debian/copyright	2011-05-03 23:35:48.000000000 +0900
+++ skksearch-0.0/debian/copyright	2012-07-08 13:24:37.000000000 +0900
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: skksearch
 Source: http://www.sato.kuis.kyoto-u.ac.jp/~sakurada/hack/skk/skksearch-0.0.tar.gz
 Comment: The upstream site no longer exists.
@@ -15,7 +15,7 @@
  version 2, can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2006-2011, Tatsuya Kinoshita <tats@debian.org>
+Copyright: 2006-2012, Tatsuya Kinoshita <tats@debian.org>
 	   2006-2007, Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>
 	   2005-2006, Kenshi Muto <kmuto@debian.org>
 	   2005, Matej Vela <vela@debian.org>
diff -Nru skksearch-0.0/debian/rules skksearch-0.0/debian/rules
--- skksearch-0.0/debian/rules	2011-05-03 23:35:48.000000000 +0900
+++ skksearch-0.0/debian/rules	2012-09-01 20:37:32.000000000 +0900
@@ -6,8 +6,13 @@
 DEB_INSTALL_DOCS_ALL :=
 DEB_INSTALL_MANPAGES_skksearch := debian/skksearch.8
 
-CFLAGS := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-DEB_MAKE_BUILD_TARGET := CFLAGS='$(CFLAGS) -DSYSLOG' LDFLAGS='-lcdb -ldb'
+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)
+
+DEB_MAKE_BUILD_TARGET := CFLAGS='$(CFLAGS) $(CPPFLAGS) -DSYSLOG' LDFLAGS='$(LDFLAGS) -lcdb -ldb'
 DEB_MAKE_INSTALL_TARGET :=
 DEB_MAKE_CHECK_TARGET :=
 

Attachment: pgp2KWUB2Trtf.pgp
Description: PGP signature


Reply to: