OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Aug-2006 08:57:27
Branch: HEAD Handle: 2006082207572700
Modified files:
openpkg-src/mpg123 mpg123.patch mpg123.spec
Log:
upgrading package: mpg123 0.59r -> 0.60b3
Summary:
Revision Changes Path
1.5 +11 -95 openpkg-src/mpg123/mpg123.patch
1.35 +17 -22 openpkg-src/mpg123/mpg123.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mpg123/mpg123.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 mpg123.patch
--- openpkg-src/mpg123/mpg123.patch 5 Feb 2005 13:43:10 -0000 1.4
+++ openpkg-src/mpg123/mpg123.patch 22 Aug 2006 06:57:27 -0000 1.5
@@ -1,98 +1,14 @@
-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;
+Index: src/httpget.c
+--- 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 @@
+ #define INADDR_NONE 0xffffffff
#endif
- int pos = 0;
-- 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 <linux/soundcard.h>
- #elif defined(__bsdi__)
- #include <sys/soundcard.h>
-+#elif defined(__FreeBSD__)
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 500000
-+#include <sys/soundcard.h>
-+#else
-+#include <machine/soundcard.h>
++#ifndef SIZE_MAX
++#define SIZE_MAX 1000
+#endif
- #else
- #include <machine/soundcard.h>
- #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];
-
++
+ void writestring (int fd, char *string)
+ {
+ int result, bytes = strlen(string);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mpg123/mpg123.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 mpg123.spec
--- openpkg-src/mpg123/mpg123.spec 1 Jan 2006 13:16:56 -0000 1.34
+++ openpkg-src/mpg123/mpg123.spec 22 Aug 2006 06:57:27 -0000 1.35
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_opkg 0.60b3
+%define V_dist 0.60-beta3
+
# package information
Name: mpg123
Summary: MP3 Decoder/Player
@@ -32,11 +36,11 @@
Class: EVAL
Group: Audio
License: GPL
-Version: 0.59r
-Release: 20050205
+Version: %{V_opkg}
+Release: 20060822
# list of sources
-Source0: http://www.mpg123.de/mpg123/mpg123-%{version}-pl1.tar.gz
+Source0: http://www.mpg123.de/download/mpg123-%{V_dist}.tar.bz2
Patch0: mpg123.patch
# build information
@@ -48,34 +52,25 @@
AutoReqProv: no
%description
- mpg123 is a real time MPEG Audio Player for Layer 1,2 and Layer3.
+ mpg123 is a real time MPEG Audio Player for Layer 1,2 and Layer 3.
%track
prog mpg123 = {
version = %{version}
- url = http://www.mpg123.de/
- regex = mpg123-(__VER__)\.tar\.gz
+ url = http://www.mpg123.de/download.shtml
+ regex = mpg123-(__VER__)\.tar\.bz2
}
%prep
- %setup -q
+ %setup -q -n mpg123-%{V_dist}
%patch -p0
- %{l_shtool} subst \
- -e 's;-Wall;;g' \
- -e 's;-m486;;g' \
- Makefile
%build
- case "%{l_platform -t}" in
- *-freebsd* ) os="freebsd" ;;
- *-sunos* ) os="solaris" ;;
- sparc-linux* ) os="linux-sparc" ;;
- *-linux* ) os="linux" ;;
- esac
- %{l_make} %{l_mflags -O} \
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- $os
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,7 +78,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
%{l_shtool} install -c -s -m 755 \
- mpg123 $RPM_BUILD_ROOT%{l_prefix}/bin/
+ src/mpg123 $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
mpg123.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
