security fix

12 files changed, 136 insertions, 1197 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 4910e4ea5f17..2d94d3e48c77 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,13 +1,10 @@
 MD5 f7a5849c9d0381f667738a7ad2820c2b mpg123-0.59r-r2.ebuild 1667
-MD5 1d1cc84eaf4ddf4b149ccfd871dc2640 mpg123-0.59s-r1.ebuild 1331
-MD5 7c44c0a8af9a58a277e4cafe631f1ef7 mpg123-0.59r-r3.ebuild 1539
-MD5 522df01148c45e1c108f33bdace1e685 ChangeLog 2779
+MD5 84e3bd19ae864b24b67692e4c4fe4b88 mpg123-0.59s-r1.ebuild 1423
+MD5 dc7ab5e9d66680cf6e8b6927cabf7481 mpg123-0.59r-r3.ebuild 1544
+MD5 cc8d7321715fb2e1e560aecb8de450bd ChangeLog 3519
 MD5 1d1cc84eaf4ddf4b149ccfd871dc2640 mpg123-0.59s.ebuild 1331
-MD5 25074032444365516e00f7c2b9a7a736 files/mpg123-0.59r-hppa.diff 1121
-MD5 b8cddd1215747a09daf3476eb7290bc6 files/mpg123-0.59r-make-fix.diff 7832
-MD5 660470ffc0acfb171f08032a4d727cba files/mpg123-0.59r-alpha.diff 17451
 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64
 MD5 1d1f7b49b09cb2394ef7a7dd893b1fea files/digest-mpg123-0.59r-r3 134
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r1 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s 67
-MD5 efa64a45cc5ceed3325967030d014e3b files/mpg123-0.59r-amd64.diff 3512
+MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59r-r1 b/media-sound/mpg123/files/digest-mpg123-0.59r-r1
deleted file mode 100644
index d1abfcacbafc..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59r-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95df59ad1651dd2346d49fafc83747e7 mpg123-0.59r.tar.gz 159028
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59r-r3 b/media-sound/mpg123/files/digest-mpg123-0.59r-r3
new file mode 100644
index 000000000000..e2e4e675202d
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59r-r3
@@ -0,0 +1,2 @@
+MD5 95df59ad1651dd2346d49fafc83747e7 mpg123-0.59r.tar.gz 159028
+MD5 0199ea604189af7ea72b0be9977bf8f6 mpg123-0.59r-gentoo.tar.bz2 6307
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r1 b/media-sound/mpg123/files/digest-mpg123-0.59s-r1
new file mode 100644
index 000000000000..88b7f6bafc5b
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r1
@@ -0,0 +1 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/mpg123-0.59r-alpha.diff b/media-sound/mpg123/files/mpg123-0.59r-alpha.diff
deleted file mode 100644
index e9821f8006ed..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59r-alpha.diff
+++ /dev/null
@@ -1,757 +0,0 @@
-diff -urN mpg123-0.59r/Makefile mpg123-0.59r.alpha/Makefile
---- mpg123-0.59r/Makefile	1999-06-15 16:39:06.000000000 -0400
-+++ mpg123-0.59r.alpha/Makefile	2002-11-22 17:57:45.000000000 -0500
-@@ -173,7 +173,7 @@
- 		mpg123-make
- 
- linux-alpha:
--	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode_alpha.o dct64_alpha.o audio_oss.o' \
- 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
- 			-fomit-frame-pointer -funroll-all-loops \
- 			-finline-functions -ffast-math \
-@@ -184,7 +184,7 @@
- linux-alpha-esd:
- 	$(MAKE) CC=gcc LDFLAGS= \
- 		AUDIO_LIB='-lesd -laudiofile' \
--		OBJECTS='decode.o dct64.o audio_esd.o' \
-+		OBJECTS='decode_alpha.o dct64_alpha.o audio_esd.o' \
- 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
- 			-fomit-frame-pointer -funroll-all-loops \
- 			-finline-functions -ffast-math \
-diff -urN mpg123-0.59r/dct64_alpha.c mpg123-0.59r.alpha/dct64_alpha.c
---- mpg123-0.59r/dct64_alpha.c	1969-12-31 19:00:00.000000000 -0500
-+++ mpg123-0.59r.alpha/dct64_alpha.c	2002-11-22 17:52:59.000000000 -0500
-@@ -0,0 +1,411 @@
-+
-+/*
-+ * Discrete Cosine Tansform (DCT) for subband synthesis
-+ * optimized for machines with no auto-increment. 
-+ */
-+
-+/*
-+ * 1999-03-17 Ivan Kokshaysky
-+ * Optimized for Alpha
-+ */
-+
-+#include "mpg123.h"
-+
-+void dct64(real *out0,real *out1,real *samples)
-+{
-+
-+  register real *costab = pnts[1];
-+  register real cos0,cos1,tmp;
-+  register real b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,bA,bB,bC,bD,bE,bF;
-+
-+/* --1 */
-+  b0 = samples[0x00] + samples[0x1F];
-+  b1 = samples[0x01] + samples[0x1E];
-+  b2 = samples[0x02] + samples[0x1D];
-+  b3 = samples[0x03] + samples[0x1C];
-+  b4 = samples[0x04] + samples[0x1B];
-+  b5 = samples[0x05] + samples[0x1A];
-+  b6 = samples[0x06] + samples[0x19];
-+  b7 = samples[0x07] + samples[0x18];
-+  b8 = samples[0x08] + samples[0x17];
-+  b9 = samples[0x09] + samples[0x16];
-+  bA = samples[0x0A] + samples[0x15];
-+  bB = samples[0x0B] + samples[0x14];
-+  bC = samples[0x0C] + samples[0x13];
-+  bD = samples[0x0D] + samples[0x12];
-+  bE = samples[0x0E] + samples[0x11];
-+  bF = samples[0x0F] + samples[0x10];
-+
-+  tmp = b0 + bF;
-+  bF = b0 - bF;
-+  b0 = tmp;
-+  bF *= costab[0];
-+  tmp = b1 + bE; 
-+  bE = b1 - bE;
-+  b1 = tmp; 
-+  bE *= costab[1];
-+  tmp = b2 + bD; 
-+  bD = b2 - bD;
-+  b2 = tmp; 
-+  bD *= costab[2];
-+  tmp = b3 + bC; 
-+  bC = b3 - bC;
-+  b3 = tmp; 
-+  bC *= costab[3];
-+  tmp = b4 + bB; 
-+  bB = b4 - bB;
-+  b4 = tmp; 
-+  bB *= costab[4];
-+  tmp = b5 + bA; 
-+  bA = b5 - bA;
-+  b5 = tmp; 
-+  bA *= costab[5];
-+  tmp = b6 + b9; 
-+  b9 = b6 - b9;
-+  b6 = tmp; 
-+  b9 *= costab[6];
-+  tmp = b7 + b8; 
-+  b8 = b7 - b8;
-+  b7 = tmp; 
-+  b8 *= costab[7];
-+
-+  costab = pnts[2];
-+
-+  tmp = b0 + b7;
-+  b7 = b0 - b7;
-+  b0 = tmp;
-+  b7 *= costab[0];
-+  tmp = b1 + b6;
-+  b6 = b1 - b6;
-+  b1 = tmp;
-+  b6 *= costab[1];
-+  tmp = b2 + b5;
-+  b5 = b2 - b5;
-+  b2 = tmp;
-+  b5 *= costab[2];
-+  tmp = b3 + b4;
-+  b4 = b3 - b4;
-+  b3 = tmp;
-+  b4 *= costab[3];
-+  tmp = b8 + bF;
-+  bF = bF - b8;
-+  b8 = tmp;
-+  bF *= costab[0];
-+  tmp = b9 + bE;
-+  bE = bE - b9;
-+  b9 = tmp;
-+  bE *= costab[1];
-+  tmp = bA + bD;
-+  bD = bD - bA;
-+  bA = tmp;
-+  bD *= costab[2];
-+  tmp = bB + bC;
-+  bC = bC - bB;
-+  bB = tmp;
-+  bC *= costab[3];
-+
-+  cos0 = pnts[3][0];
-+  cos1 = pnts[3][1];
-+
-+  tmp = b0 + b3;
-+  b3 = b0 - b3;
-+  b0 = tmp;
-+  b3 *= cos0;
-+  tmp = b1 + b2;
-+  b2 = b1 - b2;
-+  b1 = tmp;
-+  b2 *= cos1;
-+  tmp = b4 + b7;
-+  b7 = b7 - b4;
-+  b4 = tmp;
-+  b7 *= cos0;
-+  tmp = b5 + b6;
-+  b6 = b6 - b5;
-+  b5 = tmp;
-+  b6 *= cos1;
-+  tmp = b8 + bB;
-+  bB = b8 - bB;
-+  b8 = tmp;
-+  bB *= cos0;
-+  tmp = b9 + bA;
-+  bA = b9 - bA;
-+  b9 = tmp;
-+  bA *= cos1;
-+  tmp = bC + bF;
-+  bF = bF - bC;
-+  bC = tmp;
-+  bF *= cos0;
-+  tmp = bD + bE;
-+  bE = bE - bD;
-+  bD = tmp;
-+  bE *= cos1;
-+
-+  cos0 = pnts[4][0];
-+
-+  tmp = b0 + b1;
-+  b1 = b0 - b1;
-+  b0 = tmp;
-+  b1 *= cos0;
-+  tmp = b2 + b3;
-+  b3 = b3 - b2;
-+  b2 = tmp;
-+  b3 *= cos0;
-+  tmp = b4 + b5;
-+  b5 = b4 - b5;
-+  b2 += b3;
-+  b4 = tmp;
-+  b5 *= cos0;
-+  tmp = b6 + b7;
-+  b7 = b7 - b6;
-+  b6 = tmp;
-+  b7 *= cos0;
-+  tmp = b8 + b9;
-+  b6 += b7;
-+  b9 = b8 - b9;
-+  b4 += b6;
-+  b8 = tmp;
-+  b6 += b5;
-+  b9 *= cos0;
-+  b5 += b7;
-+
-+  tmp = bA + bB;
-+  bB = bB - bA;
-+  bA = tmp;
-+  bB *= cos0;
-+  tmp = bC + bD;
-+  bA += bB;
-+  bD = bC - bD;
-+  bC = tmp;
-+  bD *= cos0;
-+  tmp = bE + bF;
-+  bF = bF - bE;
-+  bE = tmp;
-+  bF *= cos0;
-+  out0[0x10*16] = b0;
-+  bE += bF;
-+  out0[0x10*12] = b4;
-+  bC += bE;
-+  out0[0x10* 8] = b2;
-+  bE += bD;
-+  out0[0x10* 4] = b6;
-+  bD += bF;
-+
-+  out0[0x10* 0] = b1;
-+  b8 += bC;
-+  out1[0x10* 0] = b1;
-+  out0[0x10*14] = b8;
-+  bC += bA;
-+  out1[0x10* 4] = b5;
-+  out0[0x10*10] = bC;
-+  bA += bE;
-+  out1[0x10* 8] = b3;
-+  out0[0x10* 6] = bA;
-+  bE += b9;
-+  out1[0x10*12] = b7;
-+  out0[0x10* 2] = bE;
-+  b9 += bD;
-+  out1[0x10* 2] = b9;
-+  bD += bB;
-+  out1[0x10* 6] = bD;
-+  bB += bF;
-+  out1[0x10*10] = bB;
-+  out1[0x10*14] = bF;
-+
-+/* --2 */
-+  costab = pnts[0];
-+
-+  bF = (samples[0x00] - samples[0x1F]) * costab[0x0];
-+  bE = (samples[0x01] - samples[0x1E]) * costab[0x1];
-+  bD = (samples[0x02] - samples[0x1D]) * costab[0x2];
-+  bC = (samples[0x03] - samples[0x1C]) * costab[0x3];
-+  bB = (samples[0x04] - samples[0x1B]) * costab[0x4];
-+  bA = (samples[0x05] - samples[0x1A]) * costab[0x5];
-+  b9 = (samples[0x06] - samples[0x19]) * costab[0x6];
-+  b8 = (samples[0x07] - samples[0x18]) * costab[0x7];
-+  b7 = (samples[0x08] - samples[0x17]) * costab[0x8];
-+  b6 = (samples[0x09] - samples[0x16]) * costab[0x9];
-+  b5 = (samples[0x0A] - samples[0x15]) * costab[0xA];
-+  b4 = (samples[0x0B] - samples[0x14]) * costab[0xB];
-+  b3 = (samples[0x0C] - samples[0x13]) * costab[0xC];
-+  b2 = (samples[0x0D] - samples[0x12]) * costab[0xD];
-+  b1 = (samples[0x0E] - samples[0x11]) * costab[0xE];
-+  b0 = (samples[0x0F] - samples[0x10]) * costab[0xF];
-+
-+  costab = pnts[1];
-+
-+  tmp = b0 + bF;
-+  bF = bF - b0;
-+  b0 = tmp;
-+  bF *= costab[0];
-+  tmp = b1 + bE;
-+  bE = bE - b1;
-+  b1 = tmp;
-+  bE *= costab[1];
-+  tmp = b2 + bD;
-+  bD = bD - b2;
-+  b2 = tmp;
-+  bD *= costab[2];
-+  tmp = b3 + bC;
-+  bC = bC - b3;
-+  b3 = tmp;
-+  bC *= costab[3];
-+  tmp = b4 + bB;
-+  bB = bB - b4;
-+  b4 = tmp;
-+  bB *= costab[4];
-+  tmp = b5 + bA;
-+  bA = bA - b5;
-+  b5 = tmp;
-+  bA *= costab[5];
-+  tmp = b6 + b9;
-+  b9 = b9 - b6;
-+  b6 = tmp;
-+  b9 *= costab[6];
-+  tmp = b7 + b8;
-+  b8 = b8 - b7;
-+  b7 = tmp;
-+  b8 *= costab[7];
-+
-+  costab = pnts[2];
-+
-+  tmp = b0 + b7;
-+  b7 = b0 - b7;
-+  b0 = tmp;
-+  b7 *= costab[0];
-+  tmp = b1 + b6;
-+  b6 = b1 - b6;
-+  b1 = tmp;
-+  b6 *= costab[1];
-+  tmp = b2 + b5;
-+  b5 = b2 - b5;
-+  b2 = tmp;
-+  b5 *= costab[2];
-+  tmp = b3 + b4;
-+  b4 = b3 - b4;
-+  b3 = tmp;
-+  b4 *= costab[3];
-+  tmp = b8 + bF;
-+  bF = bF - b8;
-+  b8 = tmp;
-+  bF *= costab[0];
-+  tmp = b9 + bE;
-+  bE = bE - b9;
-+  b9 = tmp;
-+  bE *= costab[1];
-+  tmp = bA + bD;
-+  bD = bD - bA;
-+  bA = tmp;
-+  bD *= costab[2];
-+  tmp = bB + bC;
-+  bC = bC - bB;
-+  bB = tmp;
-+  bC *= costab[3];
-+
-+  cos0 = pnts[3][0];
-+  cos1 = pnts[3][1];
-+
-+  tmp = b0 + b3;
-+  b3 = b0 - b3;
-+  b0 = tmp;
-+  b3 *= cos0;
-+  tmp = b1 + b2;
-+  b2 = b1 - b2;
-+  b1 = tmp;
-+  b2 *= cos1;
-+  tmp = b4 + b7;
-+  b7 = b7 - b4;
-+  b4 = tmp;
-+  b7 *= cos0;
-+  tmp = b5 + b6;
-+  b6 = b6 - b5;
-+  b5 = tmp;
-+  b6 *= cos1;
-+  tmp = b8 + bB;
-+  bB = b8 - bB;
-+  b8 = tmp;
-+  bB *= cos0;
-+  tmp = b9 + bA;
-+  bA = b9 - bA;
-+  b9 = tmp;
-+  bA *= cos1;
-+  tmp = bC + bF;
-+  bF = bF - bC;
-+  bC = tmp;
-+  bF *= cos0;
-+  tmp = bD + bE;
-+  bE = bE - bD;
-+  bD = tmp;
-+  bE *= cos1;
-+
-+  cos0 = pnts[4][0];
-+
-+  tmp = b0 + b1;
-+  b1 = b0 - b1;
-+  b0 = tmp;
-+  b1 *= cos0;
-+  tmp = b2 + b3;
-+  b3 = b3 - b2;
-+  b2 = tmp;
-+  b3 *= cos0;
-+
-+  tmp = b4 + b5;
-+  b2 += b3;
-+  b5 = b4 - b5;
-+  b4 = tmp;
-+  b5 *= cos0;
-+  tmp = b6 + b7;
-+  b7 = b7 - b6;
-+  b6 = tmp;
-+  b7 *= cos0;
-+  tmp = b8 + b9;
-+  b6 += b7;
-+  b9 = b8 - b9;
-+  b4 += b6;
-+  b8 = tmp;
-+  b6 += b5;
-+  b9 *= cos0;
-+  b5 += b7;
-+
-+  tmp = bA + bB;
-+  bB = bB - bA;
-+  bA = tmp;
-+  bB *= cos0;
-+
-+  tmp = bC + bD;
-+  bA += bB;
-+  bD = bC - bD;
-+  bC = tmp;
-+  bD *= cos0;
-+  tmp = bE + bF;
-+  bF = bF - bE;
-+  bE = tmp;
-+  bF *= cos0;
-+  bE += bF;
-+  bC += bE;
-+  bE += bD;
-+  bD += bF;
-+
-+  b8 += bC;
-+  out0[0x10*15] = b0 + b8;
-+  out0[0x10*13] = b8 + b4;
-+  bC += bA;
-+  out0[0x10*11] = b4 + bC;
-+  out0[0x10* 9] = bC + b2;
-+  bA += bE;
-+  out0[0x10* 7] = b2 + bA;
-+  out0[0x10* 5] = bA + b6;
-+  bE += b9;
-+  out0[0x10* 3] = b6 + bE;
-+  out0[0x10* 1] = bE + b1;
-+  b9 += bD;
-+  out1[0x10* 1] = b1 + b9;
-+  out1[0x10* 3] = b9 + b5;
-+  bD += bB;
-+  out1[0x10* 5] = b5 + bD;
-+  out1[0x10* 7] = bD + b3;
-+  bB += bF;
-+  out1[0x10* 9] = b3 + bB;
-+  out1[0x10*11] = bB + b7;
-+  out1[0x10*13] = b7 + bF;
-+  out1[0x10*15] = bF;
-+}
-diff -urN mpg123-0.59r/decode_alpha.c mpg123-0.59r.alpha/decode_alpha.c
---- mpg123-0.59r/decode_alpha.c	1969-12-31 19:00:00.000000000 -0500
-+++ mpg123-0.59r.alpha/decode_alpha.c	2002-11-22 17:52:59.000000000 -0500
-@@ -0,0 +1,239 @@
-+/* 
-+ * Mpeg Layer-1,2,3 audio decoder 
-+ * ------------------------------
-+ * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
-+ * See also 'README'
-+ *
-+ * Actually it's slightly modified decode_i386.c, but it gives
-+ * a noticable speed increase on Alpha :) -ink
-+ */
-+
-+#include <stdlib.h>
-+#include <math.h>
-+#include <string.h>
-+
-+#include "mpg123.h"
-+
-+#if 0
-+ /* old WRITE_SAMPLE */
-+#define WRITE_SAMPLE(samples,sum,clip) \
-+  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-+  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-+  else { *(samples) = sum; }
-+#else
-+ /* new WRITE_SAMPLE */
-+#define WRITE_SAMPLE(samples,sum,clip) { \
-+  double dtemp; int v; /* sizeof(int) == 4 */ \
-+  dtemp = ((((65536.0 * 65536.0 * 16)+(65536.0 * 0.5))* 65536.0)) + (sum);  \
-+  v = ((*(int *)&dtemp) - 0x80000000); \
-+  if( v > 32767) { *(samples) = 0x7fff; (clip)++; } \
-+  else if( v < -32768) { *(samples) = -0x8000; (clip)++; } \
-+  else { *(samples) = v; }  \
-+}
-+#endif
-+
-+
-+int synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt)
-+{
-+  short samples_tmp[64];
-+  short *tmp1 = samples_tmp + channel;
-+  int i,ret;
-+  int pnt1 = 0;
-+
-+  ret = synth_1to1(bandPtr,channel,(unsigned char *)samples_tmp,&pnt1);
-+  samples += channel + *pnt;
-+
-+  for(i=0;i<32;i++) {
-+    *samples = conv16to8[*tmp1>>AUSHIFT];
-+    samples += 2;
-+    tmp1 += 2;
-+  }
-+  *pnt += 64;
-+
-+  return ret;
-+}
-+
-+int synth_1to1_8bit_mono(real *bandPtr,unsigned char *samples,int *pnt) 
-+{
-+  short samples_tmp[64];
-+  short *tmp1 = samples_tmp;
-+  int i,ret;
-+  int pnt1 = 0;
-+
-+  ret = synth_1to1(bandPtr,0,(unsigned char *)samples_tmp,&pnt1);
-+  samples += *pnt;
-+
-+  for(i=0;i<32;i++) {
-+    *samples++ = conv16to8[*tmp1>>AUSHIFT];
-+    tmp1+=2;
-+  }
-+  *pnt += 32;
-+
-+  return ret;
-+}
-+
-+int synth_1to1_8bit_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt)
-+{
-+  short samples_tmp[64];
-+  short *tmp1 = samples_tmp;
-+  int i,ret;
-+  int pnt1 = 0;
-+
-+  ret = synth_1to1(bandPtr,0,(unsigned char *)samples_tmp,&pnt1);
-+  samples += *pnt;
-+
-+  for(i=0;i<32;i++) {
-+    *samples++ = conv16to8[*tmp1>>AUSHIFT];
-+    *samples++ = conv16to8[*tmp1>>AUSHIFT];
-+    tmp1 += 2;
-+  }
-+  *pnt += 64;
-+
-+  return ret;
-+}
-+
-+int synth_1to1_mono(real *bandPtr,unsigned char *samples,int *pnt)
-+{
-+  short samples_tmp[64];
-+  short *tmp1 = samples_tmp;
-+  int i,ret;
-+  int pnt1 = 0;
-+
-+  ret = synth_1to1(bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
-+  samples += *pnt;
-+
-+  for(i=0;i<32;i++) {
-+    *( (short *) samples) = *tmp1;
-+    samples += 2;
-+    tmp1 += 2;
-+  }
-+  *pnt += 64;
-+
-+  return ret;
-+}
-+
-+
-+int synth_1to1_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt)
-+{
-+  int i,ret;
-+
-+  ret = synth_1to1(bandPtr,0,samples,pnt);
-+  samples = samples + *pnt - 128;
-+
-+  for(i=0;i<32;i++) {
-+    ((short *)samples)[1] = ((short *)samples)[0];
-+    samples+=4;
-+  }
-+
-+  return ret;
-+}
-+
-+int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
-+{
-+  static real buffs[2][2][0x110];
-+  static const int step = 2;
-+  static int bo = 1;
-+  short *samples = (short *) (out + *pnt);
-+
-+  real *b0,(*buf)[0x110];
-+  int clip = 0; 
-+  int bo1;
-+
-+  if(equalfile)
-+	do_equalizer(bandPtr,channel);
-+
-+  if(!channel) {
-+    bo--;
-+    bo &= 0xf;
-+    buf = buffs[0];
-+  }
-+  else {
-+    samples++;
-+    buf = buffs[1];
-+  }
-+
-+  if(bo & 0x1) {
-+    b0 = buf[0];
-+    bo1 = bo;
-+    dct64(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
-+  }
-+  else {
-+    b0 = buf[1];
-+    bo1 = bo+1;
-+    dct64(buf[0]+bo,buf[1]+bo+1,bandPtr);
-+  }
-+
-+  {
-+    register int j;
-+    real *window = decwin + 16 - bo1;
-+
-+/* sum1 added to prevent pipeline stalls on an alphas.
-+   Ivan Kokshaysky, 1999 */
-+
-+    for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)
-+    {
-+      real sum,sum1;
-+      sum  = window[0x0] * b0[0x0];
-+      sum1 = window[0x1] * b0[0x1];
-+      sum += window[0x2] * b0[0x2];
-+      sum1 += window[0x3] * b0[0x3];
-+      sum += window[0x4] * b0[0x4];
-+      sum1 += window[0x5] * b0[0x5];
-+      sum += window[0x6] * b0[0x6];
-+      sum1 += window[0x7] * b0[0x7];
-+      sum += window[0x8] * b0[0x8];
-+      sum1 += window[0x9] * b0[0x9];
-+      sum += window[0xA] * b0[0xA];
-+      sum1 += window[0xB] * b0[0xB];
-+      sum += window[0xC] * b0[0xC];
-+      sum1 += window[0xD] * b0[0xD];
-+      sum += window[0xE] * b0[0xE];
-+      sum1 += window[0xF] * b0[0xF];
-+      sum -= sum1;
-+      WRITE_SAMPLE(samples,sum,clip);
-+    }
-+
-+    {
-+      real sum,sum1;
-+      sum  = window[0x0] * b0[0x0];
-+      sum1 = window[0x2] * b0[0x2];
-+      sum += window[0x4] * b0[0x4];
-+      sum1 += window[0x6] * b0[0x6];
-+      sum += window[0x8] * b0[0x8];
-+      sum1 += window[0xA] * b0[0xA];
-+      sum += window[0xC] * b0[0xC];
-+      sum1 += window[0xE] * b0[0xE];
-+      sum += sum1;
-+      WRITE_SAMPLE(samples,sum,clip);
-+      b0-=0x10,window-=0x20,samples+=step;
-+    }
-+    window += bo1<<1;
-+
-+    for (j=15;j;j--,b0-=0x10,window-=0x20,samples+=step)
-+    {
-+      real sum,sum1;
-+      sum = window[-0x1] * b0[0x0];
-+      sum1 = window[-0x2] * b0[0x1];
-+      sum += window[-0x3] * b0[0x2];
-+      sum1 += window[-0x4] * b0[0x3];
-+      sum += window[-0x5] * b0[0x4];
-+      sum1 += window[-0x6] * b0[0x5];
-+      sum += window[-0x7] * b0[0x6];
-+      sum1 += window[-0x8] * b0[0x7];
-+      sum += window[-0x9] * b0[0x8];
-+      sum1 += window[-0xA] * b0[0x9];
-+      sum += window[-0xB] * b0[0xA];
-+      sum1 += window[-0xC] * b0[0xB];
-+      sum += window[-0xD] * b0[0xC];
-+      sum1 += window[-0xE] * b0[0xD];
-+      sum += window[-0xF] * b0[0xE];
-+      sum1 += window[-0x0] * b0[0xF];
-+      sum = -sum - sum1;
-+
-+      WRITE_SAMPLE(samples,sum,clip);
-+    }
-+  }
-+  *pnt += 128;
-+
-+  return clip;
-+}
-diff -urN mpg123-0.59r/getlopt.c mpg123-0.59r.alpha/getlopt.c
---- mpg123-0.59r/getlopt.c	1998-12-08 04:41:11.000000000 -0500
-+++ mpg123-0.59r.alpha/getlopt.c	2002-11-22 17:52:59.000000000 -0500
-@@ -48,7 +48,7 @@
- 			if (opt->flags & 2) /* var is *char */
- 				*((char *) opt->var) = (char) opt->value;
- 			else
--				*((long *) opt->var) = opt->value;
-+				*((int *) opt->var) = opt->value;
- 		}
- 		else
- 			result = opt->value ? opt->value : opt->sname;
-@@ -62,7 +62,7 @@
- 			if (opt->flags & 2) /* var is *char */
- 				*((char **) opt->var) = strdup(loptarg);
- 			else
--				*((long *) opt->var) = atoi(loptarg);
-+				*((int *) opt->var) = atoi(loptarg);
- 		}
- 		else
- 			result = opt->value ? opt->value : opt->sname;
-diff -urN mpg123-0.59r/layer3.c mpg123-0.59r.alpha/layer3.c
---- mpg123-0.59r/layer3.c	1999-04-21 11:25:18.000000000 -0400
-+++ mpg123-0.59r.alpha/layer3.c	2002-11-22 17:52:59.000000000 -0500
-@@ -608,7 +608,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 |= getbyte()<<(BITSHIFT-num); \
-@@ -625,7 +625,7 @@
-   int *me;
- 
-   int num=getbitoffset();
--  long mask = (long) getbits(num)<<(BITSHIFT+8-num);
-+  int mask = (int) getbits(num)<<(BITSHIFT+8-num);
-   part2remain -= num;
- 
-   {
-@@ -709,7 +709,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)
-@@ -733,7 +733,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)
-@@ -883,7 +883,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)
-@@ -907,7 +907,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.59r-amd64.diff b/media-sound/mpg123/files/mpg123-0.59r-amd64.diff
deleted file mode 100644
index 4f557c8036e4..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59r-amd64.diff
+++ /dev/null
@@ -1,110 +0,0 @@
---- Makefile.orig	2003-07-15 00:17:35.000000000 -0400
-+++ Makefile	2003-07-15 00:19:58.000000000 -0400
-@@ -192,6 +192,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)   LDFLAGS= \
- #		OBJECTS='decode.o dct64.o audio_oss.o' \
-diff -urN mpg123-0.59r/getlopt.c mpg123-0.59r.alpha/getlopt.c
---- getlopt.c	1998-12-08 04:41:11.000000000 -0500
-+++ mpg123-0.59r.alpha/getlopt.c	2002-11-22 17:52:59.000000000 -0500
-@@ -48,7 +48,7 @@
- 			if (opt->flags & 2) /* var is *char */
- 				*((char *) opt->var) = (char) opt->value;
- 			else
--				*((long *) opt->var) = opt->value;
-+				*((int *) opt->var) = opt->value;
- 		}
- 		else
- 			result = opt->value ? opt->value : opt->sname;
-@@ -62,7 +62,7 @@
- 			if (opt->flags & 2) /* var is *char */
- 				*((char **) opt->var) = strdup(loptarg);
- 			else
--				*((long *) opt->var) = atoi(loptarg);
-+				*((int *) opt->var) = atoi(loptarg);
- 		}
- 		else
- 			result = opt->value ? opt->value : opt->sname;
-diff -urN mpg123-0.59r/layer3.c mpg123-0.59r.alpha/layer3.c
---- layer3.c	1999-04-21 11:25:18.000000000 -0400
-+++ mpg123-0.59r.alpha/layer3.c	2002-11-22 17:52:59.000000000 -0500
-@@ -608,7 +608,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 |= getbyte()<<(BITSHIFT-num); \
-@@ -625,7 +625,7 @@
-   int *me;
- 
-   int num=getbitoffset();
--  long mask = (long) getbits(num)<<(BITSHIFT+8-num);
-+  int mask = (int) getbits(num)<<(BITSHIFT+8-num);
-   part2remain -= num;
- 
-   {
-@@ -709,7 +709,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)
-@@ -733,7 +733,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)
-@@ -883,7 +883,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)
-@@ -907,7 +907,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.59r-hppa.diff b/media-sound/mpg123/files/mpg123-0.59r-hppa.diff
deleted file mode 100644
index b922332e2095..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59r-hppa.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2003-06-23 14:25:34.000000000 +0200
-+++ Makefile	2003-06-23 14:28:09.000000000 +0200
-@@ -58,6 +58,7 @@
- 	@echo "                    (ie with 'as' from binutils-2.9.1.0.19a or later)"
- 	@echo "make linux-alpha    make with minor changes for ALPHA-Linux"
- 	@echo "make linux-ppc      LinuxPPC or MkLinux for the PowerPC"
-+	@echo "make linux-hppa     Linux/hppa HP-PARISC using OSS"
- 	@echo "make linux-m68k     Linux/m68k (Amiga, Atari) using OSS"
- 	@echo "make linux-nas      Linux, output to Network Audio System"
- 	@echo "make linux-sparc    Linux/Sparc"
-@@ -237,6 +238,13 @@
- 			-fomit-frame-pointer -funroll-all-loops \
- 			-finline-functions -ffast-math' \
- 		mpg123-make
-+linux-hppa:                                                                                                                  
-+	$(MAKE)   LDFLAGS= \
-+		OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DLINUX -Wall -O2 \
-+			-fomit-frame-pointer -funroll-all-loops \
-+			-finline-functions -ffast-math' \
-+		mpg123-make
- 
- linux-m68k:
- 	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
diff --git a/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff b/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff
deleted file mode 100644
index fb85ef4989a3..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -urN mpg123-0.59r-old/Makefile mpg123-0.59r/Makefile
---- mpg123-0.59r-old/Makefile	2003-03-13 05:59:26.000000000 +0000
-+++ mpg123-0.59r/Makefile	2003-03-13 05:59:58.000000000 +0000
-@@ -88,7 +88,7 @@
- 
- linux-devel:
- 	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
--        CC=gcc LDFLAGS= \
-+         LDFLAGS= \
-         CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -g -m486 \
- 		-DREAD_MMAP -DOSS -funroll-all-loops \
- 		-finline-functions -ffast-math' \
-@@ -96,14 +96,14 @@
- 
- linux-profile:
- 	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
--        CC=gcc LDFLAGS='-pg' \
-+         LDFLAGS='-pg' \
-         CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -pg -m486 \
- 		-DREAD_MMAP -DOSS -funroll-all-loops \
- 		-finline-functions -ffast-math' \
-         mpg123-make
- 
- linux:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
-@@ -114,7 +114,7 @@
- 		mpg123-make
- 
- linux-3dnow:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_3dnow.o \
- 			decode_3dnow.o audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-@@ -125,7 +125,7 @@
- 		mpg123-make
- 
- linux-i486:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			decode_i486.o dct64_i486.o audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
-@@ -136,7 +136,7 @@
- 		mpg123-make
- 
- linux-esd:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		AUDIO_LIB='-lesd -laudiofile' \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_esd.o' \
-@@ -149,7 +149,7 @@
- 		mpg123-make
- 
- linux-alsa:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		AUDIO_LIB='-lasound' \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_alsa.o term.o' \
-@@ -162,7 +162,7 @@
- 		mpg123-make
- 
- linux-mips-alsa:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		AUDIO_LIB='-lasound' \
- 		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP -DALSA \
-@@ -173,7 +173,7 @@
- 		mpg123-make
- 
- linux-alpha:
--	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
- 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
- 			-fomit-frame-pointer -funroll-all-loops \
- 			-finline-functions -ffast-math \
-@@ -182,7 +182,7 @@
- 		mpg123-make
- 
- linux-alpha-esd:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		AUDIO_LIB='-lesd -laudiofile' \
- 		OBJECTS='decode.o dct64.o audio_esd.o' \
- 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
-@@ -193,7 +193,7 @@
- 		mpg123-make
- 
- #linux-ppc:
--#	$(MAKE) CC=gcc  LDFLAGS= \
-+#	$(MAKE)   LDFLAGS= \
- #		OBJECTS='decode.o dct64.o audio_oss.o' \
- #		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
- #			-DOSS -DPPC_ENDIAN \
-@@ -202,7 +202,7 @@
- #		mpg123-make
- 
- #linux-ppc-esd:
--#	$(MAKE) CC=gcc  LDFLAGS= \
-+#	$(MAKE)   LDFLAGS= \
- #		AUDIO_LIB='-lesd -laudiofile' \
- #		OBJECTS='decode.o dct64.o audio_esd.o' \
- #		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
-@@ -212,7 +212,7 @@
- #		mpg123-make
- 
- linux-ppc:
--	$(MAKE) CC=gcc  LDFLAGS= \
-+	$(MAKE)   LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_oss.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
- 			-DOSS \
-@@ -221,7 +221,7 @@
- 		mpg123-make
- 
- linux-ppc-esd:
--	$(MAKE) CC=gcc  LDFLAGS= \
-+	$(MAKE)   LDFLAGS= \
- 		AUDIO_LIB='-lesd -laudiofile' \
- 		OBJECTS='decode.o dct64.o audio_esd.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
-@@ -231,7 +231,7 @@
- 		mpg123-make
- 
- linux-sparc:
--	$(MAKE) CC=gcc  LDFLAGS= \
-+	$(MAKE)   LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_sun.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall -O2 \
- 			-fomit-frame-pointer -funroll-all-loops \
-@@ -239,7 +239,7 @@
- 		mpg123-make
- 
- linux-m68k:
--	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
- 			-DOSS -DOSS_BIG_ENDIAN -Wall -O2 -m68040 \
- 			-fomit-frame-pointer -funroll-loops \
-@@ -259,7 +259,7 @@
- 	@ $(MAKE) FRONTEND=mpg123m-make freebsd-frontend
- 
- linux-frontend:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			control_sajber.o control_tk3play.o audio_oss.o' \
- 		CFLAGS='-DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
-@@ -269,7 +269,7 @@
- 		$(FRONTEND)
- 
- linux-nas:
--	$(MAKE) CC=gcc LDFLAGS='-L/usr/X11R6/lib' \
-+	$(MAKE)  LDFLAGS='-L/usr/X11R6/lib' \
- 		AUDIO_LIB='-laudio -lXau' \
- 		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
- 		CFLAGS='-I/usr/X11R6/include \
-@@ -354,7 +354,7 @@
- 		mpg123-make
- 
- solaris-gcc:
--	$(MAKE) CC=gcc \
-+	$(MAKE)  \
- 		LDFLAGS='-lsocket -lnsl' \
- 		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
- 		CFLAGS='-O2 -Wall -pedantic -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-@@ -363,7 +363,7 @@
- 		mpg123-make
- 
- solaris-gcc-esd:
--	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-+	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
- 		AUDIO_LIB='-lesd -lresolv' \
- 		OBJECTS='decode.o dct64.o audio_esd.o' \
- 		CFLAGS='-O2 -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-@@ -372,7 +372,7 @@
- 		mpg123-make
- 
- solaris-x86-gcc-oss:
--	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-+	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_oss.o' \
- 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
-@@ -382,7 +382,7 @@
- 		mpg123-make
- 
- solaris-gcc-nas:
--	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-+	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
- 		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
- 		OBJECTS='decode.o dct64.o audio_nas.o' \
- 		CFLAGS='-O2 -I/usr/openwin/include -Wall \
-@@ -392,7 +392,7 @@
- 		mpg123-make
- 
- sunos:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_sun.o' \
- 		CFLAGS='-O2 -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP \
- 			-funroll-loops' \
-@@ -414,7 +414,7 @@
- 		mpg123-make
- 
- hpux-gcc:
--	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
-+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -O3 -D_HPUX_SOURCE -DHPUX' \
- 		mpg123-make
- sgi:
-@@ -424,7 +424,7 @@
- 		mpg123-make
- 
- sgi-gcc:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio \
- 		CFLAGS='-O2 -DSGI -DREAL_IS_FLOAT -DUSE_MMAP' \
- 		mpg123-make
-@@ -447,7 +447,7 @@
- 		mpg123-make
- 
- aix-gcc:
--	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
-+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
- 		CFLAGS='-DAIX -Wall -O6 -DUSE_MMAP -DREAD_MMAP -DREAL_IS_FLOAT \
- 			-fomit-frame-pointer -funroll-all-loops \
- 			-finline-functions -ffast-math' \
-@@ -471,7 +471,7 @@
- 		$(FRONTEND)
- 
- os2:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
- 		CFLAGS='-DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall -O2 -m486 \
- 		-fomit-frame-pointer -funroll-all-loops \
-@@ -506,7 +506,7 @@
- 		mpg123-make
- 
- bsdos4:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
- 		CFLAGS='-Wall -O4 -m486 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math -DROT_I386 \
-@@ -526,7 +526,7 @@
- 		mpg123-make
- 
- mint:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE)  LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_mint.o' \
- 		CFLAGS='-Wall -O2 -m68020-40 -m68881 \
- 		-fomit-frame-pointer -funroll-all-loops \
-diff -urN mpg123-0.59r-old/mpglib/Makefile mpg123-0.59r/mpglib/Makefile
---- mpg123-0.59r-old/mpglib/Makefile	2003-03-13 05:59:26.000000000 +0000
-+++ mpg123-0.59r/mpglib/Makefile	2003-03-13 06:00:31.000000000 +0000
-@@ -1,5 +1,4 @@
- 
--CC=gcc
- CFLAGS=-Wall -g
- 
- all: mpglib
diff --git a/media-sound/mpg123/files/mpg123-0.59r-sparc.diff b/media-sound/mpg123/files/mpg123-0.59r-sparc.diff
deleted file mode 100644
index f46917c76d24..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59r-sparc.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur mpg123-0.59r.ORG/audio_sun.c mpg123-0.59r/audio_sun.c
---- mpg123-0.59r.ORG/audio_sun.c	Thu Feb  4 13:22:34 1999
-+++ mpg123-0.59r/audio_sun.c	Fri May 10 07:31:28 2002
-@@ -28,6 +28,11 @@
- #include <asm/audioio.h>
- #endif
- 
-+#ifdef SPARCLINUX
-+#include <audiofile.h>
-+#include <linux/soundcard.h>
-+#endif
-+
- static void audio_set_format_helper(struct audio_info_struct *ai,audio_info_t *ainfo);
- 
- 
diff --git a/media-sound/mpg123/files/mpg123-0.59s-security.diff b/media-sound/mpg123/files/mpg123-0.59s-security.diff
new file mode 100644
index 000000000000..a3e67f75cdb1
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-security.diff
@@ -0,0 +1,34 @@
+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;
diff --git a/media-sound/mpg123/mpg123-0.59r-r1.ebuild b/media-sound/mpg123/mpg123-0.59r-r3.ebuild
index c91108859ec7..d69d98692dfc 100644
--- a/media-sound/mpg123/mpg123-0.59r-r1.ebuild
+++ b/media-sound/mpg123/mpg123-0.59r-r3.ebuild
@@ -1,30 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r-r1.ebuild,v 1.15 2003/09/07 00:06:06 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r-r3.ebuild,v 1.1 2003/09/30 07:42:52 seemant Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Real Time mp3 player"
-SRC_URI="http://www.mpg123.de/mpg123/${P}.tar.gz"
 HOMEPAGE="http://www.mpg123.de/"
+SRC_URI="http://www.mpg123.de/mpg123/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.bz2"
 
-DEPEND="virtual/glibc
+DEPEND=">=sys-apps/sed-4
+	virtual/glibc
 	sparc? ( media-libs/audiofile ) "
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 
 src_unpack () {
 	unpack ${A}
+	unpack ${P}-gentoo.tar.bz2
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-sparc.diff
-	use alpha && patch -p1 < ${FILESDIR}/${P}-alpha.diff
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -m486:${CFLAGS}:" \
+
+	EPATCH_SUFFIX="diff" epatch ${WORKDIR}/patches
+
+	sed -i \
+		-e "s:-O2 -m486:${CFLAGS}:" \
 		-e "s:-O2 -mcpu=ppc:${CFLAGS}:g" \
 		-e "s:-O6:${CFLAGS}:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
@@ -35,6 +40,7 @@ src_compile() {
 		sed -e s/[i]*.86/i386/ \
 			-e s/sun.*/sparc/ \
 			-e s/arm.*/arm/ \
+			-e s/amd64/x86_64/ \
 			-e s/sa110/arm/`
 
 	if [ -z "$SYSTEM_ARCH" ]
@@ -50,8 +56,12 @@ src_compile() {
 	   MAKESTYLE="-i486";;
 	  sparc)
 	   MAKESTYLE="-sparc";;
-	 alpha)
+	  alpha)
 	   MAKESTYLE="-alpha";;
+	  hppa)
+	   MAKESTYLE="-hppa";;
+	  x86_64)
+	   MAKESTYLE="-x86_64";;
 	  arm)
 	   ;;
 	esac
diff --git a/media-sound/mpg123/mpg123-0.59s-r1.ebuild b/media-sound/mpg123/mpg123-0.59s-r1.ebuild
new file mode 100644
index 000000000000..8b400693a91b
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59s-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r1.ebuild,v 1.1 2003/09/30 07:42:52 seemant Exp $
+
+inherit eutils
+
+S=${WORKDIR}/mpg123
+DESCRIPTION="Real Time mp3 player"
+HOMEPAGE="http://www.mpg123.de/"
+SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ia64 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+	# Apply security fix
+	epatch ${FILESDIR}/${P}-security.diff
+
+	sed -i \
+		-e "s:-O2 -m486:${CFLAGS}:" \
+		-e "s:-O2 -mcpu=ppc:${CFLAGS}:g" Makefile
+}
+
+src_compile() {
+	local MAKEOPT=""
+	local MAKESTYLE=""
+
+	SYSTEM_ARCH=`echo $ARCH |\
+		sed -e s/[i]*.86/i386/ \
+			-e s/sun.*/sparc/ \
+			-e s/arm.*/arm/ \
+			-e s/sa110/arm/`
+
+	if [ -z "$SYSTEM_ARCH" ]
+	then
+		SYSTEM_ARCH=`uname -m |\
+		sed -e s/[i]*.86/i386/ -e s/arm.*/arm/ -e s/sa110/arm/`
+	fi
+
+	case $SYSTEM_ARCH in
+		ppc)
+			MAKESTYLE="-ppc";;
+		i386)
+			if [ -z "use mmx" ]
+			then
+				MAKESTYLE="-mmx"
+			else
+				MAKESTYLE="-i486"
+			fi;;
+		sparc64)
+			MAKESTYLE="-sparc";;
+		sparc)
+			MAKESTYLE="-sparc";;
+		arm)
+			;;
+	esac
+
+	make linux${MAKESTYLE}${MAKEOPT} || die
+}
+
+src_install () {
+	into /usr
+	dobin mpg123
+	doman mpg123.1
+	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
+}
+