From 345e3811719177be2d2edbf507a394cf92cfccb6 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Fri, 11 Oct 2019 16:46:20 -0300
Subject: main/faad2: security upgrade to 2.9.0

fixes:
  - CVE-2019-6956
  - CVE-2018-20196
  - CVE-2018-20199
  - CVE-2018-20360
  - CVE-2018-20362
  - CVE-2018-19504
  - CVE-2018-20195
  - CVE-2018-20198
  - CVE-2018-20358
  - CVE-2018-20194
  - CVE-2018-19503
  - CVE-2018-20197
  - CVE-2018-20357
  - CVE-2018-20359
  - CVE-2018-20361
  - CVE-2019-15296
  - CVE-2018-19502

ref #10696
---
 main/faad2/APKBUILD       | 42 ++++++++++++++++++++++++++++--------------
 main/faad2/automake.patch | 11 -----------
 2 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 main/faad2/automake.patch

diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD
index ae578853f46..4cde4b96950 100644
--- a/main/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=faad2
-pkgver=2.7
-pkgrel=7
+pkgver=2.9.0
+_pkgver="${pkgver//./_}"
+pkgrel=0
 pkgdesc="ISO AAC audio decoder"
-url="http://www.audiocoding.com/"
+url="https://github.com/knik0/faad2"
 arch="all"
 license="custom:GPL"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="autoconf automake libtool"
-source="http://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.bz2
-	automake.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/knik0/faad2/archive/$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgver"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$_pkgver
 prepare() {
 	cd "$_builddir"
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -23,6 +23,26 @@ prepare() {
 	done
 }
 
+# secfixes:
+#   2.9.0-r0:
+#     - CVE-2019-6956
+#     - CVE-2018-20196
+#     - CVE-2018-20199
+#     - CVE-2018-20360
+#     - CVE-2018-20362
+#     - CVE-2018-19504
+#     - CVE-2018-20195
+#     - CVE-2018-20198
+#     - CVE-2018-20358
+#     - CVE-2018-20194
+#     - CVE-2018-19503
+#     - CVE-2018-20197
+#     - CVE-2018-20357
+#     - CVE-2018-20359
+#     - CVE-2018-20361
+#     - CVE-2019-15296
+#     - CVE-2018-19502
+
 build() {
 	cd "$_builddir"
 
@@ -43,12 +63,6 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	install -m644 common/mp4ff/mp4ff_int_types.h "$pkgdir"/usr/include/mp4ff_int_types.h || return 1
 }
 
-md5sums="4c332fa23febc0e4648064685a3d4332  faad2-2.7.tar.bz2
-28b178eddf06bda888fe048abc65d57f  automake.patch"
-sha256sums="14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5  faad2-2.7.tar.bz2
-e7b9c8231dfd9227b27ff8c1e8a9be678abf73ce4ce0d3ee9333cb19608fdcfd  automake.patch"
-sha512sums="0934aa9b752b5d86879d94156dea02595e2428340d0cf44202ffea369895b21a9aadbb4833a39212c9a79429b409eb108706b1f523bfddd32809b53730d50947  faad2-2.7.tar.bz2
-0b66cfa240529a2139b47cb8dc87c4b43a451b906d66ef7d211fb509358b1493ceee13894516c2f552b33eae74640910e97957caa49dade2597ebd9777152a9e  automake.patch"
+sha512sums="1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc  faad2-2.9.0.tar.gz"
diff --git a/main/faad2/automake.patch b/main/faad2/automake.patch
deleted file mode 100644
index 809031eb006..00000000000
--- a/main/faad2/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2012-12-31 10:42:26.394219312 +0000
-+++ ./configure.in	2012-12-31 10:42:43.294360781 +0000
-@@ -25,7 +25,7 @@
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
-- 
cgit v1.2.3