[vorbis-tools] 01/01: Switch from debhelper version 7 to 9, and adjust code to build with this setup. Added format-security.patch to fix build failure triggered when hardening was automatically enabled.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository vorbis-tools.

commit 989f7b6a5d898fa989963ffb0a9348c8c74c8653
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Oct 22 13:25:21 2014 +0200

    Switch from debhelper version 7 to 9, and adjust code to build with this setup.  Added format-security.patch to fix build failure triggered when hardening was automatically enabled.
---
 debian/compat                        |  2 +-
 debian/control                       |  2 +-
 debian/patches/format-security.patch | 20 ++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 66fab94..de9f83e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders:
  Petter Reinholdtsen <pere at debian.org>
  , Martin Steghöfer <martin at steghoefer.eu>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), quilt (>= 0.46-7~), libcurl4-gnutls-dev, libao-dev (>= 1.0.0), libogg-dev, libflac-dev (>> 1.1.4) | liboggflac-dev, libspeex-dev, libvorbis-dev (>= 1.3.0), libkate-dev, pkg-config
+Build-Depends: autotools-dev, debhelper (>= 9), quilt (>= 0.46-7~), libcurl4-gnutls-dev, libao-dev (>= 1.0.0), libogg-dev, libflac-dev (>> 1.1.4) | liboggflac-dev, libspeex-dev, libvorbis-dev (>= 1.3.0), libkate-dev, pkg-config
 Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-xiph/vorbis-tools.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xiph/vorbis-tools.git
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
new file mode 100644
index 0000000..7f2ff23
--- /dev/null
+++ b/debian/patches/format-security.patch
@@ -0,0 +1,20 @@
+Description: Fix format error blocking compilation with hardening
+ Enabling hardening refuses to compile code with sprintf() calls
+ with no formatting string.  Adjust the code to work with hardening.
+Last-Update: 2014-10-22
+Forwarded: no
+Author: Petter Reinholdtsen
+
+diff --git a/ogg123/status.c b/ogg123/status.c
+index 92b8ff1..ccec389 100644
+--- a/ogg123/status.c
++++ b/ogg123/status.c
+@@ -148,7 +148,7 @@ int print_statistics_line (stat_format_t stats[])
+ 
+     switch (stats->type) {
+     case stat_noarg:
+-      len += sprintf(str+len, stats->formatstr);
++      len += sprintf(str+len, "%s", stats->formatstr);
+       break;
+     case stat_intarg:
+       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);
diff --git a/debian/patches/series b/debian/patches/series
index c51f936..f9d4eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no_debian_subdir.diff
 dont-corrupt-stdout.patch
 quality-check-first-scale-next.patch
+format-security.patch
diff --git a/debian/rules b/debian/rules
index b5392a2..0114f60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@ --with quilt
 
 override_dh_strip:
 	dh_strip --dbg-package=vorbis-tools-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/vorbis-tools.git