diff --git a/SDL_sound-1.0.1-speex.patch b/SDL_sound-1.0.1-speex.patch deleted file mode 100644 index 70d7e70..0000000 --- a/SDL_sound-1.0.1-speex.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.in -+++ configure.in -@@ -296,7 +296,7 @@ - if test x$enable_speex = xyes; then - AC_CHECK_HEADER(ogg/ogg.h, have_ogg_hdr=yes) - AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg_lib=yes) -- AC_CHECK_HEADER(speex.h, have_speex_hdr=yes) -+ AC_CHECK_HEADER(speex/speex.h, have_speex_hdr=yes) - AC_CHECK_LIB(speex, speex_bits_init, have_speex_lib=yes) - if test "x$have_ogg_hdr" = "xyes" -a "x$have_ogg_lib" = "xyes" -a "x$have_speex_hdr" = "xyes" -a "x$have_speex_lib" = "xyes"; then - LIBS="$LIBS -logg -lspeex" ---- decoders/speex.c -+++ decoders/speex.c -@@ -51,8 +51,8 @@ - #include - - #include --#include --#include -+#include -+#include - - #include "SDL_sound.h" - -@@ -135,7 +135,7 @@ - memcpy(&header, hptr, sizeof (SpeexHeader)); /* move to stack. */ - free(hptr); /* lame that this forces you to malloc... */ - -- BAIL_IF_MACRO(header.mode >= SPEEX_NB_MODES, "SPEEX: Unknown mode", 0); -+ BAIL_IF_MACRO((header.mode < 0 || header.mode >= SPEEX_NB_MODES), "SPEEX: Unknown mode", 0); - mode = speex_mode_list[header.mode]; - BAIL_IF_MACRO(header.speex_version_id > 1, "SPEEX: Unknown version", 0); - BAIL_IF_MACRO(mode->bitstream_version < header.mode_bitstream_version, diff --git a/SDL_sound-1.0.1-svn536-nompglib.tar.bz2 b/SDL_sound-1.0.1-svn536-nompglib.tar.bz2 deleted file mode 100644 index 1176516..0000000 --- a/SDL_sound-1.0.1-svn536-nompglib.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1e4ee388e5683cf59e9dd0d6085e3799f5b492ba5769977680e308f843df4e7 -size 230469 diff --git a/SDL_sound-1.0.3-nompglib.patch b/SDL_sound-1.0.3-nompglib.patch new file mode 100644 index 0000000..b59ba10 --- /dev/null +++ b/SDL_sound-1.0.3-nompglib.patch @@ -0,0 +1,41 @@ +--- configure ++++ configure +@@ -22990,7 +22990,7 @@ + fi + + +-ac_config_files="$ac_config_files Makefile decoders/Makefile decoders/timidity/Makefile decoders/mpglib/Makefile playsound/Makefile" ++ac_config_files="$ac_config_files Makefile decoders/Makefile decoders/timidity/Makefile playsound/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +--- configure.in ++++ configure.in +@@ -342,6 +342,5 @@ + Makefile + decoders/Makefile + decoders/timidity/Makefile +-decoders/mpglib/Makefile + playsound/Makefile + ]) +--- decoders/Makefile.am ++++ decoders/Makefile.am +@@ -1,6 +1,6 @@ + noinst_LTLIBRARIES = libdecoders.la + +-SUBDIRS = timidity mpglib ++SUBDIRS = timidity + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/decoders/timidity + +--- decoders/Makefile.in ++++ decoders/Makefile.in +@@ -201,7 +201,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + noinst_LTLIBRARIES = libdecoders.la +-SUBDIRS = timidity mpglib ++SUBDIRS = timidity + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/decoders/timidity + libdecoders_la_SOURCES = \ + aiff.c \ diff --git a/SDL_sound-1.0.3-nompglib.tar.bz2 b/SDL_sound-1.0.3-nompglib.tar.bz2 new file mode 100644 index 0000000..06025da --- /dev/null +++ b/SDL_sound-1.0.3-nompglib.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5c3d268d631d175ade562ba3a2187282f0a85f7f6ee0894d0ea843c030e10d3 +size 995688 diff --git a/SDL_sound.changes b/SDL_sound.changes index d8dde69..4418e2e 100644 --- a/SDL_sound.changes +++ b/SDL_sound.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Apr 24 11:18:57 CEST 2008 - prusnak@suse.cz + +- updated to 1.0.3 + * check if Speex header has bogus data (CVE-2008-1686) + * look for Speex includes in new directory + * converted all text encoding from ISO-8859-1 to UTF-8 + * fixed "make dist" script for dealing with Subversion instead of CVS + * added Speex to the README + * include in shn.c. +- dropped obsoleted patches: + * speex.patch (included in update) + ------------------------------------------------------------------- Fri Apr 11 15:44:08 CEST 2008 - prusnak@suse.cz diff --git a/SDL_sound.spec b/SDL_sound.spec index 3414eae..99f1aa0 100644 --- a/SDL_sound.spec +++ b/SDL_sound.spec @@ -1,5 +1,5 @@ # -# spec file for package SDL_sound (Version 1.0.1) +# spec file for package SDL_sound (Version 1.0.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,10 +15,10 @@ Name: SDL_sound BuildRequires: SDL-devel flac-devel libmikmod-devel libogg-devel libvorbis-devel physfs-devel speex-devel Url: http://icculus.org/SDL_sound/ Summary: Sound Sample Library for SDL (Simple DirectMedia Layer) -Version: 1.0.1 -Release: 46 -Source: %{name}-%{version}-svn536-nompglib.tar.bz2 -Patch0: %{name}-%{version}-speex.patch +Version: 1.0.3 +Release: 1 +Source: %{name}-%{version}-nompglib.tar.bz2 +Patch0: %{name}-%{version}-nompglib.patch License: LGPL v2.1 or later Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,11 +57,10 @@ Authors: Ryan C. Gordon %prep -%setup -q -n %{name} +%setup -q %patch0 %build -./bootstrap %configure --disable-sdltest --disable-smpeg --disable-mpglib make %{?jobs:-j %jobs} @@ -88,6 +87,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %changelog +* Thu Apr 24 2008 prusnak@suse.cz +- updated to 1.0.3 + * check if Speex header has bogus data (CVE-2008-1686) + * look for Speex includes in new directory + * converted all text encoding from ISO-8859-1 to UTF-8 + * fixed "make dist" script for dealing with Subversion instead of CVS + * added Speex to the README + * include in shn.c. +- dropped obsoleted patches: + * speex.patch (included in update) * Fri Apr 11 2008 prusnak@suse.cz - fix speex support and insufficient bounds checking in speex decoder (speex.patch) [bnc#379107]