diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-30 23:31:17 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-30 23:31:17 +0000 |
commit | bfff2ba9439b912c79c31d3aafdc5fee659e3afa (patch) | |
tree | 2443fc1b7169b95335eb5df6bd4546bf5159a5ea /media-sound/mpg123/files | |
parent | Moving to kde-misc/kalbum (diff) | |
download | historical-bfff2ba9439b912c79c31d3aafdc5fee659e3afa.tar.gz historical-bfff2ba9439b912c79c31d3aafdc5fee659e3afa.tar.bz2 historical-bfff2ba9439b912c79c31d3aafdc5fee659e3afa.zip |
Removing insecure versions.
Diffstat (limited to 'media-sound/mpg123/files')
-rw-r--r-- | media-sound/mpg123/files/0.59s-generic.patch | 18 | ||||
-rw-r--r-- | media-sound/mpg123/files/digest-mpg123-0.59s-r4 | 1 | ||||
-rw-r--r-- | media-sound/mpg123/files/digest-mpg123-0.59s-r5 | 2 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch | 15 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-Makefile.patch | 29 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-amd64.patch | 81 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-heapfix.diff | 11 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-ppc64.patch | 46 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-security.diff | 34 |
9 files changed, 0 insertions, 237 deletions
diff --git a/media-sound/mpg123/files/0.59s-generic.patch b/media-sound/mpg123/files/0.59s-generic.patch deleted file mode 100644 index 2bbc0002a2f5..000000000000 --- a/media-sound/mpg123/files/0.59s-generic.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.orig 2003-11-23 20:15:23.000000000 -0500 -+++ Makefile 2003-11-23 20:16:46.000000000 -0500 -@@ -176,6 +176,15 @@ - -finline-functions -ffast-math' \ - mpg123-make - -+linux-generic: -+ $(MAKE) CC=gcc LDFLAGS= \ -+ OBJECTS='decode.o dct64.o audio_oss.o' \ -+ CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \ -+ -DOSS \ -+ -fomit-frame-pointer -funroll-all-loops \ -+ -finline-functions -ffast-math' \ -+ mpg123-make -+ - linux-pentium: - $(MAKE) CC=gcc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r4 b/media-sound/mpg123/files/digest-mpg123-0.59s-r4 deleted file mode 100644 index 88b7f6bafc5b..000000000000 --- a/media-sound/mpg123/files/digest-mpg123-0.59s-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r5 b/media-sound/mpg123/files/digest-mpg123-0.59s-r5 deleted file mode 100644 index 55e939750ab2..000000000000 --- a/media-sound/mpg123/files/digest-mpg123-0.59s-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 -MD5 cb48de54032d91a3d5557a8ef78696ee mpg123-0.59s-gentoo-1.0.tar.bz2 4992 diff --git a/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch b/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch deleted file mode 100644 index 5c457af500d6..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mpg123/layer2.c.orig 2004-09-14 17:15:48.000000000 -0400 -+++ mpg123/layer2.c 2004-09-14 17:18:49.000000000 -0400 -@@ -287,6 +287,12 @@ - fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? - (fr->mode_ext<<2)+4 : fr->II_sblimit; - -+ /* security fix. */ -+ if (fr->jsbound > fr->II_sblimit) { -+ fprintf(stderr, "Truncating stereo boundary to sideband limit.\n"); -+ fr->jsbound=fr->II_sblimit; -+ } -+ - if(stereo == 1 || single == 3) - single = 0; - diff --git a/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch b/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch deleted file mode 100644 index d31d6863e6f8..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- mpg123/Makefile.orig 2004-04-13 09:19:04.445654000 -0600 -+++ mpg123/Makefile 2004-04-13 09:21:41.845654000 -0600 -@@ -402,7 +402,7 @@ - OBJECTS='decode.o dct64.o audio_esd.o' \ - CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall \ - -fomit-frame-pointer -funroll-all-loops \ -- -finline-functions -ffast-math \ -+ -finline-functions -ffast-math' \ - mpg123-make - - -@@ -411,7 +411,7 @@ - CFLAGS='-DLINUX -DOSS -Wall \ - -fomit-frame-pointer -funroll-all-loops \ - -finline-functions -ffast-math \ -- -Wall -O6 -DUSE_MMAP \ -+ -Wall -O6 -DUSE_MMAP' \ - mpg123-make - - linux-arm: -@@ -496,7 +496,7 @@ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ - -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD \ -- -I/usr/local/include -L/usr/local/lib -+ -I/usr/local/include -L/usr/local/lib' \ - mpg123-make - - freebsd-nas: diff --git a/media-sound/mpg123/files/mpg123-0.59s-amd64.patch b/media-sound/mpg123/files/mpg123-0.59s-amd64.patch deleted file mode 100644 index b8ab3c065c09..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-amd64.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ruN mpg123.old/Makefile mpg123/Makefile ---- mpg123.old/Makefile 2001-01-23 13:00:46.000000000 -0500 -+++ mpg123/Makefile 2003-10-06 00:19:31.356137840 -0400 -@@ -318,6 +318,29 @@ - $(RPM_OPT_FLAGS)' \ - mpg123-make - -+linux-x86_64: -+ $(MAKE) LDFLAGS= \ -+ OBJECTS='decode.o dct64.o audio_oss.o' \ -+ CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \ -+ $(RPM_OPT_FLAGS)' \ -+ mpg123-make -+ -+linux-x86_64-esd: -+ $(MAKE) LDFLAGS= \ -+ AUDIO_LIB='-lesd -laudiofile' \ -+ OBJECTS='decode.o dct64.o audio_esd.o' \ -+ CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \ -+ $(RPM_OPT_FLAGS)' \ -+ mpg123-make -+ -+linux-x86_64-alsa: -+ $(MAKE) LDFLAGS= \ -+ AUDIO_LIB='-lasound' \ -+ OBJECTS='decode.o dct64.o audio_alsa.o' \ -+ CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \ -+ $(RPM_OPT_FLAGS)' \ -+ mpg123-make -+ - #linux-ppc: - # $(MAKE) CC=gcc LDFLAGS= \ - # OBJECTS='decode.o dct64.o audio_oss.o' \ -diff -ruN mpg123.old/layer3.c mpg123/layer3.c ---- mpg123.old/layer3.c 2001-01-23 10:10:02.000000000 -0500 -+++ mpg123/layer3.c 2003-10-06 00:19:31.357137688 -0400 -@@ -609,7 +609,7 @@ - * Dequantize samples (includes huffman decoding) - */ - /* 24 is enough because tab13 has max. a 19 bit huffvector */ --#define BITSHIFT ((sizeof(long)-1)*8) -+#define BITSHIFT ((sizeof(int)-1)*8) - #define REFRESH_MASK \ - while(num < BITSHIFT) { \ - mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ -@@ -713,7 +713,7 @@ - if(x == 15 && h->linbits) { - max[lwin] = cb; - REFRESH_MASK; -- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); -+ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); - num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) -@@ -737,7 +737,7 @@ - if(y == 15 && h->linbits) { - max[lwin] = cb; - REFRESH_MASK; -- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); -+ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); - num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) -@@ -891,7 +891,7 @@ - if (x == 15 && h->linbits) { - max = cb; - REFRESH_MASK; -- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); -+ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); - num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) -@@ -915,7 +915,7 @@ - if (y == 15 && h->linbits) { - max = cb; - REFRESH_MASK; -- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); -+ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); - num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) diff --git a/media-sound/mpg123/files/mpg123-0.59s-heapfix.diff b/media-sound/mpg123/files/mpg123-0.59s-heapfix.diff deleted file mode 100644 index f5006f2fbc64..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-heapfix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- httpget.c 2000-10-30 18:45:12.000000000 +0100 -+++ httpget.c.patch 2004-02-09 10:05:56.000000000 +0100 -@@ -55,7 +55,7 @@ void readstring (char *string, int maxle - #endif - int pos = 0; - -- while(1) { -+ while(maxlen>pos) { - if( read(fileno(f),string+pos,1) == 1) { - pos++; - if(string[pos-1] == '\n') { diff --git a/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch b/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch deleted file mode 100644 index 299e062e83a5..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- Makefile.orig 2004-10-18 21:58:56.743022904 -0500 -+++ Makefile 2004-10-18 22:00:08.095092976 -0500 -@@ -327,25 +327,25 @@ - $(RPM_OPT_FLAGS)' \ - mpg123-make - --#linux-ppc: --# $(MAKE) CC=gcc LDFLAGS= \ --# OBJECTS='decode.o dct64.o audio_oss.o' \ --# CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \ --# -DOSS -DPPC_ENDIAN \ --# -fomit-frame-pointer -funroll-all-loops \ --# -finline-functions -ffast-math' \ --# mpg123-make -- --#linux-ppc-esd: --# $(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 \ --# -DOSS -DPPC_ENDIAN \ --# -fomit-frame-pointer -funroll-all-loops \ --# -finline-functions -ffast-math' \ --# mpg123-make -+linux-ppc64: -+ $(MAKE) CC=gcc LDFLAGS= \ -+ OBJECTS='decode.o dct64.o audio_oss.o' \ -+ CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 \ -+ -DOSS -DPPC_ENDIAN \ -+ -fomit-frame-pointer -funroll-all-loops \ -+ -finline-functions -ffast-math' \ -+ mpg123-make - -+linux-ppc64-esd: -+ $(MAKE) CC=gcc LDFLAGS= \ -+ AUDIO_LIB='-lesd -laudiofile' \ -+ OBJECTS='decode.o dct64.o audio_esd.o' \ -+ CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 \ -+ -DOSS -DPPC_ENDIAN \ -+ -fomit-frame-pointer -funroll-all-loops \ -+ -finline-functions -ffast-math' \ -+ mpg123-make -+ - linux-ppc: - $(MAKE) CC=gcc LDFLAGS= \ - OBJECTS='decode.o dct64.o audio_oss.o' \ diff --git a/media-sound/mpg123/files/mpg123-0.59s-security.diff b/media-sound/mpg123/files/mpg123-0.59s-security.diff deleted file mode 100644 index a3e67f75cdb1..000000000000 --- a/media-sound/mpg123/files/mpg123-0.59s-security.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN mpg123.old/common.c mpg123/common.c ---- mpg123.old/common.c 2001-05-16 09:56:56.000000000 -0700 -+++ mpg123/common.c 2003-09-30 00:31:24.000000000 -0700 -@@ -127,7 +127,7 @@ - return FALSE; - if(!((head>>17)&3)) - return FALSE; -- if( ((head>>12)&0xf) == 0xf) -+ if( ((head>>12)&0xf) == 0xf || ((head>>12)&0xf) == 0) - return FALSE; - if( ((head>>10)&0x3) == 0x3 ) - return FALSE; -@@ -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 -@@ -579,7 +579,11 @@ - fprintf(stderr,"Sorry, unknown layer type.\n"); - return (0); - } -- -+ if (fr->framesize>MAX_INPUT_FRAMESIZE) { -+ fprintf(stderr,"Frame size too big.\n"); -+ fr->framesize = MAX_INPUT_FRAMESIZE; -+ return 0; -+ } - if(!fr->bitrate_index) { - /* fprintf(stderr,"Warning, Free format not heavily tested: (head %08lx)\n",newhead); */ - fr->framesize = 0; |