[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.12-2-2-g7854564

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 7854564f16b61c4eb5925c661e1f11dc080c5ffb
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Sep 23 14:55:29 2012 +0100

    Changes for 1.2.12-3, mainly fix for #688369

diff --git a/debian/changelog b/debian/changelog
index 32c48eb..60e3718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sdl-mixer1.2 (1.2.12-3) unstable; urgency=low
+
+  * Bring back the unnecessary dependencies previously dropped by Felix Geyer,
+    only present in experimental.  This solution is preferred for the time
+    being, rather than start branching because of this kind of changes.  We
+    submitted bugs and provided experimental packages well before the freeze in
+    order to help maintainers to fix the problems, but most packages depending
+    and relying on this one to include these dependencies were not fixed in
+    time.  Dependencies will be removed for good just after Wheezy is released.
+  * Added patches:
+    - bug-688369-double_free_crash.patch: Backport patch from upstream to fix
+      crash caused by freeing the same memory region twice.  Thanks Philipp
+      Klaus Krause for reporting and pointing to the fix (Closes: #688369).
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Sun, 23 Sep 2012 15:00:38 +0100
+
 sdl-mixer1.2 (1.2.12-3~exp1) experimental; urgency=low
 
   [ Felix Geyer ]
diff --git a/debian/control b/debian/control
index a07357b..d0db305 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,13 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
+         libflac-dev (>= 1.2.1),
+         libmad0-dev (>= 0.15.1b),
+         libmikmod2-dev (>= 3.1.11),
+         libogg-dev (>= 1.2.0),
          libsdl-mixer1.2 (= ${binary:Version}),
-         libsdl1.2-dev (>= 1.2.14~)
+         libsdl1.2-dev (>= 1.2.14~),
+         libvorbis-dev (>= 1.2.0)
 Description: Mixer library for Simple DirectMedia Layer 1.2, development files
  SDL_mixer is a sample multi-channel audio mixer library.  It supports any
  number of simultaneously playing channels of 16 bit stereo audio, plus a single
diff --git a/debian/patches/bug-688369-double_free_crash.patch b/debian/patches/bug-688369-double_free_crash.patch
new file mode 100644
index 0000000..1293af7
--- /dev/null
+++ b/debian/patches/bug-688369-double_free_crash.patch
@@ -0,0 +1,36 @@
+Description: Fix crash on double free if loading WAV file failed
+ Backported from upstream:
+  # HG changeset patch
+  # User Sam Lantinga <slouken at libsdl.org>
+  # Date 1329087437 18000
+  # Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd
+  # Parent  df72f22b4b411ad4b08f924329678aabd5ac97d6
+  Fixed 1418 - crash on double free if loading WAV file failed
+Author: Sam Lantinga <slouken at libsdl.org>
+Last-Update: 2012-09-23
+Bug-Debian: http://bugs.debian.org/688369
+
+diff -r df72f22b4b41 -r 2d713670db9b mixer.c
+--- a/mixer.c	Mon Jan 30 21:41:45 2012 -0500
++++ b/mixer.c	Sun Feb 12 17:57:17 2012 -0500
+@@ -610,13 +610,15 @@
+ 			break;
+ 		default:
+ 			SDL_SetError("Unrecognized sound file type");
+-			return(0);			
++			if ( freesrc ) {
++				SDL_RWclose(src);
++			}
++			loaded = NULL;
++			break;
+ 	}
+ 	if ( !loaded ) {
++		/* The individual loaders have closed src if needed */
+ 		SDL_free(chunk);
+-		if ( freesrc ) {
+-			SDL_RWclose(src);
+-		}
+ 		return(NULL);
+ 	}
+ 
+
diff --git a/debian/patches/series b/debian/patches/series
index 2dc3ebe..5ee8369 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_hurd.patch
 04_timidity_cfg_opts.patch
 05_fallback_to_freepats.patch
+bug-688369-double_free_crash.patch

-- 
Debian packaging of SDL_mixer project