[packages/libvorbis] - updated to 1.3.6 (fixes CVE-2017-14632 CVE-2017-14633 CVE-2018-5146) - updated make patch - droppe

Fri Mar 16 21:00:12 CET 2018

commit 928fe8d4b600fca4adee912aa609f1fd5f0e0acd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Mar 16 21:02:47 2018 +0100

    - updated to 1.3.6 (fixes CVE-2017-14632 CVE-2017-14633 CVE-2018-5146)
    - updated make patch
    - dropped no longer needed ac_fixes patch

 libvorbis-ac_fixes.patch | 25 -------------------------
 libvorbis-make.patch     | 12 +++++-------
 libvorbis.spec           | 19 +++++++++----------
 3 files changed, 14 insertions(+), 42 deletions(-)
---

diff --git a/libvorbis.spec b/libvorbis.spec
index 6879e9f..fee6588 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -4,16 +4,15 @@ Summary(pt_BR.UTF-8):	Biblioteca libvorbis
 Summary(ru.UTF-8):	Кодек звуковой компрессии Vorbis
 Summary(uk.UTF-8):	Кодек звукової компресії Vorbis
 Name:		libvorbis
-Version:	1.3.5
+Version:	1.3.6
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		Libraries
-Source0:	http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
-# Source0-md5:	28cb28097c07a735d6af56e598e1c90f
-Patch0:		%{name}-ac_fixes.patch
-Patch1:		%{name}-make.patch
-URL:		http://www.vorbis.com/
+Source0:	https://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
+# Source0-md5:	b7d1692f275c73e7833ed1cc2697cd65
+Patch0:		%{name}-make.patch
+URL:		https://xiph.org/vorbis/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.6
 BuildRequires:	gcc >= 5:3.0
@@ -105,7 +104,6 @@ Bibliotecas estáticas para desenvolvimento com o codec Vorbis.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -113,7 +111,8 @@ Bibliotecas estáticas para desenvolvimento com o codec Vorbis.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
 
 %{__make}
 
@@ -124,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	m4datadir=%{_aclocaldir}
 
-mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} devel-docs
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} devel-docs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS CHANGES COPYING
 %attr(755,root,root) %{_libdir}/libvorbis.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvorbis.so.0
 %attr(755,root,root) %{_libdir}/libvorbisenc.so.*.*.*
diff --git a/libvorbis-ac_fixes.patch b/libvorbis-ac_fixes.patch
deleted file mode 100644
index 40c2f0b..0000000
--- a/libvorbis-ac_fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libvorbis-1.3.5/configure.ac~	2015-01-12 21:00:37.000000000 +0100
-+++ libvorbis-1.3.5/configure.ac	2015-03-03 12:54:34.168894342 +0100
-@@ -128,9 +128,9 @@
- 	case $host in 
- 	*86-*-linux*)
- 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--		CFLAGS="-O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+		CFLAGS="${CFLAGS} -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
- #              	PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
--		PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+		PROFILE="-Wall -Wextra -pg -g ${CFLAGS} -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
- 
- 		# glibc < 2.1.3 has a serious FP bug in the math inline header
- 		# that will cripple Vorbis.  Look to see if the magic FP stack
-@@ -181,8 +181,8 @@
- 		PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
- 	*-*-linux*)
- 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--		CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
--		PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";;
-+		CFLAGS="${CFLAGS} -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
-+		PROFILE="-pg -g ${CFLAGS} -ffast-math -D_REENTRANT -fsigned-char";;
- 	sparc-sun-*)
- 		sparc_cpu=""
- 		AC_MSG_CHECKING([if gcc supports -mv8])
diff --git a/libvorbis-make.patch b/libvorbis-make.patch
index 57bfbff..6afca20 100644
--- a/libvorbis-make.patch
+++ b/libvorbis-make.patch
@@ -1,4 +1,3 @@
-diff -urN libvorbis-1.0beta4.org/lib/Makefile.am libvorbis-1.0beta4/lib/Makefile.am
 --- libvorbis-1.0beta4.org/lib/Makefile.am	Sun Apr 29 00:04:26 2001
 +++ libvorbis-1.0beta4/lib/Makefile.am	Sun Apr 29 01:10:55 2001
 @@ -30,7 +30,7 @@
@@ -10,14 +9,13 @@ diff -urN libvorbis-1.0beta4.org/lib/Makefile.am libvorbis-1.0beta4/lib/Makefile
  psytune_LDADD = libvorbis.la
  
  EXTRA_DIST = lookups.pl iir.c
---- libvorbis-1.1.0.orig/vq/Makefile.am	Sun Apr 29 00:04:26 2001
-+++ libvorbis-1.1.0/vq/Makefile.am	Sun Apr 29 01:10:38 2001
-@@ -9,7 +9,7 @@
- 	latticetune huffbuild residuesplit distribution
+--- libvorbis-1.3.6/vq/Makefile.am.orig	2018-03-16 20:52:17.501161210 +0100
++++ libvorbis-1.3.6/vq/Makefile.am	2018-03-16 20:53:01.524494045 +0100
+@@ -4,7 +4,6 @@
  CLEANFILES = $(EXTRA_PROGRAMS)
  
+ AM_CPPFLAGS = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
 -AM_LDFLAGS = -static
-+AM_LDFLAGS = 
  LDADD = ../lib/libvorbis.la
  
- lspvqtrain_SOURCES = lspdata.c train.c vqgen.c bookutil.c\
+ latticebuild_SOURCES = latticebuild.c vqgen.c bookutil.c\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvorbis.git/commitdiff/928fe8d4b600fca4adee912aa609f1fd5f0e0acd

