Pullup ticket #6082 - requested by nia

audio/faac: security fix

Revisions pulled up:
- audio/faac/Makefile                                           1.18
- audio/faac/distinfo                                           1.11
- audio/faac/patches/patch-frontend_mp4write.c                  deleted

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Nov  9 11:48:35 UTC 2019

   Modified Files:
   	pkgsrc/audio/faac: Makefile distinfo
   Removed Files:
   	pkgsrc/audio/faac/patches: patch-frontend_mp4write.c

   Log Message:
   faac: Update to 1.30

   Changes:

   [ Robert Kausch ]

       Fix Joint Stereo coding

   [ Krzysztof Nikiel ]

       Code cleanup and compilation fixes
       Fix endianness conversion functions

   [ Takashi Yoshi ]

       Fix compilation with GCC < 4.6
       Fix compilation on big endian systems

   [ Fabian Greffrath ]

       Fix division by zero errors
       Fix compilation with GCC <= 4.7.3
       Change pointer type for proper arithmetics
       Fix logic error in compiler detection
       Revert back to some more generic SSE2 code
       Fix a memory leak
       Fix some cppcheck warnings in the Cfaac code
       Check index ranges before dereferencing book arrays (CVE-2018-19886)
       Clean up stdint.h header inclusions
       Consistently use stdint.h types

   [ Michael Fink ]

       Update Visual Studio 2017 projects
       Add stdint.h header inclusions
       Port over ac2ver tool from faad2 to generate PACKAGE_VERSION
       when compiling with Visual Studio

   [ Eugčne Filin ]

       Memory allocations redefined

3 files changed, 11 insertions, 37 deletions

diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 005f329d60a..72780a7a335 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.17 2019/06/23 11:41:25 nia Exp $
+# $NetBSD: Makefile,v 1.17.4.1 2019/11/13 21:04:16 bsiegert Exp $
 
-DISTNAME=	faac-1.29.9.2
+DISTNAME=	faac-1.30
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=knik0/}
+GITHUB_TAG=	${PKGVERSION_NOREV:S/./_/g}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://faac.sourceforge.net/
+HOMEPAGE=	https://github.com/knik0/faac
 COMMENT=	AAC audio encoder
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-lgpl-v2
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		aclocal autoconf autoheader automake
 GNU_CONFIGURE=		yes
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
-GCC_REQD+=		4.8
-
 pre-configure:
 	cd ${WRKSRC} && aclocal -I . && autoheader && libtoolize --automake \
 	&& automake -a && autoconf
diff --git a/audio/faac/distinfo b/audio/faac/distinfo
index ea4a0b043aa..0ba931c59e6 100644
--- a/audio/faac/distinfo
+++ b/audio/faac/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/12/01 11:00:03 adam Exp $
+$NetBSD: distinfo,v 1.10.16.1 2019/11/13 21:04:16 bsiegert Exp $
 
-SHA1 (faac-1.29.9.2.tar.gz) = 35ed1059f34bd411c80e9a8745eddf16c112be69
-RMD160 (faac-1.29.9.2.tar.gz) = 5281fe9d905e7b749086232b5c6ced8c32d8d5c3
-SHA512 (faac-1.29.9.2.tar.gz) = 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-Size (faac-1.29.9.2.tar.gz) = 483826 bytes
+SHA1 (faac-1.30.tar.gz) = a07f7f5d700f9aa15fb70276c9ae2199c4cfc2cb
+RMD160 (faac-1.30.tar.gz) = 99fb55f82984fb94ca9a85a8cad99962c7d78ef2
+SHA512 (faac-1.30.tar.gz) = 8582cd580dba2a347d15dc4fab42020d7120d0552c54ab74cfaf59ba1b270abb94c67e39d42459a14cbc6e98f3fd00cbda589e1b4f0c7278e41bdef6ae7b6554
+Size (faac-1.30.tar.gz) = 241750 bytes
 SHA1 (patch-configure.ac) = d29bb3379a47b62c739ef055db6acb175c4ed060
 SHA1 (patch-frontend_main.c) = 3b0327b636c60cf2a0466d3b38363e364bf504fe
-SHA1 (patch-frontend_mp4write.c) = 675cd3c56351e5630e055edc1d8aa893a6c6eb28
diff --git a/audio/faac/patches/patch-frontend_mp4write.c b/audio/faac/patches/patch-frontend_mp4write.c
deleted file mode 100644
index 12a02ff916e..00000000000
--- a/audio/faac/patches/patch-frontend_mp4write.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-frontend_mp4write.c,v 1.1 2017/07/23 16:01:14 adam Exp $
-
-Do not re-define bswap32() and bswap16().
-
---- frontend/mp4write.c.orig	2017-07-23 15:44:39.000000000 +0000
-+++ frontend/mp4write.c
-@@ -46,6 +46,8 @@ mp4config_t mp4config = { 0 };
- 
- static FILE *g_fout = NULL;
- 
-+#include "config.h"
-+#ifndef HAVE_SYS_ENDIAN_H
- static inline uint32_t bswap32(uint32_t u32)
- {
- #ifndef WORDS_BIGENDIAN
-@@ -61,6 +63,7 @@ static inline uint16_t bswap16(uint16_t 
-     return __builtin_bswap16(u16);
- #endif
- }
-+#endif
- 
- static int dataout(const void *data, int size)
- {