- started update to pre0.59s

- updated makefile patch, removed obsolete ipv6 patch
- added security patch (fix for arbitrary code execution through mp3 file)
  (bug in pre0.59s only, 0.59r didn't have this one)
- added id3v2-hack patch (fix for stopping on ID3v2 tag in 1st file)
- added 3dnow (for athlon) and mmx (for i[56]86 - bcond) support

Changed files:
    mpg123-id3v2-hack.patch -> 1.1
    mpg123-makefile.patch -> 1.7
    mpg123-security.patch -> 1.1
    mpg123.spec -> 1.36

diff --git a/mpg123-id3v2-hack.patch b/mpg123-id3v2-hack.patch
new file mode 100644 (file)
index 0000000..0f5081b
--- /dev/null
+++ b/mpg123-id3v2-hack.patch
@@ -0,0 +1,33 @@
+--- mpg123/buffer.c.orig       Thu Jan 18 15:00:34 2001
++++ mpg123/buffer.c    Tue Feb  4 23:41:34 2003
+@@ -16,6 +16,8 @@
+ static int intflag = FALSE;
+ static int usr1flag = FALSE;
+ 
++static int bufinitialized = FALSE;
++
+ static void catch_interrupt (void)
+ {
+       intflag = TRUE;
+@@ -47,11 +49,13 @@
+ 
+ void buffer_resync(void)
+ {
++      if(bufinitialized)
+       buffer_sig(SIGINT, TRUE);
+ }
+ 
+ void buffer_reset(void)
+ {
++      if(bufinitialized)
+       buffer_sig(SIGUSR1, TRUE);
+ }
+ 
+@@ -96,6 +100,7 @@
+       catchsignal (SIGINT, catch_interrupt);
+       catchsignal (SIGUSR1, catch_usr1);
+       sigprocmask (SIG_SETMASK, oldsigset, NULL);
++      bufinitialized = TRUE;
+       if (param.outmode == DECODE_AUDIO) {
+               if (audio_open(ai) < 0) {
+                       perror("audio");

diff --git a/mpg123-makefile.patch b/mpg123-makefile.patch
index 3b9b10e1d34793592d469a8efbe842adc2d2f7ea..c389d49733c1ce0af54c3c668289af4439ce4829 100644 (file)
--- a/mpg123-makefile.patch
+++ b/mpg123-makefile.patch
@@ -1,123 +1,231 @@
-diff -urN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
---- mpg123-0.59r.orig/Makefile Fri Mar  3 12:59:29 2000
-+++ mpg123-0.59r/Makefile      Fri Mar  3 13:04:39 2000
-@@ -104,7 +104,7 @@
+--- mpg123/Makefile.orig       Tue Jan 23 19:00:46 2001
++++ mpg123/Makefile    Tue Feb  4 23:03:44 2003
+@@ -152,7 +152,7 @@
  linux-devel:
        $(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
          CC=gcc LDFLAGS= \
 -        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g -m486 \
-+        CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g \
-               -DREAD_MMAP -DOSS -funroll-all-loops \
++        CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
+               -DOSS -funroll-all-loops \
                -finline-functions -ffast-math' \
          mpg123-make
-@@ -112,7 +112,7 @@
+@@ -160,7 +160,7 @@
  linux-profile:
        $(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
          CC=gcc LDFLAGS='-pg' \
 -        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg -m486 \
 +        CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg \
-               -DREAD_MMAP -DOSS -funroll-all-loops \
+               -DOSS -funroll-all-loops \
                -finline-functions -ffast-math' \
          mpg123-make
-@@ -121,9 +121,9 @@
+@@ -169,10 +169,10 @@
        $(MAKE) CC=gcc LDFLAGS= \
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
                        audio_oss.o term.o' \
 -              CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
-                       -DREAD_MMAP -DOSS -DTERM_CONTROL\
+                       -DOSS -DTERM_CONTROL\
 -                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
-@@ -132,9 +132,9 @@
+ 
+@@ -180,10 +180,10 @@
+       $(MAKE) CC=gcc LDFLAGS= \
+               OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+                       audio_oss.o term.o' \
+-              CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
++              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+                       -DOSS -DTERM_CONTROL\
+-                      -Wall -O2 -mpentium \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -Wall \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
+@@ -191,10 +191,10 @@
        $(MAKE) CC=gcc LDFLAGS= \
-               OBJECTS='decode_i386.o dct64_3dnow.o \
-                       decode_3dnow.o audio_oss.o term.o' \
+               OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o \
+                       audio_oss.o term.o' \
+-              CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
++              CFLAGS='$(OPT_FLAGS) -DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
+                       -DLINUX -DOSS -DTERM_CONTROL\
+-                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -Wall \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
+@@ -203,10 +203,10 @@
+               OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+                       dct64_i386.o dct36_3dnow.o getcpuflags.o \
+                       equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
 -              CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-                       -DUSE_3DNOW -DREAD_MMAP -DOSS -DTERM_CONTROL\
+                       -DUSE_3DNOW -DOSS -DTERM_CONTROL\
 -                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
-@@ -143,9 +143,9 @@
-       $(MAKE) CC=gcc LDFLAGS= \
+ 
+@@ -216,10 +216,10 @@
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-                       decode_i486.o dct64_i486.o audio_oss.o term.o' \
+                       decode_i486.o audio_oss.o term.o \
+                       dct64_i486-a.o dct64_i486-b.o ' \
 -              CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
-                       -DREAD_MMAP -DOSS -DTERM_CONTROL\
+                       -DOSS -DTERM_CONTROL\
 -                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
-@@ -155,12 +155,11 @@
+ 
+@@ -228,12 +228,11 @@
                AUDIO_LIB='-lesd -laudiofile' \
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
                        audio_esd.o' \
 -              CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-                       -DREAD_MMAP -DOSS -DUSE_ESD \
+                       -DOSS -DUSE_ESD \
 -                      -Wall  -O2 -m486 \
-+                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
+-                      -fomit-frame-pointer -funroll-all-loops \
 -                      -finline-functions -ffast-math \
 -                      $(RPM_OPT_FLAGS)' \
++                      -Wall \
++                      -funroll-all-loops \
 +                      -finline-functions -ffast-math' \
                mpg123-make
  
  linux-alsa:
-@@ -168,43 +167,39 @@
+@@ -241,12 +240,36 @@
                AUDIO_LIB='-lasound' \
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
                        audio_alsa.o term.o' \
 -              CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-                       -DREAD_MMAP -DALSA -DTERM_CONTROL\
+                       -DALSA -DTERM_CONTROL\
 -                      -Wall  -O2 -m486 \
-+                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
+-                      -fomit-frame-pointer -funroll-all-loops \
 -                      -finline-functions -ffast-math \
 -                      $(RPM_OPT_FLAGS)' \
++                      -Wall \
++                      -funroll-all-loops \
++                      -finline-functions -ffast-math' \
++              mpg123-make
++
++linux-i486-esd:
++      $(MAKE) CC=gcc LDFLAGS= \
++              AUDIO_LIB='-lesd -laudiofile' \
++              OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
++                      decode_i486.o audio_esd.o \
++                      dct64_i486-a.o dct64_i486-b.o ' \
++              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
++                      -DOSS -DUSE_ESD \
++                      -Wall \
++                      -funroll-all-loops \
++                      -finline-functions -ffast-math' \
++              mpg123-make
++
++linux-mmx-esd:
++      $(MAKE) CC=gcc LDFLAGS= \
++              AUDIO_LIB='-lesd -laudiofile' \
++              OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o \
++                      audio_esd.o' \
++              CFLAGS='$(OPT_FLAGS) -DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
++                      -DLINUX -DOSS -DUSE_ESD \
++                      -Wall \
++                      -funroll-all-loops \
 +                      -finline-functions -ffast-math' \
                mpg123-make
  
- linux-mips-alsa:
+ linux-3dnow-alsa:
+@@ -255,10 +278,10 @@
+               OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+                       dct64_i386.o dct36_3dnow.o getcpuflags.o \
+                       equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
+-              CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
++              CFLAGS='$(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+                       -DUSE_3DNOW -DALSA -DTERM_CONTROL\
+-                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -Wall \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
+@@ -268,10 +291,10 @@
+               OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+                       dct64_i386.o dct36_3dnow.o getcpuflags.o \
+                       equalizer_3dnow.o decode_i586.o audio_esd.o' \
+-              CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
++              CFLAGS='$(OPT_FLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+                       -DUSE_3DNOW -DUSE_ESD \
+-                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -Wall \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
+@@ -279,43 +302,39 @@
        $(MAKE) CC=gcc LDFLAGS= \
                AUDIO_LIB='-lasound' \
                OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
--              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DREAD_MMAP -DALSA \
+-              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA \
 -                      -DTERM_CONTROL -Wall  -O2 \
-+              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -DREAD_MMAP -DALSA \
-+                      -DTERM_CONTROL -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
+-                      -fomit-frame-pointer -funroll-all-loops \
 -                      -finline-functions -ffast-math \
 -                      $(RPM_OPT_FLAGS)' \
++              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA \
++                      -DTERM_CONTROL -Wall \
++                      -funroll-all-loops \
 +                      -finline-functions -ffast-math' \
                mpg123-make
  
  linux-alpha:
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
 -              CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall -O2 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DLINUX -DOSS -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math \
 -                      -Wall -O6 -DUSE_MMAP \
 -                      $(RPM_OPT_FLAGS)' \
 +                      -Wall -DUSE_MMAP' \
                mpg123-make
  
+ linux-alpha-alsa:
+       $(MAKE) CC=gcc LDFLAGS= \
+               AUDIO_LIB='-lasound' \
+               OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
+-              CFLAGS='-DLINUX \
++              CFLAGS='$(OPT_FLAGS) -DLINUX \
+                       -DALSA -DTERM_CONTROL\
+-                      -DUSE_MMAP  -O6 \
+-                      -fomit-frame-pointer -funroll-all-loops \
+-                      -finline-functions -ffast-math \
+-                      $(RPM_OPT_FLAGS)' \
++                      -DUSE_MMAP \
++                      -funroll-all-loops \
++                      -finline-functions -ffast-math' \
+               mpg123-make
+ 
  linux-alpha-esd:
        $(MAKE) CC=gcc LDFLAGS= \
                AUDIO_LIB='-lesd -laudiofile' \
                OBJECTS='decode.o dct64.o audio_esd.o' \
--              CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall -O2 \
-+              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DLINUX -DOSS -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
+-              CFLAGS='$(CFLAGS) -DLINUX -DOSS -DUSE_ESD -Wall -O2 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DLINUX -DOSS -DUSE_ESD -Wall \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math \
 -                      -Wall -O6 -DUSE_MMAP \
 -                      $(RPM_OPT_FLAGS)' \
@@ -125,55 +233,101 @@ diff -urN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
                mpg123-make
  
  #linux-ppc:
-@@ -229,7 +224,7 @@
+@@ -340,9 +359,9 @@
  linux-ppc:
        $(MAKE) CC=gcc  LDFLAGS= \
                OBJECTS='decode.o dct64.o audio_oss.o' \
 -              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
                        -DOSS \
-                       -fomit-frame-pointer -funroll-all-loops \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
-@@ -239,7 +234,7 @@
+               mpg123-make
+ 
+@@ -350,17 +369,17 @@
        $(MAKE) CC=gcc  LDFLAGS= \
                AUDIO_LIB='-lesd -laudiofile' \
                OBJECTS='decode.o dct64.o audio_esd.o' \
 -              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
-                       -DOSS  \
-                       -fomit-frame-pointer -funroll-all-loops \
+                       -DOSS -DUSE_ESD \
+-                      -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
-@@ -248,15 +243,15 @@
+               mpg123-make
+ 
  linux-sparc:
        $(MAKE) CC=gcc  LDFLAGS= \
                OBJECTS='decode.o dct64.o audio_sun.o' \
 -              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall -O2 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
+@@ -368,34 +387,34 @@
+       $(MAKE) CC=gcc  LDFLAGS= \
+               AUDIO_LIB='-lesd -laudiofile' \
+               OBJECTS='decode.o dct64.o audio_esd.o' \
+-              CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall -O2 \
+-                      -fomit-frame-pointer -funroll-all-loops \
+-                      -finline-functions -ffast-math \
++              CFLAGS='$(OPT_FLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall \
++                      -funroll-all-loops \
++                      -finline-functions -ffast-math' \
+               mpg123-make
+ 
+ 
+ linux-armv4l:
+       $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
+-              CFLAGS='-DLINUX -DOSS -Wall -O2 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++              CFLAGS='$(OPT_FLAGS) -DLINUX -DOSS -Wall \
++                      -funroll-all-loops \
+                       -finline-functions -ffast-math \
+-                      -Wall -O6 -DUSE_MMAP \
++                      -Wall -DUSE_MMAP \
+                 mpg123-make
+ 
+ linux-arm:
+       $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
+-              CFLAGS='-DREAL_IS_FIXED -DLINUX \
+-                      -DOSS -Wall -O6 -march=armv4 \
+-                      -fomit-frame-pointer -funroll-all-loops \
++              CFLAGS='$(OPT_FLAGS) -DREAL_IS_FIXED -DLINUX \
++                      -DOSS -Wall \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
+  
  
  linux-m68k:
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
--              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
+-              CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX \
 -                      -DOSS -DOSS_BIG_ENDIAN -Wall -O2 -m68040 \
-+              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
+-                      -fomit-frame-pointer -funroll-loops \
++              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX \
 +                      -DOSS -DOSS_BIG_ENDIAN -Wall \
-                       -fomit-frame-pointer -funroll-loops \
++                      -funroll-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
-@@ -277,8 +272,8 @@
+ 
+@@ -415,9 +434,9 @@
        $(MAKE) CC=gcc LDFLAGS= \
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
                        control_sajber.o control_tk3play.o audio_oss.o' \
 -              CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
 -                      -DPENTIUM_OPT -DLINUX -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
 +                      -DPENTIUM_OPT -DLINUX -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                $(FRONTEND)
-@@ -287,9 +282,9 @@
+ 
+@@ -425,10 +444,10 @@
        $(MAKE) CC=gcc LDFLAGS='-L/usr/X11R6/lib' \
                AUDIO_LIB='-laudio -lXau' \
                OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
@@ -181,34 +335,9 @@ diff -urN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
 +              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -I/usr/X11R6/include \
                        -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS \
 -                      -Wall -O2 -m486 \
+-                      -fomit-frame-pointer -funroll-all-loops \
 +                      -Wall \
-                       -fomit-frame-pointer -funroll-all-loops \
-                       -finline-functions -ffast-math' \
-               mpg123-make
---- mpg123-0.59r/Makefile~     Fri Dec  7 12:42:58 2001
-+++ mpg123-0.59r/Makefile      Fri Dec  7 12:42:58 2001
-@@ -82,6 +82,7 @@
-       @echo ""
-       @echo "make linux-esd      Linux, output to EsounD"
-       @echo "make linux-alpha-esd Linux/Alpha, output to EsounD"
-+      @echo "make linux-sparc-esd Linux, output to EsounD"
-       @echo "make linux-ppc-esd  Linux/PPC, output to EsounD"
-       @echo "    NOTE: esd flavours require libaudiofile, available from: "
-       @echo "          http://www.68k.org/~michael/audiofile/"
-@@ -248,6 +249,16 @@
++                      -funroll-all-loops \
                        -finline-functions -ffast-math' \
                mpg123-make
  
-+linux-sparc-esd:
-+      $(MAKE) CC=gcc LDFLAGS= \
-+              AUDIO_LIB='-lesd -laudiofile' \
-+              OBJECTS='decode.o dct64.o audio_esd.o' \
-+              CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -DLINUX -Wall \
-+                      -fomit-frame-pointer -funroll-all-loops \
-+                      -finline-functions -ffast-math \
-+                      -Wall -DUSE_MMAP' \
-+              mpg123-make
-+
- linux-m68k:
-       $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-               CFLAGS='$(CFLAGS) $(OPT_FLAGS) -DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \

diff --git a/mpg123-security.patch b/mpg123-security.patch
new file mode 100644 (file)
index 0000000..c10f6d2
--- /dev/null
+++ b/mpg123-security.patch
@@ -0,0 +1,24 @@
+--- mpg123/common.c.orig       Wed May 16 18:56:56 2001
++++ mpg123/common.c    Tue Feb  4 22:28:25 2003
+@@ -140,7 +140,7 @@
+  *       -1: giving up
+  *        1: synched
+  */
+-#define MAX_INPUT_FRAMESIZE 1920
++#define MAX_INPUT_FRAMESIZE 4096
+ #define SYNC_HEAD_MASK    0xffff0000
+ #define SYNC_HEAD_MASK_FF 0x0000f000
+ #define LOOK_AHEAD_NUM 3
+@@ -583,7 +583,12 @@
+     if(!fr->bitrate_index) {
+         /* fprintf(stderr,"Warning, Free format not heavily tested: (head %08lx)\n",newhead); */
+         fr->framesize = 0;
++    } else if(fr->framesize > MAX_INPUT_FRAMESIZE) {
++      fprintf(stderr,"Frame size too big: %d\n", fr->framesize);
++      fr->framesize = MAX_INPUT_FRAMESIZE;
++      return 0;
+     }
++
+     fr->thishead = newhead;
+ 
+     return 1;

diff --git a/mpg123.spec b/mpg123.spec
index b724d4b4b0d0378178b94abe02530153b9fba364..bce13d5f5153ec85cb152c58bdef5742764f96e7 100644 (file)
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -1,21 +1,40 @@
+#
+# Conditional build:
+# _with_mmx    - use MMX to decode stream (won't run without MMX)
+#
 Summary:       MPEG audio player
 Summary(es):   Ejecuta archivos MP3
 Summary(pl):   Odtwarzacz plików audio MPEG
 Summary(pt_BR):        Tocador de arquivos MP3
 Name:          mpg123
-Version:       0.59r
-Release:       7
+Version:       0.59s
+Release:       0.pre.1
 Group:         Applications/Sound
 License:       freely distributable for non-commercial use, GPL (mpglib)
-Source0:       http://www.mpg123.de/mpg123/%{name}-%{version}.tar.gz
-Patch0:                ftp://ftp.kame.net/pub/kame/misc/%{name}-059r-v6-20000111.diff.gz
-Patch1:                %{name}-makefile.patch
-Patch2:                %{name}-esd.patch
-Patch3:                %{name}-audio_sun.patch
+Source0:       http://www.mpg123.de/mpg123/%{name}-pre%{version}.tar.gz
+Patch0:                %{name}-makefile.patch
+Patch1:                %{name}-esd.patch
+Patch2:                %{name}-audio_sun.patch
+Patch3:                %{name}-security.patch
+Patch4:                %{name}-id3v2-hack.patch
 URL:           http://www.mpg123.de/
 BuildRequires: esound-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch %{ix86}
+%ifarch athlon
+%define                trgt    linux-3dnow
+%else
+%ifarch i586 i686
+%define                trgt    linux%{?_with_mmx:-mmx}
+%else
+%define                trgt    linux-i486
+%endif
+%endif
+%else
+%define                trgt    linux-%{_target_cpu}
+%endif
+
 %description
 Mpg123 is a fast, free(for non-commercial use) and portable MPEG audio
 player for Unix. It supports MPEG 1.0/2.0 layers 1, 2 and 3 (those
@@ -65,27 +84,22 @@ mo
 Wersja z wyj¶ciem na ESD.
 
 %prep
-%setup -q
-%patch0 -p0
-%patch1 -p1
+%setup -q -n %{name}
+%patch0 -p1
+#%patch1 -p1   -- unneeded?
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-%ifarch %{ix86}
-%{__make} OPT_FLAGS="%{rpmcflags} -DINET6" linux
-%else
-%{__make} OPT_FLAGS="%{rpmcflags} -DINET6" linux-%{_target_cpu}
-%endif
+%{__make} %{trgt} \
+       OPT_FLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer} -DINET6"
 
 mv -f mpg123 mpg123.base
 
 %{__make} clean
-%ifarch %{ix86}
-%{__make} OPT_FLAGS="%{rpmcflags} -DINET6" linux-esd
-%else
-%{__make} OPT_FLAGS="%{rpmcflags} -DINET6" linux-%{_target_cpu}-esd
-%endif
+%{__make} %{trgt}-esd \
+       OPT_FLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer} -DINET6"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -100,8 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS COPYING CHANGES JUKEBOX README BENCHMARKING README.remote TODO
-
+%doc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README README.remote TODO
+%ifarch athlon
+%doc README.3DNOW
+%endif
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/*