[Pkg-sdl-commits] r109 - in unstable/libsdl1.2/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-02-09 16:17:19 +0100 (Fri, 09 Feb 2007)
New Revision: 109

Added:
   unstable/libsdl1.2/debian/patches/218_double_free.diff
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/patches/series
Log:
libsdl1.2 (1.2.11-8) unstable; urgency=high

  * debian/control:
    + Do not build-depend on nonexistent libdirectfb-dev on hurd-i386, thanks
      to Samuel Thibault (Closes: #407870).
    + Added XS-Vcs-Svn field.

  * debian/patches/218_double_free.diff:
    + Fix an invalid free() call, courtesy of Jiri Palecek (Closes: #380508,
      Closes: #401950).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Feb 2007 16:09:04 +0100


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-11-30 19:07:28 UTC (rev 108)
+++ unstable/libsdl1.2/debian/changelog	2007-02-09 15:17:19 UTC (rev 109)
@@ -1,3 +1,16 @@
+libsdl1.2 (1.2.11-8) unstable; urgency=high
+
+  * debian/control:
+    + Do not build-depend on nonexistent libdirectfb-dev on hurd-i386, thanks
+      to Samuel Thibault (Closes: #407870).
+    + Added XS-Vcs-Svn field.
+
+  * debian/patches/218_double_free.diff:
+    + Fix an invalid free() call, courtesy of Jiri Palecek (Closes: #380508,
+      Closes: #401950).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Feb 2007 16:09:04 +0100
+
 libsdl1.2 (1.2.11-7) unstable; urgency=high
 
   * debian/control:

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-11-30 19:07:28 UTC (rev 108)
+++ unstable/libsdl1.2/debian/control	2007-02-09 15:17:19 UTC (rev 109)
@@ -4,7 +4,8 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.25.1), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.25.1) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-sdl/unstable/libsdl1.2/
 
 Package: libsdl1.2debian
 Architecture: any

Added: unstable/libsdl1.2/debian/patches/218_double_free.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/218_double_free.diff	2006-11-30 19:07:28 UTC (rev 108)
+++ unstable/libsdl1.2/debian/patches/218_double_free.diff	2007-02-09 15:17:19 UTC (rev 109)
@@ -0,0 +1,22 @@
+Index: libsdl1.2-1.2.11/src/cdrom/linux/SDL_syscdrom.c
+===================================================================
+--- libsdl1.2-1.2.11.orig/src/cdrom/linux/SDL_syscdrom.c	2007-02-09 16:13:16.000000000 +0100
++++ libsdl1.2-1.2.11/src/cdrom/linux/SDL_syscdrom.c	2007-02-09 16:13:22.000000000 +0100
+@@ -218,7 +218,7 @@
+ 			if ( SDL_strcmp(mnt_type, MNTTYPE_SUPER) == 0 ) {
+ 				tmp = SDL_strstr(mntent->mnt_opts, "fs=");
+ 				if ( tmp ) {
+-					SDL_free(mnt_type);
++					SDL_stack_free(mnt_type);
+ 					mnt_type = SDL_strdup(tmp + SDL_strlen("fs="));
+ 					if ( mnt_type ) {
+ 						tmp = SDL_strchr(mnt_type, ',');
+@@ -229,7 +229,7 @@
+ 				}
+ 				tmp = SDL_strstr(mntent->mnt_opts, "dev=");
+ 				if ( tmp ) {
+-					SDL_free(mnt_dev);
++					SDL_stack_free(mnt_dev);
+ 					mnt_dev = SDL_strdup(tmp + SDL_strlen("dev="));
+ 					if ( mnt_dev ) {
+ 						tmp = SDL_strchr(mnt_dev, ',');

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2006-11-30 19:07:28 UTC (rev 108)
+++ unstable/libsdl1.2/debian/patches/series	2007-02-09 15:17:19 UTC (rev 109)
@@ -17,4 +17,5 @@
 215_kfreebsd_gnu.diff
 216_page_size.diff
 217_x11_keytounicode.diff
+218_double_free.diff
 300_dont_propagate_lpthread.diff