[pkgsrc/trunk]: pkgsrc/audio Changes 1.23.8:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio Changes 1.23.8:
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:25:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5e505986768
branches:  trunk
changeset: 356105:c5e505986768
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Dec 18 22:58:34 2016 +0000

description:
Changes 1.23.8:
- Fix long-standing bad memory read (via integer underflow) in ID3 parser
  for crafted ID3v2 tags with tiny size information

diffstat:

 audio/mpg123-nas/Makefile     |   4 +---
 audio/mpg123-pulse/Makefile   |   3 +--
 audio/mpg123/Makefile         |   5 +----
 audio/mpg123/Makefile.common  |  18 +++++++-----------
 audio/mpg123/PLIST            |  12 ++++++++----
 audio/mpg123/distinfo         |  16 ++++++++--------
 audio/mpg123/patches/patch-aa |   8 +++++---
 audio/mpg123/patches/patch-ad |  26 +++++++++++++-------------
 audio/mpg123/patches/patch-af |  20 ++++++++------------
 9 files changed, 52 insertions(+), 60 deletions(-)

diffs (233 lines):

diff -r a1b6800756bd -r c5e505986768 audio/mpg123-nas/Makefile
--- a/audio/mpg123-nas/Makefile Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123-nas/Makefile Sun Dec 18 22:58:34 2016 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2015/01/01 08:29:07 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2016/12/18 22:58:35 adam Exp $
 
 MPG123_MODULE= nas
 
-#NOT_FOR_COMPILER=     sunpro
-
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/mpg123/buildlink3.mk"
diff -r a1b6800756bd -r c5e505986768 audio/mpg123-pulse/Makefile
--- a/audio/mpg123-pulse/Makefile       Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123-pulse/Makefile       Sun Dec 18 22:58:34 2016 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/08/04 17:03:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2016/12/18 22:58:35 adam Exp $
 
 MPG123_MODULE= pulse
 
-PKGREVISION= 2
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/mpg123/buildlink3.mk"
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/Makefile
--- a/audio/mpg123/Makefile     Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/Makefile     Sun Dec 18 22:58:34 2016 +0000
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2014/05/20 19:59:09 adam Exp $
+# $NetBSD: Makefile,v 1.55 2016/12/18 22:58:34 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/[^[:alnum:]]*//}
 COMMENT=       MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=   libmpg123.pc.in
 
-MPG123_SUBDIRS=                src doc
-MPG123_SUBDIRS.src=    output libmpg123
-
 MAKE_ENV+=             MPG123_PROGRAM=mpg123
 MAKE_ENV+=             EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
 
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/Makefile.common
--- a/audio/mpg123/Makefile.common      Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/Makefile.common      Sun Dec 18 22:58:34 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2015/10/18 15:07:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.41 2016/12/18 22:58:34 adam Exp $
 #
 # used by audio/mpg123-arts/Makefile
 # used by audio/mpg123-esound/Makefile
@@ -7,7 +7,7 @@
 # used by audio/mpg123-pulse/Makefile
 # used by audio/mpg123-sun/Makefile
 
-DISTNAME=      mpg123-1.22.4
+DISTNAME=      mpg123-1.23.8
 PKGNAME?=      ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -24,21 +24,17 @@
 CONFIGURE_ARGS+=       --enable-modules=yes
 CONFIGURE_ENV+=                BUILD_${MPG123_MODULE:tu}=yes
 CONFIGURE_ENV+=                MPG123_MODULE=${MPG123_MODULE:Q}
-MAKE_ENV+=             MPG123_SUBDIRS=${MPG123_SUBDIRS:Q}
-MAKE_ENV+=             MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q}
-MPG123_SUBDIRS?=       src
-MPG123_SUBDIRS.src?=   output
 
-DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
+DISTINFO_FILE=         ${.CURDIR}/../../audio/mpg123/distinfo
 
 .if !defined(MPG123_BUILDING_BASE)
 INSTALLATION_DIRS+=    lib/mpg123
 LIBS+=                 -lmpg123
-BUILD_DIRS=            src/output
-PATCHDIR=      ${.CURDIR}/../../audio/mpg123/patches
+BUILD_TARGET=          src/libout123/modules/output_${MPG123_MODULE}.la
+PATCHDIR=              ${.CURDIR}/../../audio/mpg123/patches
 do-install:
-       ${LIBTOOL} --mode=install ${INSTALL_LIB}                        \
-               ${WRKSRC}/src/output/output_${MPG123_MODULE}.la         \
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/src/libout123/modules/output_${MPG123_MODULE}.la \
                ${DESTDIR}${PREFIX}/lib/mpg123
 .endif
 
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/PLIST
--- a/audio/mpg123/PLIST        Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/PLIST        Sun Dec 18 22:58:34 2016 +0000
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.5 2014/11/20 13:07:12 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/12/18 22:58:34 adam Exp $
 bin/mpg123
 bin/mpg123-id3dump
 bin/mpg123-strip
 bin/out123
+include/fmt123.h
 include/mpg123.h
+include/out123.h
 lib/libmpg123.la
+lib/libout123.la
+${PLIST.coreaudio}lib/mpg123/output_coreaudio.la
+${PLIST.oss}lib/mpg123/output_oss.la
+${PLIST.sun}lib/mpg123/output_sun.la
 lib/pkgconfig/libmpg123.pc
+lib/pkgconfig/libout123.pc
 man/man1/mpg123.1
 man/man1/out123.1
-${PLIST.coreaudio}lib/mpg123/output_coreaudio.la
-${PLIST.sun}lib/mpg123/output_sun.la
-${PLIST.oss}lib/mpg123/output_oss.la
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/distinfo
--- a/audio/mpg123/distinfo     Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/distinfo     Sun Dec 18 22:58:34 2016 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2015/11/04 17:41:15 agc Exp $
+$NetBSD: distinfo,v 1.42 2016/12/18 22:58:34 adam Exp $
 
-SHA1 (mpg123-1.22.4.tar.bz2) = 6ca59baceeebe361cc508214ba725a56d4fea743
-RMD160 (mpg123-1.22.4.tar.bz2) = 0775dd28389ef27aafc9de4d261a9ddb24699563
-SHA512 (mpg123-1.22.4.tar.bz2) = d8552b3522fa58647cee7c43227737993851452a15dc6d3ae6948c6c62d4a8f6064e2b284f170413aa3f805a3f3e1a6f1faac7d19daddd25c6790863e4925212
-Size (mpg123-1.22.4.tar.bz2) = 870889 bytes
-SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b
-SHA1 (patch-ad) = 1287cc2ec7c718ecd5566ece52608235d76fde11
-SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
+SHA1 (mpg123-1.23.8.tar.bz2) = 799b9fe2beb5ae1c1769b10d011c0904f8e5273e
+RMD160 (mpg123-1.23.8.tar.bz2) = 9e6bf8351b2c5fe7423607719ca969e61f29b20d
+SHA512 (mpg123-1.23.8.tar.bz2) = 7b77b543bd6a127095c6a6a2e7f9b5933f5a391734cc6dcbc160f786008afcd74646a7c304e1be682042221648b0fcae7efafda4bbe66ba30a7021740abddc34
+Size (mpg123-1.23.8.tar.bz2) = 893728 bytes
+SHA1 (patch-aa) = 4b2761219dd8fb92079d7f96872e56beb702696a
+SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
+SHA1 (patch-af) = ba9ccddda15f0e711675b1bbad72b082b34b15f5
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/patches/patch-aa
--- a/audio/mpg123/patches/patch-aa     Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/patches/patch-aa     Sun Dec 18 22:58:34 2016 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.30 2014/05/20 19:59:09 adam Exp $
+$NetBSD: patch-aa,v 1.31 2016/12/18 22:58:34 adam Exp $
+
+Handle modules by pkgsrc.
 
---- configure.orig     2014-03-08 12:12:59.000000000 +0000
+--- configure.orig     2016-09-26 21:21:39.000000000 +0000
 +++ configure
-@@ -16363,7 +16363,7 @@ fi
+@@ -17124,7 +17124,7 @@ fi
  
  
  # The full list of supported modules to check, first come, first serve.
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/patches/patch-ad
--- a/audio/mpg123/patches/patch-ad     Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/patches/patch-ad     Sun Dec 18 22:58:34 2016 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-ad,v 1.5 2014/11/20 13:07:12 mef Exp $
+$NetBSD: patch-ad,v 1.6 2016/12/18 22:58:34 adam Exp $
 
 Let device portable over environment
 
---- src/output/oss.c.orig      2009-12-05 21:26:23.000000000 +0100
-+++ src/output/oss.c   2010-02-06 20:09:39.000000000 +0100
-@@ -167,7 +167,7 @@
-       if(!ao) return -1;
-       
-       if(!ao->device) {
--              ao->device = "/dev/dsp";
-+              ao->device = DEVOSSAUDIO;
+--- src/libout123/modules/oss.c.orig   2016-09-26 21:20:25.000000000 +0000
++++ src/libout123/modules/oss.c
+@@ -159,7 +159,7 @@ static int open_oss(out123_handle *ao)
+ 
+       dev = ao->device;
+       if(!dev) {
+-              dev = "/dev/dsp";
++              dev = DEVOSSAUDIO;
                usingdefdev = 1;
        }
        
-@@ -176,7 +176,7 @@
+@@ -168,7 +168,7 @@ static int open_oss(out123_handle *ao)
        if(ao->fn < 0)
        {
                if(usingdefdev) {
--                      ao->device = "/dev/sound/dsp";
-+                      ao->device = DEVOSSSOUND;
-                       ao->fn = open(ao->device,O_WRONLY);
+-                      dev = "/dev/sound/dsp";
++                      dev = DEVOSSSOUND;
+                       ao->fn = open(dev,O_WRONLY);
                        if(ao->fn < 0) {
                                if(!AOQUIET) error("Can't open default sound device!");
diff -r a1b6800756bd -r c5e505986768 audio/mpg123/patches/patch-af
--- a/audio/mpg123/patches/patch-af     Sun Dec 18 22:41:12 2016 +0000
+++ b/audio/mpg123/patches/patch-af     Sun Dec 18 22:58:34 2016 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2010/03/14 14:19:19 martin Exp $
+$NetBSD: patch-af,v 1.3 2016/12/18 22:58:34 adam Exp $
 
---- src/xfermem.c.orig 2009-12-05 21:26:24.000000000 +0100
-+++ src/xfermem.c      2010-02-06 20:14:14.000000000 +0100
-@@ -37,6 +37,13 @@
+--- src/libout123/xfermem.c.orig       2016-09-26 21:20:25.000000000 +0000
++++ src/libout123/xfermem.c
+@@ -36,6 +36,13 @@ void xfermem_init (txfermem **xf, size_t
  
  #ifdef HAVE_MMAP
  #  ifdef MAP_ANON
@@ -16,18 +16,14 @@
        if ((*xf = (txfermem *) mmap(0, regsize, PROT_READ | PROT_WRITE,
                        MAP_ANON | MAP_SHARED, -1, 0)) == (txfermem *) -1) {
                perror ("mmap()");
-@@ -92,7 +99,13 @@
-       if(!xf)
-               return;
- #ifdef HAVE_MMAP
--      munmap ((caddr_t) xf, xf->size + xf->metasize + sizeof(txfermem));
-+      munmap ((void *) xf, xf->size + xf->metasize + sizeof(txfermem));
-+
+@@ -93,6 +100,10 @@ void xfermem_done (txfermem *xf)
+          Casting to (void*) should silence compilers in case of funny
+          prototype for munmap(). */
+       munmap ( (void*)xf, xf->size + xf->metasize + sizeof(txfermem));
 +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000)
 +      if(madvise((void *)xf, (xf->size + xf->metasize), MADV_FREE) < 0)
 +              fprintf(stderr,"madvise failed, continuing anyways..\n");
 +#endif
-+
  #else
        if (shmdt((void *) xf) == -1) {
                perror ("shmdt()");
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated security/gnupg21 to 2.1.16
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.64:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated security/gnupg21 to 2.1.16
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.64:
Indexes:
Home | Main Index | Thread Index | Old Index