From 5996b79dbc6e9d457d8b9aab3d36f9884771f1dd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:12 +0000 Subject: [PATCH 01/74] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6bb21df..3b08c10 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wavpack -# $Id$ +# $Id: Makefile,v 1.1 2006/01/15 10:50:46 peter Exp $ NAME := wavpack SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c951a07ab1b38c60bb4c56d72edaab593f7aff77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:13:08 +0000 Subject: [PATCH 02/74] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 4 ---- 3 files changed, 25 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3b08c10..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wavpack -# $Id: Makefile,v 1.1 2006/01/15 10:50:46 peter Exp $ -NAME := wavpack -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 51edf17..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -wavpack-4_50-1_fc9:HEAD:wavpack-4.50-1.fc9.src.rpm:1213791201 -wavpack-4_50_1-1_fc9:HEAD:wavpack-4.50.1-1.fc9.src.rpm:1219571566 -wavpack-4_50_1-2_fc9:HEAD:wavpack-4.50.1-2.fc9.src.rpm:1220095019 -wavpack-4_60-1_fc11:HEAD:wavpack-4.60-1.fc11.src.rpm:1254135327 From 605b36a6abad520b48c150a9bb74627c390f84d0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 9 Jan 2011 16:25:04 +0300 Subject: [PATCH 03/74] Ver. 4.60.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- ...xed-default-values-in-pkgconfig-file.patch | 32 +++++++++++++++++++ wavpack-wavpack_pc_in.patch | 10 ------ wavpack.spec | 29 +++++++++++------ 5 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch delete mode 100644 wavpack-wavpack_pc_in.patch diff --git a/.gitignore b/.gitignore index 3b33ae5..083640c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wavpack-4.60.0.tar.bz2 +/wavpack-4.60.1.tar.bz2 diff --git a/sources b/sources index ab17239..35325dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 +7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 diff --git a/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch b/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch new file mode 100644 index 0000000..be205b3 --- /dev/null +++ b/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch @@ -0,0 +1,32 @@ +From 194af7649ea958e6609289e8d210e66b168d57cf Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sun, 9 Jan 2011 16:10:20 +0300 +Subject: [PATCH] Fixed default values in pkgconfig file + +Signed-off-by: Peter Lemenkov +--- + wavpack.pc.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/wavpack.pc.in b/wavpack.pc.in +index fe6b231..58e74ac 100644 +--- a/wavpack.pc.in ++++ b/wavpack.pc.in +@@ -1,5 +1,5 @@ + prefix=@prefix@ +-libdir=${prefix}/lib ++libdir=@libdir@ + includedir=${prefix}/include + + Name: wavpack +@@ -7,5 +7,5 @@ Description: wavpack library + Version: @PACKAGE_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} -lwavpack @LIBM@ @ICONV@ +-Cflags: -I${includedir} ++Libs: -lwavpack @LIBM@ @ICONV@ ++Cflags: +-- +1.7.2.3 + diff --git a/wavpack-wavpack_pc_in.patch b/wavpack-wavpack_pc_in.patch deleted file mode 100644 index 0b1a6fa..0000000 --- a/wavpack-wavpack_pc_in.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- wavpack.pc.in 2006-12-14 23:55:15.000000000 +0300 -+++ wavpack.pc.in 2006-12-14 23:57:17.000000000 +0300 -@@ -7,5 +7,5 @@ - Version: @PACKAGE_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} -lwavpack -lm @ICONV@ --Cflags: -I${includedir} -+Libs: -lwavpack -lm @ICONV@ -+Cflags: diff --git a/wavpack.spec b/wavpack.spec index a694d6c..6200e6c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,12 +1,12 @@ Name: wavpack Summary: A completely open audiocodec -Version: 4.60 +Version: 4.60.1 Release: 1%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ -Source: http://www.wavpack.com/%{name}-%{version}.0.tar.bz2 -Patch0: wavpack-wavpack_pc_in.patch +Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 +Patch1: wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,29 +26,32 @@ Requires: pkgconfig Files needed for developing apps using wavpack %prep -%setup -q -n %{name}-%{version}.0 -%patch0 -p0 -b .libs +%setup -q +%patch1 -p1 -b .pkgconfig_values %build %configure --disable-static -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} install -%{__rm} -f %{buildroot}/%{_libdir}/*.la +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install +rm -f %{buildroot}/%{_libdir}/*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/libwavpack.so.* +%{_mandir}/man1/wavpack.1* +%{_mandir}/man1/wvgain.1* +%{_mandir}/man1/wvunpack.1* %doc license.txt %files devel @@ -59,6 +62,12 @@ Files needed for developing apps using wavpack %doc ChangeLog README doc/* %changelog +* Sun Jan 9 2011 Peter Lemenkov 4.60.1-1 +- Version 4.60.1 (bugfix release) +- Added man-pages +- The only patch was rebased +- Small cosmetic spec-file cleanups + * Mon Sep 28 2009 Peter Lemenkov 4.60-1 - Version 4.60 From 6f7d0442520c1db12fb3f2dd326428b387ee7910 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:08:52 -0600 Subject: [PATCH 04/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 6200e6c..6c5e33d 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -62,6 +62,9 @@ rm -rf %{buildroot} %doc ChangeLog README doc/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 4.60.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jan 9 2011 Peter Lemenkov 4.60.1-1 - Version 4.60.1 (bugfix release) - Added man-pages From 4c6266e914dc1cd16cb9aacbbab1862f0eb0b7e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:10:11 -0600 Subject: [PATCH 05/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 6c5e33d..8fb5f7c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -62,6 +62,9 @@ rm -rf %{buildroot} %doc ChangeLog README doc/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 4.60.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 4.60.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 19d162a16b3f08bcb249377fa7558f8f5260e4de Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 22:16:20 -0500 Subject: [PATCH 06/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 8fb5f7c..d3a8830 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -62,6 +62,9 @@ rm -rf %{buildroot} %doc ChangeLog README doc/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 4.60.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 4.60.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 17735836efe7f254ed0049bc2ef99ec15e4c182f Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 3 Jan 2013 18:31:33 +0100 Subject: [PATCH 07/74] Fix -Wstrict-aliasing compiler warnings --- wavpack-strict-aliasing.patch | 13 +++++++++++++ wavpack.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 wavpack-strict-aliasing.patch diff --git a/wavpack-strict-aliasing.patch b/wavpack-strict-aliasing.patch new file mode 100644 index 0000000..8229af0 --- /dev/null +++ b/wavpack-strict-aliasing.patch @@ -0,0 +1,13 @@ +diff -up wavpack-4.60.1/cli/md5.c.strict_aliasing wavpack-4.60.1/cli/md5.c +--- wavpack-4.60.1/cli/md5.c.strict_aliasing 2009-12-01 05:24:52.000000000 +0100 ++++ wavpack-4.60.1/cli/md5.c 2013-01-03 18:38:00.647181420 +0100 +@@ -151,8 +151,7 @@ void MD5Final(digest, ctx) + byteReverse(ctx->in, 14); + + /* Append length in bits and transform */ +- ((uint32 *) ctx->in)[14] = ctx->bits[0]; +- ((uint32 *) ctx->in)[15] = ctx->bits[1]; ++ memcpy(ctx->in + 14 * sizeof (uint32), ctx->bits, 2 * sizeof (uint32)); + + MD5Transform(ctx->buf, (uint32 *) ctx->in); + byteReverse((unsigned char *) ctx->buf, 4); diff --git a/wavpack.spec b/wavpack.spec index d3a8830..5aca4c5 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,12 +1,13 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 Patch1: wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch +Patch2: wavpack-strict-aliasing.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,6 +29,7 @@ Files needed for developing apps using wavpack %prep %setup -q %patch1 -p1 -b .pkgconfig_values +%patch2 -p1 -b .strict_aliasing %build %configure --disable-static @@ -62,6 +64,9 @@ rm -rf %{buildroot} %doc ChangeLog README doc/* %changelog +* Thu Jan 3 2013 Miroslav Lichvar 4.60.1-5 +- Fix -Wstrict-aliasing compiler warnings + * Sun Jul 22 2012 Fedora Release Engineering - 4.60.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4a04d9f05b3295f4b00bf5c47fb2136b2682e7cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:59:32 -0600 Subject: [PATCH 08/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 5aca4c5..b7137e1 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -64,6 +64,9 @@ rm -rf %{buildroot} %doc ChangeLog README doc/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 4.60.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jan 3 2013 Miroslav Lichvar 4.60.1-5 - Fix -Wstrict-aliasing compiler warnings From 739f1e1259e88c69feb3daa7336fd9aa1e058f9e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 21 Jul 2013 21:58:14 +0400 Subject: [PATCH 09/74] Reconfigure to allow building on AArch64 Signed-off-by: Peter Lemenkov --- wavpack.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index b7137e1..d820f6c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,14 +1,17 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 Patch1: wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch Patch2: wavpack-strict-aliasing.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# For autoreconf +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description WavPack is a completely open audio compression format providing lossless, @@ -20,7 +23,7 @@ performance and functionality. %package devel Summary: WavPack - development files Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -32,11 +35,11 @@ Files needed for developing apps using wavpack %patch2 -p1 -b .strict_aliasing %build +autoreconf -ivf %configure --disable-static make %{?_smp_mflags} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -f %{buildroot}/%{_libdir}/*.la @@ -44,11 +47,7 @@ rm -f %{buildroot}/%{_libdir}/*.la %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %{_bindir}/* %{_libdir}/libwavpack.so.* %{_mandir}/man1/wavpack.1* @@ -57,13 +56,16 @@ rm -rf %{buildroot} %doc license.txt %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/libwavpack.so %doc ChangeLog README doc/* %changelog +* Sun Jul 21 2013 Peter Lemenkov - 4.60.1-7 +- Reconfigure to allow building on AArch64 +- Cleanup spec-file + * Fri Feb 15 2013 Fedora Release Engineering - 4.60.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 986ce54b797377d632f23bce3b725a487bc44b4b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:39:33 -0500 Subject: [PATCH 10/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index d820f6c..03faa3e 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.60.1 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -62,6 +62,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README doc/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 4.60.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Jul 21 2013 Peter Lemenkov - 4.60.1-7 - Reconfigure to allow building on AArch64 - Cleanup spec-file From d5f0486b795e17b3e7b5be326230e539e7928a39 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 17 Feb 2014 16:58:19 +0400 Subject: [PATCH 11/74] Ver. 4.70.0 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- ...x-Wstrict-aliasing-compiler-warnings.patch | 12 +++++-- ...xed-default-values-in-pkgconfig-file.patch | 32 ------------------- wavpack.spec | 17 +++++----- 5 files changed, 20 insertions(+), 44 deletions(-) rename wavpack-strict-aliasing.patch => wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch (62%) delete mode 100644 wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch diff --git a/.gitignore b/.gitignore index 083640c..8fd0d27 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wavpack-4.60.0.tar.bz2 /wavpack-4.60.1.tar.bz2 +/wavpack-4.70.0.tar.bz2 diff --git a/sources b/sources index 35325dd..bb92bbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 +4c0186ef0dc8367ce5cd7cc0f398b714 wavpack-4.70.0.tar.bz2 diff --git a/wavpack-strict-aliasing.patch b/wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch similarity index 62% rename from wavpack-strict-aliasing.patch rename to wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch index 8229af0..fea6e63 100644 --- a/wavpack-strict-aliasing.patch +++ b/wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch @@ -1,6 +1,12 @@ -diff -up wavpack-4.60.1/cli/md5.c.strict_aliasing wavpack-4.60.1/cli/md5.c ---- wavpack-4.60.1/cli/md5.c.strict_aliasing 2009-12-01 05:24:52.000000000 +0100 -+++ wavpack-4.60.1/cli/md5.c 2013-01-03 18:38:00.647181420 +0100 +From: Miroslav Lichvar +Date: Thu, 3 Jan 2013 18:31:33 +0100 +Subject: [PATCH] Fix -Wstrict-aliasing compiler warnings + + +diff --git a/cli/md5.c b/cli/md5.c +index 1700240..a9954c2 100644 +--- a/cli/md5.c ++++ b/cli/md5.c @@ -151,8 +151,7 @@ void MD5Final(digest, ctx) byteReverse(ctx->in, 14); diff --git a/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch b/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch deleted file mode 100644 index be205b3..0000000 --- a/wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 194af7649ea958e6609289e8d210e66b168d57cf Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sun, 9 Jan 2011 16:10:20 +0300 -Subject: [PATCH] Fixed default values in pkgconfig file - -Signed-off-by: Peter Lemenkov ---- - wavpack.pc.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/wavpack.pc.in b/wavpack.pc.in -index fe6b231..58e74ac 100644 ---- a/wavpack.pc.in -+++ b/wavpack.pc.in -@@ -1,5 +1,5 @@ - prefix=@prefix@ --libdir=${prefix}/lib -+libdir=@libdir@ - includedir=${prefix}/include - - Name: wavpack -@@ -7,5 +7,5 @@ Description: wavpack library - Version: @PACKAGE_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} -lwavpack @LIBM@ @ICONV@ --Cflags: -I${includedir} -+Libs: -lwavpack @LIBM@ @ICONV@ -+Cflags: --- -1.7.2.3 - diff --git a/wavpack.spec b/wavpack.spec index 03faa3e..fae92af 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,13 +1,12 @@ Name: wavpack Summary: A completely open audiocodec -Version: 4.60.1 -Release: 8%{?dist} +Version: 4.70.0 +Release: 1%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack-0001-Fixed-default-values-in-pkgconfig-file.patch -Patch2: wavpack-strict-aliasing.patch +Patch1: wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -31,8 +30,7 @@ Files needed for developing apps using wavpack %prep %setup -q -%patch1 -p1 -b .pkgconfig_values -%patch2 -p1 -b .strict_aliasing +%patch1 -p1 -b .strict_aliasing %build autoreconf -ivf @@ -53,15 +51,18 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wavpack.1* %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* -%doc license.txt +%doc AUTHORS COPYING %files devel %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/libwavpack.so -%doc ChangeLog README doc/* +%doc ChangeLog README %changelog +* Mon Feb 17 2014 Peter Lemenkov - 4.70.0-1 +- Ver. 4.70.0 + * Sun Aug 04 2013 Fedora Release Engineering - 4.60.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 4eb797b7a1e8fb2aac33675b0981f288d5bc0613 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:15:11 -0500 Subject: [PATCH 12/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index fae92af..0f3751c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.70.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -60,6 +60,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.70.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Feb 17 2014 Peter Lemenkov - 4.70.0-1 - Ver. 4.70.0 From 9e58c5529f1668bd1ed1e1fcb5b1c0a558b27b3f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:19:53 +0000 Subject: [PATCH 13/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 0f3751c..7aaccd7 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.70.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -60,6 +60,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.70.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 4.70.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 06b31526a2d6e1bc47ffd8938b556f090af7ff5b Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:19:04 +0100 Subject: [PATCH 14/74] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- wavpack.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 7aaccd7..bf81004 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.70.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -60,6 +60,10 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sat Feb 21 2015 Till Maas - 4.70.0-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Mon Aug 18 2014 Fedora Release Engineering - 4.70.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From c812df64c7ba73c9b241715007e72677003ba08c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:16:36 +0000 Subject: [PATCH 15/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index bf81004..ca81b1b 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.70.0 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -60,6 +60,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 4.70.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 21 2015 Till Maas - 4.70.0-4 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From da98e17fa952e17235841f041bb86cfe70efbcfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:54:53 +0000 Subject: [PATCH 16/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index ca81b1b..641caf4 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.70.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -60,6 +60,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 4.70.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 4.70.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 7b47e442f7301759b3c80845fc2bd4dff043c316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 6 Apr 2016 18:06:09 +0100 Subject: [PATCH 17/74] Update to 4.75.2 --- .gitignore | 1 + sources | 2 +- ...x-Wstrict-aliasing-compiler-warnings.patch | 19 ------------------- wavpack.spec | 9 +++++---- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch diff --git a/.gitignore b/.gitignore index 8fd0d27..eef6ed6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ wavpack-4.60.0.tar.bz2 /wavpack-4.60.1.tar.bz2 /wavpack-4.70.0.tar.bz2 +/wavpack-4.75.2.tar.bz2 diff --git a/sources b/sources index bb92bbe..03ee51a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c0186ef0dc8367ce5cd7cc0f398b714 wavpack-4.70.0.tar.bz2 +e8bbc4c3382f9148918ad7b896e10ac1 wavpack-4.75.2.tar.bz2 diff --git a/wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch b/wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch deleted file mode 100644 index fea6e63..0000000 --- a/wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Miroslav Lichvar -Date: Thu, 3 Jan 2013 18:31:33 +0100 -Subject: [PATCH] Fix -Wstrict-aliasing compiler warnings - - -diff --git a/cli/md5.c b/cli/md5.c -index 1700240..a9954c2 100644 ---- a/cli/md5.c -+++ b/cli/md5.c -@@ -151,8 +151,7 @@ void MD5Final(digest, ctx) - byteReverse(ctx->in, 14); - - /* Append length in bits and transform */ -- ((uint32 *) ctx->in)[14] = ctx->bits[0]; -- ((uint32 *) ctx->in)[15] = ctx->bits[1]; -+ memcpy(ctx->in + 14 * sizeof (uint32), ctx->bits, 2 * sizeof (uint32)); - - MD5Transform(ctx->buf, (uint32 *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); diff --git a/wavpack.spec b/wavpack.spec index 641caf4..e050fae 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,12 +1,11 @@ Name: wavpack Summary: A completely open audiocodec -Version: 4.70.0 -Release: 6%{?dist} +Version: 4.75.2 +Release: 1%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack-0001-Fix-Wstrict-aliasing-compiler-warnings.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -30,7 +29,6 @@ Files needed for developing apps using wavpack %prep %setup -q -%patch1 -p1 -b .strict_aliasing %build autoreconf -ivf @@ -60,6 +58,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Mon Mar 28 2016 Sérgio Basto - 4.75.2-1 +- Update to 4.75.2 + * Fri Feb 05 2016 Fedora Release Engineering - 4.70.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0daa6ae8d8aa6af26e15783860393dce5c6cd0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 21 Apr 2016 05:57:41 +0100 Subject: [PATCH 18/74] Update wavpack to 4.80.0 --- .gitignore | 1 + sources | 2 +- wavpack.spec | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eef6ed6..5762745 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ wavpack-4.60.0.tar.bz2 /wavpack-4.60.1.tar.bz2 /wavpack-4.70.0.tar.bz2 /wavpack-4.75.2.tar.bz2 +/wavpack-4.80.0.tar.bz2 diff --git a/sources b/sources index 03ee51a..07059c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8bbc4c3382f9148918ad7b896e10ac1 wavpack-4.75.2.tar.bz2 +0f2f1184813dce1caf51b52af615ec17 wavpack-4.80.0.tar.bz2 diff --git a/wavpack.spec b/wavpack.spec index e050fae..f8a6d39 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,6 +1,6 @@ Name: wavpack Summary: A completely open audiocodec -Version: 4.75.2 +Version: 4.80.0 Release: 1%{?dist} License: BSD Group: Applications/Multimedia @@ -32,7 +32,16 @@ Files needed for developing apps using wavpack %build autoreconf -ivf -%configure --disable-static +# Debian and Buildroot recomendation: +# WavPack "autodetects" CPU type to enable ASM code. However, the assembly code +# for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 +# architecture will fail. +# http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html +%configure --disable-static \ +%ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl + --disable-asm \ +%endif + make %{?_smp_mflags} %install @@ -58,6 +67,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Thu Apr 21 2016 Sérgio Basto - 4.80.0-1 +- Update wavpack to 4.80.0 + * Mon Mar 28 2016 Sérgio Basto - 4.75.2-1 - Update to 4.75.2 From a63bee23906f8338d7c9da69f06cba2cab89bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 1 Feb 2017 05:30:52 +0000 Subject: [PATCH 19/74] Update wavpack to 5.1.0 --- .gitignore | 1 + sources | 2 +- wavpack.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5762745..9d153c0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ wavpack-4.60.0.tar.bz2 /wavpack-4.70.0.tar.bz2 /wavpack-4.75.2.tar.bz2 /wavpack-4.80.0.tar.bz2 +/wavpack-5.1.0.tar.bz2 diff --git a/sources b/sources index 07059c7..98d5eff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f2f1184813dce1caf51b52af615ec17 wavpack-4.80.0.tar.bz2 +SHA512 (wavpack-5.1.0.tar.bz2) = 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 diff --git a/wavpack.spec b/wavpack.spec index f8a6d39..f994811 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,6 +1,6 @@ Name: wavpack Summary: A completely open audiocodec -Version: 4.80.0 +Version: 5.1.0 Release: 1%{?dist} License: BSD Group: Applications/Multimedia @@ -58,6 +58,7 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wavpack.1* %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* +%{_mandir}/man1/wvtag.1.* %doc AUTHORS COPYING %files devel @@ -67,6 +68,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Wed Feb 01 2017 Sérgio Basto - 5.1.0-1 +- Update wavpack to 5.1.0 + * Thu Apr 21 2016 Sérgio Basto - 4.80.0-1 - Update wavpack to 4.80.0 From 5a9ea9d0724984eca00ca8886555d948bb3945d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:16:01 +0000 Subject: [PATCH 20/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index f994811..e395042 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -68,6 +68,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Sérgio Basto - 5.1.0-1 - Update wavpack to 5.1.0 From b7c408374fee549bc1a224d90acc8ff371042bef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:30:35 +0000 Subject: [PATCH 21/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index e395042..47a1cf3 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -68,6 +68,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 74c477022ae443e7f30959ad7ca995e6ac39b87b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:12:06 +0000 Subject: [PATCH 22/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 47a1cf3..87f14db 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -68,6 +68,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 5.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b2f07e42537df920f0232163df5185f49111484e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 17:42:37 +0100 Subject: [PATCH 23/74] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- wavpack.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index 87f14db..02c7f8f 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -48,9 +48,7 @@ make %{?_smp_mflags} make DESTDIR=%{buildroot} install rm -f %{buildroot}/%{_libdir}/*.la -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{_bindir}/* @@ -68,6 +66,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sat Feb 03 2018 Igor Gnatenko - 5.1.0-5 +- Switch to %%ldconfig_scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4358098900042eaff8743a3707a57ed0b9ecc40b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:46:38 +0000 Subject: [PATCH 24/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 02c7f8f..71b90a5 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -66,6 +66,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 5.1.0-5 - Switch to %%ldconfig_scriptlets From be8d9f333fca9df19894a907d33aded11cb16cbc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 20 Feb 2018 17:21:14 +0300 Subject: [PATCH 25/74] Fix for CVE-2018-6767, CVE-2018-7253, and two more GH issues Signed-off-by: Peter Lemenkov --- ...overwrite-stack-on-corrupt-RF64-file.patch | 108 ++++++++++++++++++ ...overwrite-heap-on-corrupt-DSDIFF-fil.patch | 28 +++++ ...fer-overflows-and-bad-allocs-on-corr.patch | 62 ++++++++++ wavpack.spec | 10 +- 4 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch create mode 100644 wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch create mode 100644 wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch diff --git a/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch b/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch new file mode 100644 index 0000000..e58eea3 --- /dev/null +++ b/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch @@ -0,0 +1,108 @@ +From: David Bryant +Date: Sun, 4 Feb 2018 11:28:15 -0800 +Subject: [PATCH] issue #27, do not overwrite stack on corrupt RF64 file + + +diff --git a/cli/riff.c b/cli/riff.c +index 8b1af45..de98c1e 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -42,6 +42,7 @@ typedef struct { + + #pragma pack(pop) + ++#define CS64ChunkFormat "4D" + #define DS64ChunkFormat "DDDL" + + #define WAVPACK_NO_ERROR 0 +@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + if (!strncmp (chunk_header.ckID, "ds64", 4)) { + if (chunk_header.ckSize < sizeof (DS64Chunk) || +- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || +- bcount != chunk_header.ckSize) { ++ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || ++ bcount != sizeof (DS64Chunk)) { + error_line ("%s is not a valid .WAV file!", infilename); + return WAVPACK_SOFT_ERROR; + } + else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && +- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { ++ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { + error_line ("%s", WavpackGetErrorMessage (wpc)); + return WAVPACK_SOFT_ERROR; + } +@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + + int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) + { +- int do_rf64 = 0, write_junk = 1; ++ int do_rf64 = 0, write_junk = 1, table_length = 0; + ChunkHeader ds64hdr, datahdr, fmthdr; + RiffChunkHeader riffhdr; + DS64Chunk ds64_chunk; ++ CS64Chunk cs64_chunk; + JunkChunk junkchunk; + WaveHeader wavhdr; + uint32_t bcount; +@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); + total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); + if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); ++ total_riff_bytes += table_length * sizeof (CS64Chunk); + if (write_junk) total_riff_bytes += sizeof (junkchunk); + strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); + strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); +@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (do_rf64) { + strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); +- ds64hdr.ckSize = sizeof (ds64_chunk); ++ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); + CLEAR (ds64_chunk); + ds64_chunk.riffSize64 = total_riff_bytes; + ds64_chunk.dataSize64 = total_data_bytes; + ds64_chunk.sampleCount64 = total_samples; ++ ds64_chunk.tableLength = table_length; + riffhdr.ckSize = (uint32_t) -1; + datahdr.ckSize = (uint32_t) -1; + WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); +@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + datahdr.ckSize = (uint32_t) total_data_bytes; + } + ++ // this "table" is just a dummy placeholder for testing (normally not written) ++ ++ if (table_length) { ++ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); ++ cs64_chunk.chunkSize64 = 12345678; ++ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); ++ } ++ + // write the RIFF chunks up to just before the data starts + + WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); +@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, + + if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || + (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || +- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || +- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || ++ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ // again, this is normally not written except for testing ++ ++ while (table_length--) ++ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { ++ error_line ("can't write .WAV data, disk probably full!"); ++ return FALSE; ++ } ++ ++ ++ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || + !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || + !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || + !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { diff --git a/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch b/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch new file mode 100644 index 0000000..cba8f3c --- /dev/null +++ b/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch @@ -0,0 +1,28 @@ +From: David Bryant +Date: Sat, 10 Feb 2018 16:01:39 -0800 +Subject: [PATCH] issue #28, do not overwrite heap on corrupt DSDIFF file + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index 410dc1c..c016df9 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + error_line ("dsdiff file version = 0x%08x", version); + } + else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { +- char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); ++ char *prop_chunk; ++ ++ if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ if (debug_logging_mode) ++ error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); ++ ++ prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); + + if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || + bcount != dff_chunk_header.ckDataSize) { diff --git a/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch b/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch new file mode 100644 index 0000000..0e182f6 --- /dev/null +++ b/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch @@ -0,0 +1,62 @@ +From: David Bryant +Date: Sun, 11 Feb 2018 16:37:47 -0800 +Subject: [PATCH] issue #28, fix buffer overflows and bad allocs on corrupt CAF + files + + +diff --git a/cli/caff.c b/cli/caff.c +index ae57c4b..6248a71 100644 +--- a/cli/caff.c ++++ b/cli/caff.c +@@ -89,8 +89,8 @@ typedef struct + + #define CAFChannelDescriptionFormat "LLLLL" + +-static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; +-static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; ++static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; ++static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; + + static struct { + uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word +@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + } + } + else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { +- CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); ++ CAFChannelLayout *caf_channel_layout; + +- if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || +- !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || ++ if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { ++ error_line ("this .CAF file has an invalid 'chan' chunk!"); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ if (debug_logging_mode) ++ error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); ++ ++ caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); ++ ++ if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || + bcount != caf_chunk_header.mChunkSize) { + error_line ("%s is not a valid .CAF file!", infilename); + free (caf_channel_layout); +@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + } + else { // just copy unknown chunks to output file + +- int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; +- char *buff = malloc (bytes_to_copy); ++ uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; ++ char *buff; ++ ++ if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { ++ error_line ("%s is not a valid .CAF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/wavpack.spec b/wavpack.spec index 71b90a5..952c55f 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,11 +1,14 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 +Patch1: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch +Patch2: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch +Patch3: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -28,7 +31,7 @@ Requires: pkgconfig Files needed for developing apps using wavpack %prep -%setup -q +%autosetup -p1 %build autoreconf -ivf @@ -66,6 +69,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Tue Feb 20 2018 Peter Lemenkov - 5.1.0-7 +- Fix for CVE-2018-6767, CVE-2018-7253, and two more GH issues + * Fri Feb 09 2018 Fedora Release Engineering - 5.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 273e47cb1dfa3040ba92a1f8b09d42c1ccf0dd89 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 22 May 2018 12:01:14 +0200 Subject: [PATCH 26/74] Fix for CVE-2018-10536, CVE-2018-10537, CVE-2018-10538, CVE-2018-10539, CVE-2018-10540 --- ...e-size-of-unknown-chunks-before-mall.patch | 75 +++++++++++++++++++ ...1-issue-32-no-multiple-format-chunks.patch | 63 ++++++++++++++++ wavpack.spec | 8 +- 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch create mode 100644 wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch diff --git a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch new file mode 100644 index 0000000..421ef50 --- /dev/null +++ b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch @@ -0,0 +1,75 @@ +From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 17:27:01 -0700 +Subject: [PATCH 1/2] issue #33, sanitize size of unknown chunks before + malloc() + +--- + cli/dsdiff.c | 9 ++++++++- + cli/riff.c | 9 ++++++++- + cli/wave64.c | 9 ++++++++- + 3 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index c016df9..fa56bbb 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + else { // just copy unknown chunks to output file + + int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git a/cli/riff.c b/cli/riff.c +index de98c1e..7bddf63 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else { // just copy unknown chunks to output file + + int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git a/cli/wave64.c b/cli/wave64.c +index 591d640..fa928a0 100644 +--- a/cli/wave64.c ++++ b/cli/wave64.c +@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + else { // just copy unknown chunks to output file + int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +-- +2.14.3 + diff --git a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch new file mode 100644 index 0000000..1bd1d2f --- /dev/null +++ b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch @@ -0,0 +1,63 @@ +From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 22:18:07 -0700 +Subject: [PATCH 2/2] issue #30 issue #31 issue #32: no multiple format chunks + in WAV or W64 + +--- + cli/riff.c | 7 ++++++- + cli/wave64.c | 6 ++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/cli/riff.c b/cli/riff.c +index 7bddf63..5d6452e 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -53,7 +53,7 @@ extern int debug_logging_mode; + + int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) + { +- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; ++ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; + int64_t total_samples = 0, infilesize; + RiffChunkHeader riff_chunk_header; + ChunkHeader chunk_header; +@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and + int supported = TRUE, format; // make sure it's a .wav file we can handle + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || + !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || + bcount != chunk_header.ckSize) { +diff --git a/cli/wave64.c b/cli/wave64.c +index fa928a0..0388dc7 100644 +--- a/cli/wave64.c ++++ b/cli/wave64.c +@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + Wave64ChunkHeader chunk_header; + Wave64FileHeader filehdr; + WaveHeader WaveHeader; ++ int format_chunk = 0; + uint32_t bcount; + + infilesize = DoGetFileSize (infile); +@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { + int supported = TRUE, format; + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; + + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || +-- +2.14.3 + diff --git a/wavpack.spec b/wavpack.spec index 952c55f..808a055 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -9,6 +9,8 @@ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 Patch1: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch Patch2: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch Patch3: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch +Patch4: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch +Patch5: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -69,6 +71,10 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Tue May 22 2018 Miroslav Lichvar - 5.1.0-8 +- Fix for CVE-2018-10536, CVE-2018-10537, CVE-2018-10538, CVE-2018-10539, + CVE-2018-10540 + * Tue Feb 20 2018 Peter Lemenkov - 5.1.0-7 - Fix for CVE-2018-6767, CVE-2018-7253, and two more GH issues From 5b387d78a23bc731770f2b9238488ea9953f1592 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:44:05 +0000 Subject: [PATCH 27/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 808a055..29b7014 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -71,6 +71,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue May 22 2018 Miroslav Lichvar - 5.1.0-8 - Fix for CVE-2018-10536, CVE-2018-10537, CVE-2018-10538, CVE-2018-10539, CVE-2018-10540 From ba87f01dcec5c6af186a6d78f0d4775fe4ba16b4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 28/74] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- wavpack.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index 29b7014..4ae3fe4 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -3,7 +3,6 @@ Summary: A completely open audiocodec Version: 5.1.0 Release: 9%{?dist} License: BSD -Group: Applications/Multimedia Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 Patch1: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch @@ -25,7 +24,6 @@ performance and functionality. %package devel Summary: WavPack - development files -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig From 7afc12b732435b0efed57d5cabeee2f3898ac4e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:33:42 +0000 Subject: [PATCH 29/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 4ae3fe4..946c280 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 5.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 5.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 88a53b2c995f65fbace639262890f92e0517f59a Mon Sep 17 00:00:00 2001 From: Felipe Borges Date: Thu, 28 Feb 2019 11:19:21 +0100 Subject: [PATCH 30/74] Make the manual pages decompression format agnostic It is recommended in the Fedora packaging guidelines to have %{_mandir}/man1/.1* which is more robust against future changes to the RPM scritps to use different compression. --- wavpack.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 29b7014..2c46eff 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -61,7 +61,7 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wavpack.1* %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* -%{_mandir}/man1/wvtag.1.* +%{_mandir}/man1/wvtag.1* %doc AUTHORS COPYING %files devel From 41d2bb624bef4cfc1e9b6a71892cf3d44aca51a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 28 Feb 2019 23:11:13 +0000 Subject: [PATCH 31/74] Make the manual pages decompression format agnostic --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 8aec986..914fc6c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Thu Feb 28 2019 Sérgio Basto - 5.1.0-11 +- Make the manual pages decompression format agnostic + * Sun Feb 03 2019 Fedora Release Engineering - 5.1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From abbd04c47f9e222fb1c2c0c0345f45f7b83b9d5b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Apr 2019 12:03:42 +0300 Subject: [PATCH 32/74] Fix for CVE-2018-19840, CVE-2018-19841 Signed-off-by: Peter Lemenkov --- .gitignore | 8 ++---- ...e-size-of-unknown-chunks-before-mall.patch | 12 +-------- ...1-issue-32-no-multiple-format-chunks.patch | 12 ++------- ...sue-53-error-out-on-zero-sample-rate.patch | 21 ++++++++++++++++ ...ix-potential-out-of-bounds-heap-read.patch | 25 +++++++++++++++++++ wavpack.spec | 16 ++++++++---- 6 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch create mode 100644 wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch diff --git a/.gitignore b/.gitignore index 9d153c0..ebd4f21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -wavpack-4.60.0.tar.bz2 -/wavpack-4.60.1.tar.bz2 -/wavpack-4.70.0.tar.bz2 -/wavpack-4.75.2.tar.bz2 -/wavpack-4.80.0.tar.bz2 -/wavpack-5.1.0.tar.bz2 +*~ +/wavpack-[0-9]*.[0-9]*.[0-9]*.tar.bz2 diff --git a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch index 421ef50..52fc237 100644 --- a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch +++ b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch @@ -1,14 +1,7 @@ -From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 24 Apr 2018 17:27:01 -0700 -Subject: [PATCH 1/2] issue #33, sanitize size of unknown chunks before - malloc() +Subject: [PATCH] issue #33, sanitize size of unknown chunks before malloc() ---- - cli/dsdiff.c | 9 ++++++++- - cli/riff.c | 9 ++++++++- - cli/wave64.c | 9 ++++++++- - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/cli/dsdiff.c b/cli/dsdiff.c index c016df9..fa56bbb 100644 @@ -70,6 +63,3 @@ index 591d640..fa928a0 100644 if (debug_logging_mode) error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", --- -2.14.3 - diff --git a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch index 1bd1d2f..b1f4afd 100644 --- a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch +++ b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch @@ -1,13 +1,8 @@ -From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 24 Apr 2018 22:18:07 -0700 -Subject: [PATCH 2/2] issue #30 issue #31 issue #32: no multiple format chunks - in WAV or W64 +Subject: [PATCH] issue #30 issue #31 issue #32: no multiple format chunks in + WAV or W64 ---- - cli/riff.c | 7 ++++++- - cli/wave64.c | 6 ++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cli/riff.c b/cli/riff.c index 7bddf63..5d6452e 100644 @@ -58,6 +53,3 @@ index fa928a0..0388dc7 100644 chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || --- -2.14.3 - diff --git a/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch b/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch new file mode 100644 index 0000000..0dd06d6 --- /dev/null +++ b/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch @@ -0,0 +1,21 @@ +From: David Bryant +Date: Thu, 29 Nov 2018 21:00:42 -0800 +Subject: [PATCH] issue #53: error out on zero sample rate + + +diff --git a/src/pack_utils.c b/src/pack_utils.c +index 1918c18..ee3debf 100644 +--- a/src/pack_utils.c ++++ b/src/pack_utils.c +@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 + int num_chans = config->num_channels; + int i; + ++ if (!config->sample_rate) { ++ strcpy (wpc->error_message, "sample rate cannot be zero!"); ++ return FALSE; ++ } ++ + wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; + + if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch b/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch new file mode 100644 index 0000000..a915641 --- /dev/null +++ b/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch @@ -0,0 +1,25 @@ +From: David Bryant +Date: Thu, 29 Nov 2018 21:53:51 -0800 +Subject: [PATCH] issue #54: fix potential out-of-bounds heap read + + +diff --git a/src/open_utils.c b/src/open_utils.c +index fc9440c..ce0879c 100644 +--- a/src/open_utils.c ++++ b/src/open_utils.c +@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) + #endif + + if (meta_bc == 4) { +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) + return FALSE; + } + else { + csum ^= csum >> 16; + +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) + return FALSE; + } + diff --git a/wavpack.spec b/wavpack.spec index 914fc6c..d4e27ea 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -10,6 +10,8 @@ Patch2: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch Patch3: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch Patch4: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch Patch5: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch +Patch6: wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch +Patch7: wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -38,17 +40,17 @@ autoreconf -ivf # Debian and Buildroot recomendation: # WavPack "autodetects" CPU type to enable ASM code. However, the assembly code # for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 -# architecture will fail. +# architecture will fail. # http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html %configure --disable-static \ -%ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl +%ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl --disable-asm \ %endif make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +%make_install rm -f %{buildroot}/%{_libdir}/*.la %ldconfig_scriptlets @@ -60,7 +62,8 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* %{_mandir}/man1/wvtag.1* -%doc AUTHORS COPYING +%doc AUTHORS +%license COPYING %files devel %{_includedir}/* @@ -69,6 +72,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Wed Apr 10 2019 Peter Lemenkov - 5.1.0-12 +- Fix for CVE-2018-19840, CVE-2018-19841 + * Thu Feb 28 2019 Sérgio Basto - 5.1.0-11 - Make the manual pages decompression format agnostic From b69b5ea9d2fbc130989e7a6a47a900080f721d51 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 17 May 2019 13:26:28 +0300 Subject: [PATCH 33/74] WavPack: fix for CVE-2019-11498 Signed-off-by: Peter Lemenkov --- ...re-DFF-chunk-does-not-have-negative-.patch | 18 +++++++++ ...ero-channel-count-in-DSF-and-DSDIFF-.patch | 34 ++++++++++++++++ ...re-DSDIFF-files-have-a-valid-channel.patch | 40 +++++++++++++++++++ ...re-sample-rate-is-specified-and-non-.patch | 28 +++++++++++++ wavpack.spec | 9 ++++- 5 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch create mode 100644 wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch create mode 100644 wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch create mode 100644 wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch diff --git a/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch b/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch new file mode 100644 index 0000000..03fc32c --- /dev/null +++ b/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch @@ -0,0 +1,18 @@ +From: David Bryant +Date: Sun, 26 Aug 2018 20:24:00 -0700 +Subject: [PATCH] issue #41: make sure DFF chunk does not have negative length + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index fa56bbb..c65aed3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -188,7 +188,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + cptr += sizeof (dff_chunk_header); + WavpackBigEndianToNative (&dff_chunk_header, DFFChunkHeaderFormat); + +- if (eptr - cptr >= dff_chunk_header.ckDataSize) { ++ if (dff_chunk_header.ckDataSize > 0 && dff_chunk_header.ckDataSize <= eptr - cptr) { + if (!strncmp (dff_chunk_header.ckID, "FS ", 4) && dff_chunk_header.ckDataSize == 4) { + memcpy (&sampleRate, cptr, sizeof (sampleRate)); + WavpackBigEndianToNative (&sampleRate, "L"); diff --git a/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch b/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch new file mode 100644 index 0000000..02025ae --- /dev/null +++ b/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch @@ -0,0 +1,34 @@ +From: David Bryant +Date: Sun, 26 Aug 2018 21:25:38 -0700 +Subject: [PATCH] issue #43: catch zero channel count in DSF and DSDIFF files + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index c65aed3..738a46b 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -204,6 +204,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + + chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; + ++ if (numChannels < chansSpecified || numChannels < 1) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ free (prop_chunk); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + while (chansSpecified--) { + if (!strncmp (cptr, "SLFT", 4) || !strncmp (cptr, "MLFT", 4)) + chanMask |= 0x1; +diff --git a/cli/dsf.c b/cli/dsf.c +index cd82ae9..d12e409 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -122,6 +122,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || ++ format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { + error_line ("%s is not a valid .DSF file!", infilename); + return WAVPACK_SOFT_ERROR; diff --git a/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch b/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch new file mode 100644 index 0000000..0ab6843 --- /dev/null +++ b/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch @@ -0,0 +1,40 @@ +From: David Bryant +Date: Sat, 2 Mar 2019 18:37:14 -0800 +Subject: [PATCH] issue #65: make sure DSDIFF files have a valid channel count + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index 738a46b..1d637d7 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -180,7 +180,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + + if (!strncmp (prop_chunk, "SND ", 4)) { + char *cptr = prop_chunk + 4, *eptr = prop_chunk + dff_chunk_header.ckDataSize; +- uint16_t numChannels, chansSpecified, chanMask = 0; ++ uint16_t numChannels = 0, chansSpecified, chanMask = 0; + uint32_t sampleRate; + + while (eptr - cptr >= sizeof (dff_chunk_header)) { +@@ -204,7 +204,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + + chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; + +- if (numChannels < chansSpecified || numChannels < 1) { ++ if (numChannels < chansSpecified || numChannels < 1 || numChannels > 256) { + error_line ("%s is not a valid .DFF file!", infilename); + free (prop_chunk); + return WAVPACK_SOFT_ERROR; +@@ -279,6 +279,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + free (prop_chunk); + } + else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { ++ ++ if (!config->num_channels) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + total_samples = dff_chunk_header.ckDataSize / config->num_channels; + break; + } diff --git a/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch b/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch new file mode 100644 index 0000000..ee1197d --- /dev/null +++ b/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch @@ -0,0 +1,28 @@ +From: David Bryant +Date: Tue, 5 Mar 2019 21:32:27 -0800 +Subject: [PATCH] issue #67: make sure sample rate is specified and non-zero in + DFF files + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index 1d637d7..32d276c 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -181,7 +181,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + if (!strncmp (prop_chunk, "SND ", 4)) { + char *cptr = prop_chunk + 4, *eptr = prop_chunk + dff_chunk_header.ckDataSize; + uint16_t numChannels = 0, chansSpecified, chanMask = 0; +- uint32_t sampleRate; ++ uint32_t sampleRate = 0; + + while (eptr - cptr >= sizeof (dff_chunk_header)) { + memcpy (&dff_chunk_header, cptr, sizeof (dff_chunk_header)); +@@ -280,7 +280,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { + +- if (!config->num_channels) { ++ if (!config->num_channels || !config->sample_rate) { + error_line ("%s is not a valid .DFF file!", infilename); + return WAVPACK_SOFT_ERROR; + } diff --git a/wavpack.spec b/wavpack.spec index d4e27ea..e78d15e 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -12,6 +12,10 @@ Patch4: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch Patch5: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch Patch6: wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch Patch7: wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch +Patch8: wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch +Patch9: wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch +Patch10: wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch +Patch11: wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -72,6 +76,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Fri May 17 2019 Peter Lemenkov - 5.1.0-13 +- Fix for CVE-2019-11498 + * Wed Apr 10 2019 Peter Lemenkov - 5.1.0-12 - Fix for CVE-2018-19840, CVE-2018-19841 From 3e3b42fe9db0ada41ff80eb8ac90f59aa887ff41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:18:32 +0000 Subject: [PATCH 34/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index e78d15e..15f924f 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -76,6 +76,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 5.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 17 2019 Peter Lemenkov - 5.1.0-13 - Fix for CVE-2019-11498 From ef9d4e48727c3c7850d68a491b1c1a45e8d8e39a Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Mon, 19 Aug 2019 11:39:11 +0200 Subject: [PATCH 35/74] Fix for CVE-2019-1010319 --- ...clear-WaveHeader-at-start-to-prevent-uninit.patch | 12 ++++++++++++ wavpack.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch diff --git a/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch b/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch new file mode 100644 index 0000000..dc4206a --- /dev/null +++ b/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch @@ -0,0 +1,12 @@ +diff --git a/cli/wave64.c b/cli/wave64.c +index 7beffe6..59548b1 100644 +--- a/cli/wave64.c ++++ b/cli/wave64.c +@@ -56,6 +56,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + int format_chunk = 0; + uint32_t bcount; + ++ CLEAR (WaveHeader); + infilesize = DoGetFileSize (infile); + memcpy (&filehdr, fourcc, 4); + diff --git a/wavpack.spec b/wavpack.spec index 15f924f..de8aa15 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -16,6 +16,7 @@ Patch8: wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch Patch9: wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch Patch10: wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch Patch11: wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch +Patch12: wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -76,6 +77,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Mon Aug 19 2019 Tomas Korbar - 5.1.0-15 +- Fix for CVE-2019-1010319 + * Sat Jul 27 2019 Fedora Release Engineering - 5.1.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9354dcc6c0b802f1ae7d1351d774a640071a1a8f Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Mon, 19 Aug 2019 11:55:33 +0200 Subject: [PATCH 36/74] Fix for CVE-2019-1010317 --- ...ake-sure-CAF-files-have-a-desc-chunk.patch | 30 +++++++++++++++++++ wavpack.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch diff --git a/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch b/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch new file mode 100644 index 0000000..57bcaf9 --- /dev/null +++ b/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch @@ -0,0 +1,30 @@ +diff --git a/cli/caff.c b/cli/caff.c +index 2a5e2d9..a35da74 100644 +--- a/cli/caff.c ++++ b/cli/caff.c +@@ -152,7 +152,7 @@ static struct { + + int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) + { +- uint32_t chan_chunk = 0, channel_layout = 0, bcount; ++ uint32_t chan_chunk = 0, desc_chunk = 0, channel_layout = 0, bcount; + unsigned char *channel_identities = NULL; + unsigned char *channel_reorder = NULL; + int64_t total_samples = 0, infilesize; +@@ -218,6 +218,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + } + + WavpackBigEndianToNative (&caf_audio_format, CAFAudioFormatFormat); ++ desc_chunk = 1; + + if (debug_logging_mode) { + char formatstr [5]; +@@ -458,7 +459,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else if (!strncmp (caf_chunk_header.mChunkType, "data", 4)) { // on the data chunk, get size and exit loop + uint32_t mEditCount; + +- if (!DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || ++ if (!desc_chunk || !DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || + bcount != sizeof (mEditCount)) { + error_line ("%s is not a valid .CAF file!", infilename); + return WAVPACK_SOFT_ERROR; diff --git a/wavpack.spec b/wavpack.spec index de8aa15..f77fe75 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.1.0 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -17,6 +17,7 @@ Patch9: wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch Patch10: wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch Patch11: wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch Patch12: wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch +Patch13: wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -77,6 +78,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog README %changelog +* Mon Aug 19 2019 Tomas Korbar - 5.1.0-16 +- Fix for CVE-2019-1010317 + * Mon Aug 19 2019 Tomas Korbar - 5.1.0-15 - Fix for CVE-2019-1010319 From 0efd7c4daf909f81952f74ff178da566b8127b0b Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Thu, 9 Jan 2020 09:52:00 +0100 Subject: [PATCH 37/74] Update to 5.2.0 Resolves: rhbz#1785008 --- sources | 2 +- ...overwrite-stack-on-corrupt-RF64-file.patch | 108 ------------------ ...overwrite-heap-on-corrupt-DSDIFF-fil.patch | 28 ----- ...fer-overflows-and-bad-allocs-on-corr.patch | 62 ---------- ...e-size-of-unknown-chunks-before-mall.patch | 65 ----------- ...1-issue-32-no-multiple-format-chunks.patch | 55 --------- ...sue-53-error-out-on-zero-sample-rate.patch | 21 ---- ...ix-potential-out-of-bounds-heap-read.patch | 25 ---- ...re-DFF-chunk-does-not-have-negative-.patch | 18 --- ...ero-channel-count-in-DSF-and-DSDIFF-.patch | 34 ------ ...re-DSDIFF-files-have-a-valid-channel.patch | 40 ------- ...re-sample-rate-is-specified-and-non-.patch | 28 ----- ...aveHeader-at-start-to-prevent-uninit.patch | 12 -- ...ake-sure-CAF-files-have-a-desc-chunk.patch | 30 ----- wavpack.spec | 24 ++-- 15 files changed, 8 insertions(+), 544 deletions(-) delete mode 100644 wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch delete mode 100644 wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch delete mode 100644 wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch delete mode 100644 wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch delete mode 100644 wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch delete mode 100644 wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch delete mode 100644 wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch delete mode 100644 wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch delete mode 100644 wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch delete mode 100644 wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch delete mode 100644 wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch delete mode 100644 wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch delete mode 100644 wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch diff --git a/sources b/sources index 98d5eff..09c3a23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.1.0.tar.bz2) = 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 +SHA512 (wavpack-5.2.0.tar.bz2) = 456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 diff --git a/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch b/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch deleted file mode 100644 index e58eea3..0000000 --- a/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: David Bryant -Date: Sun, 4 Feb 2018 11:28:15 -0800 -Subject: [PATCH] issue #27, do not overwrite stack on corrupt RF64 file - - -diff --git a/cli/riff.c b/cli/riff.c -index 8b1af45..de98c1e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -42,6 +42,7 @@ typedef struct { - - #pragma pack(pop) - -+#define CS64ChunkFormat "4D" - #define DS64ChunkFormat "DDDL" - - #define WAVPACK_NO_ERROR 0 -@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - if (!strncmp (chunk_header.ckID, "ds64", 4)) { - if (chunk_header.ckSize < sizeof (DS64Chunk) || -- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || -- bcount != chunk_header.ckSize) { -+ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || -+ bcount != sizeof (DS64Chunk)) { - error_line ("%s is not a valid .WAV file!", infilename); - return WAVPACK_SOFT_ERROR; - } - else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && -- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { -+ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { - error_line ("%s", WavpackGetErrorMessage (wpc)); - return WAVPACK_SOFT_ERROR; - } -@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) - { -- int do_rf64 = 0, write_junk = 1; -+ int do_rf64 = 0, write_junk = 1, table_length = 0; - ChunkHeader ds64hdr, datahdr, fmthdr; - RiffChunkHeader riffhdr; - DS64Chunk ds64_chunk; -+ CS64Chunk cs64_chunk; - JunkChunk junkchunk; - WaveHeader wavhdr; - uint32_t bcount; -@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); - total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); - if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); -+ total_riff_bytes += table_length * sizeof (CS64Chunk); - if (write_junk) total_riff_bytes += sizeof (junkchunk); - strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); - strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); -@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (do_rf64) { - strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); -- ds64hdr.ckSize = sizeof (ds64_chunk); -+ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); - CLEAR (ds64_chunk); - ds64_chunk.riffSize64 = total_riff_bytes; - ds64_chunk.dataSize64 = total_data_bytes; - ds64_chunk.sampleCount64 = total_samples; -+ ds64_chunk.tableLength = table_length; - riffhdr.ckSize = (uint32_t) -1; - datahdr.ckSize = (uint32_t) -1; - WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); -@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - datahdr.ckSize = (uint32_t) total_data_bytes; - } - -+ // this "table" is just a dummy placeholder for testing (normally not written) -+ -+ if (table_length) { -+ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); -+ cs64_chunk.chunkSize64 = 12345678; -+ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); -+ } -+ - // write the RIFF chunks up to just before the data starts - - WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); -@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || - (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || -- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || -- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || -+ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ // again, this is normally not written except for testing -+ -+ while (table_length--) -+ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ -+ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || - !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || - !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || - !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { diff --git a/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch b/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch deleted file mode 100644 index cba8f3c..0000000 --- a/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: David Bryant -Date: Sat, 10 Feb 2018 16:01:39 -0800 -Subject: [PATCH] issue #28, do not overwrite heap on corrupt DSDIFF file - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 410dc1c..c016df9 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - error_line ("dsdiff file version = 0x%08x", version); - } - else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { -- char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); -+ char *prop_chunk; -+ -+ if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); -+ -+ prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); - - if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || - bcount != dff_chunk_header.ckDataSize) { diff --git a/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch b/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch deleted file mode 100644 index 0e182f6..0000000 --- a/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: David Bryant -Date: Sun, 11 Feb 2018 16:37:47 -0800 -Subject: [PATCH] issue #28, fix buffer overflows and bad allocs on corrupt CAF - files - - -diff --git a/cli/caff.c b/cli/caff.c -index ae57c4b..6248a71 100644 ---- a/cli/caff.c -+++ b/cli/caff.c -@@ -89,8 +89,8 @@ typedef struct - - #define CAFChannelDescriptionFormat "LLLLL" - --static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; --static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; -+static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; -+static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; - - static struct { - uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word -@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - } - else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { -- CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ CAFChannelLayout *caf_channel_layout; - -- if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || -- !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || -+ if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { -+ error_line ("this .CAF file has an invalid 'chan' chunk!"); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); -+ -+ caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ -+ if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || - bcount != caf_chunk_header.mChunkSize) { - error_line ("%s is not a valid .CAF file!", infilename); - free (caf_channel_layout); -@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - else { // just copy unknown chunks to output file - -- int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -- char *buff = malloc (bytes_to_copy); -+ uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -+ char *buff; -+ -+ if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { -+ error_line ("%s is not a valid .CAF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch deleted file mode 100644 index 52fc237..0000000 --- a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: David Bryant -Date: Tue, 24 Apr 2018 17:27:01 -0700 -Subject: [PATCH] issue #33, sanitize size of unknown chunks before malloc() - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index c016df9..fa56bbb 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - else { // just copy unknown chunks to output file - - int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/riff.c b/cli/riff.c -index de98c1e..7bddf63 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else { // just copy unknown chunks to output file - - int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/wave64.c b/cli/wave64.c -index 591d640..fa928a0 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - else { // just copy unknown chunks to output file - int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch deleted file mode 100644 index b1f4afd..0000000 --- a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: David Bryant -Date: Tue, 24 Apr 2018 22:18:07 -0700 -Subject: [PATCH] issue #30 issue #31 issue #32: no multiple format chunks in - WAV or W64 - - -diff --git a/cli/riff.c b/cli/riff.c -index 7bddf63..5d6452e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -53,7 +53,7 @@ extern int debug_logging_mode; - - int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) - { -- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; -+ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; - int64_t total_samples = 0, infilesize; - RiffChunkHeader riff_chunk_header; - ChunkHeader chunk_header; -@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and - int supported = TRUE, format; // make sure it's a .wav file we can handle - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || - !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || - bcount != chunk_header.ckSize) { -diff --git a/cli/wave64.c b/cli/wave64.c -index fa928a0..0388dc7 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - Wave64ChunkHeader chunk_header; - Wave64FileHeader filehdr; - WaveHeader WaveHeader; -+ int format_chunk = 0; - uint32_t bcount; - - infilesize = DoGetFileSize (infile); -@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { - int supported = TRUE, format; - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; - - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || diff --git a/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch b/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch deleted file mode 100644 index 0dd06d6..0000000 --- a/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: David Bryant -Date: Thu, 29 Nov 2018 21:00:42 -0800 -Subject: [PATCH] issue #53: error out on zero sample rate - - -diff --git a/src/pack_utils.c b/src/pack_utils.c -index 1918c18..ee3debf 100644 ---- a/src/pack_utils.c -+++ b/src/pack_utils.c -@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 - int num_chans = config->num_channels; - int i; - -+ if (!config->sample_rate) { -+ strcpy (wpc->error_message, "sample rate cannot be zero!"); -+ return FALSE; -+ } -+ - wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; - - if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch b/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch deleted file mode 100644 index a915641..0000000 --- a/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: David Bryant -Date: Thu, 29 Nov 2018 21:53:51 -0800 -Subject: [PATCH] issue #54: fix potential out-of-bounds heap read - - -diff --git a/src/open_utils.c b/src/open_utils.c -index fc9440c..ce0879c 100644 ---- a/src/open_utils.c -+++ b/src/open_utils.c -@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) - #endif - - if (meta_bc == 4) { -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) - return FALSE; - } - else { - csum ^= csum >> 16; - -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) - return FALSE; - } - diff --git a/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch b/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch deleted file mode 100644 index 03fc32c..0000000 --- a/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: David Bryant -Date: Sun, 26 Aug 2018 20:24:00 -0700 -Subject: [PATCH] issue #41: make sure DFF chunk does not have negative length - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index fa56bbb..c65aed3 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -188,7 +188,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - cptr += sizeof (dff_chunk_header); - WavpackBigEndianToNative (&dff_chunk_header, DFFChunkHeaderFormat); - -- if (eptr - cptr >= dff_chunk_header.ckDataSize) { -+ if (dff_chunk_header.ckDataSize > 0 && dff_chunk_header.ckDataSize <= eptr - cptr) { - if (!strncmp (dff_chunk_header.ckID, "FS ", 4) && dff_chunk_header.ckDataSize == 4) { - memcpy (&sampleRate, cptr, sizeof (sampleRate)); - WavpackBigEndianToNative (&sampleRate, "L"); diff --git a/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch b/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch deleted file mode 100644 index 02025ae..0000000 --- a/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: David Bryant -Date: Sun, 26 Aug 2018 21:25:38 -0700 -Subject: [PATCH] issue #43: catch zero channel count in DSF and DSDIFF files - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index c65aed3..738a46b 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -204,6 +204,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - - chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; - -+ if (numChannels < chansSpecified || numChannels < 1) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ free (prop_chunk); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - while (chansSpecified--) { - if (!strncmp (cptr, "SLFT", 4) || !strncmp (cptr, "MLFT", 4)) - chanMask |= 0x1; -diff --git a/cli/dsf.c b/cli/dsf.c -index cd82ae9..d12e409 100644 ---- a/cli/dsf.c -+++ b/cli/dsf.c -@@ -122,6 +122,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC - if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || - format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || - (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || -+ format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || - format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { - error_line ("%s is not a valid .DSF file!", infilename); - return WAVPACK_SOFT_ERROR; diff --git a/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch b/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch deleted file mode 100644 index 0ab6843..0000000 --- a/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: David Bryant -Date: Sat, 2 Mar 2019 18:37:14 -0800 -Subject: [PATCH] issue #65: make sure DSDIFF files have a valid channel count - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 738a46b..1d637d7 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -180,7 +180,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - - if (!strncmp (prop_chunk, "SND ", 4)) { - char *cptr = prop_chunk + 4, *eptr = prop_chunk + dff_chunk_header.ckDataSize; -- uint16_t numChannels, chansSpecified, chanMask = 0; -+ uint16_t numChannels = 0, chansSpecified, chanMask = 0; - uint32_t sampleRate; - - while (eptr - cptr >= sizeof (dff_chunk_header)) { -@@ -204,7 +204,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - - chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; - -- if (numChannels < chansSpecified || numChannels < 1) { -+ if (numChannels < chansSpecified || numChannels < 1 || numChannels > 256) { - error_line ("%s is not a valid .DFF file!", infilename); - free (prop_chunk); - return WAVPACK_SOFT_ERROR; -@@ -279,6 +279,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - free (prop_chunk); - } - else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { -+ -+ if (!config->num_channels) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - total_samples = dff_chunk_header.ckDataSize / config->num_channels; - break; - } diff --git a/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch b/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch deleted file mode 100644 index ee1197d..0000000 --- a/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: David Bryant -Date: Tue, 5 Mar 2019 21:32:27 -0800 -Subject: [PATCH] issue #67: make sure sample rate is specified and non-zero in - DFF files - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 1d637d7..32d276c 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -181,7 +181,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - if (!strncmp (prop_chunk, "SND ", 4)) { - char *cptr = prop_chunk + 4, *eptr = prop_chunk + dff_chunk_header.ckDataSize; - uint16_t numChannels = 0, chansSpecified, chanMask = 0; -- uint32_t sampleRate; -+ uint32_t sampleRate = 0; - - while (eptr - cptr >= sizeof (dff_chunk_header)) { - memcpy (&dff_chunk_header, cptr, sizeof (dff_chunk_header)); -@@ -280,7 +280,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { - -- if (!config->num_channels) { -+ if (!config->num_channels || !config->sample_rate) { - error_line ("%s is not a valid .DFF file!", infilename); - return WAVPACK_SOFT_ERROR; - } diff --git a/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch b/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch deleted file mode 100644 index dc4206a..0000000 --- a/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cli/wave64.c b/cli/wave64.c -index 7beffe6..59548b1 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -56,6 +56,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - int format_chunk = 0; - uint32_t bcount; - -+ CLEAR (WaveHeader); - infilesize = DoGetFileSize (infile); - memcpy (&filehdr, fourcc, 4); - diff --git a/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch b/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch deleted file mode 100644 index 57bcaf9..0000000 --- a/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/cli/caff.c b/cli/caff.c -index 2a5e2d9..a35da74 100644 ---- a/cli/caff.c -+++ b/cli/caff.c -@@ -152,7 +152,7 @@ static struct { - - int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) - { -- uint32_t chan_chunk = 0, channel_layout = 0, bcount; -+ uint32_t chan_chunk = 0, desc_chunk = 0, channel_layout = 0, bcount; - unsigned char *channel_identities = NULL; - unsigned char *channel_reorder = NULL; - int64_t total_samples = 0, infilesize; -@@ -218,6 +218,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - - WavpackBigEndianToNative (&caf_audio_format, CAFAudioFormatFormat); -+ desc_chunk = 1; - - if (debug_logging_mode) { - char formatstr [5]; -@@ -458,7 +459,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else if (!strncmp (caf_chunk_header.mChunkType, "data", 4)) { // on the data chunk, get size and exit loop - uint32_t mEditCount; - -- if (!DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || -+ if (!desc_chunk || !DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || - bcount != sizeof (mEditCount)) { - error_line ("%s is not a valid .CAF file!", infilename); - return WAVPACK_SOFT_ERROR; diff --git a/wavpack.spec b/wavpack.spec index f77fe75..d105287 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,23 +1,10 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.1.0 -Release: 16%{?dist} +Version: 5.2.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch -Patch2: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch -Patch3: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch -Patch4: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch -Patch5: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch -Patch6: wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch -Patch7: wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch -Patch8: wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch -Patch9: wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch -Patch10: wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch -Patch11: wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch -Patch12: wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch -Patch13: wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -68,16 +55,19 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* %{_mandir}/man1/wvtag.1* -%doc AUTHORS +%doc AUTHORS doc/wavpack_doc.html %license COPYING %files devel %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/libwavpack.so -%doc ChangeLog README +%doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Thu Jan 09 2020 Tomas Korbar - 5.2.0-1 +- Update to 5.2.0 + * Mon Aug 19 2019 Tomas Korbar - 5.1.0-16 - Fix for CVE-2019-1010317 From 0e22412bd690bc179dcd9b9dfa40f24a00d91727 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:30:43 +0000 Subject: [PATCH 38/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index d105287..6e32811 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 09 2020 Tomas Korbar - 5.2.0-1 - Update to 5.2.0 From 5f5c8cb3e6a186a56fa757efa5cb713f2d3899a1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Apr 2020 21:08:18 +0200 Subject: [PATCH 39/74] Update to 5.3.0 Resolves: rhbz#1825218 Signed-off-by: Peter Lemenkov --- wavpack.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index 6e32811..0689c7c 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.3.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Apr 18 2020 Peter Lemenkov - 5.3.0-1 +- Update to 5.3.0 + * Fri Jan 31 2020 Fedora Release Engineering - 5.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c9bfacd3ec9307b8766f320795cded49a11f3e14 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Apr 2020 21:12:10 +0200 Subject: [PATCH 40/74] forgot to upload files Signed-off-by: Peter Lemenkov --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 09c3a23..2282147 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.2.0.tar.bz2) = 456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 +SHA512 (wavpack-5.3.0.tar.bz2) = 2c5038abfbe7ab3b51fb30b3fc8b636117e9afe1821c40832fbdfb960d1153e0cb4a68dd84a89b205c3cdc10030d3aa7a7340b296d9c148e8847471c2e7c0cd1 From 534fc62e340143b2f98505571c8ad3b63ee6f9a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:59:15 +0000 Subject: [PATCH 41/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 0689c7c..11ed6ba 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Apr 18 2020 Peter Lemenkov - 5.3.0-1 - Update to 5.3.0 From 4373b17c465cd5aa0521fb6b7e3c83ac92364602 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:50:21 +0000 Subject: [PATCH 42/74] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- wavpack.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wavpack.spec b/wavpack.spec index 11ed6ba..4dff4a1 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -6,6 +6,7 @@ License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 # For autoreconf +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool From 8422aeea0259bc65816e8e2cc5b0ecb2112efec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 17 Jan 2021 13:34:00 +0000 Subject: [PATCH 43/74] Update wavpack to 5.4.0 (#1915740) Security fix for CVE-2020-35738 --- sources | 2 +- wavpack.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2282147..e9d4b15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.3.0.tar.bz2) = 2c5038abfbe7ab3b51fb30b3fc8b636117e9afe1821c40832fbdfb960d1153e0cb4a68dd84a89b205c3cdc10030d3aa7a7340b296d9c148e8847471c2e7c0cd1 +SHA512 (wavpack-5.4.0.tar.bz2) = 6575c63c9309023ad4bd1711e2d7684ac6a5b61879514342b79f04453d7495e59592dc08d3de4d4cc6c64d6bdf56e361587d425f21fac084cb441fb70d83b6d8 diff --git a/wavpack.spec b/wavpack.spec index 4dff4a1..da8bafe 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.3.0 -Release: 2%{?dist} +Version: 5.4.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -66,6 +66,10 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sun Jan 17 2021 Sérgio Basto - 5.4.0-1 +- Update wavpack to 5.4.0 (#1915740) +- Security fix for CVE-2020-35738 + * Wed Jul 29 2020 Fedora Release Engineering - 5.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 89a885d0baea1d5b93c7e6ca75fe35df75e9ddc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:20:33 +0000 Subject: [PATCH 44/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index da8bafe..9647bec 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 17 2021 Sérgio Basto - 5.4.0-1 - Update wavpack to 5.4.0 (#1915740) - Security fix for CVE-2020-35738 From f167601c17c49162f1d4495a3f605012828127ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:46:50 +0000 Subject: [PATCH 45/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 9647bec..2d926e5 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.4.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 5.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 65c9683474f95eeb238b61dea25f5b06835f9349 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:17:38 +0000 Subject: [PATCH 46/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 2d926e5..63dc0de 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 89b10b65375f51fac19451c440d7f8d735c72ef0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 6 Apr 2022 22:27:07 +0200 Subject: [PATCH 47/74] Fix CVE-2021-44269 Signed-off-by: Peter Lemenkov --- ...ze-DSD-file-types-for-invalid-length.patch | 34 +++++++++++++++++++ wavpack.spec | 8 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch diff --git a/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch b/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch new file mode 100644 index 0000000..9cbeb77 --- /dev/null +++ b/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch @@ -0,0 +1,34 @@ +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/wavpack.spec b/wavpack.spec index 63dc0de..2678887 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,15 +1,16 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 +Patch1: wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch # For autoreconf -BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: make %description WavPack is a completely open audio compression format providing lossless, @@ -66,6 +67,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Wed Apr 6 2022 Peter Lemenkov - 5.4.0-5 +- Fix for CVE-2021-44269 + * Sat Jan 22 2022 Fedora Release Engineering - 5.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5f0f312699df2cb337010576b043fe2847a347d9 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Wed, 13 Jul 2022 12:51:15 +0200 Subject: [PATCH 48/74] Rebase to 5.5.0 Resolves: rhbz#2105686 --- sources | 2 +- ...ze-DSD-file-types-for-invalid-length.patch | 34 ------------------- wavpack.spec | 16 ++++++--- 3 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch diff --git a/sources b/sources index e9d4b15..4f78a24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.4.0.tar.bz2) = 6575c63c9309023ad4bd1711e2d7684ac6a5b61879514342b79f04453d7495e59592dc08d3de4d4cc6c64d6bdf56e361587d425f21fac084cb441fb70d83b6d8 +SHA512 (wavpack-5.5.0.tar.bz2) = bf2b32c90850f1adaddb92b4996371b5cdb1a366bfed9967c39215dec4a7cc1a0474352db72e699f3eed32451a6c1ff33221457330577a403a73e4158297c68e diff --git a/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch b/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch deleted file mode 100644 index 9cbeb77..0000000 --- a/wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: David Bryant -Date: Tue, 23 Nov 2021 13:14:35 -0800 -Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index d7adb6a..5bdcae3 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - - total_samples = dff_chunk_header.ckDataSize / config->num_channels; -+ -+ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - break; - } - else { // just copy unknown chunks to output file -diff --git a/cli/dsf.c b/cli/dsf.c -index e1d7973..dddd488 100644 ---- a/cli/dsf.c -+++ b/cli/dsf.c -@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC - - if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || - format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || -+ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || - (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || - format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || - format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/wavpack.spec b/wavpack.spec index 2678887..04f8681 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,16 +1,16 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.4.0 -Release: 5%{?dist} +Version: 5.5.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: make +BuildRequires: gettext-devel %description WavPack is a completely open audio compression format providing lossless, @@ -37,7 +37,7 @@ autoreconf -ivf # for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 # architecture will fail. # http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html -%configure --disable-static \ +%configure --disable-static --disable-rpath \ %ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl --disable-asm \ %endif @@ -47,6 +47,8 @@ make %{?_smp_mflags} %install %make_install rm -f %{buildroot}/%{_libdir}/*.la +# we will install the documentation ourselves through the %doc macro +rm -rf %{buildroot}/%{_docdir}/ %ldconfig_scriptlets @@ -57,7 +59,7 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* %{_mandir}/man1/wvtag.1* -%doc AUTHORS doc/wavpack_doc.html +%doc AUTHORS doc/wavpack_doc.html doc/style.css %license COPYING %files devel @@ -67,6 +69,10 @@ rm -f %{buildroot}/%{_libdir}/*.la %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Wed Jul 13 2022 Tomas Korbar - 5.5.0-1 +- Rebase to 5.5.0 +- Resolves: rhbz#2105686 + * Wed Apr 6 2022 Peter Lemenkov - 5.4.0-5 - Fix for CVE-2021-44269 From ff221c721a2fda361316627a59ac048013024e8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:13:55 +0000 Subject: [PATCH 49/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 04f8681..6b44e75 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Tomas Korbar - 5.5.0-1 - Rebase to 5.5.0 - Resolves: rhbz#2105686 From 0aaeecd47d464eae46997bed664e435adf238066 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Thu, 8 Dec 2022 15:09:22 +0100 Subject: [PATCH 50/74] Rebase to 5.6.0 Resolves: rhbz#2148994 --- sources | 2 +- wavpack.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4f78a24..e33a273 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.5.0.tar.bz2) = bf2b32c90850f1adaddb92b4996371b5cdb1a366bfed9967c39215dec4a7cc1a0474352db72e699f3eed32451a6c1ff33221457330577a403a73e4158297c68e +SHA512 (wavpack-5.6.0.tar.bz2) = f74593e1e0d527729e08453b3c83ff56b4acc0e75e74f4903fc82e8265a9aa91436d33bf0d1ace208dc0ce60e798ca0830f6e9f9bbd38d3a7f392f6c9cf013fe diff --git a/wavpack.spec b/wavpack.spec index 6b44e75..e669b0b 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.5.0 -Release: 2%{?dist} +Version: 5.6.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,10 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Thu Dec 08 2022 Tomas Korbar - 5.6.0-1 +- Rebase to 5.6.0 +- Resolves: rhbz#2148994 + * Sat Jul 23 2022 Fedora Release Engineering - 5.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1b7c8f7cfe94be4db20e06ecd8421b9e93937ef3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:37:46 +0000 Subject: [PATCH 51/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index e669b0b..85c359a 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 08 2022 Tomas Korbar - 5.6.0-1 - Rebase to 5.6.0 - Resolves: rhbz#2148994 From 65ace30c12ec5974f9109c04f0e588934379178e Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Sat, 11 Mar 2023 12:11:18 +0100 Subject: [PATCH 52/74] Change the License tag to the SPDX format --- wavpack.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index 85c359a..286a048 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,8 +1,8 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.6.0 -Release: 2%{?dist} -License: BSD +Release: 3%{?dist} +License: BSD-3-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 # For autoreconf @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Mar 11 2023 Tomas Korbar - 5.6.0-3 +- Change the License tag to the SPDX format + * Sat Jan 21 2023 Fedora Release Engineering - 5.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d93313bb159beaa8ea880cb838794617cc99e0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Mon, 3 Apr 2023 09:11:58 +0200 Subject: [PATCH 53/74] Adding fmf plan and gating.yaml --- .fmf/version | 1 + gating.yaml | 16 ++++++++++++++++ plans/all.fmf | 6 ++++++ 3 files changed, 23 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..195c6fe --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rawhide +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..ad0edac --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/wavpack.git +execute: + how: tmt From f4c5da67eff2b0929e3a61218c430277ae92f209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:59:55 +0000 Subject: [PATCH 54/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 286a048..c7e21b6 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.6.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Mar 11 2023 Tomas Korbar - 5.6.0-3 - Change the License tag to the SPDX format From d92f8fb294313eba4546c1781eeccef063989312 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Thu, 2 Nov 2023 09:44:36 +0100 Subject: [PATCH 55/74] Add licenses to fully conform to SPDX --- wavpack.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index c7e21b6..236f402 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,8 +1,8 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.6.0 -Release: 4%{?dist} -License: BSD-3-Clause AND LicenseRef-Fedora-Public-Domain +Release: 5%{?dist} +License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 # For autoreconf @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Thu Nov 02 2023 Tomas Korbar - 5.6.0-5 +- Add licenses to fully conform to SPDX + * Sat Jul 22 2023 Fedora Release Engineering - 5.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0d4d1adb0ad397786fc8ef0a4c823fb7146f5fd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:25:28 +0000 Subject: [PATCH 56/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 236f402..9cc3c31 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.6.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 02 2023 Tomas Korbar - 5.6.0-5 - Add licenses to fully conform to SPDX From 6da0e2f7c4391c08ec848dac205e179d023b8541 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Wed, 13 Mar 2024 12:47:53 +0100 Subject: [PATCH 57/74] Rebase to 5.7.0 Resolves: rhbz#2267425 --- sources | 2 +- wavpack.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e33a273..c3ae404 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.6.0.tar.bz2) = f74593e1e0d527729e08453b3c83ff56b4acc0e75e74f4903fc82e8265a9aa91436d33bf0d1ace208dc0ce60e798ca0830f6e9f9bbd38d3a7f392f6c9cf013fe +SHA512 (wavpack-5.7.0.tar.bz2) = cb95efd9eebd1c733a72951b9e3340d4a36cb587ee61c5d3c801d8fdcc560e0669fbb3cc6d6caf06a928c1236f63573c888f78ca16dc2e4599b72c26c7024ad2 diff --git a/wavpack.spec b/wavpack.spec index 9cc3c31..65c0c93 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.6.0 -Release: 6%{?dist} +Version: 5.7.0 +Release: 1%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,10 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Wed Mar 13 2024 Tomas Korbar - 5.7.0-1 +- Rebase to 5.7.0 +- Resolves: rhbz#2267425 + * Sat Jan 27 2024 Fedora Release Engineering - 5.6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f0a60c0c04b855ecffd7cfa388f20107703f06e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:08:51 +0000 Subject: [PATCH 58/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wavpack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 65c0c93..3d19b81 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 5.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Mar 13 2024 Tomas Korbar - 5.7.0-1 - Rebase to 5.7.0 - Resolves: rhbz#2267425 From f79c405956ff8c4bc92ec9fda5a4798a7d5382c1 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Mon, 29 Jul 2024 13:19:10 +0200 Subject: [PATCH 59/74] Disable asm code parts ASM code parts break support for cf-protection on x86_64, since they do not contain such feature. This situation is likely to repeat in the future and thus all code parts should be compiled by compiler which knows distribution settings. --- wavpack.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index 3d19b81..e5b4be4 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.7.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -37,10 +37,7 @@ autoreconf -ivf # for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 # architecture will fail. # http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html -%configure --disable-static --disable-rpath \ -%ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl - --disable-asm \ -%endif +%configure --disable-static --disable-rpath --disable-asm make %{?_smp_mflags} @@ -69,6 +66,14 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Mon Jul 29 2024 Tomas Korbar - 5.7.0-3 +- Disable asm code parts +- ASM code parts break support for cf-protection on x86_64, + since they do not contain such feature. This situation is + likely to repeat in the future and thus all code parts + should be compiled by compiler which knows distribution + settings. + * Sat Jul 20 2024 Fedora Release Engineering - 5.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e669d92e915808a13b27c5b69909600d0635edfb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 17:07:07 +0300 Subject: [PATCH 60/74] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++ wavpack.spec | 226 +-------------------------------------------------- 2 files changed, 224 insertions(+), 224 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..6813ddb --- /dev/null +++ b/changelog @@ -0,0 +1,222 @@ +* Mon Jul 29 2024 Tomas Korbar - 5.7.0-3 +- Disable asm code parts +- ASM code parts break support for cf-protection on x86_64, + since they do not contain such feature. This situation is + likely to repeat in the future and thus all code parts + should be compiled by compiler which knows distribution + settings. + +* Sat Jul 20 2024 Fedora Release Engineering - 5.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Mar 13 2024 Tomas Korbar - 5.7.0-1 +- Rebase to 5.7.0 +- Resolves: rhbz#2267425 + +* Sat Jan 27 2024 Fedora Release Engineering - 5.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 02 2023 Tomas Korbar - 5.6.0-5 +- Add licenses to fully conform to SPDX + +* Sat Jul 22 2023 Fedora Release Engineering - 5.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Mar 11 2023 Tomas Korbar - 5.6.0-3 +- Change the License tag to the SPDX format + +* Sat Jan 21 2023 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 08 2022 Tomas Korbar - 5.6.0-1 +- Rebase to 5.6.0 +- Resolves: rhbz#2148994 + +* Sat Jul 23 2022 Fedora Release Engineering - 5.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Tomas Korbar - 5.5.0-1 +- Rebase to 5.5.0 +- Resolves: rhbz#2105686 + +* Wed Apr 6 2022 Peter Lemenkov - 5.4.0-5 +- Fix for CVE-2021-44269 + +* Sat Jan 22 2022 Fedora Release Engineering - 5.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 5.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 5.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Jan 17 2021 Sérgio Basto - 5.4.0-1 +- Update wavpack to 5.4.0 (#1915740) +- Security fix for CVE-2020-35738 + +* Wed Jul 29 2020 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Apr 18 2020 Peter Lemenkov - 5.3.0-1 +- Update to 5.3.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 5.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 09 2020 Tomas Korbar - 5.2.0-1 +- Update to 5.2.0 + +* Mon Aug 19 2019 Tomas Korbar - 5.1.0-16 +- Fix for CVE-2019-1010317 + +* Mon Aug 19 2019 Tomas Korbar - 5.1.0-15 +- Fix for CVE-2019-1010319 + +* Sat Jul 27 2019 Fedora Release Engineering - 5.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 17 2019 Peter Lemenkov - 5.1.0-13 +- Fix for CVE-2019-11498 + +* Wed Apr 10 2019 Peter Lemenkov - 5.1.0-12 +- Fix for CVE-2018-19840, CVE-2018-19841 + +* Thu Feb 28 2019 Sérgio Basto - 5.1.0-11 +- Make the manual pages decompression format agnostic + +* Sun Feb 03 2019 Fedora Release Engineering - 5.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 5.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 22 2018 Miroslav Lichvar - 5.1.0-8 +- Fix for CVE-2018-10536, CVE-2018-10537, CVE-2018-10538, CVE-2018-10539, + CVE-2018-10540 + +* Tue Feb 20 2018 Peter Lemenkov - 5.1.0-7 +- Fix for CVE-2018-6767, CVE-2018-7253, and two more GH issues + +* Fri Feb 09 2018 Fedora Release Engineering - 5.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 5.1.0-5 +- Switch to %%ldconfig_scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 5.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 5.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Sérgio Basto - 5.1.0-1 +- Update wavpack to 5.1.0 + +* Thu Apr 21 2016 Sérgio Basto - 4.80.0-1 +- Update wavpack to 4.80.0 + +* Mon Mar 28 2016 Sérgio Basto - 4.75.2-1 +- Update to 4.75.2 + +* Fri Feb 05 2016 Fedora Release Engineering - 4.70.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 4.70.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 4.70.0-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Mon Aug 18 2014 Fedora Release Engineering - 4.70.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.70.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Feb 17 2014 Peter Lemenkov - 4.70.0-1 +- Ver. 4.70.0 + +* Sun Aug 04 2013 Fedora Release Engineering - 4.60.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 21 2013 Peter Lemenkov - 4.60.1-7 +- Reconfigure to allow building on AArch64 +- Cleanup spec-file + +* Fri Feb 15 2013 Fedora Release Engineering - 4.60.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 3 2013 Miroslav Lichvar 4.60.1-5 +- Fix -Wstrict-aliasing compiler warnings + +* Sun Jul 22 2012 Fedora Release Engineering - 4.60.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 4.60.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 4.60.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jan 9 2011 Peter Lemenkov 4.60.1-1 +- Version 4.60.1 (bugfix release) +- Added man-pages +- The only patch was rebased +- Small cosmetic spec-file cleanups + +* Mon Sep 28 2009 Peter Lemenkov 4.60-1 +- Version 4.60 + +* Mon Jul 27 2009 Fedora Release Engineering - 4.50.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 4.50.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Aug 30 2008 Peter Lemenkov 4.50.1-2 +- Fixes to meet the Fedora Packaging Guidelines + +* Sun Aug 24 2008 Peter Lemenkov 4.50.1-1 +- Version 4.50.1 + +* Wed Jun 18 2008 Peter Lemenkov 4.50-1 +- Version 4.50 + +* Tue Feb 19 2008 Fedora Release Engineering - 4.41-2 +- Autorebuild for GCC 4.3 + +* Sat May 12 2007 Peter Lemenkov 4.41-1 +- Version 4.41 +- Removed unnecessary --with-pic + +* Fri Dec 15 2006 Peter Lemenkov 4.40-1.1 +- Rebuild + +* Fri Dec 15 2006 Peter Lemenkov 4.40-1 +- Version 4.40 + +* Tue Sep 12 2006 Peter Lemenkov 4.32-3%{?dist} +- Rebuild for FC6 + +* Sat Jul 01 2006 Peter Lemenkov 4.32-2%{?dist} +- force PIC-only code + +* Wed Jun 28 2006 Peter Lemenkov 4.32-1%{?dist} +- Version 4.32 + +* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} +- rebuild + +* Sat Jan 07 2006 Peter Lemenkov 4.31-1 +- Fixed several issues with wavpack.pc.in +- Cosmetic fixes. +- Version 4.31 + +* Sun Nov 13 2005 Peter Lemenkov 4.3-1 +- Initial build for FC-Extras +- Version 4.3 diff --git a/wavpack.spec b/wavpack.spec index e5b4be4..d170f72 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 5.7.0 -Release: 3%{?dist} +Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 @@ -66,226 +66,4 @@ rm -rf %{buildroot}/%{_docdir}/ %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog -* Mon Jul 29 2024 Tomas Korbar - 5.7.0-3 -- Disable asm code parts -- ASM code parts break support for cf-protection on x86_64, - since they do not contain such feature. This situation is - likely to repeat in the future and thus all code parts - should be compiled by compiler which knows distribution - settings. - -* Sat Jul 20 2024 Fedora Release Engineering - 5.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Mar 13 2024 Tomas Korbar - 5.7.0-1 -- Rebase to 5.7.0 -- Resolves: rhbz#2267425 - -* Sat Jan 27 2024 Fedora Release Engineering - 5.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 02 2023 Tomas Korbar - 5.6.0-5 -- Add licenses to fully conform to SPDX - -* Sat Jul 22 2023 Fedora Release Engineering - 5.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Mar 11 2023 Tomas Korbar - 5.6.0-3 -- Change the License tag to the SPDX format - -* Sat Jan 21 2023 Fedora Release Engineering - 5.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 08 2022 Tomas Korbar - 5.6.0-1 -- Rebase to 5.6.0 -- Resolves: rhbz#2148994 - -* Sat Jul 23 2022 Fedora Release Engineering - 5.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 13 2022 Tomas Korbar - 5.5.0-1 -- Rebase to 5.5.0 -- Resolves: rhbz#2105686 - -* Wed Apr 6 2022 Peter Lemenkov - 5.4.0-5 -- Fix for CVE-2021-44269 - -* Sat Jan 22 2022 Fedora Release Engineering - 5.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 5.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 5.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Jan 17 2021 Sérgio Basto - 5.4.0-1 -- Update wavpack to 5.4.0 (#1915740) -- Security fix for CVE-2020-35738 - -* Wed Jul 29 2020 Fedora Release Engineering - 5.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Apr 18 2020 Peter Lemenkov - 5.3.0-1 -- Update to 5.3.0 - -* Fri Jan 31 2020 Fedora Release Engineering - 5.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 09 2020 Tomas Korbar - 5.2.0-1 -- Update to 5.2.0 - -* Mon Aug 19 2019 Tomas Korbar - 5.1.0-16 -- Fix for CVE-2019-1010317 - -* Mon Aug 19 2019 Tomas Korbar - 5.1.0-15 -- Fix for CVE-2019-1010319 - -* Sat Jul 27 2019 Fedora Release Engineering - 5.1.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 17 2019 Peter Lemenkov - 5.1.0-13 -- Fix for CVE-2019-11498 - -* Wed Apr 10 2019 Peter Lemenkov - 5.1.0-12 -- Fix for CVE-2018-19840, CVE-2018-19841 - -* Thu Feb 28 2019 Sérgio Basto - 5.1.0-11 -- Make the manual pages decompression format agnostic - -* Sun Feb 03 2019 Fedora Release Engineering - 5.1.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 5.1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 22 2018 Miroslav Lichvar - 5.1.0-8 -- Fix for CVE-2018-10536, CVE-2018-10537, CVE-2018-10538, CVE-2018-10539, - CVE-2018-10540 - -* Tue Feb 20 2018 Peter Lemenkov - 5.1.0-7 -- Fix for CVE-2018-6767, CVE-2018-7253, and two more GH issues - -* Fri Feb 09 2018 Fedora Release Engineering - 5.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 5.1.0-5 -- Switch to %%ldconfig_scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 5.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 5.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Sérgio Basto - 5.1.0-1 -- Update wavpack to 5.1.0 - -* Thu Apr 21 2016 Sérgio Basto - 4.80.0-1 -- Update wavpack to 4.80.0 - -* Mon Mar 28 2016 Sérgio Basto - 4.75.2-1 -- Update to 4.75.2 - -* Fri Feb 05 2016 Fedora Release Engineering - 4.70.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 4.70.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 4.70.0-4 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Mon Aug 18 2014 Fedora Release Engineering - 4.70.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.70.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Feb 17 2014 Peter Lemenkov - 4.70.0-1 -- Ver. 4.70.0 - -* Sun Aug 04 2013 Fedora Release Engineering - 4.60.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Jul 21 2013 Peter Lemenkov - 4.60.1-7 -- Reconfigure to allow building on AArch64 -- Cleanup spec-file - -* Fri Feb 15 2013 Fedora Release Engineering - 4.60.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jan 3 2013 Miroslav Lichvar 4.60.1-5 -- Fix -Wstrict-aliasing compiler warnings - -* Sun Jul 22 2012 Fedora Release Engineering - 4.60.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 4.60.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 4.60.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jan 9 2011 Peter Lemenkov 4.60.1-1 -- Version 4.60.1 (bugfix release) -- Added man-pages -- The only patch was rebased -- Small cosmetic spec-file cleanups - -* Mon Sep 28 2009 Peter Lemenkov 4.60-1 -- Version 4.60 - -* Mon Jul 27 2009 Fedora Release Engineering - 4.50.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 4.50.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Aug 30 2008 Peter Lemenkov 4.50.1-2 -- Fixes to meet the Fedora Packaging Guidelines - -* Sun Aug 24 2008 Peter Lemenkov 4.50.1-1 -- Version 4.50.1 - -* Wed Jun 18 2008 Peter Lemenkov 4.50-1 -- Version 4.50 - -* Tue Feb 19 2008 Fedora Release Engineering - 4.41-2 -- Autorebuild for GCC 4.3 - -* Sat May 12 2007 Peter Lemenkov 4.41-1 -- Version 4.41 -- Removed unnecessary --with-pic - -* Fri Dec 15 2006 Peter Lemenkov 4.40-1.1 -- Rebuild - -* Fri Dec 15 2006 Peter Lemenkov 4.40-1 -- Version 4.40 - -* Tue Sep 12 2006 Peter Lemenkov 4.32-3%{?dist} -- Rebuild for FC6 - -* Sat Jul 01 2006 Peter Lemenkov 4.32-2%{?dist} -- force PIC-only code - -* Wed Jun 28 2006 Peter Lemenkov 4.32-1%{?dist} -- Version 4.32 - -* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} -- rebuild - -* Sat Jan 07 2006 Peter Lemenkov 4.31-1 -- Fixed several issues with wavpack.pc.in -- Cosmetic fixes. -- Version 4.31 - -* Sun Nov 13 2005 Peter Lemenkov 4.3-1 -- Initial build for FC-Extras -- Version 4.3 - +%autochangelog From f89d02dd546e5664efce09e7b6d399ccf278dc35 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 19:54:22 +0300 Subject: [PATCH 61/74] Cosmetic cleanups Signed-off-by: Peter Lemenkov --- gating.yaml | 4 ++-- wavpack.spec | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gating.yaml b/gating.yaml index 195c6fe..d2f0c2e 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,7 @@ decision_contexts: [bodhi_update_push_testing] subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - + #gating rawhide --- !Policy product_versions: @@ -13,4 +13,4 @@ product_versions: decision_contexts: [bodhi_update_push_stable] subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/wavpack.spec b/wavpack.spec index d170f72..52beb4d 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -8,9 +8,9 @@ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 # For autoreconf BuildRequires: autoconf BuildRequires: automake +BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: make -BuildRequires: gettext-devel %description WavPack is a completely open audio compression format providing lossless, @@ -38,8 +38,8 @@ autoreconf -ivf # architecture will fail. # http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html %configure --disable-static --disable-rpath --disable-asm +%make_build -make %{?_smp_mflags} %install %make_install @@ -47,7 +47,6 @@ rm -f %{buildroot}/%{_libdir}/*.la # we will install the documentation ourselves through the %doc macro rm -rf %{buildroot}/%{_docdir}/ -%ldconfig_scriptlets %files %{_bindir}/* From 1826ea64158b1cdd38961e5d77dcf7486421406f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 22:24:25 +0300 Subject: [PATCH 62/74] No need to specify this dep Signed-off-by: Peter Lemenkov --- wavpack.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wavpack.spec b/wavpack.spec index 52beb4d..cdc1e5b 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -22,7 +22,6 @@ performance and functionality. %package devel Summary: WavPack - development files Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig %description devel Files needed for developing apps using wavpack From 9fdeec18a1b9e359bc590e86276dbdc0bd0e2db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 20:08:57 +0300 Subject: [PATCH 63/74] Switch to cmake Signed-off-by: Peter Lemenkov --- wavpack.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index cdc1e5b..df0ffaf 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -5,9 +5,11 @@ Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -# For autoreconf -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: cmake +BuildRequires: gcc +# FIXME current CMakeLists.txt erroneously requires g++ during the +# configuration stage +BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: make @@ -30,18 +32,17 @@ Files needed for developing apps using wavpack %autosetup -p1 %build -autoreconf -ivf # Debian and Buildroot recomendation: # WavPack "autodetects" CPU type to enable ASM code. However, the assembly code # for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 # architecture will fail. # http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html -%configure --disable-static --disable-rpath --disable-asm -%make_build +%cmake -DWAVPACK_ENABLE_ASM=OFF +%cmake_build %install -%make_install +%cmake_install rm -f %{buildroot}/%{_libdir}/*.la # we will install the documentation ourselves through the %doc macro rm -rf %{buildroot}/%{_docdir}/ @@ -59,6 +60,7 @@ rm -rf %{buildroot}/%{_docdir}/ %files devel %{_includedir}/* +%{_libdir}/cmake/WavPack/ %{_libdir}/pkgconfig/* %{_libdir}/libwavpack.so %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf From d32b0f677f4191a971bb6952813946ffadb66ac4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 21:36:15 +0300 Subject: [PATCH 64/74] Use common description block (prepare for Mingw merge) Signed-off-by: Peter Lemenkov --- wavpack.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wavpack.spec b/wavpack.spec index df0ffaf..3b76505 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,3 +1,10 @@ +%global common_description %{expand: +WavPack is a completely open audio compression format providing lossless, +high-quality lossy, and a unique hybrid compression mode. Although the +technology is loosely based on previous versions of WavPack, the new +version 4 format has been designed from the ground up to offer unparalleled +performance and functionality.} + Name: wavpack Summary: A completely open audiocodec Version: 5.7.0 @@ -15,11 +22,7 @@ BuildRequires: libtool BuildRequires: make %description -WavPack is a completely open audio compression format providing lossless, -high-quality lossy, and a unique hybrid compression mode. Although the -technology is loosely based on previous versions of WavPack, the new -version 4 format has been designed from the ground up to offer unparalleled -performance and functionality. +%{common_description} %package devel Summary: WavPack - development files From e442bdb1c06fbe25d163f1e35686caaaaf0a4f90 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 23:02:23 +0300 Subject: [PATCH 65/74] Merge mingw32/64 package Signed-off-by: Peter Lemenkov --- wavpack.spec | 108 ++++++++++++++++++++++++++++++++++++++++++++ wavpack_mingw.patch | 13 ++++++ 2 files changed, 121 insertions(+) create mode 100644 wavpack_mingw.patch diff --git a/wavpack.spec b/wavpack.spec index 3b76505..1f3e374 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,3 +1,9 @@ +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif + %global common_description %{expand: WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode. Although the @@ -12,6 +18,7 @@ Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 +Patch1: wavpack_mingw.patch BuildRequires: cmake BuildRequires: gcc # FIXME current CMakeLists.txt erroneously requires g++ during the @@ -21,6 +28,19 @@ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: make +%if %{with mingw} +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc +# FIXME current CMakeLists.txt erroneously requires g++ during the +# configuration stage +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +# FIXME current CMakeLists.txt erroneously requires g++ during the +# configuration stage +BuildRequires: mingw64-gcc-c++ +%endif + %description %{common_description} @@ -31,6 +51,49 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Files needed for developing apps using wavpack +%if %{with mingw} +%package -n mingw32-%{name} +Summary: %{summary} +BuildArch: noarch + +%description -n mingw32-%{name} +%{common_description} + +This package is MinGW compiled wavpack library for the Win32 target. + +%package -n mingw32-%{name}-tools +Summary: %{summary} tools +BuildArch: noarch +Requires: mingw32-%{name} = %{version}-%{release} + +%description -n mingw32-%{name}-tools +%{common_description} + +This package is MinGW compiled wavpack tools for the Win32 target. + +%package -n mingw64-%{name} +Summary: %{summary} +BuildArch: noarch + +%description -n mingw64-%{name} +%{common_description} + +This package is MinGW compiled wavpack library for the Win64 target. + +%package -n mingw64-%{name}-tools +Summary: %{summary} tools +BuildArch: noarch +Requires: mingw64-%{name} = %{version}-%{release} + +%description -n mingw64-%{name}-tools +%{common_description} + +This package is MinGW compiled wavpack tools for the Win64 target. + +%endif + +%{?mingw_debug_package} + %prep %autosetup -p1 @@ -43,6 +106,10 @@ Files needed for developing apps using wavpack %cmake -DWAVPACK_ENABLE_ASM=OFF %cmake_build +%if %{with mingw} +%mingw_cmake -DWAVPACK_ENABLE_ASM=OFF +%mingw_make_build +%endif %install %cmake_install @@ -50,6 +117,19 @@ rm -f %{buildroot}/%{_libdir}/*.la # we will install the documentation ourselves through the %doc macro rm -rf %{buildroot}/%{_docdir}/ +%if %{with mingw} +%mingw_make_install +# remove libtool files +rm -f %{buildroot}%{mingw32_libdir}/*.la +rm -f %{buildroot}%{mingw64_libdir}/*.la +# remove documentation (it's in the native version) +rm -rf %{buildroot}%{mingw32_docdir} +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_docdir} +rm -rf %{buildroot}%{mingw64_mandir} +%endif + +%{?mingw_debug_install_post} %files %{_bindir}/* @@ -68,5 +148,33 @@ rm -rf %{buildroot}/%{_docdir}/ %{_libdir}/libwavpack.so %doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf +%if %{with mingw} +%files -n mingw32-wavpack +%doc AUTHORS +%license COPYING +%dir %{mingw32_includedir}/wavpack +%{mingw32_bindir}/libwavpack-1.dll +%{mingw32_includedir}/wavpack/*.h +%{mingw32_libdir}/cmake/WavPack/ +%{mingw32_libdir}/libwavpack.dll.a +%{mingw32_libdir}/pkgconfig/* + +%files -n mingw32-wavpack-tools +%{mingw32_bindir}/*.exe + +%files -n mingw64-wavpack +%doc AUTHORS +%license COPYING +%dir %{mingw64_includedir}/wavpack +%{mingw64_bindir}/libwavpack-1.dll +%{mingw64_includedir}/wavpack/*.h +%{mingw64_libdir}/cmake/WavPack/ +%{mingw64_libdir}/libwavpack.dll.a +%{mingw64_libdir}/pkgconfig/* + +%files -n mingw64-wavpack-tools +%{mingw64_bindir}/*.exe +%endif + %changelog %autochangelog diff --git a/wavpack_mingw.patch b/wavpack_mingw.patch new file mode 100644 index 0000000..dc343ec --- /dev/null +++ b/wavpack_mingw.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f9e70..36bf4f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -612,7 +612,7 @@ install(TARGETS ${WAVPACK_INSTALL_TARGETS} + + if(WAVPACK_INSTALL_CMAKE_MODULE) + +- if(WIN32) ++ if(MSVC) + set(CMAKE_INSTALL_PACKAGEDIR cmake) + else() + set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) From 1bbb260634a3267c1ae6292bf017d08676507b74 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 25 Oct 2024 19:26:04 +0300 Subject: [PATCH 66/74] Remove CMake requirement for C++ compiler Signed-off-by: Peter Lemenkov --- ...w.patch => wavpack-0001-fix-for-MinGW.patch | 5 +++++ ...k-0002-We-compile-only-ANSI-C-sources.patch | 18 ++++++++++++++++++ wavpack.spec | 18 ++++++------------ 3 files changed, 29 insertions(+), 12 deletions(-) rename wavpack_mingw.patch => wavpack-0001-fix-for-MinGW.patch (76%) create mode 100644 wavpack-0002-We-compile-only-ANSI-C-sources.patch diff --git a/wavpack_mingw.patch b/wavpack-0001-fix-for-MinGW.patch similarity index 76% rename from wavpack_mingw.patch rename to wavpack-0001-fix-for-MinGW.patch index dc343ec..51d52be 100644 --- a/wavpack_mingw.patch +++ b/wavpack-0001-fix-for-MinGW.patch @@ -1,3 +1,8 @@ +From: Sandro Mani +Date: Mon, 5 Dec 2022 14:43:54 +0100 +Subject: [PATCH] fix for MinGW + + diff --git a/CMakeLists.txt b/CMakeLists.txt index c9f9e70..36bf4f8 100644 --- a/CMakeLists.txt diff --git a/wavpack-0002-We-compile-only-ANSI-C-sources.patch b/wavpack-0002-We-compile-only-ANSI-C-sources.patch new file mode 100644 index 0000000..63fa05a --- /dev/null +++ b/wavpack-0002-We-compile-only-ANSI-C-sources.patch @@ -0,0 +1,18 @@ +From: Peter Lemenkov +Date: Fri, 25 Oct 2024 19:15:33 +0300 +Subject: [PATCH] We compile only ANSI C sources + +Signed-off-by: Peter Lemenkov + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36bf4f8..82f7173 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.2...3.5) + +-project(WavPack VERSION 5.7.0) ++project(WavPack VERSION 5.7.0 LANGUAGES C) + + file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) + string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") diff --git a/wavpack.spec b/wavpack.spec index 1f3e374..12135d7 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -16,14 +16,14 @@ Summary: A completely open audiocodec Version: 5.7.0 Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain -Url: http://www.wavpack.com/ -Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack_mingw.patch +Url: https://www.wavpack.com/ +Source: https://www.wavpack.com/%{name}-%{version}.tar.bz2 +# Fedora-specific +Patch1: wavpack-0001-fix-for-MinGW.patch +# Fedora-specific (we do not build any C++ code) +Patch2: wavpack-0002-We-compile-only-ANSI-C-sources.patch BuildRequires: cmake BuildRequires: gcc -# FIXME current CMakeLists.txt erroneously requires g++ during the -# configuration stage -BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: make @@ -31,14 +31,8 @@ BuildRequires: make %if %{with mingw} BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc -# FIXME current CMakeLists.txt erroneously requires g++ during the -# configuration stage -BuildRequires: mingw32-gcc-c++ BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc -# FIXME current CMakeLists.txt erroneously requires g++ during the -# configuration stage -BuildRequires: mingw64-gcc-c++ %endif %description From 41ac63fc2255c76b7d2f9382431eec708712de08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:46:59 +0000 Subject: [PATCH 67/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4e1fa1131ee31a8565a8157e0f47d232d24d9c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Feb 2025 16:34:44 +0000 Subject: [PATCH 68/74] Update wavpack to 5.8.1 (#2338095) --- sources | 2 +- wavpack-0002-We-compile-only-ANSI-C-sources.patch | 6 +++--- wavpack.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources b/sources index c3ae404..e91653d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.7.0.tar.bz2) = cb95efd9eebd1c733a72951b9e3340d4a36cb587ee61c5d3c801d8fdcc560e0669fbb3cc6d6caf06a928c1236f63573c888f78ca16dc2e4599b72c26c7024ad2 +SHA512 (wavpack-5.8.1.tar.bz2) = b29313a22e73df9ddf77c98cfcf629ea6fbc2522e34e9562eb170cbe557b5b279b640668f2b3a3cf804d89303409d8622b9d683c113456920760b750534f682b diff --git a/wavpack-0002-We-compile-only-ANSI-C-sources.patch b/wavpack-0002-We-compile-only-ANSI-C-sources.patch index 63fa05a..60b2611 100644 --- a/wavpack-0002-We-compile-only-ANSI-C-sources.patch +++ b/wavpack-0002-We-compile-only-ANSI-C-sources.patch @@ -9,10 +9,10 @@ index 36bf4f8..82f7173 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.2...3.5) + cmake_minimum_required(VERSION 3.2...3.10) --project(WavPack VERSION 5.7.0) -+project(WavPack VERSION 5.7.0 LANGUAGES C) +-project(WavPack VERSION 5.8.1) ++project(WavPack VERSION 5.8.1 LANGUAGES C) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") diff --git a/wavpack.spec b/wavpack.spec index 12135d7..67f1d13 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -13,7 +13,7 @@ performance and functionality.} Name: wavpack Summary: A completely open audiocodec -Version: 5.7.0 +Version: 5.8.1 Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: https://www.wavpack.com/ From a04832ab082bc8e0b017b1811df2e980f2d162dd Mon Sep 17 00:00:00 2001 From: "psklenar@redhat.com" Date: Mon, 9 Jun 2025 17:03:30 +0200 Subject: [PATCH 69/74] fedora CI plans move to gitlab for centos-stream test space https://issues.redhat.com/browse/RHELMISC-13073 --- plans/all.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/all.fmf b/plans/all.fmf index ad0edac..4260874 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -1,6 +1,6 @@ summary: Test plan with all Fedora tests discover: how: fmf - url: https://src.fedoraproject.org/tests/wavpack.git + url: https://gitlab.com/redhat/centos-stream/tests/wavpack.git execute: how: tmt From 635dce8db3619258a617e3fe4a6e158e2a239eac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:18:10 +0000 Subject: [PATCH 70/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 10f340c06c886141d0b6a5c4cf07bc545e04715f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:07:50 +0000 Subject: [PATCH 71/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3db12b9d47834f3882309b3b7d87adebc4e9d358 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 22 Feb 2026 18:57:50 +0100 Subject: [PATCH 72/74] Update wavpack to 5.9.0 (#2430665) Signed-off-by: Peter Lemenkov --- wavpack-0001-fix-for-MinGW.patch | 4 ++-- wavpack-0002-We-compile-only-ANSI-C-sources.patch | 6 +++--- wavpack.spec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wavpack-0001-fix-for-MinGW.patch b/wavpack-0001-fix-for-MinGW.patch index 51d52be..338fbab 100644 --- a/wavpack-0001-fix-for-MinGW.patch +++ b/wavpack-0001-fix-for-MinGW.patch @@ -4,10 +4,10 @@ Subject: [PATCH] fix for MinGW diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9f9e70..36bf4f8 100644 +index 0b5d26d..b633572 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -612,7 +612,7 @@ install(TARGETS ${WAVPACK_INSTALL_TARGETS} +@@ -632,7 +632,7 @@ install(TARGETS ${WAVPACK_INSTALL_TARGETS} if(WAVPACK_INSTALL_CMAKE_MODULE) diff --git a/wavpack-0002-We-compile-only-ANSI-C-sources.patch b/wavpack-0002-We-compile-only-ANSI-C-sources.patch index 60b2611..864b122 100644 --- a/wavpack-0002-We-compile-only-ANSI-C-sources.patch +++ b/wavpack-0002-We-compile-only-ANSI-C-sources.patch @@ -5,14 +5,14 @@ Subject: [PATCH] We compile only ANSI C sources Signed-off-by: Peter Lemenkov diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36bf4f8..82f7173 100644 +index b633572..d2b730b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2...3.10) --project(WavPack VERSION 5.8.1) -+project(WavPack VERSION 5.8.1 LANGUAGES C) +-project(WavPack VERSION 5.9.0) ++project(WavPack VERSION 5.9.0 LANGUAGES C) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") diff --git a/wavpack.spec b/wavpack.spec index 67f1d13..f0b97ab 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -13,7 +13,7 @@ performance and functionality.} Name: wavpack Summary: A completely open audiocodec -Version: 5.8.1 +Version: 5.9.0 Release: %autorelease License: BSD-3-Clause AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain Url: https://www.wavpack.com/ From 1c6698680042f73c09f410eee779d8833ebc26b8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 22 Feb 2026 19:31:05 +0100 Subject: [PATCH 73/74] Forgot to upload sources Signed-off-by: Peter Lemenkov --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ebd4f21..cdab5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -/wavpack-[0-9]*.[0-9]*.[0-9]*.tar.bz2 +/wavpack-*.tar.bz2 diff --git a/sources b/sources index e91653d..abc78b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.8.1.tar.bz2) = b29313a22e73df9ddf77c98cfcf629ea6fbc2522e34e9562eb170cbe557b5b279b640668f2b3a3cf804d89303409d8622b9d683c113456920760b750534f682b +SHA512 (wavpack-5.9.0.tar.bz2) = dc32f7115a9185956ed2713651b990b1e34894fb5a001abc3f277f41111ded41c5e0cd8740f9c55a226ab58170c633fd7cc52270afdd72c75edf111db75ef4cd From dbbec6b4037ff2f3856ec39fbc7ece85f10085fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:42:07 +0000 Subject: [PATCH 74/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild