pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q3]: pkgsrc/audio Pullup ticket 798 - requested by Joerg S...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4a68ca21a894
branches: pkgsrc-2005Q3
changeset: 499556:4a68ca21a894
user: salo <salo%pkgsrc.org@localhost>
date: Mon Oct 03 19:00:34 2005 +0000
description:
Pullup ticket 798 - requested by Joerg Sonnenberger
bugfixes for mpg123
Revisions pulled up:
- pkgsrc/audio/mpg123/Makefile 1.40
- pkgsrc/audio/mpg123/distinfo 1.24
- pkgsrc/audio/mpg123-esound/Makefile 1.12
- pkgsrc/audio/mpg123-nas/Makefile 1.13
- pkgsrc/audio/mpg123/patches/patch-aq 1.3
- pkgsrc/audio/mpg123/patches/patch-av 1.1
- pkgsrc/audio/mpg123/patches/patch-aw 1.1
Module Name: pkgsrc
Committed By: joerg
Date: Mon Oct 3 15:17:14 UTC 2005
Modified Files:
pkgsrc/audio/mpg123: Makefile distinfo
pkgsrc/audio/mpg123-esound: Makefile
pkgsrc/audio/mpg123-nas: Makefile
pkgsrc/audio/mpg123/patches: patch-aq
Added Files:
pkgsrc/audio/mpg123/patches: patch-av patch-aw
Log Message:
Correct usage of errno and ctype macros. The former is wrong when thread
linking is active, the latter can result in segfaults.
Bump revisions of mpg123, mpg123-esound and mpg123-nas for the ctype
bugfix.
diffstat:
audio/mpg123-esound/Makefile | 4 ++--
audio/mpg123-nas/Makefile | 4 ++--
audio/mpg123/Makefile | 4 ++--
audio/mpg123/distinfo | 6 ++++--
audio/mpg123/patches/patch-aq | 40 +++++++++++++++++++++++++++++++---------
audio/mpg123/patches/patch-av | 13 +++++++++++++
audio/mpg123/patches/patch-aw | 13 +++++++++++++
7 files changed, 67 insertions(+), 17 deletions(-)
diffs (177 lines):
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123-esound/Makefile
--- a/audio/mpg123-esound/Makefile Mon Oct 03 14:30:25 2005 +0000
+++ b/audio/mpg123-esound/Makefile Mon Oct 03 19:00:34 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/03/09 20:16:27 minskim Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2005/10/03 19:00:34 salo Exp $
PKGNAME= mpg123-esound-${MPG123_VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
TARGET_SUFFIX= -esd
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123-nas/Makefile
--- a/audio/mpg123-nas/Makefile Mon Oct 03 14:30:25 2005 +0000
+++ b/audio/mpg123-nas/Makefile Mon Oct 03 19:00:34 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.12.4.1 2005/10/03 19:00:34 salo Exp $
PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
TARGET_SUFFIX= -nas
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123/Makefile
--- a/audio/mpg123/Makefile Mon Oct 03 14:30:25 2005 +0000
+++ b/audio/mpg123/Makefile Mon Oct 03 19:00:34 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2005/01/12 14:17:44 wiz Exp $
+# $NetBSD: Makefile,v 1.39.6.1 2005/10/03 19:00:34 salo Exp $
PKGNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 7
+PKGREVISION= 8
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
CONFLICTS+= mpg123-nas-[0-9]*
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123/distinfo
--- a/audio/mpg123/distinfo Mon Oct 03 14:30:25 2005 +0000
+++ b/audio/mpg123/distinfo Mon Oct 03 19:00:34 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2005/03/28 19:52:21 schwarz Exp $
+$NetBSD: distinfo,v 1.23.4.1 2005/10/03 19:00:34 salo Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
RMD160 (mpg123/mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
@@ -22,8 +22,10 @@
SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304
SHA1 (patch-ap) = b35e7f6739a8b4979412793c7b3f2f7f5a9f15a7
-SHA1 (patch-aq) = a993d815b6657b9a2241b2e3f0ba30d6c2861230
+SHA1 (patch-aq) = 7eb736b995bf35b7ad029ea4d96bdfbaf669e689
SHA1 (patch-ar) = e81771bf72da97d898f9320fb6c529e5a1151050
SHA1 (patch-as) = 8765b22c556cdc217f6270f3a5e70b40b36b9229
SHA1 (patch-at) = 9a64a62f7d1d115e3d36dbb0f08762d4b0eb1e2b
SHA1 (patch-au) = 02c480cbb6ff8ab904be93eaf319b43f4f02d588
+SHA1 (patch-av) = 9c25c4a82042ca862409284fb2616a613485ff76
+SHA1 (patch-aw) = ba937829caf7f3ca042dca87f5b3f83a0cf2611a
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123/patches/patch-aq
--- a/audio/mpg123/patches/patch-aq Mon Oct 03 14:30:25 2005 +0000
+++ b/audio/mpg123/patches/patch-aq Mon Oct 03 19:00:34 2005 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
+$NetBSD: patch-aq,v 1.2.8.1 2005/10/03 19:00:34 salo Exp $
---- httpget.c.orig 2004-11-07 09:47:28.000000000 +0100
-+++ httpget.c 2004-11-07 09:49:34.000000000 +0100
-@@ -55,11 +55,10 @@
+--- httpget.c.orig 2005-10-03 17:03:06.000000000 +0200
++++ httpget.c 2005-10-03 17:03:06.000000000 +0200
+@@ -18,11 +18,9 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <ctype.h>
+
+-extern int errno;
+-
+ #include "mpg123.h"
+
+ #ifndef INADDR_NONE
+@@ -55,11 +53,10 @@
#endif
int pos = 0;
@@ -15,7 +28,7 @@
break;
}
}
-@@ -78,6 +77,7 @@
+@@ -78,6 +75,7 @@
}
#endif
@@ -23,7 +36,7 @@
}
void encode64 (char *source,char *destination)
-@@ -111,7 +111,7 @@
+@@ -111,7 +109,7 @@
}
/* VERY simple auth-from-URL grabber */
@@ -32,7 +45,7 @@
{
char *pos;
-@@ -126,9 +126,13 @@
+@@ -126,9 +124,13 @@
if( url[i] == '/' )
return 0;
}
@@ -47,7 +60,16 @@
return 1;
}
return 0;
-@@ -265,7 +269,10 @@
+@@ -199,7 +201,7 @@
+ strncpy(p0, portptr, stringlength);
+ *(p0 + stringlength) = '\0';
+
+- for (p = p0; *p && isdigit(*p); p++)
++ for (p = p0; *p && isdigit((unsigned char)*p); p++)
+ ;
+ *p = '\0';
+ *port = (char *)p0;
+@@ -265,7 +267,10 @@
strncpy (purl, url, 1023);
purl[1023] = '\0';
@@ -59,7 +81,7 @@
do {
strcpy (request, "GET ");
-@@ -399,6 +406,7 @@
+@@ -399,6 +404,7 @@
fprintf (stderr, "Too many HTTP relocations.\n");
exit (1);
}
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123/patches/patch-av
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123/patches/patch-av Mon Oct 03 19:00:34 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1.2.2 2005/10/03 19:00:34 salo Exp $
+
+--- xfermem.c.orig 2005-07-23 23:42:59.000000000 +0000
++++ xfermem.c
+@@ -32,8 +32,6 @@
+ #include <sys/shm.h>
+ #endif
+
+-extern int errno;
+-
+ #if defined (USE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
+ #define MAP_ANON MAP_ANONYMOUS
+ #endif
diff -r 3527734fa667 -r 4a68ca21a894 audio/mpg123/patches/patch-aw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123/patches/patch-aw Mon Oct 03 19:00:34 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1.2.2 2005/10/03 19:00:34 salo Exp $
+
+--- term.c.orig 2005-10-03 15:20:10.000000000 +0200
++++ term.c
+@@ -90,7 +90,7 @@ static long term_handle_input(struct fra
+ while(n > 0) {
+ fd_set r;
+ struct timeval t;
+- char val;
++ unsigned char val;
+
+ t.tv_sec=0;
+ t.tv_usec=(do_delay) ? 1000 : 0;
Home |
Main Index |
Thread Index |
Old Index