CVS commit: [pkgsrc-2017Q4] pkgsrc/audio/tremor

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Fri Mar 16 23:20:00 UTC 2018

Modified Files:
        pkgsrc/audio/tremor [pkgsrc-2017Q4]: Makefile PLIST distinfo
        pkgsrc/audio/tremor/patches [pkgsrc-2017Q4]: patch-misc.h
Added Files:
        pkgsrc/audio/tremor/patches [pkgsrc-2017Q4]: patch-configure.in

Log Message:
Pullup ticket #5724 - requested by maya
audio/tremor: security update

Revisions pulled up:
- audio/tremor/Makefile                                         1.26
- audio/tremor/PLIST                                            1.5
- audio/tremor/distinfo                                         1.8
- audio/tremor/patches/patch-configure.in                       1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Fri Mar 16 21:54:13 UTC 2018

   Modified Files:
        pkgsrc/audio/tremor: Makefile PLIST distinfo
   Added Files:
        pkgsrc/audio/tremor/patches: patch-configure.in

   Log Message:
   tremor: update to latest git commit.

   This fixes an out of bound write, but possibly many other changes.
   Unfortunately upstream doesn't do releases for tremor, so I manually
   fetch the tarball and uploaded it.

   To generate a diff of this commit:
   cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/tremor/Makefile
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/tremor/PLIST
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/tremor/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/audio/tremor/patches/patch-configure.in

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Fri Mar 16 23:02:09 UTC 2018

   Modified Files:
        pkgsrc/audio/tremor/patches: patch-misc.h

   Log Message:
   tremor: add missing patch.
   (Got into cvs problems, sorry.)

   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/tremor/patches/patch-misc.h


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.6.1 pkgsrc/audio/tremor/Makefile
cvs rdiff -u -r1.3 -r1.3.72.1 pkgsrc/audio/tremor/PLIST
cvs rdiff -u -r1.7 -r1.7.20.1 pkgsrc/audio/tremor/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/audio/tremor/patches/patch-configure.in
cvs rdiff -u -r1.1 -r1.1.50.1 pkgsrc/audio/tremor/patches/patch-misc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/tremor/Makefile
diff -u pkgsrc/audio/tremor/Makefile:1.25 pkgsrc/audio/tremor/Makefile:1.25.6.1
--- pkgsrc/audio/tremor/Makefile:1.25   Wed Aug 16 20:21:04 2017
+++ pkgsrc/audio/tremor/Makefile        Fri Mar 16 23:20:00 2018
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2017/08/16 20:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.25.6.1 2018/03/16 23:20:00 spz Exp $
 
-DISTNAME=      tremor_snapshot_030406
-PKGNAME=       tremor-1.0.2
-PKGREVISION=   5
+DISTNAME=      tremor-562307a
+PKGNAME=       tremor-1.0.2.20180316
 CATEGORIES=    devel audio
-MASTER_SITES=  https://www.xiph.org/ogg/vorbis/download/
-EXTRACT_SUFX=  .tgz
+# No releases.
+#GIT_COMMIT=   562307a4a7082e24553f3d2c55dab397a17c4b4f
+#MASTER_SITES= "http://git.xiph.org/?p=tremor.git;a=snapshot;sf=tgz;h=${GIT_COMMIT};";
+EXTRACT_SUFX=  .tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.xiph.org/vorbis/
 COMMENT=       Fixed point decoding library for the Ogg Vorbis audio encoding format
 LICENSE=       modified-bsd
 
-WRKSRC=                ${WRKDIR}/Tremor
 AUTOCONF_REQD=         2.50
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            autoconf automake gmake
@@ -21,9 +21,11 @@ USE_LIBTOOL=         yes
 PLIST_SUBST+=          DISTNAME=${DISTNAME:Q}
 
 pre-configure:
+       touch ${WRKSRC}/config.h.in
        cd ${WRKSRC} && aclocal
        cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
        cd ${WRKSRC} && automake --add-missing
        cd ${WRKSRC} && autoconf
 
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/tremor/PLIST
diff -u pkgsrc/audio/tremor/PLIST:1.3 pkgsrc/audio/tremor/PLIST:1.3.72.1
--- pkgsrc/audio/tremor/PLIST:1.3       Sun Jun 14 17:32:23 2009
+++ pkgsrc/audio/tremor/PLIST   Fri Mar 16 23:20:00 2018
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3.72.1 2018/03/16 23:20:00 spz Exp $
 include/tremor/ivorbiscodec.h
 include/tremor/ivorbisfile.h
-include/tremor/ogg.h
-include/tremor/os_types.h
 include/tremor/config_types.h
 lib/libvorbisidec.la
+lib/pkgconfig/vorbisidec.pc

Index: pkgsrc/audio/tremor/distinfo
diff -u pkgsrc/audio/tremor/distinfo:1.7 pkgsrc/audio/tremor/distinfo:1.7.20.1
--- pkgsrc/audio/tremor/distinfo:1.7    Tue Nov  3 01:12:53 2015
+++ pkgsrc/audio/tremor/distinfo        Fri Mar 16 23:20:00 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 01:12:53 agc Exp $
+$NetBSD: distinfo,v 1.7.20.1 2018/03/16 23:20:00 spz Exp $
 
-SHA1 (tremor_snapshot_030406.tgz) = f0df8d70e2aad9a345716b551ead826434134f39
-RMD160 (tremor_snapshot_030406.tgz) = 34eebdf9a74f729ae0319c9e8d8b707642f5d002
-SHA512 (tremor_snapshot_030406.tgz) = 8dbf9abea4dfe09f011b292edd32cee8845c95df3d6571bb67e6f72e77742ec8bdb7c8d49c5a57e0e263c31839a065ddd1910eda3321d73f23fca7f8567700cd
-Size (tremor_snapshot_030406.tgz) = 151981 bytes
-SHA1 (patch-misc.h) = ebe129d13d711d238b7f1e7c52e55804b040fa86
+SHA1 (tremor-562307a.tar.gz) = 31f596fe1e55ce67e5c8b03d611bd1b9593272bd
+RMD160 (tremor-562307a.tar.gz) = d04d47d8441ed7f66b3e9be9507af81cb2116fcb
+SHA512 (tremor-562307a.tar.gz) = 19776c9a9e022c14224578eca5b290cd26a9f883ef20567c172491617c929c254d8cd6b844f8419e2e62c88f71e61238f87d82c23c02ab8ad195ab2a3b0f9384
+Size (tremor-562307a.tar.gz) = 148875 bytes
+SHA1 (patch-configure.in) = cf359f27acf93eab341b084b0fb9c007e7f3baed
+SHA1 (patch-misc.h) = 46f83e79562934bce45758254df401d3b551ccfa

Index: pkgsrc/audio/tremor/patches/patch-misc.h
diff -u pkgsrc/audio/tremor/patches/patch-misc.h:1.1 pkgsrc/audio/tremor/patches/patch-misc.h:1.1.50.1
--- pkgsrc/audio/tremor/patches/patch-misc.h:1.1        Wed Jan 11 20:58:09 2012
+++ pkgsrc/audio/tremor/patches/patch-misc.h    Fri Mar 16 23:20:00 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-misc.h,v 1.1 2012/01/11 20:58:09 hans Exp $
+$NetBSD: patch-misc.h,v 1.1.50.1 2018/03/16 23:20:00 spz Exp $
 
---- misc.h.orig        2003-03-31 01:40:56.000000000 +0200
-+++ misc.h     2012-01-02 18:16:15.405713912 +0100
-@@ -30,6 +30,17 @@
- 
+--- misc.h.orig        2018-03-16 05:15:51.000000000 +0000
++++ misc.h
+@@ -41,6 +41,17 @@
  #include <sys/types.h>
+ #endif
  
 +#ifdef __sun
 +#include <sys/byteorder.h>

Added files:

Index: pkgsrc/audio/tremor/patches/patch-configure.in
diff -u /dev/null pkgsrc/audio/tremor/patches/patch-configure.in:1.1.2.2
--- /dev/null   Fri Mar 16 23:20:00 2018
+++ pkgsrc/audio/tremor/patches/patch-configure.in      Fri Mar 16 23:20:00 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1.2.2 2018/03/16 23:20:00 spz Exp $
+
+Avoid trying to use a non-existent Version_script file
+
+--- configure.in.orig  2018-03-16 05:15:51.000000000 +0000
++++ configure.in
+@@ -79,7 +79,7 @@ LDFLAGS="$LDFLAGS $ldflags_save"
+ AC_PROG_LD
+ AC_PROG_LD_GNU
+ if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+-   SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
++   #SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" # XXX this file doesn't exist?!
+    LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
+ fi
+