- added nul-overrun patch (avoid crash on ID3v2 tags with embedded NUL)

- dropped no longer recognized configure option
- release 2

Changed files:
    mpg123-nul-overrun.patch -> 1.1
    mpg123.spec -> 1.110

diff --git a/mpg123-nul-overrun.patch b/mpg123-nul-overrun.patch
new file mode 100644 (file)
index 0000000..c8ce3d4
--- /dev/null
+++ b/mpg123-nul-overrun.patch
@@ -0,0 +1,12 @@
+Don't overrun output buffer in utf8_ascii() if source string contains embedded NUL
+--- mpg123-1.12.4/src/metaprint.c.orig 2010-08-22 14:09:17.000000000 +0200
++++ mpg123-1.12.4/src/metaprint.c      2010-10-03 09:39:15.851740205 +0200
+@@ -335,7 +335,7 @@
+       if(!mpg123_resize_string(dest, dlen+1)){ mpg123_free_string(dest); return; }
+       /* Just ASCII, we take it easy. */
+       p = dest->p;
+-      for(spos=0; spos < source->fill; ++spos)
++      for(spos=0; (spos < source->fill) && (source->p[spos] != 0); ++spos)
+       {
+               /* UTF-8 continuation byte 0x10?????? */
+               if((source->p[spos] & 0xc0) == 0x80) continue;

diff --git a/mpg123.spec b/mpg123.spec
index 769f5d4ad01ac3cd5297360277d3796a6ba5d6b1..5e8fd1d773161f88d78d4273f187c25e9250656c 100644 (file)
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -22,7 +22,7 @@ Summary(ru.UTF-8):    Проигрыватель MPEG аудиофайлов
 Summary(uk.UTF-8):     Програвач MPEG аудіофайлів
 Name:          mpg123
 Version:       1.12.4
-Release:       1
+Release:       2
 # some old parts are GPLed, but they are not included in package
 License:       LGPL v2.1
 Group:         Applications/Sound
@@ -30,6 +30,7 @@ Source0:      http://downloads.sourceforge.net/mpg123/%{name}-%{version}.tar.bz2
 # Source0-md5: 256ab49b228b334d18377e8485840391
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-no-la.patch
+Patch2:                %{name}-nul-overrun.patch
 URL:           http://www.mpg123.de/
 %{?with_openal:BuildRequires:  OpenAL-devel}
 %{?with_sdl:BuildRequires:     SDL-devel >= 1.2.11}
@@ -233,6 +234,7 @@ Statyczna biblioteka mpg123.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -242,7 +244,6 @@ Statyczna biblioteka mpg123.
 %{__automake}
 # select "0" optimization, which doesn't add any -O to CFLAGS
 %configure \
-       --disable-ltdl-install \
        --enable-modules \
        --enable-static \
        --with-audio=%{?with_alsa:alsa,}oss%{?with_esd:,esd}%{?with_jack:,jack}%{?with_portaudio:,portaudio}%{?with_pulseaudio:,pulse}%{?with_sdl:,sdl}%{?with_nas:,nas}%{?with_arts:,arts}%{?with_openal:,openal} \