[vorbis-tools] 01/01: Merge branch 'jessie-fixes' into 'master'

[Martin Steghöfer]

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

martin.steghoefer-guest pushed a commit to branch master
in repository vorbis-tools.

commit f660a69eadf617d8f82d374e7249facbe97ef71a
Merge: af56389 59138f4
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Mon Dec 8 18:23:19 2014 +0100

    Merge branch 'jessie-fixes' into 'master'

 debian/changelog                                   | 33 +++++++++++++++++--
 ...x-oggenc-crash-on-closing-raw-input-files.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index ddb66ef,8f795aa..d984d2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,38 @@@
- vorbis-tools (1.4.0-5) UNRELEASED; urgency=low
++vorbis-tools (1.4.0-7) UNRELEASED; urgency=low
 +
-   * 
++  [ Martin Steghöfer ]
++  * Format patches for gbp-pq, correct tagging and add missing
++    information to tagging.
++  * Add sampling rate sanity check to avoid crash (in case of unpatched
++    libvorbis version) or to improve error message (with patched libvorbis).
++  * Fix vorbistagedit: Reading of file list from stdin was broken.
++    (Closes: #771448)
++  * Documentation of vorbistagedit: Improve wording of error message.
++  * Fix bashism in /usr/bin/vorbistagedit (negative status code).
++    (Closes: #772391)
 +
 + -- Petter Reinholdtsen <pere at debian.org>  Mon, 03 Nov 2014 09:09:40 +0100
 +
+ vorbis-tools (1.4.0-6) unstable; urgency=low
+ 
+   [ Martin Steghöfer ]
+   * Fix oggenc crash on closing raw input files by backporting r19117 from upstream
+     (Closes: #771363)
+   * Fix vorbistagedit: Correctly process input files containing spaces
+     (Closes: #763338)
+ 
+  -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Dec 2014 23:10:56 +0100
+ 
+ vorbis-tools (1.4.0-5) unstable; urgency=low
+ 
+   [ Martin Steghöfer ]
+   * Fix ogg123 freeze when interrupting  at End-Of-Stream
+     (Closes: #307325).
+   * Make it clear in the ogg123 manual page and error message that -f
+     needs a previous -d (Closes: #359948).
+ 
+  -- Petter Reinholdtsen <pere at debian.org>  Tue, 11 Nov 2014 21:44:40 +0100
+ 
  vorbis-tools (1.4.0-4) unstable; urgency=low
  
    * Make sure vorbistagedit quote command line arguments when
diff --cc debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
index 0000000,05ac12a..d25bf8d
mode 000000,100644..100644
--- a/debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
+++ b/debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
@@@ -1,0 -1,37 +1,37 @@@
+ From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
+ Date: Sat, 29 Nov 2014 10:57:11 +0100
+ Subject: Fix oggenc crash on closing raw input files
+ 
+ Origin: backport, https://trac.xiph.org/changeset/19117/trunk/vorbis-tools/oggenc
+ Author: Gregory Maxwell <greg at xiph.org>
+ Bug-Debian: https://bugs.debian.org/771363
+ 
+ Fixes a crash of oggenc on closing of any raw input file. The problem was
+ a function call using a function pointer that had become invalid when
+ a variable that was still referenced by a pointer ran out of scope.
+ ---
+  oggenc/oggenc.c | 4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+ 
+ diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c
 -index 5c36fea..7ad9303 100644
++index 6a6d8fe..a9d8aa2 100644
+ --- a/oggenc/oggenc.c
+ +++ b/oggenc/oggenc.c
+ @@ -97,6 +97,8 @@ int main(int argc, char **argv)
+                .3,-1,
+                0,0,0.f,
+                0, 0, 0, 0, 0};
+ +    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+ +      N_("RAW file reader")};
+  
+      int i;
+  
+ @@ -239,8 +241,6 @@ int main(int argc, char **argv)
+  
+          if(opt.rawmode)
+          {
+ -            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+ -                N_("RAW file reader")};
+  
+              enc_opts.rate=opt.raw_samplerate;
+              enc_opts.channels=opt.raw_channels;
diff --cc debian/patches/series
index bafe760,d1b37e8..67d3016
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,8 +1,9 @@@
 -no_debian_subdir.diff
 -dont-corrupt-stdout.patch
 -quality-check-first-scale-next.patch
 -format-security.patch
 -fix_xiph_url.diff
 -fix-ogg123-freeze-when-interrupting-at-end-of-stream.patch
 -documentation-of-link-between-f-and-d-flag.patch
 +0001-debian-directory-does-not-have-Makefile.-am-in.patch
 +0002-Don-t-corrupt-stdout.patch
 +0003-Floating-point-comparison-fails.patch
 +0004-Fix-format-error-blocking-compilation-with-hardening.patch
 +0005-Fix-URL-in-manpage.patch
 +0006-Add-sampling-rate-sanity-check-to-avoid-crash.patch
 +0007-Fix-ogg123-freeze-when-interrupting-at-End-Of-Stream.patch
 +0008-Make-it-clear-in-documentation-that-f-needs-a-previo.patch
+ 0009-Fix-oggenc-crash-on-closing-raw-input-files.patch

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