pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/audio Pullup ticket 1673 - requested by drochner
details: https://anonhg.NetBSD.org/pkgsrc/rev/edccc1135c3f
branches: pkgsrc-2006Q1
changeset: 510293:edccc1135c3f
user: ghen <ghen%pkgsrc.org@localhost>
date: Sat May 27 11:24:06 2006 +0000
description:
Pullup ticket 1673 - requested by drochner
security fix for mpg123
Revisions pulled up:
- pkgsrc/audio/mpg123/Makefile 1.42
- pkgsrc/audio/mpg123/distinfo 1.27
- pkgsrc/audio/mpg123/patches/patch-ai 1.4
- pkgsrc/audio/mpg123-esound/Makefile 1.17
- pkgsrc/audio/mpg123-nas/Makefile 1.20
Module Name: pkgsrc
Committed By: drochner
Date: Fri May 26 12:16:13 UTC 2006
Modified Files:
pkgsrc/audio/mpg123: Makefile distinfo
pkgsrc/audio/mpg123/patches: patch-ai
Log Message:
fix buffer overflow (CVE-2006-1655), from Debian
bump PKGREVISION
---
Module Name: pkgsrc
Committed By: drochner
Date: Fri May 26 12:33:37 UTC 2006
Modified Files:
pkgsrc/audio/mpg123-esound: Makefile
pkgsrc/audio/mpg123-nas: Makefile
Log Message:
also bump PKGREVISION for mpg123 security fix, pointed out
by Joerg Sonnenberger
diffstat:
audio/mpg123-esound/Makefile | 4 +-
audio/mpg123-nas/Makefile | 4 +-
audio/mpg123/Makefile | 4 +-
audio/mpg123/distinfo | 4 +-
audio/mpg123/patches/patch-ai | 86 ++++++++++++++++++++++++------------------
5 files changed, 57 insertions(+), 45 deletions(-)
diffs (truncated from 390 to 300 lines):
diff -r bf5af39e875e -r edccc1135c3f audio/mpg123-esound/Makefile
--- a/audio/mpg123-esound/Makefile Wed May 24 16:55:32 2006 +0000
+++ b/audio/mpg123-esound/Makefile Sat May 27 11:24:06 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2006/05/27 11:24:06 ghen Exp $
PKGNAME= mpg123-esound-${MPG123_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff -r bf5af39e875e -r edccc1135c3f audio/mpg123-nas/Makefile
--- a/audio/mpg123-nas/Makefile Wed May 24 16:55:32 2006 +0000
+++ b/audio/mpg123-nas/Makefile Sat May 27 11:24:06 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2006/05/27 11:24:06 ghen Exp $
PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
-PKGREVISION= 9
+PKGREVISION= 10
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff -r bf5af39e875e -r edccc1135c3f audio/mpg123/Makefile
--- a/audio/mpg123/Makefile Wed May 24 16:55:32 2006 +0000
+++ b/audio/mpg123/Makefile Sat May 27 11:24:06 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2005/12/10 21:31:41 heinz Exp $
+# $NetBSD: Makefile,v 1.41.4.1 2006/05/27 11:24:06 ghen Exp $
PKGNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 8
+PKGREVISION= 9
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
CONFLICTS+= mpg123-nas-[0-9]*
diff -r bf5af39e875e -r edccc1135c3f audio/mpg123/distinfo
--- a/audio/mpg123/distinfo Wed May 24 16:55:32 2006 +0000
+++ b/audio/mpg123/distinfo Sat May 27 11:24:06 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2005/12/11 21:59:29 joerg Exp $
+$NetBSD: distinfo,v 1.26.4.1 2006/05/27 11:24:06 ghen Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
RMD160 (mpg123/mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
@@ -14,7 +14,7 @@
SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452
SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b
SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43
-SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba
+SHA1 (patch-ai) = eff8d2d5602056a052855dc81046642779a61272
SHA1 (patch-aj) = b828a5e35a03b307d46cd07356624d19b9d56777
SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
diff -r bf5af39e875e -r edccc1135c3f audio/mpg123/patches/patch-ai
--- a/audio/mpg123/patches/patch-ai Wed May 24 16:55:32 2006 +0000
+++ b/audio/mpg123/patches/patch-ai Sat May 27 11:24:06 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2002/02/22 13:17:54 simonb Exp $
+$NetBSD: patch-ai,v 1.3.28.1 2006/05/27 11:24:06 ghen Exp $
---- layer3.c.orig Thu Apr 22 01:25:18 1999
+--- layer3.c.orig 1999-04-21 17:25:18.000000000 +0200
+++ layer3.c
-@@ -109,54 +109,54 @@
+@@ -109,54 +109,54 @@ void init_layer3(int down_sample_sblimit
int i,j,k,l;
for(i=-256;i<118+4;i++)
@@ -81,7 +81,7 @@
}
for(j=0;j<4;j++) {
-@@ -169,10 +169,10 @@
+@@ -169,10 +169,10 @@ void init_layer3(int down_sample_sblimit
for(i=0;i<16;i++) {
double t = tan( (double) i * M_PI / 12.0 );
@@ -96,7 +96,7 @@
for(j=0;j<2;j++) {
double base = pow(2.0,-0.25*(j+1.0));
-@@ -183,10 +183,10 @@
+@@ -183,10 +183,10 @@ void init_layer3(int down_sample_sblimit
else
p2 = pow(base,i*0.5);
}
@@ -111,7 +111,7 @@
}
}
-@@ -608,7 +608,7 @@
+@@ -608,7 +608,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,
* Dequantize samples (includes huffman decoding)
*/
/* 24 is enough because tab13 has max. a 19 bit huffvector */
@@ -120,7 +120,7 @@
#define REFRESH_MASK \
while(num < BITSHIFT) { \
mask |= getbyte()<<(BITSHIFT-num); \
-@@ -625,7 +625,7 @@
+@@ -625,7 +625,7 @@ static int III_dequantize_sample(real xr
int *me;
int num=getbitoffset();
@@ -129,7 +129,7 @@
part2remain -= num;
{
-@@ -709,50 +709,50 @@
+@@ -709,50 +709,50 @@ static int III_dequantize_sample(real xr
if(x == 15 && h->linbits) {
max[lwin] = cb;
REFRESH_MASK;
@@ -192,7 +192,7 @@
xrpnt += step;
}
}
-@@ -804,7 +804,7 @@
+@@ -804,7 +804,7 @@ static int III_dequantize_sample(real xr
mask <<= 1;
}
else
@@ -201,7 +201,7 @@
xrpnt += step;
}
}
-@@ -812,8 +812,8 @@
+@@ -812,8 +812,8 @@ static int III_dequantize_sample(real xr
if(lwin < 3) { /* short band? */
while(1) {
for(;mc > 0;mc--) {
@@ -212,7 +212,7 @@
}
if(m >= me)
break;
-@@ -883,50 +883,50 @@
+@@ -883,50 +883,50 @@ static int III_dequantize_sample(real xr
if (x == 15 && h->linbits) {
max = cb;
REFRESH_MASK;
@@ -275,7 +275,7 @@
}
}
-@@ -974,7 +974,7 @@
+@@ -974,7 +974,7 @@ static int III_dequantize_sample(real xr
mask <<= 1;
}
else
@@ -284,7 +284,7 @@
}
}
-@@ -987,7 +987,7 @@
+@@ -987,7 +987,7 @@ static int III_dequantize_sample(real xr
num = 0;
while(xrpnt < &xr[SBLIMIT][0])
@@ -293,7 +293,7 @@
while( part2remain > 16 ) {
getbits(16); /* Dismiss stuffing Bits */
-@@ -1065,8 +1065,8 @@
+@@ -1065,8 +1065,8 @@ static void III_i_stereo(real xr_buf[2][
t1 = tab1[is_p]; t2 = tab2[is_p];
for (; sb > 0; sb--,idx+=3) {
real v = xr[0][idx];
@@ -304,7 +304,7 @@
}
}
}
-@@ -1087,8 +1087,8 @@
+@@ -1087,8 +1087,8 @@ maybe still wrong??? (copy 12 to 13?) */
t1 = tab1[is_p]; t2 = tab2[is_p];
for ( ; sb > 0; sb--,idx+=3 ) {
real v = xr[0][idx];
@@ -315,7 +315,7 @@
}
}
} /* end for(lwin; .. ; . ) */
-@@ -1108,8 +1108,8 @@
+@@ -1108,8 +1108,8 @@ maybe still wrong??? (copy 12 to 13?) */
t1 = tab1[is_p]; t2 = tab2[is_p];
for ( ; sb > 0; sb--,idx++) {
real v = xr[0][idx];
@@ -326,7 +326,19 @@
}
}
else
-@@ -1128,8 +1128,8 @@
+@@ -1119,7 +1119,10 @@ maybe still wrong??? (copy 12 to 13?) */
+ }
+ else { /* ((gr_info->block_type != 2)) */
+ int sfb = gr_info->maxbandl;
+- int is_p,idx = bi->longIdx[sfb];
++ int is_p,idx;
++ if (sfb > 21)
++ return;
++ idx = bi->longIdx[sfb];
+ for ( ; sfb<21; sfb++) {
+ int sb = bi->longDiff[sfb];
+ is_p = scalefac[sfb]; /* scale: 0-15 */
+@@ -1128,8 +1131,8 @@ maybe still wrong??? (copy 12 to 13?) */
t1 = tab1[is_p]; t2 = tab2[is_p];
for ( ; sb > 0; sb--,idx++) {
real v = xr[0][idx];
@@ -337,7 +349,7 @@
}
}
else
-@@ -1143,8 +1143,8 @@
+@@ -1143,8 +1146,8 @@ maybe still wrong??? (copy 12 to 13?) */
for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) {
real v = xr[0][idx];
@@ -348,7 +360,7 @@
}
}
} /* ... */
-@@ -1177,8 +1177,8 @@
+@@ -1177,8 +1180,8 @@ static void III_antialias(real xr[SBLIMI
for(ss=7;ss>=0;ss--)
{ /* upper and lower butterfly inputs */
register real bu = *--xr2,bd = *xr1;
@@ -359,7 +371,7 @@
}
}
}
-@@ -1252,8 +1252,8 @@
+@@ -1252,8 +1255,8 @@ static void dct36(real *inbuf,real *o1,r
{
real t0, t1, t2;
@@ -370,7 +382,7 @@
t3 = in[0];
t2 = t3 - t1 - t1;
-@@ -1261,16 +1261,16 @@
+@@ -1261,16 +1264,16 @@ static void dct36(real *inbuf,real *o1,r
tmp[4] = t2 + t0 + t0;
t3 += t1;
@@ -391,7 +403,7 @@
tmp[2] = tmp[6] = t3 - t0 - t2;
tmp[0] = tmp[8] = t3 + t0 + t1;
-@@ -1280,9 +1280,9 @@
+@@ -1280,9 +1283,9 @@ static void dct36(real *inbuf,real *o1,r
{
real t1, t2, t3;
@@ -404,7 +416,7 @@
{
real t0 = t1 + t2 + t3;
-@@ -1293,7 +1293,7 @@
+@@ -1293,7 +1296,7 @@ static void dct36(real *inbuf,real *o1,r
t2 -= t3;
t1 -= t3;
@@ -413,7 +425,7 @@
t1 += t3;
tmp[3] += t1;
-@@ -1308,35 +1308,35 @@
+@@ -1308,35 +1311,35 @@ static void dct36(real *inbuf,real *o1,r
{
real t0, t1, t2, t3, t4, t5, t6, t7;
@@ -459,7 +471,7 @@
tmp[5] = t3 - t2;
t4 -= t1 + t7;
-@@ -1351,53 +1351,53 @@
+@@ -1351,53 +1354,53 @@ static void dct36(real *inbuf,real *o1,r
{
real t0, t1, t2, t3, t4, t5, t6, t7;
@@ -536,7 +548,7 @@
{
register real *out2 = o2;
-@@ -1422,20 +1422,20 @@
+@@ -1422,20 +1425,20 @@ static void dct36(real *inbuf,real *o1,r
#define MACRO0(v) { \
real tmp; \
@@ -563,7 +575,7 @@
MACRO0(v); }
register const real *c = COS9;
-@@ -1446,17 +1446,17 @@
+@@ -1446,17 +1449,17 @@ static void dct36(real *inbuf,real *o1,r
real ta33,ta66,tb33,tb66;
Home |
Main Index |
Thread Index |
Old Index