[packages/faad2] - updated to 2.9.2 (fixes CVE-2018-19502 CVE-2018-19503 CVE-2018-19504 CVE-2018-20194 CVE-2018-201

Tue May 19 19:08:41 CEST 2020

commit ac4a87199b366ae80af5185885114d55b08df7f3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 19 19:09:10 2020 +0200

    - updated to 2.9.2
      (fixes CVE-2018-19502 CVE-2018-19503 CVE-2018-19504 CVE-2018-20194 CVE-2018-20195 CVE-2018-20196
      CVE-2018-20197 CVE-2018-20198 CVE-2018-20199 CVE-2018-20357 CVE-2018-20358 CVE-2018-20359
      CVE-2018-20360 CVE-2018-20361 CVE-2018-20362 CVE-2019-6956 CVE-2019-15296)
    - mp4ff library has been removed upstream, but xmms plugin still requires it,
      so use externally packaged mp4ff, updated mp4ff patch accordingly

 faad2-mp4ff.patch | 28 +++++++++-------------------
 faad2.spec        | 32 +++++++++++++++-----------------
 2 files changed, 24 insertions(+), 36 deletions(-)
---

diff --git a/faad2.spec b/faad2.spec
index 19f6453..36ec73f 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -9,23 +9,27 @@
 Summary:	Freeware Advanced Audio Decoder 2
 Summary(pl.UTF-8):	Darmowy zaawansowany dekoder audio
 Name:		faad2
-Version:	2.8.8
+Version:	2.9.2
+%define	tag_ver	%(echo %{version} | tr . _)
 Release:	1
 License:	GPL v2+
 Group:		Applications/Sound
-Source0:	http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
-# Source0-md5:	28f6116efdbe9378269f8a6221767d1f
+#Source0:	http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
+#Source0Download: https://github.com/knik0/faad2/releases
+Source0:	https://github.com/knik0/faad2/archive/%{tag_ver}/%{name}-%{tag_ver}.tar.gz
+# Source0-md5:	ed0db61d6ffa3e67748c3f03468c6eec
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-mpeg4ip.patch
 Patch3:		%{name}-backward_compat.patch
 Patch4:		%{name}-mp4ff.patch
-Patch6:		%{name}-mp4v2.patch
-URL:		http://www.audiocoding.com/
+Patch5:		%{name}-mp4v2.patch
+URL:		https://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires:	SDL-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_xmms:BuildRequires:	id3lib-devel >= 3.8.2}
 BuildRequires:	libtool >= 2:1.4d-3
+%{?with_xmms:BuildRequires:	mp4ff-devel}
 %if %{with mpeg4ip}
 BuildRequires:	mp4v2-devel
 BuildRequires:	mpeg4ip-devel >= 1:1.6
@@ -113,12 +117,12 @@ XMMS plugin for AAC files.
 Wtyczka XMMS do plików AAC.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{tag_ver}
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%patch6 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -127,8 +131,8 @@ Wtyczka XMMS do plików AAC.
 %{__autoheader}
 %{__automake}
 %configure \
-	--with%{!?with_xmms:out}-xmms \
-	--with%{!?with_mpeg4ip:out}-mpeg4ip \
+	--with-xmms%{!?with_xmms:=no} \
+	--with-mpeg4ip%{!?with_mpeg4ip:=no} \
 	%{!?with_static_libs:--disable-static}
 
 %{__make}
@@ -169,28 +173,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfaad.so.0
 %attr(755,root,root) %{_libdir}/libfaad_drm.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaad_drm.so.2
-%attr(755,root,root) %{_libdir}/libmp4ff.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmp4ff.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfaad.so
 %attr(755,root,root) %{_libdir}/libfaad_drm.so
-%attr(755,root,root) %{_libdir}/libmp4ff.so
 %{_libdir}/libfaad.la
 %{_libdir}/libfaad_drm.la
-%{_libdir}/libmp4ff.la
 %{_includedir}/faad.h
-%{_includedir}/mp4ff.h
-%{_includedir}/mp4ffint.h
 %{_includedir}/neaacdec.h
+%{_pkgconfigdir}/faad2.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfaad.a
 %{_libdir}/libfaad_drm.a
-%{_libdir}/libmp4ff.a
 %endif
 
 %if %{with xmms}
diff --git a/faad2-mp4ff.patch b/faad2-mp4ff.patch
index da948ab..4d9d4c1 100644
--- a/faad2-mp4ff.patch
+++ b/faad2-mp4ff.patch
@@ -1,25 +1,15 @@
---- faad2-2.8.6/common/mp4ff/Makefile.am.orig	2017-12-11 17:43:53.975769960 +0100
-+++ faad2-2.8.6/common/mp4ff/Makefile.am	2017-12-11 17:54:59.092429032 +0100
-@@ -1,7 +1,7 @@
--noinst_LIBRARIES = libmp4ff.a
--noinst_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h
+--- faad2-2_9_2/plugins/xmms/src/Makefile.am.orig	2020-05-19 18:03:13.548664034 +0200
++++ faad2-2_9_2/plugins/xmms/src/Makefile.am	2020-05-19 18:05:21.617970223 +0200
+@@ -4,10 +4,9 @@
+ plugin_LTLIBRARIES = libmp4.la
  
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
+-       -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
++       -I$(top_srcdir)/include
  
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h
---- faad2-2.7/plugins/xmms/src/Makefile.am.orig	2010-10-25 20:09:20.343741882 +0200
-+++ faad2-2.7/plugins/xmms/src/Makefile.am	2010-10-25 20:32:37.203740205 +0200
-@@ -7,7 +7,7 @@
-        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
- 
- libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
 -       $(top_builddir)/common/mp4ff/libmp4ff.a
-+       $(top_builddir)/common/mp4ff/libmp4ff.la
++libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la -lmp4ff
  
  libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/faad2.git/commitdiff/ac4a87199b366ae80af5185885114d55b08df7f3

