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

Bug#682089: unblock: mew/1:6.4-3



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

Please unblock mew/1:6.4-3 to enable hardening flags for wheezy.

Changes:

  * debian/rules: Use dpkg-buildflags to support hardening flags
  * debian/control: Add emacs24 to Depends

Note that the emacs24 dependency is optional, emacs is prior to
emacs24, so it's safe even if there isn't emacs24 in wheezy.

See also the attached debdiff.

unblock mew/1:6.4-3

Thanks,
--
Tatsuya Kinoshita
diffstat for mew-6.4 mew-6.4

 changelog |    7 +++++++
 control   |    2 +-
 rules     |   17 ++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff -Nru mew-6.4/debian/changelog mew-6.4/debian/changelog
--- mew-6.4/debian/changelog	2012-03-31 01:20:31.000000000 +0900
+++ mew-6.4/debian/changelog	2012-07-07 00:16:12.000000000 +0900
@@ -1,3 +1,10 @@
+mew (1:6.4-3) unstable; urgency=low
+
+  * debian/rules: Use dpkg-buildflags to support hardening flags
+  * debian/control: Add emacs24 to Depends
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sat, 07 Jul 2012 00:15:53 +0900
+
 mew (1:6.4-2) unstable; urgency=low
 
   * debian/patches/060_cmew-blob.patch: New patch from upstream to prevent
diff -Nru mew-6.4/debian/control mew-6.4/debian/control
--- mew-6.4/debian/control	2012-03-11 20:00:53.000000000 +0900
+++ mew-6.4/debian/control	2012-07-05 23:19:42.000000000 +0900
@@ -9,7 +9,7 @@
 Package: mew
 Section: lisp
 Architecture: all
-Depends: mew-bin (>= 1:5.3), emacs | emacs23 | emacs22 | emacs21 | emacs-snapshot, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: mew-bin (>= 1:5.3), emacs | emacs24 | emacs23 | emacs22 | emacs21 | emacs-snapshot, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
 Suggests: w3m-el, gnupg, gpgsm, ssh, wv, xlhtml, ppthtml, compface, netpbm, x-face-el, mu-cite, mule-ucs, bogofilter | bsfilter | spamassassin, hyperestraier, namazu2, namazu2-index-tools, mhc
 Replaces: mew-beta
 Conflicts: mew-beta
diff -Nru mew-6.4/debian/rules mew-6.4/debian/rules
--- mew-6.4/debian/rules	2010-04-18 17:08:22.000000000 +0900
+++ mew-6.4/debian/rules	2012-07-05 22:58:31.000000000 +0900
@@ -7,20 +7,15 @@
 PACKAGE=`cat debian/PACKAGE`
 PKGSNAME=mew
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-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)
 
 configure-stamp: configure
 	dh_testdir
-	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
+	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
 	grep '^Package: ' debian/control | head -1 | sed -e "s/^Package: //g" > debian/PACKAGE
 	sed -e "s/@PACKAGE@/$(PACKAGE)/g" debian/README.Debian.in > debian/README.Debian
 	sed -e "s/@PACKAGE@/$(PACKAGE)/g" debian/dirs.in > debian/dirs

Attachment: pgp_sycCWMZV9.pgp
Description: PGP signature


Reply to: