head 1.14; access; symbols OPENPKG_E1_MP_HEAD:1.8 OPENPKG_E1_MP:1.8 OPENPKG_E1_MP_2_STABLE:1.7.2.3 OPENPKG_E1_FP:1.7.2.3 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.7.2.2 OPENPKG_2_STABLE:1.7.0.2 OPENPKG_CW_FP:1.4; locks; strict; comment @# @; 1.14 date 2009.12.06.15.31.25; author rse; state Exp; branches; next 1.13; commitid yLz9Xg3zv6o5nkeu; 1.13 date 2009.08.15.09.14.38; author rse; state Exp; branches; next 1.12; commitid 91wq6Sj4rDb1VLZt; 1.12 date 2009.06.04.21.00.30; author rse; state Exp; branches; next 1.11; commitid 5Q0svCfqDNyE8AQt; 1.11 date 2009.03.26.17.57.04; author rse; state Exp; branches; next 1.10; commitid 65stjfjo4JzenzHt; 1.10 date 2007.12.05.07.35.39; author rse; state Exp; branches; next 1.9; commitid 741ADhyDcWKEgdIs; 1.9 date 2007.01.15.10.07.19; author rse; state dead; branches; next 1.8; commitid zrp1WeukM5AowA2s; 1.8 date 2006.10.22.09.21.58; author rse; state Exp; branches; next 1.7; commitid Sw6c70PfwTWe0FRr; 1.7 date 2006.10.12.13.13.29; author rse; state Exp; branches 1.7.2.1; next 1.6; commitid G3zi0EvCIrlABoQr; 1.6 date 2006.09.05.21.02.32; author rse; state Exp; branches; next 1.5; commitid dXLC2bhUsa4eoGLr; 1.5 date 2006.08.22.06.57.27; author rse; state Exp; branches; next 1.4; commitid SuBHiFk1jQIdaOJr; 1.4 date 2005.02.05.13.43.10; author rse; state Exp; branches; next 1.3; 1.3 date 2004.09.17.13.24.52; author rse; state Exp; branches; next 1.2; 1.2 date 2003.11.12.19.08.23; author rse; state Exp; branches; next 1.1; 1.1 date 2003.08.25.07.18.13; author rse; state Exp; branches; next ; 1.7.2.1 date 2006.10.12.13.13.29; author rse; state dead; branches; next 1.7.2.2; commitid iZxwRSmmWscPXUQr; 1.7.2.2 date 2006.10.16.14.52.59; author rse; state Exp; branches; next 1.7.2.3; commitid iZxwRSmmWscPXUQr; 1.7.2.3 date 2006.10.22.09.24.17; author rse; state Exp; branches; next ; commitid gF20F325aRD11FRr; desc @@ 1.14 log @upgrading package: mpg123 1.9.2 -> 1.10.0 @ text @Index: src/Makefile.in --- src/Makefile.in.orig 2009-12-05 21:30:45 +0100 +++ src/Makefile.in 2009-12-06 16:27:12 +0100 @@@@ -89,7 +89,7 @@@@ tests_seek_whence_OBJECTS = $(am_tests_seek_whence_OBJECTS) am_tests_text_OBJECTS = text.$(OBJEXT) compat.$(OBJEXT) tests_text_OBJECTS = $(am_tests_text_OBJECTS) -DEFAULT_INCLUDES = -I.@@am__isrc@@ +DEFAULT_INCLUDES = -I.@@am__isrc@@ -I. -I$(top_srcdir)/libltdl depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@@@ -348,7 +348,7 @@@@ top_srcdir = @@top_srcdir@@ AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @@MODULE_OBJ@@ @@OUTPUT_OBJ@@ @@OUTPUT_LIBS@@ -mpg123_LDFLAGS = @@EXEC_LT_LDFLAGS@@ @@OUTPUT_LDFLAGS@@ +mpg123_LDFLAGS = @@EXEC_LT_LDFLAGS@@ @@OUTPUT_LDFLAGS@@ -static # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 # libltdl is not mentioned here... it's not that trivial Index: src/output/Makefile.in --- src/output/Makefile.in.orig 2009-12-05 21:30:46 +0100 +++ src/output/Makefile.in 2009-12-06 16:26:22 +0100 @@@@ -316,7 +316,7 @@@@ $(CFLAGS) $(output_win32_la_LDFLAGS) $(LDFLAGS) -o $@@ @@HAVE_MODULES_TRUE@@@@HAVE_WIN32_TRUE@@am_output_win32_la_rpath = -rpath \ @@HAVE_MODULES_TRUE@@@@HAVE_WIN32_TRUE@@ $(pkglibdir) -DEFAULT_INCLUDES = -I.@@am__isrc@@ -I$(top_builddir)/src +DEFAULT_INCLUDES = -I.@@am__isrc@@ -I$(top_builddir)/src -I$(top_srcdir)/libltdl depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @ 1.13 log @upgrading package: mpg123 1.8.1 -> 1.9.0 @ text @d2 3 a4 3 --- src/Makefile.in.orig 2009-08-14 01:42:08 +0200 +++ src/Makefile.in 2009-08-15 11:00:45 +0200 @@@@ -76,7 +76,7 @@@@ d12 2 a13 2 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@@@ -304,7 +304,7 @@@@ d17 2 a18 2 -mpg123_LDFLAGS = @@LT_LDFLAGS@@ @@OUTPUT_LDFLAGS@@ +mpg123_LDFLAGS = @@LT_LDFLAGS@@ @@OUTPUT_LDFLAGS@@ -static d23 3 a25 3 --- src/output/Makefile.in.orig 2009-08-14 01:42:09 +0200 +++ src/output/Makefile.in 2009-08-15 10:58:08 +0200 @@@@ -299,7 +299,7 @@@@ d33 1 a33 1 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @ 1.12 log @upgrading package: mpg123 1.7.3 -> 1.8rc3 @ text @d2 6 a7 6 --- src/Makefile.in.orig 2009-06-03 01:54:05 +0200 +++ src/Makefile.in 2009-06-04 22:57:19 +0200 @@@@ -62,7 +62,7 @@@@ compat.$(OBJEXT) tests_seek_accuracy_OBJECTS = $(am_tests_seek_accuracy_OBJECTS) am__dirstamp = $(am__leading_dot)dirstamp d13 1 a13 1 @@@@ -287,7 +287,7 @@@@ d23 3 a25 3 --- src/output/Makefile.in.orig 2009-06-03 01:54:06 +0200 +++ src/output/Makefile.in 2009-06-04 22:43:45 +0200 @@@@ -287,7 +287,7 @@@@ @ 1.11 log @upgrading package: mpg123 1.6.4 -> 1.7.0 @ text @d2 6 a7 6 --- src/Makefile.in.orig 2009-03-25 00:37:48 +0100 +++ src/Makefile.in 2009-03-26 18:48:41 +0100 @@@@ -58,7 +58,7 @@@@ mpg123_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpg123_LDFLAGS) \ $(LDFLAGS) -o $@@ d13 1 a13 1 @@@@ -289,7 +289,7 @@@@ d23 2 a24 2 --- src/output/Makefile.in.orig 2009-03-25 00:37:50 +0100 +++ src/output/Makefile.in 2009-03-26 18:49:00 +0100 @ 1.10 log @upgrading package: mpg123 0.68 -> 1.0rc1 @ text @d2 8 a9 8 --- src/Makefile.in.orig 2007-12-05 02:36:29 +0100 +++ src/Makefile.in 2007-12-05 08:34:08 +0100 @@@@ -57,7 +57,7 @@@@ term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) mpg123_OBJECTS = $(am_mpg123_OBJECTS) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl d13 3 a15 3 @@@@ -294,7 +294,7 @@@@ # AM_CPPFLAGS = d20 1 a20 1 INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123 d23 4 a26 4 --- src/output/Makefile.in.orig 2007-12-05 02:36:30 +0100 +++ src/output/Makefile.in 2007-12-05 08:33:30 +0100 @@@@ -212,7 +212,7 @@@@ output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS) d29 2 a30 2 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl @ 1.9 log @upgrading package: mpg123 0.62 -> 0.63 @ text @d1 13 a13 4 Index: src/httpget.c --- src/httpget.c.orig 2006-10-21 00:08:33 +0200 +++ src/httpget.c 2006-10-22 11:12:22 +0200 @@@@ -688,10 +688,12 @@@@ d15 19 a33 11 int readstring (char *string, int maxlen, FILE *f) { + return 0; } char *url2hostport (char *url, char **hname, unsigned long *hip, unsigned int *port) { + return NULL; } char *proxyurl = NULL; @ 1.8 log @upgrading package: mpg123 0.60 -> 0.61 @ text @@ 1.7 log @fix some portability fallback sources @ text @a0 21 Index: configure --- configure.orig 2006-08-29 23:39:29 +0200 +++ configure 2006-10-12 15:10:30 +0200 @@@@ -7627,7 +7627,7 @@@@ # None chosen? -if test "x$with_optimization" == "x"; then +if test "x$with_optimization" = "x"; then if test "$debugging" = "enabled"; then with_optimization="0" else @@@@ -7666,7 +7666,7 @@@@ esac -if test "x$with_seektable" == "x"; then +if test "x$with_seektable" = "x"; then seektable=1000 else seektable=$with_seektable d2 3 a4 14 --- src/httpget.c.orig 2006-08-21 14:54:31 +0200 +++ src/httpget.c 2006-10-12 15:12:41 +0200 @@@@ -61,6 +61,10 @@@@ #define INADDR_NONE 0xffffffff #endif +#ifndef SIZE_MAX +#define SIZE_MAX 1000 +#endif + void writestring (int fd, char *string) { int result, bytes = strlen(string); @@@@ -705,10 +709,12 @@@@ a16 11 @@@@ -717,8 +723,9 @@@@ #define ACCEPT_HEAD "Accept: audio/mpeg, audio/x-mpegurl, */*\r\n" -int http_open (char *url) +int http_open (char* url, char** content_type) { + return 0; } #endif @ 1.7.2.1 log @file mpg123.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:59 +0000 @ text @d1 59 @ 1.7.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 59 Index: configure --- configure.orig 2006-08-29 23:39:29 +0200 +++ configure 2006-10-12 15:10:30 +0200 @@@@ -7627,7 +7627,7 @@@@ # None chosen? -if test "x$with_optimization" == "x"; then +if test "x$with_optimization" = "x"; then if test "$debugging" = "enabled"; then with_optimization="0" else @@@@ -7666,7 +7666,7 @@@@ esac -if test "x$with_seektable" == "x"; then +if test "x$with_seektable" = "x"; then seektable=1000 else seektable=$with_seektable Index: src/httpget.c --- src/httpget.c.orig 2006-08-21 14:54:31 +0200 +++ src/httpget.c 2006-10-12 15:12:41 +0200 @@@@ -61,6 +61,10 @@@@ #define INADDR_NONE 0xffffffff #endif +#ifndef SIZE_MAX +#define SIZE_MAX 1000 +#endif + void writestring (int fd, char *string) { int result, bytes = strlen(string); @@@@ -705,10 +709,12 @@@@ int readstring (char *string, int maxlen, FILE *f) { + return 0; } char *url2hostport (char *url, char **hname, unsigned long *hip, unsigned int *port) { + return NULL; } char *proxyurl = NULL; @@@@ -717,8 +723,9 @@@@ #define ACCEPT_HEAD "Accept: audio/mpeg, audio/x-mpegurl, */*\r\n" -int http_open (char *url) +int http_open (char* url, char** content_type) { + return 0; } #endif @ 1.7.2.3 log @MFC: latest security fixed version @ text @d1 21 d23 14 a36 3 --- src/httpget.c.orig 2006-10-21 00:08:33 +0200 +++ src/httpget.c 2006-10-22 11:12:22 +0200 @@@@ -688,10 +688,12 @@@@ d49 11 @ 1.6 log @fix syntax errors @ text @d3 1 a3 1 +++ configure 2006-09-05 23:01:35 +0200 d24 1 a24 1 +++ src/httpget.c 2006-09-05 23:00:28 +0200 d36 24 @ 1.5 log @upgrading package: mpg123 0.59r -> 0.60b3 @ text @d1 21 d23 3 a25 3 --- src/httpget.c.orig 2006-07-29 13:51:44 +0200 +++ src/httpget.c 2006-08-22 08:54:19 +0200 @@@@ -50,6 +50,10 @@@@ @ 1.4 log @apply security fix (CAN-2004-0991) @ text @d1 5 a5 23 Security Bugfix http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0577 --- common.c.orig 1999-06-15 18:24:19.000000000 -0300 +++ common.c 2003-07-11 14:28:13.000000000 -0300 @@@@ -123,7 +123,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; Security Bugfix: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0865 --- httpget.c.orig Fri May 28 08:10:44 1999 +++ httpget.c Tue Nov 11 13:50:17 2003 @@@@ -53,11 +53,11 @@@@ void readstring (char *string, int maxle #if 0 char *result; a6 1 int pos = 0; d8 2 a9 32 - while(1) { + while(pos < maxlen) { if( read(fileno(f),string+pos,1) == 1) { pos++; if(string[pos-1] == '\n') { string[pos] = 0; break; @@@@ -66,10 +66,11 @@@@ void readstring (char *string, int maxle else if(errno != EINTR) { fprintf (stderr, "Error reading from socket or unexpected EOF.\n"); exit(1); } } + string[pos] = 0; #if 0 do { result = fgets(string, maxlen, f); } while (!result && errno == EINTR); if (!result) { Index: audio_oss.c --- audio_oss.c.orig 1998-01-31 15:14:08 +0100 +++ audio_oss.c 2004-09-17 15:23:49 +0200 @@@@ -30,6 +30,13 @@@@ #include #elif defined(__bsdi__) #include +#elif defined(__FreeBSD__) +#include +#if __FreeBSD_version >= 500000 +#include +#else +#include d11 4 a14 39 #else #include #endif Security Bugfix http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0991 Index: common.c --- common.c 2003/01/29 19:22:48 1.4 +++ common.c 2005/01/01 19:21:47 1.5 @@@@ -343,9 +343,12 @@@@ fr->mpeg25 = 1; } - if (!param.tryresync || !oldhead) { - /* If "tryresync" is true, assume that certain - parameters do not change within the stream! */ + if (!param.tryresync || !oldhead || + (((oldhead>>19)&0x3) ^ ((newhead>>19)&0x3))) { + /* If "tryresync" is false, assume that certain + parameters do not change within the stream! + Force an update if lsf or mpeg25 settings + have changed. */ fr->lay = 4-((newhead>>17)&3); if( ((newhead>>10)&0x3) == 0x3) { fprintf(stderr,"Stream error\n"); Index: layer2.c --- layer2.c:1.2 Tue Sep 7 14:32:13 2004 +++ layer2.c Sat Jan 1 20:21:47 2005 @@@@ -240,7 +240,7 @@@@ { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 }; static int sblims[5] = { 27 , 30 , 8, 12 , 30 }; - if(fr->lsf) + if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */ table = 4; else table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index]; @ 1.3 log @be more portable @ text @d63 36 @ 1.2 log @include bugfix for CAN-2003-0865 @ text @d46 17 @ 1.1 log @apply security bugfix: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0577 @ text @d15 31 @