CVS commit: pkgsrc/audio/faad2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/faad2
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 14 Sep 2019 13:34:07 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Sep 14 13:34:06 UTC 2019

Modified Files:
        pkgsrc/audio/faad2: Makefile PLIST distinfo
        pkgsrc/audio/faad2/patches: patch-frontend_Makefile.am
            patch-frontend_mp4read.c
Removed Files:
        pkgsrc/audio/faad2/patches: patch-CVE-2018-20194 patch-CVE-2018-20362
            patch-common_mp4ff_Makefile.am patch-libfaad_bits.c

Log Message:
faad2: Update to 2.9.0

Changes:

[ Krzysztof Nikiel ]

    Build system fixes and code clean-up

[ LoRd_MuldeR ]

    Fix compiler warnings and code indentation
    Fix compilation with GCC <= 4.7.3
    MSVC solution file clean-up

[ Cameron Cawley ]

    Fix compilation with GCC 4.7.4
    Fix compilation with MinGW

[ Michael Fink ]

    MSVC 2017 project file update

[ Hugo Lefeuvre ]

    Fix crash with unsupported MP4 files (NULL pointer dereference,
    division by zero)
    CVE-2019-6956: ps_dec: sanitize iid_index before mixing
    CVE-2018-20196: sbr_fbt: sanitize sbr->M (should not exceed MAX_M)
    CVE-2018-20199, CVE-2018-20360: specrec: better handle unexpected
    parametric stereo (PS)
    CVE-2018-20362, CVE-2018-19504, CVE-2018-20195, CVE-2018-20198,
    CVE-2018-20358: syntax.c: check for syntax element inconsistencies
    CVE-2018-20194, CVE-2018-19503, CVE-2018-20197, CVE-2018-20357,
    CVE-2018-20359, CVE-2018-20361: sbr_hfadj: sanitize frequency band
    borders

[ Hugo Beauzée-Luyssen ]

    CVE-2019-15296, CVE-2018-19502: Fix a couple buffer overflows

[ Filip Roséen ]

    Prevent crash on SCE followed by CPE

[ Gianfranco Costamagna ]

    Fix linking with GCC 9 and "-Wl,--as-needed"

[ Fabian Greffrath ]

    Enable the frontend to be built reproducibly


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/audio/faad2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/faad2/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/faad2/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/faad2/patches/patch-CVE-2018-20194 \
    pkgsrc/audio/faad2/patches/patch-CVE-2018-20362 \
    pkgsrc/audio/faad2/patches/patch-common_mp4ff_Makefile.am \
    pkgsrc/audio/faad2/patches/patch-libfaad_bits.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c

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

Modified files:

Index: pkgsrc/audio/faad2/Makefile
diff -u pkgsrc/audio/faad2/Makefile:1.53 pkgsrc/audio/faad2/Makefile:1.54
--- pkgsrc/audio/faad2/Makefile:1.53    Thu Jul 11 09:03:35 2019
+++ pkgsrc/audio/faad2/Makefile Sat Sep 14 13:34:06 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.53 2019/07/11 09:03:35 nia Exp $
+# $NetBSD: Makefile,v 1.54 2019/09/14 13:34:06 nia Exp $
 # IMPORTANT: Do not forget to update audio/xmms-faad
 
-DISTNAME=      faad2-2.8.8
-PKGREVISION=   1
+DISTNAME=      faad2-2.9.0
 CATEGORIES=    audio
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=faac/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=knik0/}
+GITHUB_TAG=    2_9_0
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.audiocoding.com/
+HOMEPAGE=      https://github.com/knik0/faad2
 COMMENT=       AAC decoding library
 LICENSE=       gnu-gpl-v2
 
@@ -17,18 +17,9 @@ USE_TOOLS+=          autoconf automake autorecon
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/faad2
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
-GCC_REQD+=             4.8
-
 LIBS+=                 -lm
 CPPFLAGS.SunOS+=       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
 
-SUBST_CLASSES+=                pkgver
-SUBST_STAGE.pkgver=    pre-configure
-SUBST_MESSAGE.pkgver=  Setting PACKAGE_VERSION in neaacdec.h
-SUBST_FILES.pkgver=    include/neaacdec.h
-SUBST_SED.pkgver=      -e 's,PACKAGE_VERSION,"${PKGVERSION_NOREV}",'
-
 post-extract:
        ${MV} ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
 

Index: pkgsrc/audio/faad2/PLIST
diff -u pkgsrc/audio/faad2/PLIST:1.15 pkgsrc/audio/faad2/PLIST:1.16
--- pkgsrc/audio/faad2/PLIST:1.15       Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/PLIST    Sat Sep 14 13:34:06 2019
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.15 2017/07/23 16:09:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/09/14 13:34:06 nia Exp $
 bin/faad
 include/faad2/faad.h
-include/faad2/mp4ff.h
-include/faad2/mp4ffint.h
 include/faad2/neaacdec.h
 lib/libfaad.la
 lib/libfaad_drm.la
-lib/libmp4ff.la
 man/man1/faad.1

Index: pkgsrc/audio/faad2/distinfo
diff -u pkgsrc/audio/faad2/distinfo:1.27 pkgsrc/audio/faad2/distinfo:1.28
--- pkgsrc/audio/faad2/distinfo:1.27    Thu Jul 11 09:03:35 2019
+++ pkgsrc/audio/faad2/distinfo Sat Sep 14 13:34:06 2019
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.27 2019/07/11 09:03:35 nia Exp $
+$NetBSD: distinfo,v 1.28 2019/09/14 13:34:06 nia Exp $
 
-SHA1 (faad2-2.8.8.tar.gz) = 0d49c516d4a83c39053a9bd214fddba72cbc34ad
-RMD160 (faad2-2.8.8.tar.gz) = b69349ee69c869ba070f28c58418749d53898985
-SHA512 (faad2-2.8.8.tar.gz) = 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-Size (faad2-2.8.8.tar.gz) = 1069044 bytes
-SHA1 (patch-CVE-2018-20194) = fefaa2cde9cdaff71cfe8e82e9d0e4b791bca015
-SHA1 (patch-CVE-2018-20362) = 00a8cf72f824a3c98d7f20d80542192634a84518
-SHA1 (patch-common_mp4ff_Makefile.am) = a662e6fd841420110c02f85923d022919135be82
+SHA1 (faad2-2.9.0.tar.gz) = 0c39dd1362288f372211cdbc053748569a9cb2ea
+RMD160 (faad2-2.9.0.tar.gz) = 6a6576fb640daba2cb4754ade1d2b8834b8766e5
+SHA512 (faad2-2.9.0.tar.gz) = 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
+Size (faad2-2.9.0.tar.gz) = 802390 bytes
 SHA1 (patch-configure.ac) = ed9d4e9d611d27d4add86884996a8e7fc001bc90
-SHA1 (patch-frontend_Makefile.am) = ab3369e67fb5f2842076fb698819936473440de9
+SHA1 (patch-frontend_Makefile.am) = 32c8bede5773b2cb97777951b1a18366b4e10e3d
 SHA1 (patch-frontend_getopt.c) = 3eaf3e8318887eca49e354696cad1bd2c5bf5504
-SHA1 (patch-frontend_mp4read.c) = 235d69a310bb2cb52cf62479e9254c1d3eb9cef9
+SHA1 (patch-frontend_mp4read.c) = a72c20b69428809caf328850fd70a13ba5c82d41
 SHA1 (patch-libfaad_Makefile.am) = 4d3b92f54d998bd577641f49e88d0c8bc38f963c
-SHA1 (patch-libfaad_bits.c) = bc21ea92f62a7facbf70df3fe85b852e625efc1c
 SHA1 (patch-libfaad_common.h) = 60eccd8aebeb085760d6866f83ff5a613197918f
 SHA1 (patch-plugins_xmms_src_Makefile.am) = 4ba1dfefe1e351830ee990c711af6ac46db42c14
 SHA1 (patch-plugins_xmms_src_libmp4.c) = 7c6cd667999aab36efc9d713cf967c01b01916bf

Index: pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am
diff -u pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am:1.3 pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am:1.4
--- pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am:1.3   Wed Jun  5 06:07:27 2019
+++ pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am       Sat Sep 14 13:34:06 2019
@@ -1,20 +1,11 @@
-$NetBSD: patch-frontend_Makefile.am,v 1.3 2019/06/05 06:07:27 nia Exp $
+$NetBSD: patch-frontend_Makefile.am,v 1.4 2019/09/14 13:34:06 nia Exp $
 
-Use correct sources.
-
---- frontend/Makefile.am.orig  2017-12-17 19:51:26.000000000 +0000
+--- frontend/Makefile.am.orig  2019-09-09 10:28:33.000000000 +0000
 +++ frontend/Makefile.am
-@@ -1,10 +1,11 @@
+@@ -1,5 +1,5 @@
  bin_PROGRAMS = faad
 -dist_man1_MANS = faad.man
 +dist_man1_MANS = faad.1
  
  AM_CPPFLAGS = -I$(top_srcdir)/include
  
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la
- 
--faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h unicode_support.c unicode_support.h
-+faad_SOURCES = mp4read.c audio.c main.c unicode_support.c
-+faad_INCLUDES = audio.h mp4read.h unicode_support.h
- 
- EXTRA_faad_SOURCES =  getopt.c

Index: pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c
diff -u pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c:1.2 pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c:1.3
--- pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c:1.2     Wed Jun  5 06:07:27 2019
+++ pkgsrc/audio/faad2/patches/patch-frontend_mp4read.c Sat Sep 14 13:34:06 2019
@@ -1,20 +1,19 @@
-$NetBSD: patch-frontend_mp4read.c,v 1.2 2019/06/05 06:07:27 nia Exp $
+$NetBSD: patch-frontend_mp4read.c,v 1.3 2019/09/14 13:34:06 nia Exp $
 
-Do not re-define bswap32() and bswap16().
+Avoid conflicting with NetBSD libc.
 
---- frontend/mp4read.c.orig    2017-12-17 11:18:43.000000000 +0000
+--- frontend/mp4read.c.orig    2019-09-09 10:28:33.000000000 +0000
 +++ frontend/mp4read.c
-@@ -46,6 +46,8 @@ mp4config_t mp4config = { 0 };
+@@ -46,6 +46,7 @@ mp4config_t mp4config = { 0 };
  
  static FILE *g_fin = NULL;
  
-+#include "config.h"
-+#ifndef HAVE_SYS_ENDIAN_H
++#ifndef __NetBSD__
  static inline uint32_t bswap32(const uint32_t u32)
  {
  #ifndef WORDS_BIGENDIAN
-@@ -71,6 +73,7 @@ static inline uint16_t bswap16(const uin
-       return u16;
+@@ -75,6 +76,7 @@ static inline uint16_t bswap16(const uin
+     return u16;
  #endif
  }
 +#endif

Prev by Date: CVS commit: pkgsrc/fonts/tex-fontools-doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/fonts/tex-fontools-doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index