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

Bug#682095: marked as done (unblock: eblook/1:1.6.1-12)

Your message dated Tue, 7 Aug 2012 00:50:19 +0200
with message-id <20120806225019.GA16801@mraw.org>
and subject line Re: Bug#682095: unblock: eblook/1:1.6.1-12
has caused the Debian Bug report #682095,
regarding unblock: eblook/1:1.6.1-12
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
682095: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682095
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock eblook/1:1.6.1-12 to enable hardening flags for wheezy.

Changes:

  * debian/rules: Use dpkg-buildflags to support hardening flags
  * debian/patches/50_ldflags.patch: Typo fix for LDFLAGS

See also the attached debdiff.

unblock eblook/1:1.6.1-12

Thanks,
--
Tatsuya Kinoshita

diffstat for eblook-1.6.1 eblook-1.6.1

 changelog                |    7 ++++++
 patches/50_ldflags.patch |   48 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/series           |    1 
 rules                    |    8 ++++++-
 4 files changed, 63 insertions(+), 1 deletion(-)

diff -Nru eblook-1.6.1/debian/changelog eblook-1.6.1/debian/changelog
--- eblook-1.6.1/debian/changelog	2012-04-29 16:24:02.000000000 +0900
+++ eblook-1.6.1/debian/changelog	2012-07-08 16:14:46.000000000 +0900
@@ -1,3 +1,10 @@
+eblook (1:1.6.1-12) unstable; urgency=low
+
+  * debian/rules: Use dpkg-buildflags to support hardening flags
+  * debian/patches/50_ldflags.patch: Typo fix for LDFLAGS
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sun, 08 Jul 2012 16:14:40 +0900
+
 eblook (1:1.6.1-11) unstable; urgency=low
 
   * debian/copyright: Switch to copyright-format-1.0.
diff -Nru eblook-1.6.1/debian/patches/50_ldflags.patch eblook-1.6.1/debian/patches/50_ldflags.patch
--- eblook-1.6.1/debian/patches/50_ldflags.patch	1970-01-01 09:00:00.000000000 +0900
+++ eblook-1.6.1/debian/patches/50_ldflags.patch	2012-07-08 16:13:58.000000000 +0900
@@ -0,0 +1,48 @@
+Description: Typo fix for LDFLAGS
+Author: Tatsuya Kinoshita <tats@debian.org>
+
+diff -urN eblook-1.6.1.orig/aclocal.m4 eblook-1.6.1/aclocal.m4
+--- eblook-1.6.1.orig/aclocal.m4	2004-06-19 11:28:19.000000000 +0900
++++ eblook-1.6.1/aclocal.m4	2012-07-08 16:11:50.000000000 +0900
+@@ -116,7 +116,7 @@
+ save_LIBS=$LIBS
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ AC_TRY_LINK([#include <eb/eb.h>],
+ [eb_initialize_library(); return 0;],
+diff -urN eblook-1.6.1.orig/configure eblook-1.6.1/configure
+--- eblook-1.6.1.orig/configure	2004-06-19 11:30:49.000000000 +0900
++++ eblook-1.6.1/configure	2012-07-08 16:12:13.000000000 +0900
+@@ -21918,7 +21918,7 @@
+ save_LIBS=$LIBS
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21981,7 +21981,7 @@
+ sysconfdir=$sysconfdir
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ 
+ 
+diff -urN eblook-1.6.1.orig/configure.ac eblook-1.6.1/configure.ac
+--- eblook-1.6.1.orig/configure.ac	2004-06-19 11:27:22.000000000 +0900
++++ eblook-1.6.1/configure.ac	2012-07-08 16:12:02.000000000 +0900
+@@ -62,7 +62,7 @@
+ sysconfdir=$sysconfdir
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ 
+ dnl *
diff -Nru eblook-1.6.1/debian/patches/series eblook-1.6.1/debian/patches/series
--- eblook-1.6.1/debian/patches/series	2010-08-18 00:10:36.000000000 +0900
+++ eblook-1.6.1/debian/patches/series	2012-07-08 16:13:19.000000000 +0900
@@ -2,3 +2,4 @@
 20_strcpy-fix.patch
 30_codeconv-size.patch
 40_eb-read-ssize.patch
+50_ldflags.patch
diff -Nru eblook-1.6.1/debian/rules eblook-1.6.1/debian/rules
--- eblook-1.6.1/debian/rules	2012-04-29 16:23:46.000000000 +0900
+++ eblook-1.6.1/debian/rules	2012-07-08 16:01:13.000000000 +0900
@@ -6,12 +6,18 @@
 
 PACKAGE = eblook
 
+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-indep:
 
 build-arch: build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	./configure --prefix=/usr --infodir=/usr/share/info --with-eb-conf=/etc/eb.conf --without-readline
+	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr --infodir=/usr/share/info --with-eb-conf=/etc/eb.conf --without-readline
 	$(MAKE)
 	touch $@

Attachment: pgpOXwMPcdZNF.pgp
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Hello,

Tatsuya Kinoshita <tats@debian.org> (19/07/2012):
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock eblook/1:1.6.1-12 to enable hardening flags for wheezy.
> 
> Changes:
> 
>   * debian/rules: Use dpkg-buildflags to support hardening flags
>   * debian/patches/50_ldflags.patch: Typo fix for LDFLAGS
> 
> See also the attached debdiff.

it looks to me like *FLAGS handling might be written in a shorter way
but at least according to build logs, that seems to do the job.

Unblocked accordingly, thanks.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: