Bug#684063: unblock: denemo/0.9.2-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package denemo
denemo/0.9.2-2 fixes:
#665520 Including individual glib headers no longer supported
#683563 Enable hardened build flags
denemo (0.9.2-2) unstable; urgency=low
* glib-single-include.diff Patch added in order to include glib.h
instead of individual header. Thanks to Michael Biebl for his help to
fix this bug (closes: 665520).
* debian/control
- New maintainer address. Thanks to Jan Hauke Rahm for his sponsorships.
- Standards Version updated to 3.9.3: No changes required.
* Denemo now uses security hardening build flags (closes: 683563)
- debian/compat, and debian/control build dependency on debhelper,
raised to 9 in order to set environment variables listed by
dpkg-buildflags by default.
- format_error_strings.diff patch added to format error strings safely.
Debdiff (against denemo/0.9.2-1 which is in testing) attached.
unblock denemo/0.9.2-2
diff -Nru denemo-0.9.2/debian/changelog denemo-0.9.2/debian/changelog
--- denemo-0.9.2/debian/changelog 2011-10-04 16:35:55.000000000 -0600
+++ denemo-0.9.2/debian/changelog 2012-08-02 14:25:25.000000000 -0600
@@ -1,3 +1,19 @@
+denemo (0.9.2-2) unstable; urgency=low
+
+ * glib-single-include.diff Patch added in order to include glib.h
+ instead of individual header. Thanks to Michael Biebl for his help to
+ fix this bug (closes: 665520).
+ * debian/control
+ - New maintainer address. Thanks to Jan Hauke Rahm for his sponsorships.
+ - Standards Version updated to 3.9.3: No changes required.
+ * Denemo now uses security hardening build flags (closes: 683563)
+ - debian/compat, and debian/control build dependency on debhelper,
+ raised to 9 in order to set environment variables listed by
+ dpkg-buildflags by default.
+ - format_error_strings.diff patch added to format error strings safely.
+
+ -- Josue Abarca <jmaslibre@debian.org> Fri, 27 Jul 2012 23:37:51 -0600
+
denemo (0.9.2-1) unstable; urgency=low
* New upstream release
diff -Nru denemo-0.9.2/debian/compat denemo-0.9.2/debian/compat
--- denemo-0.9.2/debian/compat 2011-10-04 16:35:55.000000000 -0600
+++ denemo-0.9.2/debian/compat 2012-08-02 14:25:25.000000000 -0600
@@ -1 +1 @@
-7
+9
diff -Nru denemo-0.9.2/debian/control denemo-0.9.2/debian/control
--- denemo-0.9.2/debian/control 2011-10-04 16:35:55.000000000 -0600
+++ denemo-0.9.2/debian/control 2012-08-02 14:25:25.000000000 -0600
@@ -1,15 +1,15 @@
Source: denemo
Section: sound
Priority: optional
-Maintainer: Josue Abarca <jmaslibre@debian.org.gt>
+Maintainer: Josue Abarca <jmaslibre@debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), guile-1.8-dev,
+Build-Depends: debhelper (>= 9), guile-1.8-dev,
libaubio-dev, portaudio19-dev, libfftw3-dev, libgtk2.0-dev,
libxml2-dev, libsamplerate0-dev, automake, libtool,
libgtksourceview2.0-dev, libfluidsynth-dev, autoconf, automake1.11,
libsmf-dev (>= 1.3), autopoint, librsvg2-dev, dh-autoreconf
Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://anonscm.debian.org/collab-maint/denemo.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/denemo.git
Homepage: http://www.denemo.org
diff -Nru denemo-0.9.2/debian/patches/format_error_strings.diff denemo-0.9.2/debian/patches/format_error_strings.diff
--- denemo-0.9.2/debian/patches/format_error_strings.diff 1969-12-31 18:00:00.000000000 -0600
+++ denemo-0.9.2/debian/patches/format_error_strings.diff 2012-08-02 14:25:25.000000000 -0600
@@ -0,0 +1,26 @@
+Description: This patch adds string literals
+ to format error strings in the g_print function. This is required by
+ -Werror=format-security to avoid format string attacks. This pacth
+ was backported in order to be able to use security hardening build
+ flags via dpkg-buildflags.
+
+Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=denemo.git;a=commitdiff;h=e17c5abd
+Author: Jeremiah Benham <jjbenham@chicagoguitar.com>
+Bug-Debian: http://bugs.debian.org/683563
+Last-Update: 2012-08-02
+
+--- a/src/print.c
++++ b/src/print.c
+@@ -1210,10 +1210,10 @@
+
+ gchar *mt = g_strdup_printf("%u", mtime);
+ if(!gdk_pixbuf_save (pbN, thumbpathN, "png"/*type*/, &err, "tEXt::Thumb::URI", uri, "tEXt::Thumb::MTime", mt , NULL))
+- g_print(err->message);
++ g_print("%s",err->message);
+ err = NULL;
+ if(!gdk_pixbuf_save (pbL, thumbpathL, "png"/*type*/, &err, "tEXt::Thumb::URI", uri, "tEXt::Thumb::MTime", mt , NULL))
+- g_print(err->message);
++ g_print("%s",err->message);
+
+ //FIXME do the pbN L need freeing???
+ g_free(uri);
diff -Nru denemo-0.9.2/debian/patches/glib-single-include.diff denemo-0.9.2/debian/patches/glib-single-include.diff
--- denemo-0.9.2/debian/patches/glib-single-include.diff 1969-12-31 18:00:00.000000000 -0600
+++ denemo-0.9.2/debian/patches/glib-single-include.diff 2012-08-02 14:25:25.000000000 -0600
@@ -0,0 +1,21 @@
+Description: Including invidiual glib headers
+ has been deprecated for several years. Starting with glib 2.32 it is
+ now mandatory to include glib.h instead of individual headers, or the
+ compiler will generate an error.
+
+Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=denemo.git;a=commitdiff;h=0d189fa4
+Author: Adam Sampson
+Bug-Debian: http://bugs.debian.org/665520
+Last-Update: 2012-06-26
+
+--- a/src/pitchrecog.c
++++ b/src/pitchrecog.c
+@@ -28,7 +28,7 @@
+ #include <math.h>
+ #include <aubio/aubio.h>
+ #include <audio.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+
+ #ifdef HAVE_C99_VARARGS_MACROS
+ #define debug(...) if (verbose) fprintf (stderr, __VA_ARGS__)
diff -Nru denemo-0.9.2/debian/patches/series denemo-0.9.2/debian/patches/series
--- denemo-0.9.2/debian/patches/series 2011-10-04 16:35:55.000000000 -0600
+++ denemo-0.9.2/debian/patches/series 2012-08-02 14:25:25.000000000 -0600
@@ -3,3 +3,5 @@
Makefile.am.diff
denemo.conf.diff
configure.in.diff
+glib-single-include.diff
+format_error_strings.diff
Reply to: