Hello community,
here is the log from the commit of package libmodplug for openSUSE:11.3
checked in at Fri May 27 11:47:15 CEST 2011.
--------
--- old-versions/11.3/UPDATES/all/libmodplug/libmodplug.changes 2011-04-11 19:26:56.000000000 +0200
+++ 11.3/libmodplug/libmodplug.changes 2011-05-25 17:28:45.000000000 +0200
@@ -1,0 +2,10 @@
+Wed May 11 15:59:21 CEST 2011 - sbrabec@suse.cz
+
+- Updated to version 0.8.8.3 (with revert of API change):
+ * Several security fixes (including CVE-2011-1761, bnc#691137).
+ * Improve compatibility with MSVC 2010
+ * Improve PTM playback (Fix byteswapping)
+ * Improve S3M support (ignore corrupted data)
+ * Improve AMF support (bounds checking)
+
+-------------------------------------------------------------------
calling whatdependson for 11.3-i586
Old:
----
libmodplug-0.8.7.tar.bz2
libmodplug-s3m-stack-overflow.patch
New:
----
libmodplug-0.8.8.3.tar.bz2
libmodplug-api-change.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmodplug.spec ++++++
--- /var/tmp/diff_new_pack.5N7MHn/_old 2011-05-27 11:47:02.000000000 +0200
+++ /var/tmp/diff_new_pack.5N7MHn/_new 2011-05-27 11:47:02.000000000 +0200
@@ -19,8 +19,8 @@
Name: libmodplug
Summary: A MOD playing library
-Version: 0.8.7
-Release: 7.<RELEASE2>
+Version: 0.8.8.3
+Release: 2.<RELEASE2>
Group: System/Libraries
License: Public Domain
Url: http://modplug-xmms.sourceforge.net
@@ -28,9 +28,9 @@
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE libmodplug-timidity.patch -- set paths to openSUSE timidity package
Patch1: libmodplug-timidity.patch
-# PATCH-FIX-SECURITY libmodplug-s3m-stack-overflow.patch bnc686624 sbrabec@suse.cz -- Fix stack overflow fulnerability in S3M decoder. https://www.sec-consult.com/files/20110407-0_libmodplug_stackoverflow.txt
-Patch2: libmodplug-s3m-stack-overflow.patch
-BuildRequires: gcc-c++
+# PATCH-FEATURE-UPSTREAM libmodplug-api-change.patch -- Upstream commit that changes API that needs to be reverted for the library with the original soname.
+Patch2: libmodplug-api-change.patch
+BuildRequires: gcc-c++ pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -68,6 +68,9 @@
%setup -q
%patch1
%patch2 -p1
+tr -d '\r' <ChangeLog >ChangeLog~
+touch -r ChangeLog~ ChangeLog
+mv ChangeLog~ ChangeLog
%build
autoreconf -f -i
++++++ libmodplug-0.8.7.tar.bz2 -> libmodplug-0.8.8.3.tar.bz2 ++++++
++++ 67105 lines of diff (skipped)
++++++ libmodplug-api-change.patch ++++++
Patch reverts these two commits:
commit 4ca46320375dac2837691e14feff0a397058210f
Author: Konstanty Bialkowski
Date: Sun Apr 4 22:48:51 2010 +1000
Allow StereoSeparation and MaxMixChannels to be configurable in API.
commit 2cdef8dd1754638a4f588443ed93daa79099f329
Author: Konstanty Bialkowski
Date: Sat Apr 17 17:33:17 2010 +1000
Increment version number and soname.
Index: libmodplug-0.8.8.3/configure.in
===================================================================
--- libmodplug-0.8.8.3.orig/configure.in
+++ libmodplug-0.8.8.3/configure.in
@@ -59,9 +59,6 @@ AC_TYPE_UINT32_T
AC_TYPE_INT64_T
AC_TYPE_UINT64_T
-MODPLUG_LIBRARY_VERSION=1:0:0
-
-AC_SUBST(MODPLUG_LIBRARY_VERSION)
AC_CONFIG_FILES([Makefile
src/Makefile
Index: libmodplug-0.8.8.3/src/Makefile.am
===================================================================
--- libmodplug-0.8.8.3.orig/src/Makefile.am
+++ libmodplug-0.8.8.3/src/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/libmodplug
lib_LTLIBRARIES = libmodplug.la
-libmodplug_la_LDFLAGS = -version-info $(MODPLUG_LIBRARY_VERSION) $(LT_LDFLAGS)
+libmodplug_la_LDFLAGS = $(LT_LDFLAGS)
libmodplug_la_LIBADD = -lm
libmodplug_la_SOURCES = tables.h \
sndmix.cpp \
Index: libmodplug-0.8.8.3/src/libmodplug/sndfile.h
===================================================================
--- libmodplug-0.8.8.3.orig/src/libmodplug/sndfile.h
+++ libmodplug-0.8.8.3/src/libmodplug/sndfile.h
@@ -678,7 +678,6 @@ public:
public:
// Mixer Config
static BOOL InitPlayer(BOOL bReset=FALSE);
- static BOOL SetMixConfig(UINT nStereoSeparation, UINT nMaxMixChannels);
static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE);
static BOOL SetResamplingMode(UINT nMode); // SRCMODE_XXXX
static BOOL IsStereo() { return (gnChannels > 1) ? TRUE : FALSE; }
Index: libmodplug-0.8.8.3/src/modplug.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/modplug.cpp
+++ libmodplug-0.8.8.3/src/modplug.cpp
@@ -30,8 +30,6 @@ namespace ModPlug
0,
0,
0,
- 0,
- 0,
0
};
@@ -62,10 +60,8 @@ namespace ModPlug
if(updateBasicConfig)
{
CSoundFile::SetWaveConfig(gSettings.mFrequency,
- gSettings.mBits,
+ gSettings.mBits,
gSettings.mChannels);
- CSoundFile::SetMixConfig(gSettings.mStereoSeparation,
- gSettings.mMaxMixChannels);
gSampleSize = gSettings.mBits / 8 * gSettings.mChannels;
}
Index: libmodplug-0.8.8.3/src/modplug.h
===================================================================
--- libmodplug-0.8.8.3.orig/src/modplug.h
+++ libmodplug-0.8.8.3/src/modplug.h
@@ -80,9 +80,6 @@ typedef struct _ModPlug_Settings
int mBits; /* Bits per sample - 8, 16, or 32 */
int mFrequency; /* Sampling rate - 11025, 22050, or 44100 */
int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */
-
- int mStereoSeparation; /* Stereo separation, 1 - 256 */
- int mMaxMixChannels; /* Maximum number of mixing channels (polyphony), 32 - 256 */
int mReverbDepth; /* Reverb level 0(quiet)-100(loud) */
int mReverbDelay; /* Reverb delay in ms, usually 40-200ms */
Index: libmodplug-0.8.8.3/src/sndfile.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/sndfile.cpp
+++ libmodplug-0.8.8.3/src/sndfile.cpp
@@ -480,16 +480,6 @@ BOOL CSoundFile::SetWaveConfig(UINT nRat
return TRUE;
}
-BOOL CSoundFile::SetMixConfig(UINT nStereoSeparation, UINT nMaxMixChannels)
-//-------------------------------------------------------------------------
-{
- if (nMaxMixChannels < 2) return FALSE;
-
- m_nMaxMixChannels = nMaxMixChannels;
- m_nStereoSeparation = nStereoSeparation;
- return TRUE;
-}
-
BOOL CSoundFile::SetResamplingMode(UINT nMode)
//--------------------------------------------
Index: libmodplug-0.8.8.3/src/sndmix.cpp
===================================================================
--- libmodplug-0.8.8.3.orig/src/sndmix.cpp
+++ libmodplug-0.8.8.3/src/sndmix.cpp
@@ -18,10 +18,10 @@
// VU-Meter
#define VUMETER_DECAY 4
-// SNDMIX: These are global flags for playback control (first two configurable via SetMixConfig)
+// SNDMIX: These are global flags for playback control
UINT CSoundFile::m_nStereoSeparation = 128;
-UINT CSoundFile::m_nMaxMixChannels = 32;
LONG CSoundFile::m_nStreamVolume = 0x8000;
+UINT CSoundFile::m_nMaxMixChannels = 32;
// Mixing Configuration (SetWaveConfig)
DWORD CSoundFile::gdwSysInfo = 0;
DWORD CSoundFile::gnChannels = 1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org