- 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

diff --git a/crossmingw32-libvorbis.spec b/crossmingw32-libvorbis.spec
index 77eb6af99d1d83f42fcd52460e7da10109e77e93..bd7cd6587553b5799b06b5e6a134ae4cbe2110cf 100644 (file)
--- a/crossmingw32-libvorbis.spec
+++ b/crossmingw32-libvorbis.spec
@@ -2,15 +2,14 @@
 Summary:       The Vorbis General Audio Compression Codec - MinGW32 cross version
 Summary(pl.UTF-8):     Kodek kompresji audio - Vorbis - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.3.5
-Release:       2
+Version:       1.3.6
+Release:       1
 License:       BSD
 Group:         Development/Libraries
-Source0:       http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.xz
-# Source0-md5: 28cb28097c07a735d6af56e598e1c90f
-Patch0:                %{realname}-ac_fixes.patch
-Patch1:                %{realname}-make.patch
-URL:           http://www.vorbis.com/
+Source0:       https://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.xz
+# Source0-md5: b7d1692f275c73e7833ed1cc2697cd65
+Patch0:                %{realname}-make.patch
+URL:           https://xiph.org/vorbis/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.6
 BuildRequires: crossmingw32-gcc >= 3.0
@@ -88,7 +87,6 @@ Biblioteka DLL libvorbis dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -100,7 +98,8 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %configure \
        OBJDUMP=%{target}-objdump \
        --host=%{target} \
-       --target=%{target}
+       --target=%{target} \
+       --disable-silent-rules
 
 %{__make}
 
@@ -125,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS CHANGES COPYING
 %{_libdir}/libvorbis.dll.a
 %{_libdir}/libvorbisenc.dll.a
 %{_libdir}/libvorbisfile.dll.a

diff --git a/libvorbis-ac_fixes.patch b/libvorbis-ac_fixes.patch
deleted file mode 100644 (file)
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 57bfbff08f7cc5a16cb989e820ce047ea3ff6f7f..6afca207f483cc93d64acfb6332d59e048f746c4 100644 (file)
--- 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\