From 61e24f4a6bdba89ba1f8d70f786efeea6d0b2ca2 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:00 +0000 Subject: [PATCH 01/71] auto-import changelog data from audiofile-0.1.9-7.src.rpm Mon Aug 14 2000 Than Ngo - add ldconfig to %post and %postun (Bug #15413) Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release Wed Jul 12 2000 Prospector - automatic rebuild Mon Jun 12 2000 Preston Brown - use FHS macros Thu Feb 03 2000 Preston Brown - strip library, use configure macro. Tue Sep 14 1999 Elliot Lee - 0.1.8pre (take whatever is in CVS). Fri Aug 13 1999 Michael Fulbrght - version 1.7.0 Sun Apr 18 1999 Matt Wilson - updated patch from DaveM Fri Apr 16 1999 Matt Wilson - added patch from Dave Miller to disable byte swapping in decoding Fri Mar 19 1999 Michael Fulbright - strip binaries before packaging Thu Feb 25 1999 Michael Fulbright - Version 0.1.6 Sun Feb 21 1999 Michael Fulbright - Removed libtoolize from %build Wed Feb 03 1999 Jonathan Blandfor - Newer version with bug fix. Upped release. Wed Dec 16 1998 Michael Fulbright - integrating into rawhide release at GNOME freeze Fri Nov 20 1998 Michael Fulbright - First try at a spec file --- .cvsignore | 1 + audiofile.spec | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 116 insertions(+) create mode 100644 audiofile.spec diff --git a/.cvsignore b/.cvsignore index e69de29..60acb62 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +audiofile-0.1.9.tar.gz diff --git a/audiofile.spec b/audiofile.spec new file mode 100644 index 0000000..be98e89 --- /dev/null +++ b/audiofile.spec @@ -0,0 +1,114 @@ +Summary: A library for accessing various audio file formats. +Name: audiofile +Version: 0.1.9 +Release: 7 +Epoch: 1 +Copyright: LGPL +Group: System Environment/Libraries +Source: ftp://ftp.68k.org/pub/michael/audiofile-%{version}.tar.gz +URL: http://www.68k.org/~michael/audiofile/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/ldconfig + +%description +The Audio File library is an implementation of SGI's Audio File +Library, which provides an API for accessing audio file formats like +AIFF/AIFF-C, WAVE, and NeXT/Sun .snd/.au files. This library is used +by the EsounD daemon. + +Install audiofile if you're installing EsounD or you need an API for +any of the sound file formats it can handle. + +%package devel +Summary: Libraries, includes and other files to develop audiofile applications. +Group: Development/Libraries + +%description devel +The audiofile-devel package contains libraries, include files and +other resources you can use to develop Audio File applications. + +Install audiofile-devel if you want to develop Audio File apps. + +%prep +%setup -q + +%build +%configure +make + +%install + +rm -rf %{buildroot} +mkdir -p %{buildroot} + +%makeinstall + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%clean +rm -rf %{buildroot} + +%files +%defattr(-, root, root) +%doc COPYING TODO README ChangeLog docs +%{_bindir}/sfconvert +%{_bindir}/sfinfo +%{_libdir}/lib*.so.* + +%files devel +%defattr(-, root, root) +%{_bindir}/audiofile-config +%{_libdir}/lib*.so +%{_libdir}/*.a +%{_includedir}/* +%{_datadir}/aclocal/* + +%changelog +* Mon Aug 14 2000 Than Ngo +- add ldconfig to %post and %postun (Bug #15413) + +* Fri Aug 11 2000 Jonathan Blandford +- Up Epoch and release + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Preston Brown +- use FHS macros + +* Thu Feb 03 2000 Preston Brown +- strip library, use configure macro. + +* Tue Sep 14 1999 Elliot Lee +- 0.1.8pre (take whatever is in CVS). + +* Fri Aug 13 1999 Michael Fulbrght +- version 1.7.0 + +* Sun Apr 18 1999 Matt Wilson +- updated patch from DaveM + +* Fri Apr 16 1999 Matt Wilson +- added patch from Dave Miller to disable byte swapping in decoding + +* Fri Mar 19 1999 Michael Fulbright +- strip binaries before packaging + +* Thu Feb 25 1999 Michael Fulbright +- Version 0.1.6 + +* Sun Feb 21 1999 Michael Fulbright +- Removed libtoolize from %build + +* Wed Feb 3 1999 Jonathan Blandfor +- Newer version with bug fix. Upped release. + +* Wed Dec 16 1998 Michael Fulbright +- integrating into rawhide release at GNOME freeze + +* Fri Nov 20 1998 Michael Fulbright +- First try at a spec file diff --git a/sources b/sources index e69de29..bb8c0d9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d0b3c30db035fdab408ea63125068a32 audiofile-0.1.9.tar.gz From 0f72f67ab7dd55817968ba07464208d2c2616969 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:19 +0000 Subject: [PATCH 02/71] auto-import changelog data from audiofile-0.1.11-1.src.rpm Mon Dec 11 2000 Preston Brown - upgrade to 0.1.11. --- .cvsignore | 2 +- audiofile.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 60acb62..ce78497 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.1.9.tar.gz +audiofile-0.1.11.tar.gz diff --git a/audiofile.spec b/audiofile.spec index be98e89..63dd0f7 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile -Version: 0.1.9 -Release: 7 +Version: 0.1.11 +Release: 1 Epoch: 1 Copyright: LGPL Group: System Environment/Libraries @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Mon Dec 11 2000 Preston Brown +- upgrade to 0.1.11. + * Mon Aug 14 2000 Than Ngo - add ldconfig to %post and %postun (Bug #15413) diff --git a/sources b/sources index bb8c0d9..c1d14cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0b3c30db035fdab408ea63125068a32 audiofile-0.1.9.tar.gz +82e9bc75db254056849c8248ce34ae34 audiofile-0.1.11.tar.gz From fbceeb3f4c8218b5ce683af3ee19f3ad824a27d6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:21 +0000 Subject: [PATCH 03/71] auto-import changelog data from audiofile-0.2.1-1.src.rpm Tue Apr 17 2001 Jonathan Blandford - Bumped version to 0.2.1 --- .cvsignore | 2 +- audiofile.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ce78497..2a6af21 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.1.11.tar.gz +audiofile-0.2.1.tar.gz diff --git a/audiofile.spec b/audiofile.spec index 63dd0f7..1c9d3be 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,6 +1,6 @@ Summary: A library for accessing various audio file formats. Name: audiofile -Version: 0.1.11 +Version: 0.2.1 Release: 1 Epoch: 1 Copyright: LGPL @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Tue Apr 17 2001 Jonathan Blandford +- Bumped version to 0.2.1 + * Mon Dec 11 2000 Preston Brown - upgrade to 0.1.11. diff --git a/sources b/sources index c1d14cc..cef27c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82e9bc75db254056849c8248ce34ae34 audiofile-0.1.11.tar.gz +e0a9205ac868350ab9aee78f1d282aa5 audiofile-0.2.1.tar.gz From 9f5d640034f2246142a5a60390f394080bb298ff Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:28 +0000 Subject: [PATCH 04/71] auto-import changelog data from audiofile-0.2.1-2.src.rpm Mon Jun 25 2001 Preston Brown - explicit requirement of -devel package on main package (#45205) --- audiofile.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 1c9d3be..bb934c5 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.1 -Release: 1 +Release: 2 Epoch: 1 Copyright: LGPL Group: System Environment/Libraries @@ -22,6 +22,7 @@ any of the sound file formats it can handle. %package devel Summary: Libraries, includes and other files to develop audiofile applications. Group: Development/Libraries +Requires: %{name} = %{version} %description devel The audiofile-devel package contains libraries, include files and @@ -68,6 +69,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Mon Jun 25 2001 Preston Brown +- explicit requirement of -devel package on main package (#45205) + * Tue Apr 17 2001 Jonathan Blandford - Bumped version to 0.2.1 From c76444b269390dcd34c7bf91e52c789b6015724f Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:38 +0000 Subject: [PATCH 05/71] auto-import changelog data from audiofile-0.2.3-1.src.rpm Tue Jan 08 2002 Owen Taylor - Update to 0.2.3, update URLs --- .cvsignore | 2 +- audiofile.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2a6af21..c85b057 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.2.1.tar.gz +audiofile-0.2.3.tar.gz diff --git a/audiofile.spec b/audiofile.spec index bb934c5..60c7d81 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,35 +1,34 @@ Summary: A library for accessing various audio file formats. Name: audiofile -Version: 0.2.1 -Release: 2 +Version: 0.2.3 +Release: 1 Epoch: 1 -Copyright: LGPL +License: LGPL Group: System Environment/Libraries -Source: ftp://ftp.68k.org/pub/michael/audiofile-%{version}.tar.gz -URL: http://www.68k.org/~michael/audiofile/ +Source: ftp://oss.sgi.com/projects/download/audiofile-%{version}.tar.gz +URL: http://oss.sgi.com/projects/audofile/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig %description The Audio File library is an implementation of SGI's Audio File Library, which provides an API for accessing audio file formats like -AIFF/AIFF-C, WAVE, and NeXT/Sun .snd/.au files. This library is used +AIFF/AIFF-C, WAVE, and NeXT/Sun .snd/.au files. This library is used by the EsounD daemon. -Install audiofile if you're installing EsounD or you need an API for +Install audiofile if you are installing EsounD or you need an API for any of the sound file formats it can handle. %package devel -Summary: Libraries, includes and other files to develop audiofile applications. +Summary: Development files for Audio File applications. Group: Development/Libraries Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8 %description devel -The audiofile-devel package contains libraries, include files and +The audiofile-devel package contains libraries, include files, and other resources you can use to develop Audio File applications. -Install audiofile-devel if you want to develop Audio File apps. - %prep %setup -q @@ -65,10 +64,14 @@ rm -rf %{buildroot} %{_bindir}/audiofile-config %{_libdir}/lib*.so %{_libdir}/*.a +%{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_datadir}/aclocal/* %changelog +* Tue Jan 8 2002 Owen Taylor +- Update to 0.2.3, update URLs + * Mon Jun 25 2001 Preston Brown - explicit requirement of -devel package on main package (#45205) diff --git a/sources b/sources index cef27c5..c4a48ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0a9205ac868350ab9aee78f1d282aa5 audiofile-0.2.1.tar.gz +73f420be03e3f4591008fd5ead6d284d audiofile-0.2.3.tar.gz From d0a3a6d9f4819c5dd1df49689099f01e6eac4ce6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:15:57 +0000 Subject: [PATCH 06/71] auto-import changelog data from audiofile-0.2.3-2.src.rpm Thu May 23 2002 Tim Powers - automated rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 60c7d81..057d63d 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.3 -Release: 1 +Release: 2 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Thu May 23 2002 Tim Powers +- automated rebuild + * Tue Jan 8 2002 Owen Taylor - Update to 0.2.3, update URLs From a7513d6f640984501a86e04c383fe0eda9efcaaf Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:16:00 +0000 Subject: [PATCH 07/71] auto-import changelog data from audiofile-0.2.3-3.src.rpm Fri Jun 21 2002 Tim Powers - automated rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 057d63d..8cf4227 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.3 -Release: 2 +Release: 3 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Fri Jun 21 2002 Tim Powers +- automated rebuild + * Thu May 23 2002 Tim Powers - automated rebuild From 251fd7a68d4abebe5df0600226e3340d7126f88c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:16:04 +0000 Subject: [PATCH 08/71] auto-import changelog data from audiofile-0.2.3-6.src.rpm Mon Feb 10 2003 Bill Nottingham - fix URL (#71010) Wed Jan 22 2003 Tim Powers - rebuilt Tue Dec 03 2002 Elliot Lee - Remove unpackaged files --- audiofile.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 8cf4227..bd25fbb 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,12 +1,12 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.3 -Release: 3 +Release: 6 Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://oss.sgi.com/projects/download/audiofile-%{version}.tar.gz -URL: http://oss.sgi.com/projects/audofile/ +URL: http://oss.sgi.com/projects/audiofile/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig @@ -43,6 +43,8 @@ mkdir -p %{buildroot} %makeinstall +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %post /sbin/ldconfig @@ -69,6 +71,15 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Mon Feb 10 2003 Bill Nottingham +- fix URL (#71010) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Dec 03 2002 Elliot Lee +- Remove unpackaged files + * Fri Jun 21 2002 Tim Powers - automated rebuild From ddca3b5f19a71359ee2d2dd988d379e61e0f7dba Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:16:33 +0000 Subject: [PATCH 09/71] auto-import changelog data from audiofile-0.2.3-7.src.rpm Wed Jun 04 2003 Elliot Lee - rebuilt Tue Jun 03 2003 Jeff Johnson - add explicit epoch's where needed. --- audiofile.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index bd25fbb..baf6d7c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.3 -Release: 6 +Release: 7 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -22,8 +22,8 @@ any of the sound file formats it can handle. %package devel Summary: Development files for Audio File applications. Group: Development/Libraries -Requires: %{name} = %{version} -Requires: pkgconfig >= 0.8 +Requires: %{name} = %{epoch}:%{version} +Requires: pkgconfig >= 0:0.8 %description devel The audiofile-devel package contains libraries, include files, and @@ -71,6 +71,12 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + * Mon Feb 10 2003 Bill Nottingham - fix URL (#71010) From 07459147fd7764348062f2fc813c11e22b9d80bd Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:17:36 +0000 Subject: [PATCH 10/71] auto-import changelog data from audiofile-0.2.5-1.1.src.rpm Tue Mar 02 2004 Elliot Lee - rebuilt 0.2.5-1 - update to 0.2.5 Fri Feb 13 2004 Elliot Lee - rebuilt 0.2.3-7.1 - rebuild for RHEL --- .cvsignore | 2 +- audiofile.spec | 20 +++++++++++++++----- sources | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c85b057..54474d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.2.3.tar.gz +audiofile-0.2.5.tar.bz2 diff --git a/audiofile.spec b/audiofile.spec index baf6d7c..b42d926 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,12 +1,11 @@ Summary: A library for accessing various audio file formats. Name: audiofile -Version: 0.2.3 -Release: 7 +Version: 0.2.5 +Release: 1.1 Epoch: 1 License: LGPL Group: System Environment/Libraries -Source: ftp://oss.sgi.com/projects/download/audiofile-%{version}.tar.gz -URL: http://oss.sgi.com/projects/audiofile/ +Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig @@ -37,7 +36,6 @@ other resources you can use to develop Audio File applications. make %install - rm -rf %{buildroot} mkdir -p %{buildroot} @@ -71,6 +69,18 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Alexander Larsson 1:0.2.5-1 +- update to 0.2.5 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Jun 8 2003 Tim Powers 1:0.2.3-7.1 +- rebuild for RHEL + * Wed Jun 04 2003 Elliot Lee - rebuilt diff --git a/sources b/sources index c4a48ab..6ed5261 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73f420be03e3f4591008fd5ead6d284d audiofile-0.2.3.tar.gz +7eb4a437851062e93f965b6c981471c4 audiofile-0.2.5.tar.bz2 From 33d03184a364a504eaa42de200cdcc435dae276c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:17:48 +0000 Subject: [PATCH 11/71] auto-import changelog data from audiofile-0.2.5-2.src.rpm Tue Jun 15 2004 Elliot Lee - rebuilt --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index b42d926..0215321 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.5 -Release: 1.1 +Release: 2 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Tue Mar 02 2004 Elliot Lee - rebuilt From b74bd76b6984150b0e4ed7292b0114bd45d56542 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 03:17:54 +0000 Subject: [PATCH 12/71] auto-import changelog data from audiofile-0.2.6-1.src.rpm Fri Jul 30 2004 Colin Walters - Update to 0.2.6 - Rework description to not contain apostrophe that makes emacs unhappy Thu Jul 15 2004 Tim Waugh - Fixed warnings in shipped m4 file. --- .cvsignore | 2 +- audiofile-underquoted.patch | 11 +++++++++++ audiofile.spec | 18 ++++++++++++++---- sources | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 audiofile-underquoted.patch diff --git a/.cvsignore b/.cvsignore index 54474d1..6cfe9ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.2.5.tar.bz2 +audiofile-0.2.6.tar.bz2 diff --git a/audiofile-underquoted.patch b/audiofile-underquoted.patch new file mode 100644 index 0000000..fd892a3 --- /dev/null +++ b/audiofile-underquoted.patch @@ -0,0 +1,11 @@ +--- audiofile-0.2.5/audiofile.m4.underquoted 2004-07-15 13:18:34.963462705 +0100 ++++ audiofile-0.2.5/audiofile.m4 2004-07-15 13:18:43.976738116 +0100 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. + dnl +-AC_DEFUN(AM_PATH_AUDIOFILE, ++AC_DEFUN([AM_PATH_AUDIOFILE], + [dnl + dnl Get compiler flags and libraries from the audiofile-config script. + dnl diff --git a/audiofile.spec b/audiofile.spec index 0215321..428343e 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,17 +1,18 @@ Summary: A library for accessing various audio file formats. Name: audiofile -Version: 0.2.5 -Release: 2 +Version: 0.2.6 +Release: 1 Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 +Patch0: audiofile-underquoted.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig %description -The Audio File library is an implementation of SGI's Audio File -Library, which provides an API for accessing audio file formats like +The Audio File library is an implementation of the Audio File Library +from SGI, which provides an API for accessing audio file formats like AIFF/AIFF-C, WAVE, and NeXT/Sun .snd/.au files. This library is used by the EsounD daemon. @@ -30,6 +31,7 @@ other resources you can use to develop Audio File applications. %prep %setup -q +%patch0 -p1 -b .underquoted %build %configure @@ -69,6 +71,14 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Thu Jul 30 2004 Colin Walters +- Update to 0.2.6 +- Rework description to not contain apostrophe that + makes emacs unhappy + +* Thu Jul 15 2004 Tim Waugh +- Fixed warnings in shipped m4 file. + * Tue Jun 15 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index 6ed5261..c855bc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7eb4a437851062e93f965b6c981471c4 audiofile-0.2.5.tar.bz2 +3d01302834660850b6141cac1e6f5501 audiofile-0.2.6.tar.bz2 From 545cee8626c733159544936a513645f55585aab4 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Thu, 17 Mar 2005 15:49:26 +0000 Subject: [PATCH 13/71] - rebuild for gcc 4.0 --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 428343e..7d7d64d 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 1 +Release: 2 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Thu Mar 17 2004 John (J5) Palmieri - 0.2.6-2 +- rebuild for gcc 4.0 + * Thu Jul 30 2004 Colin Walters - Update to 0.2.6 - Rework description to not contain apostrophe that From 85b5aa4cb76af8151cde8b3c06c5fcc2af8931d1 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Thu, 17 Mar 2005 15:50:24 +0000 Subject: [PATCH 14/71] - fix date in changelog --- audiofile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 7d7d64d..f831c2c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -71,7 +71,7 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog -* Thu Mar 17 2004 John (J5) Palmieri - 0.2.6-2 +* Thu Mar 17 2005 John (J5) Palmieri - 0.2.6-2 - rebuild for gcc 4.0 * Thu Jul 30 2004 Colin Walters From ad181e9fd0620b173f134851253b610dbeba9f7a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:39:41 +0000 Subject: [PATCH 15/71] gcc update bump --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index f831c2c..98b008d 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2 +Release: 2 .1 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Thu Mar 17 2005 John (J5) Palmieri - 0.2.6-2 - rebuild for gcc 4.0 From 0b739eb750e53d72a5eccc66d9a0fcdc437e82f8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 10 Dec 2005 09:02:00 +0000 Subject: [PATCH 16/71] bad bump fix --- audiofile.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 98b008d..8b67939 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2 .1 +Release: 2.1 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -71,7 +71,7 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog -* Fri Dec 09 2005 Jesse Keating +* Fri Dec 09 2005 Jesse Keating - 0.2.6-2.1 - rebuilt * Thu Mar 17 2005 John (J5) Palmieri - 0.2.6-2 From 091042d706ebbcc01d2928b9bbe395122943abe0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 7 Feb 2006 11:02:06 +0000 Subject: [PATCH 17/71] bump for new gcc/glibc --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 8b67939..2a0ba10 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2.1 +Release: 2.2 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Tue Feb 07 2006 Jesse Keating - 1:0.2.6-2.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Fri Dec 09 2005 Jesse Keating - 0.2.6-2.1 - rebuilt From 69a16ded409fe9827c997fae30ebcff28c1365d9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 11 Feb 2006 01:59:17 +0000 Subject: [PATCH 18/71] bump for bug in double-long on ppc(64) --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 2a0ba10..9772c1c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2.2 +Release: 2.2.1 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Fri Feb 10 2006 Jesse Keating - 1:0.2.6-2.2.1 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jesse Keating - 1:0.2.6-2.2 - rebuilt for new gcc4.1 snapshot and glibc changes From 7663a92de73ea3105d154603dd7a688a6d268c91 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 24 Mar 2006 16:22:28 +0000 Subject: [PATCH 19/71] Reduce memory consumption --- audiofile-const.patch | 316 ++++++++++++++++++++++++++++++++++++++++++ audiofile.spec | 7 +- 2 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 audiofile-const.patch diff --git a/audiofile-const.patch b/audiofile-const.patch new file mode 100644 index 0000000..11e947b --- /dev/null +++ b/audiofile-const.patch @@ -0,0 +1,316 @@ +diff -ur audiofile-0.2.6-orig/libaudiofile/aiff.c audiofile-0.2.6-mine/libaudiofile/aiff.c +--- audiofile-0.2.6-orig/libaudiofile/aiff.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/aiff.c 2006-03-22 02:15:50.058306000 -0500 +@@ -64,7 +64,7 @@ + static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type, + size_t size); + +-_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = ++const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = + { + { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, + { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, +@@ -77,7 +77,7 @@ + { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} } + }; + +-int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = ++const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = + { + AF_COMPRESSION_G711_ULAW, + AF_COMPRESSION_G711_ALAW +diff -ur audiofile-0.2.6-orig/libaudiofile/compression.c audiofile-0.2.6-mine/libaudiofile/compression.c +--- audiofile-0.2.6-orig/libaudiofile/compression.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/compression.c 2006-03-22 02:04:44.948739250 -0500 +@@ -37,7 +37,7 @@ + #include "units.h" + #include "util.h" + +-extern _CompressionUnit _af_compression[]; ++extern const _CompressionUnit _af_compression[]; + + int _af_compression_index_from_id (int compressionid) + { +@@ -54,7 +54,7 @@ + return -1; + } + +-static _CompressionUnit *findCompression (int compressionid) ++static const _CompressionUnit *findCompression (int compressionid) + { + int compressionno; + +diff -ur audiofile-0.2.6-orig/libaudiofile/debug.c audiofile-0.2.6-mine/libaudiofile/debug.c +--- audiofile-0.2.6-orig/libaudiofile/debug.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/debug.c 2006-03-22 01:56:31.187180000 -0500 +@@ -49,7 +49,7 @@ + #include "print.h" + #include "debug.h" + +-extern _CompressionUnit _af_compression[]; ++extern const _CompressionUnit _af_compression[]; + + void _af_printid (u_int32_t id) + { +diff -ur audiofile-0.2.6-orig/libaudiofile/format.c audiofile-0.2.6-mine/libaudiofile/format.c +--- audiofile-0.2.6-orig/libaudiofile/format.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/format.c 2006-03-22 01:56:21.586580000 -0500 +@@ -43,7 +43,7 @@ + #include "units.h" + #include "modules.h" + +-extern _Unit _af_units[]; ++extern const _Unit _af_units[]; + + AFfileoffset afGetDataOffset (AFfilehandle file, int trackid) + { +diff -ur audiofile-0.2.6-orig/libaudiofile/g711.c audiofile-0.2.6-mine/libaudiofile/g711.c +--- audiofile-0.2.6-orig/libaudiofile/g711.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/g711.c 2006-03-21 22:57:37.356130750 -0500 +@@ -38,7 +38,7 @@ + #define SEG_MASK (0x70) /* Segment field mask. */ + + /* copy from CCITT G.711 specifications */ +-static unsigned char _u2a[128] = { /* u- to A-law conversions */ ++static const unsigned char _u2a[128] = { /* u- to A-law conversions */ + 1, 1, 2, 2, 3, 3, 4, 4, + 5, 5, 6, 6, 7, 7, 8, 8, + 9, 10, 11, 12, 13, 14, 15, 16, +@@ -56,7 +56,7 @@ + 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128}; + +-static unsigned char _a2u[128] = { /* A- to u-law conversions */ ++static const unsigned char _a2u[128] = { /* A- to u-law conversions */ + 1, 3, 5, 7, 9, 11, 13, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, +@@ -77,7 +77,7 @@ + /* see libst.h */ + #ifdef SUPERCEDED + +-static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, ++static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, + 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF}; + + static int +diff -ur audiofile-0.2.6-orig/libaudiofile/instrument.c audiofile-0.2.6-mine/libaudiofile/instrument.c +--- audiofile-0.2.6-orig/libaudiofile/instrument.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/instrument.c 2006-03-22 01:56:12.642021000 -0500 +@@ -55,7 +55,7 @@ + + #include + +-extern _Unit _af_units[]; ++extern const _Unit _af_units[]; + + /* + Initialize instrument id list for audio file. +diff -ur audiofile-0.2.6-orig/libaudiofile/modules.c audiofile-0.2.6-mine/libaudiofile/modules.c +--- audiofile-0.2.6-orig/libaudiofile/modules.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/modules.c 2006-03-22 02:07:29.411017500 -0500 +@@ -56,15 +56,15 @@ + + #define NULLMODULEPARAM + +-extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; +-extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; +-extern _PCMInfo _af_default_float_pcm_mapping; +-extern _PCMInfo _af_default_double_pcm_mapping; ++extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; ++extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; ++extern const _PCMInfo _af_default_float_pcm_mapping; ++extern const _PCMInfo _af_default_double_pcm_mapping; + + extern _CompressionUnit _af_compression[]; + + /* Define rebuffering modules. */ +-extern _AFmodule int2rebufferv2f, int2rebufferf2v; ++extern const _AFmodule int2rebufferv2f, int2rebufferf2v; + + /* + module utility routines +@@ -1511,7 +1511,7 @@ + } + }; + +-static _PCMInfo *intmappings[6] = ++static const _PCMInfo *intmappings[6] = + { + &_af_default_signed_integer_pcm_mappings[1], + &_af_default_signed_integer_pcm_mappings[2], +diff -ur audiofile-0.2.6-orig/libaudiofile/next.c audiofile-0.2.6-mine/libaudiofile/next.c +--- audiofile-0.2.6-orig/libaudiofile/next.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/next.c 2006-03-22 02:15:59.742911250 -0500 +@@ -47,7 +47,7 @@ + #include "setup.h" + #include "byteorder.h" + +-int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = ++const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = + { + AF_COMPRESSION_G711_ULAW, + AF_COMPRESSION_G711_ALAW +diff -ur audiofile-0.2.6-orig/libaudiofile/openclose.c audiofile-0.2.6-mine/libaudiofile/openclose.c +--- audiofile-0.2.6-orig/libaudiofile/openclose.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/openclose.c 2006-03-22 01:55:33.067547750 -0500 +@@ -45,7 +45,7 @@ + #define SETBINARYMODE(x) + #endif /* WIN32 || __CYGWIN__ */ + +-extern _Unit _af_units[]; ++extern const _Unit _af_units[]; + + static void freeFileHandle (AFfilehandle filehandle); + static void freeInstParams (AFPVu *values, int fileFormat); +diff -ur audiofile-0.2.6-orig/libaudiofile/pcm.c audiofile-0.2.6-mine/libaudiofile/pcm.c +--- audiofile-0.2.6-orig/libaudiofile/pcm.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/pcm.c 2006-03-21 22:56:53.581395000 -0500 +@@ -33,7 +33,7 @@ + #include "pcm.h" + #include "util.h" + +-_PCMInfo _af_default_signed_integer_pcm_mappings[] = ++const _PCMInfo _af_default_signed_integer_pcm_mappings[] = + { + {0, 0, 0, 0}, + {SLOPE_INT8, 0, MIN_INT8, MAX_INT8}, +@@ -42,7 +42,7 @@ + {SLOPE_INT32, 0, MIN_INT32, MAX_INT32} + }; + +-_PCMInfo _af_default_unsigned_integer_pcm_mappings[] = ++const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] = + { + {0, 0, 0, 0}, + {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8}, +@@ -51,10 +51,10 @@ + {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32} + }; + +-_PCMInfo _af_default_float_pcm_mapping = ++const _PCMInfo _af_default_float_pcm_mapping = + {1, 0, 0, 0}; + +-_PCMInfo _af_default_double_pcm_mapping = ++const _PCMInfo _af_default_double_pcm_mapping = + {1, 0, 0, 0}; + + /* +diff -ur audiofile-0.2.6-orig/libaudiofile/query.c audiofile-0.2.6-mine/libaudiofile/query.c +--- audiofile-0.2.6-orig/libaudiofile/query.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/query.c 2006-03-22 01:55:23.070923000 -0500 +@@ -43,8 +43,8 @@ + #include "compression.h" + #include "instrument.h" + +-extern _Unit _af_units[]; +-extern _CompressionUnit _af_compression[]; ++extern const _Unit _af_units[]; ++extern const _CompressionUnit _af_compression[]; + + AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4); + AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4); +diff -ur audiofile-0.2.6-orig/libaudiofile/raw.c audiofile-0.2.6-mine/libaudiofile/raw.c +--- audiofile-0.2.6-orig/libaudiofile/raw.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/raw.c 2006-03-22 02:16:08.563462500 -0500 +@@ -50,7 +50,7 @@ + NULL /* miscellaneous */ + }; + +-int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = ++const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = + { + AF_COMPRESSION_G711_ULAW, + AF_COMPRESSION_G711_ALAW +diff -ur audiofile-0.2.6-orig/libaudiofile/setup.c audiofile-0.2.6-mine/libaudiofile/setup.c +--- audiofile-0.2.6-orig/libaudiofile/setup.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/setup.c 2006-03-22 02:16:14.567837750 -0500 +@@ -39,7 +39,7 @@ + + extern _Unit _af_units[]; + +-_AFfilesetup _af_default_file_setup = ++const _AFfilesetup _af_default_file_setup = + { + _AF_VALID_FILESETUP, /* valid */ + #if WORDS_BIGENDIAN +@@ -58,7 +58,7 @@ + NULL /* miscellaneous */ + }; + +-_InstrumentSetup _af_default_instrumentsetup = ++const _InstrumentSetup _af_default_instrumentsetup = + { + 0, /* id */ + 2, /* loopCount */ +@@ -66,7 +66,7 @@ + AF_FALSE /* loopSet */ + }; + +-_TrackSetup _af_default_tracksetup = ++const _TrackSetup _af_default_tracksetup = + { + 0, + { +diff -ur audiofile-0.2.6-orig/libaudiofile/units.c audiofile-0.2.6-mine/libaudiofile/units.c +--- audiofile-0.2.6-orig/libaudiofile/units.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/units.c 2006-03-22 02:02:12.335201500 -0500 +@@ -56,7 +56,7 @@ + extern int _af_next_compression_types[]; + extern int _af_wave_compression_types[]; + +-_Unit _af_units[_AF_NUM_UNITS] = ++const _Unit _af_units[_AF_NUM_UNITS] = + { + { + AF_FILE_RAWDATA, +@@ -221,7 +221,7 @@ + } + }; + +-_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = ++const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = + { + { + AF_COMPRESSION_NONE, +diff -ur audiofile-0.2.6-orig/libaudiofile/util.c audiofile-0.2.6-mine/libaudiofile/util.c +--- audiofile-0.2.6-orig/libaudiofile/util.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/util.c 2006-03-22 01:54:41.944352750 -0500 +@@ -46,12 +46,12 @@ + #include "byteorder.h" + #include "aupvinternal.h" + +-extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; +-extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; +-extern _PCMInfo _af_default_float_pcm_mapping; +-extern _PCMInfo _af_default_double_pcm_mapping; ++extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; ++extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; ++extern const _PCMInfo _af_default_float_pcm_mapping; ++extern const _PCMInfo _af_default_double_pcm_mapping; + +-extern _CompressionUnit _af_compression[]; ++extern const _CompressionUnit _af_compression[]; + + /* + _af_filesetup_ok and _af_filehandle_ok are sanity check routines +diff -ur audiofile-0.2.6-orig/libaudiofile/wave.c audiofile-0.2.6-mine/libaudiofile/wave.c +--- audiofile-0.2.6-orig/libaudiofile/wave.c 2004-03-06 01:39:23.000000000 -0500 ++++ audiofile-0.2.6-mine/libaudiofile/wave.c 2006-03-22 02:16:29.568775250 -0500 +@@ -49,13 +49,13 @@ + #include "setup.h" + #include "marker.h" + +-int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = ++const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = + { + AF_COMPRESSION_G711_ULAW, + AF_COMPRESSION_G711_ALAW + }; + +-_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = ++const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = + { + { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, + { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, diff --git a/audiofile.spec b/audiofile.spec index 9772c1c..dc6de04 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,12 +1,13 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2.2.1 +Release: 3 Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 Patch0: audiofile-underquoted.patch +Patch1: audiofile-const.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig @@ -32,6 +33,7 @@ other resources you can use to develop Audio File applications. %prep %setup -q %patch0 -p1 -b .underquoted +%patch1 -p1 -b .const %build %configure @@ -71,6 +73,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Fri Mar 24 2006 Matthias Clasen - 1:0.2.6-3 +- Reduce memory consumption by making data tables const + * Fri Feb 10 2006 Jesse Keating - 1:0.2.6-2.2.1 - bump again for double-long bug on ppc(64) From 5f0ec3c4f1b5b2a1406bbb1c83aee70143df32cb Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Mon, 17 Apr 2006 21:12:46 +0000 Subject: [PATCH 20/71] - Remove Makefile* from docs so they are not installed --- audiofile.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index dc6de04..290e843 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 3 +Release: 4 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -46,6 +46,7 @@ mkdir -p %{buildroot} %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f docs/Makefile* %post /sbin/ldconfig @@ -73,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Mon Apr 17 2006 John (J5) Palmieri - 1:0.2.6-4 +- Remove Makefile* from docs so they are not installed + * Fri Mar 24 2006 Matthias Clasen - 1:0.2.6-3 - Reduce memory consumption by making data tables const From d55e3115174aaf169dcc072ba11470305ad0b708 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 05:23:07 +0000 Subject: [PATCH 21/71] bumped for rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 290e843..86498c3 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 4 +Release: 4.1 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -74,6 +74,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Wed Jul 12 2006 Jesse Keating - 1:0.2.6-4.1 +- rebuild + * Mon Apr 17 2006 John (J5) Palmieri - 1:0.2.6-4 - Remove Makefile* from docs so they are not installed From d3027f2cc3cd320a4d0d3dec96ce58c51588559a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 Jul 2006 23:29:00 +0000 Subject: [PATCH 22/71] Fix multilib, don't ship .a's --- audiofile-multilib.patch | 33 +++++++++++++++++++++++++++++++++ audiofile.spec | 10 ++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 audiofile-multilib.patch diff --git a/audiofile-multilib.patch b/audiofile-multilib.patch new file mode 100644 index 0000000..1d600db --- /dev/null +++ b/audiofile-multilib.patch @@ -0,0 +1,33 @@ +--- audiofile-0.2.6/audiofile-config.in.multilib 2006-07-27 19:23:38.000000000 -0400 ++++ audiofile-0.2.6/audiofile-config.in 2006-07-27 19:25:18.000000000 -0400 +@@ -1,7 +1,7 @@ + #!/bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++prefix=`pkg-config --variable prefix audiofile` ++exec_prefix=`pkg-config --variable exec_prefix audiofile` + exec_prefix_set=no + + usage="\ +@@ -36,17 +36,13 @@ + echo $exec_prefix + ;; + --version) +- echo @AUDIOFILE_VERSION@ ++ pkg-config --modversion audiofile + ;; + --cflags) +- if test @includedir@ != /usr/include ; then +- includes=-I@includedir@ +- fi +- echo $includes ++ pkg-config --cflags audiofile + ;; + --libs) +- libdirs=-L@libdir@ +- echo $libdirs -laudiofile -lm ++ pkg-config --libs audiofile + ;; + *) + echo "${usage}" 1>&2 diff --git a/audiofile.spec b/audiofile.spec index 86498c3..e123073 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,13 +1,14 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 4.1 +Release: 5 Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 Patch0: audiofile-underquoted.patch Patch1: audiofile-const.patch +Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig @@ -34,6 +35,7 @@ other resources you can use to develop Audio File applications. %setup -q %patch0 -p1 -b .underquoted %patch1 -p1 -b .const +%patch2 -p1 -b .multilib %build %configure @@ -46,6 +48,7 @@ mkdir -p %{buildroot} %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f docs/Makefile* %post @@ -68,12 +71,15 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_bindir}/audiofile-config %{_libdir}/lib*.so -%{_libdir}/*.a %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_datadir}/aclocal/* %changelog +* Thu Jul 27 2006 Matthias Clasen - 1:0.2.6-5 +- Fix multilib conflicts +- Don't ship static libraries + * Wed Jul 12 2006 Jesse Keating - 1:0.2.6-4.1 - rebuild From 2177baacc271f9a30a66adb1f2f6ffcff163cd5b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 4 Feb 2007 02:13:53 +0000 Subject: [PATCH 23/71] Corrections from package review --- audiofile.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index e123073..8841ff1 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,16 +1,16 @@ -Summary: A library for accessing various audio file formats. +Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 5 +Release: 6%{?dist} Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 +URL: http://www.68k.org/~michael/audiofile/ Patch0: audiofile-underquoted.patch Patch1: audiofile-const.patch Patch2: audiofile-multilib.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: /sbin/ldconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The Audio File library is an implementation of the Audio File Library @@ -22,10 +22,10 @@ Install audiofile if you are installing EsounD or you need an API for any of the sound file formats it can handle. %package devel -Summary: Development files for Audio File applications. +Summary: Development files for Audio File applications Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version} -Requires: pkgconfig >= 0:0.8 +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: pkgconfig >= 1:0.8 %description devel The audiofile-devel package contains libraries, include files, and @@ -38,27 +38,23 @@ other resources you can use to develop Audio File applications. %patch2 -p1 -b .multilib %build -%configure +%configure --disable-static make %install -rm -rf %{buildroot} -mkdir -p %{buildroot} +rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f docs/Makefile* -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) @@ -76,6 +72,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Sat Feb 3 2007 Matthias Clasen - 1:0.2.6-6 +- Corrections from package review + * Thu Jul 27 2006 Matthias Clasen - 1:0.2.6-5 - Fix multilib conflicts - Don't ship static libraries From d07451fed5c520918a4ca625d6918c6a6897b1ed Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 24 Aug 2007 12:20:50 +0000 Subject: [PATCH 24/71] - Rebuild for build ID --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 8841ff1..2ae919e 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Fri Aug 24 2007 Adam Jackson - 1:0.2.6-7 +- Rebuild for build ID + * Sat Feb 3 2007 Matthias Clasen - 1:0.2.6-6 - Corrections from package review From 875115431a66eda4739fd8e6fe9ec4d021e9fad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 15 Oct 2007 17:02:41 +0000 Subject: [PATCH 25/71] a* batch fix for https://hosted.fedoraproject.org/projects/fedora-infrastructure/ticket/ 42 --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7c735f9..3edc776 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: audiofile -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 03:14:58 cvsdist Exp $ NAME := audiofile SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +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 +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt 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) From ad7cbc380abd8994a56207341abff67a3214f72e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 04:22:54 +0000 Subject: [PATCH 26/71] - Autorebuild for GCC 4.3 --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 2ae919e..4e44f2c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 1:0.2.6-8 +- Autorebuild for GCC 4.3 + * Fri Aug 24 2007 Adam Jackson - 1:0.2.6-7 - Rebuild for build ID From ce7f2d6bbf2b6e9e390d174cd23e993e02cc216b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 Jul 2008 18:47:27 +0000 Subject: [PATCH 27/71] fix license tag --- audiofile.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 4e44f2c..e8d8f9b 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,9 +1,9 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 URL: http://www.68k.org/~michael/audiofile/ @@ -11,6 +11,7 @@ Patch0: audiofile-underquoted.patch Patch1: audiofile-const.patch Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool %description The Audio File library is an implementation of the Audio File Library @@ -39,14 +40,14 @@ other resources you can use to develop Audio File applications. %build %configure --disable-static -make +make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool" %install rm -rf $RPM_BUILD_ROOT - -%makeinstall +make DESTDIR="$RPM_BUILD_ROOT" install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f docs/Makefile* %post -p /sbin/ldconfig @@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1:0.2.6-9 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1:0.2.6-8 - Autorebuild for GCC 4.3 From 47bd0041083c8332b98e150e989a43f1923c66b3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 03:10:27 +0000 Subject: [PATCH 28/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index e8d8f9b..7f32c07 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 14 2008 Tom "spot" Callaway - 1:0.2.6-9 - fix license tag From c207efe3e9e5696957b806a7e776c403db67250b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 17:33:16 +0000 Subject: [PATCH 29/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 7f32c07..76449c2 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.2.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.2.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 76efa6c7fcc30f58c8fd119a9723e360e72a7bf3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:42:22 +0000 Subject: [PATCH 30/71] 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 3edc776..0f5e4d9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: audiofile -# $Id: Makefile,v 1.1 2004/09/09 03:14:58 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 17:02:41 scop Exp $ NAME := audiofile 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 008fbae70829a93fe7fc40edc0c6b16dee5f012f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 22 Mar 2010 16:55:14 +0000 Subject: [PATCH 31/71] - Update to 0.2.7 --- .cvsignore | 2 +- audiofile.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6cfe9ea..b817c08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audiofile-0.2.6.tar.bz2 +audiofile-0.2.7.tar.gz diff --git a/audiofile.spec b/audiofile.spec index 76449c2..7d51e02 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile -Version: 0.2.6 -Release: 11%{?dist} +Version: 0.2.7 +Release: 1%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Mar 22 2010 Bastien Nocera 0.2.7-1 +- Update to 0.2.7 + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.2.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index c855bc5..683eefe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d01302834660850b6141cac1e6f5501 audiofile-0.2.6.tar.bz2 +a39be317a7b1971b408805dc5e371862 audiofile-0.2.7.tar.gz From 77a2a8b5914db5c4b50f70de1c906b26ae32049a Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 22 Mar 2010 17:18:47 +0000 Subject: [PATCH 32/71] Fix Source and patch application --- audiofile-const.patch | 316 ------------------------------------ audiofile-underquoted.patch | 11 -- audiofile.spec | 6 +- 3 files changed, 1 insertion(+), 332 deletions(-) delete mode 100644 audiofile-const.patch delete mode 100644 audiofile-underquoted.patch diff --git a/audiofile-const.patch b/audiofile-const.patch deleted file mode 100644 index 11e947b..0000000 --- a/audiofile-const.patch +++ /dev/null @@ -1,316 +0,0 @@ -diff -ur audiofile-0.2.6-orig/libaudiofile/aiff.c audiofile-0.2.6-mine/libaudiofile/aiff.c ---- audiofile-0.2.6-orig/libaudiofile/aiff.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/aiff.c 2006-03-22 02:15:50.058306000 -0500 -@@ -64,7 +64,7 @@ - static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type, - size_t size); - --_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = -+const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = - { - { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, - { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, -@@ -77,7 +77,7 @@ - { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} } - }; - --int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = -+const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = - { - AF_COMPRESSION_G711_ULAW, - AF_COMPRESSION_G711_ALAW -diff -ur audiofile-0.2.6-orig/libaudiofile/compression.c audiofile-0.2.6-mine/libaudiofile/compression.c ---- audiofile-0.2.6-orig/libaudiofile/compression.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/compression.c 2006-03-22 02:04:44.948739250 -0500 -@@ -37,7 +37,7 @@ - #include "units.h" - #include "util.h" - --extern _CompressionUnit _af_compression[]; -+extern const _CompressionUnit _af_compression[]; - - int _af_compression_index_from_id (int compressionid) - { -@@ -54,7 +54,7 @@ - return -1; - } - --static _CompressionUnit *findCompression (int compressionid) -+static const _CompressionUnit *findCompression (int compressionid) - { - int compressionno; - -diff -ur audiofile-0.2.6-orig/libaudiofile/debug.c audiofile-0.2.6-mine/libaudiofile/debug.c ---- audiofile-0.2.6-orig/libaudiofile/debug.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/debug.c 2006-03-22 01:56:31.187180000 -0500 -@@ -49,7 +49,7 @@ - #include "print.h" - #include "debug.h" - --extern _CompressionUnit _af_compression[]; -+extern const _CompressionUnit _af_compression[]; - - void _af_printid (u_int32_t id) - { -diff -ur audiofile-0.2.6-orig/libaudiofile/format.c audiofile-0.2.6-mine/libaudiofile/format.c ---- audiofile-0.2.6-orig/libaudiofile/format.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/format.c 2006-03-22 01:56:21.586580000 -0500 -@@ -43,7 +43,7 @@ - #include "units.h" - #include "modules.h" - --extern _Unit _af_units[]; -+extern const _Unit _af_units[]; - - AFfileoffset afGetDataOffset (AFfilehandle file, int trackid) - { -diff -ur audiofile-0.2.6-orig/libaudiofile/g711.c audiofile-0.2.6-mine/libaudiofile/g711.c ---- audiofile-0.2.6-orig/libaudiofile/g711.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/g711.c 2006-03-21 22:57:37.356130750 -0500 -@@ -38,7 +38,7 @@ - #define SEG_MASK (0x70) /* Segment field mask. */ - - /* copy from CCITT G.711 specifications */ --static unsigned char _u2a[128] = { /* u- to A-law conversions */ -+static const unsigned char _u2a[128] = { /* u- to A-law conversions */ - 1, 1, 2, 2, 3, 3, 4, 4, - 5, 5, 6, 6, 7, 7, 8, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -@@ -56,7 +56,7 @@ - 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128}; - --static unsigned char _a2u[128] = { /* A- to u-law conversions */ -+static const unsigned char _a2u[128] = { /* A- to u-law conversions */ - 1, 3, 5, 7, 9, 11, 13, 15, - 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, -@@ -77,7 +77,7 @@ - /* see libst.h */ - #ifdef SUPERCEDED - --static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, -+static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, - 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF}; - - static int -diff -ur audiofile-0.2.6-orig/libaudiofile/instrument.c audiofile-0.2.6-mine/libaudiofile/instrument.c ---- audiofile-0.2.6-orig/libaudiofile/instrument.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/instrument.c 2006-03-22 01:56:12.642021000 -0500 -@@ -55,7 +55,7 @@ - - #include - --extern _Unit _af_units[]; -+extern const _Unit _af_units[]; - - /* - Initialize instrument id list for audio file. -diff -ur audiofile-0.2.6-orig/libaudiofile/modules.c audiofile-0.2.6-mine/libaudiofile/modules.c ---- audiofile-0.2.6-orig/libaudiofile/modules.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/modules.c 2006-03-22 02:07:29.411017500 -0500 -@@ -56,15 +56,15 @@ - - #define NULLMODULEPARAM - --extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; --extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; --extern _PCMInfo _af_default_float_pcm_mapping; --extern _PCMInfo _af_default_double_pcm_mapping; -+extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; -+extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; -+extern const _PCMInfo _af_default_float_pcm_mapping; -+extern const _PCMInfo _af_default_double_pcm_mapping; - - extern _CompressionUnit _af_compression[]; - - /* Define rebuffering modules. */ --extern _AFmodule int2rebufferv2f, int2rebufferf2v; -+extern const _AFmodule int2rebufferv2f, int2rebufferf2v; - - /* - module utility routines -@@ -1511,7 +1511,7 @@ - } - }; - --static _PCMInfo *intmappings[6] = -+static const _PCMInfo *intmappings[6] = - { - &_af_default_signed_integer_pcm_mappings[1], - &_af_default_signed_integer_pcm_mappings[2], -diff -ur audiofile-0.2.6-orig/libaudiofile/next.c audiofile-0.2.6-mine/libaudiofile/next.c ---- audiofile-0.2.6-orig/libaudiofile/next.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/next.c 2006-03-22 02:15:59.742911250 -0500 -@@ -47,7 +47,7 @@ - #include "setup.h" - #include "byteorder.h" - --int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = -+const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = - { - AF_COMPRESSION_G711_ULAW, - AF_COMPRESSION_G711_ALAW -diff -ur audiofile-0.2.6-orig/libaudiofile/openclose.c audiofile-0.2.6-mine/libaudiofile/openclose.c ---- audiofile-0.2.6-orig/libaudiofile/openclose.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/openclose.c 2006-03-22 01:55:33.067547750 -0500 -@@ -45,7 +45,7 @@ - #define SETBINARYMODE(x) - #endif /* WIN32 || __CYGWIN__ */ - --extern _Unit _af_units[]; -+extern const _Unit _af_units[]; - - static void freeFileHandle (AFfilehandle filehandle); - static void freeInstParams (AFPVu *values, int fileFormat); -diff -ur audiofile-0.2.6-orig/libaudiofile/pcm.c audiofile-0.2.6-mine/libaudiofile/pcm.c ---- audiofile-0.2.6-orig/libaudiofile/pcm.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/pcm.c 2006-03-21 22:56:53.581395000 -0500 -@@ -33,7 +33,7 @@ - #include "pcm.h" - #include "util.h" - --_PCMInfo _af_default_signed_integer_pcm_mappings[] = -+const _PCMInfo _af_default_signed_integer_pcm_mappings[] = - { - {0, 0, 0, 0}, - {SLOPE_INT8, 0, MIN_INT8, MAX_INT8}, -@@ -42,7 +42,7 @@ - {SLOPE_INT32, 0, MIN_INT32, MAX_INT32} - }; - --_PCMInfo _af_default_unsigned_integer_pcm_mappings[] = -+const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] = - { - {0, 0, 0, 0}, - {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8}, -@@ -51,10 +51,10 @@ - {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32} - }; - --_PCMInfo _af_default_float_pcm_mapping = -+const _PCMInfo _af_default_float_pcm_mapping = - {1, 0, 0, 0}; - --_PCMInfo _af_default_double_pcm_mapping = -+const _PCMInfo _af_default_double_pcm_mapping = - {1, 0, 0, 0}; - - /* -diff -ur audiofile-0.2.6-orig/libaudiofile/query.c audiofile-0.2.6-mine/libaudiofile/query.c ---- audiofile-0.2.6-orig/libaudiofile/query.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/query.c 2006-03-22 01:55:23.070923000 -0500 -@@ -43,8 +43,8 @@ - #include "compression.h" - #include "instrument.h" - --extern _Unit _af_units[]; --extern _CompressionUnit _af_compression[]; -+extern const _Unit _af_units[]; -+extern const _CompressionUnit _af_compression[]; - - AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4); - AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4); -diff -ur audiofile-0.2.6-orig/libaudiofile/raw.c audiofile-0.2.6-mine/libaudiofile/raw.c ---- audiofile-0.2.6-orig/libaudiofile/raw.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/raw.c 2006-03-22 02:16:08.563462500 -0500 -@@ -50,7 +50,7 @@ - NULL /* miscellaneous */ - }; - --int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = -+const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = - { - AF_COMPRESSION_G711_ULAW, - AF_COMPRESSION_G711_ALAW -diff -ur audiofile-0.2.6-orig/libaudiofile/setup.c audiofile-0.2.6-mine/libaudiofile/setup.c ---- audiofile-0.2.6-orig/libaudiofile/setup.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/setup.c 2006-03-22 02:16:14.567837750 -0500 -@@ -39,7 +39,7 @@ - - extern _Unit _af_units[]; - --_AFfilesetup _af_default_file_setup = -+const _AFfilesetup _af_default_file_setup = - { - _AF_VALID_FILESETUP, /* valid */ - #if WORDS_BIGENDIAN -@@ -58,7 +58,7 @@ - NULL /* miscellaneous */ - }; - --_InstrumentSetup _af_default_instrumentsetup = -+const _InstrumentSetup _af_default_instrumentsetup = - { - 0, /* id */ - 2, /* loopCount */ -@@ -66,7 +66,7 @@ - AF_FALSE /* loopSet */ - }; - --_TrackSetup _af_default_tracksetup = -+const _TrackSetup _af_default_tracksetup = - { - 0, - { -diff -ur audiofile-0.2.6-orig/libaudiofile/units.c audiofile-0.2.6-mine/libaudiofile/units.c ---- audiofile-0.2.6-orig/libaudiofile/units.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/units.c 2006-03-22 02:02:12.335201500 -0500 -@@ -56,7 +56,7 @@ - extern int _af_next_compression_types[]; - extern int _af_wave_compression_types[]; - --_Unit _af_units[_AF_NUM_UNITS] = -+const _Unit _af_units[_AF_NUM_UNITS] = - { - { - AF_FILE_RAWDATA, -@@ -221,7 +221,7 @@ - } - }; - --_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = -+const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = - { - { - AF_COMPRESSION_NONE, -diff -ur audiofile-0.2.6-orig/libaudiofile/util.c audiofile-0.2.6-mine/libaudiofile/util.c ---- audiofile-0.2.6-orig/libaudiofile/util.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/util.c 2006-03-22 01:54:41.944352750 -0500 -@@ -46,12 +46,12 @@ - #include "byteorder.h" - #include "aupvinternal.h" - --extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; --extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; --extern _PCMInfo _af_default_float_pcm_mapping; --extern _PCMInfo _af_default_double_pcm_mapping; -+extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; -+extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; -+extern const _PCMInfo _af_default_float_pcm_mapping; -+extern const _PCMInfo _af_default_double_pcm_mapping; - --extern _CompressionUnit _af_compression[]; -+extern const _CompressionUnit _af_compression[]; - - /* - _af_filesetup_ok and _af_filehandle_ok are sanity check routines -diff -ur audiofile-0.2.6-orig/libaudiofile/wave.c audiofile-0.2.6-mine/libaudiofile/wave.c ---- audiofile-0.2.6-orig/libaudiofile/wave.c 2004-03-06 01:39:23.000000000 -0500 -+++ audiofile-0.2.6-mine/libaudiofile/wave.c 2006-03-22 02:16:29.568775250 -0500 -@@ -49,13 +49,13 @@ - #include "setup.h" - #include "marker.h" - --int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = -+const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = - { - AF_COMPRESSION_G711_ULAW, - AF_COMPRESSION_G711_ALAW - }; - --_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = -+const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = - { - { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, - { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, diff --git a/audiofile-underquoted.patch b/audiofile-underquoted.patch deleted file mode 100644 index fd892a3..0000000 --- a/audiofile-underquoted.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- audiofile-0.2.5/audiofile.m4.underquoted 2004-07-15 13:18:34.963462705 +0100 -+++ audiofile-0.2.5/audiofile.m4 2004-07-15 13:18:43.976738116 +0100 -@@ -9,7 +9,7 @@ - dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. - dnl --AC_DEFUN(AM_PATH_AUDIOFILE, -+AC_DEFUN([AM_PATH_AUDIOFILE], - [dnl - dnl Get compiler flags and libraries from the audiofile-config script. - dnl diff --git a/audiofile.spec b/audiofile.spec index 7d51e02..731a1ac 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -5,10 +5,8 @@ Release: 1%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries -Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 +Source: http://www.68k.org/~michael/audiofile/audiofile-%{version}.tar.gz URL: http://www.68k.org/~michael/audiofile/ -Patch0: audiofile-underquoted.patch -Patch1: audiofile-const.patch Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -34,8 +32,6 @@ other resources you can use to develop Audio File applications. %prep %setup -q -%patch0 -p1 -b .underquoted -%patch1 -p1 -b .const %patch2 -p1 -b .multilib %build From 11cc7a966ac961995cd87169b37c53e11a038bcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:31:35 +0000 Subject: [PATCH 33/71] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 0f5e4d9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: audiofile -# $Id: Makefile,v 1.2 2007/10/15 17:02:41 scop Exp $ -NAME := audiofile -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),) -# attempt 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) From 15af30cd3c0358964ae63f27bc1bfa340d187803 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:29:57 -0600 Subject: [PATCH 34/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 731a1ac..00cabf4 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1:0.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Mar 22 2010 Bastien Nocera 0.2.7-1 - Update to 0.2.7 From 376d35e9e90ddb684afdf8390013fdd57dc74a3a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 16:04:05 -0600 Subject: [PATCH 35/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 00cabf4..76b52ff 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.7 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1:0.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1:0.2.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 9fe3c4e45a224083b19c4ada8c38c507795bf419 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 12:09:40 -0500 Subject: [PATCH 36/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 76b52ff..268bff0 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.7 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1:0.2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1:0.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 41f27fbf4dac889abd542d5fff05dc42ba42cee4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 10 Oct 2012 11:12:54 +0200 Subject: [PATCH 37/71] Update to 0.3.4 --- .gitignore | 1 + audiofile.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b817c08..14d6b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ audiofile-0.2.7.tar.gz +/audiofile-0.3.4.tar.gz diff --git a/audiofile.spec b/audiofile.spec index 268bff0..49998a8 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,12 +1,12 @@ Summary: A library for accessing various audio file formats Name: audiofile -Version: 0.2.7 -Release: 4%{?dist} +Version: 0.3.4 +Release: 1%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries -Source: http://www.68k.org/~michael/audiofile/audiofile-%{version}.tar.gz -URL: http://www.68k.org/~michael/audiofile/ +Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz +URL: http://audiofile.68k.org/ Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Wed Oct 10 2012 Bastien Nocera 0.3.4-1 +- Update to 0.3.4 + * Wed Jul 18 2012 Fedora Release Engineering - 1:0.2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 683eefe..8207d2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a39be317a7b1971b408805dc5e371862 audiofile-0.2.7.tar.gz +2ed06d64ee552a2ce490f54351b86ccd audiofile-0.3.4.tar.gz From b03c1ae21857e48bda7bb0722978fd2f067177ee Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 10 Oct 2012 11:18:22 +0200 Subject: [PATCH 38/71] Remove obsolete multilib patch --- audiofile-multilib.patch | 33 --------------------------------- audiofile.spec | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 audiofile-multilib.patch diff --git a/audiofile-multilib.patch b/audiofile-multilib.patch deleted file mode 100644 index 1d600db..0000000 --- a/audiofile-multilib.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- audiofile-0.2.6/audiofile-config.in.multilib 2006-07-27 19:23:38.000000000 -0400 -+++ audiofile-0.2.6/audiofile-config.in 2006-07-27 19:25:18.000000000 -0400 -@@ -1,7 +1,7 @@ - #!/bin/sh - --prefix=@prefix@ --exec_prefix=@exec_prefix@ -+prefix=`pkg-config --variable prefix audiofile` -+exec_prefix=`pkg-config --variable exec_prefix audiofile` - exec_prefix_set=no - - usage="\ -@@ -36,17 +36,13 @@ - echo $exec_prefix - ;; - --version) -- echo @AUDIOFILE_VERSION@ -+ pkg-config --modversion audiofile - ;; - --cflags) -- if test @includedir@ != /usr/include ; then -- includes=-I@includedir@ -- fi -- echo $includes -+ pkg-config --cflags audiofile - ;; - --libs) -- libdirs=-L@libdir@ -- echo $libdirs -laudiofile -lm -+ pkg-config --libs audiofile - ;; - *) - echo "${usage}" 1>&2 diff --git a/audiofile.spec b/audiofile.spec index 49998a8..57b4635 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -7,7 +7,6 @@ License: LGPLv2+ Group: System Environment/Libraries Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ -Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -32,7 +31,6 @@ other resources you can use to develop Audio File applications. %prep %setup -q -%patch2 -p1 -b .multilib %build %configure --disable-static From b51817a3fd10835f845d99c9954d4aa6fbc01931 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 10 Oct 2012 11:36:59 +0200 Subject: [PATCH 39/71] Fix filelist --- audiofile.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 57b4635..c22c9cb 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -57,14 +57,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sfconvert %{_bindir}/sfinfo %{_libdir}/lib*.so.* +%{_mandir}/man1/* %files devel %defattr(-, root, root) -%{_bindir}/audiofile-config %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* -%{_datadir}/aclocal/* +%{_mandir}/man3/* %changelog * Wed Oct 10 2012 Bastien Nocera 0.3.4-1 From 78f029b9a4b9fd8ef05bc794ea5845293eb2c99b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 10 Oct 2012 12:01:16 +0200 Subject: [PATCH 40/71] Add missing alsa-lib-devel BR --- audiofile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/audiofile.spec b/audiofile.spec index c22c9cb..86df220 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -9,6 +9,7 @@ Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool +BuildRequires: alsa-lib-devel %description The Audio File library is an implementation of the Audio File Library From 2a72e96bea2cb2828c100683e247be1e8dcfe97d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 6 Feb 2013 11:00:50 -0500 Subject: [PATCH 41/71] audiofile 0.3.5 --- .gitignore | 1 + audiofile.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 14d6b2a..373db78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ audiofile-0.2.7.tar.gz /audiofile-0.3.4.tar.gz +/audiofile-0.3.5.tar.gz diff --git a/audiofile.spec b/audiofile.spec index 86df220..5d949a2 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,13 +1,12 @@ Summary: A library for accessing various audio file formats Name: audiofile -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool BuildRequires: alsa-lib-devel @@ -57,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING TODO README ChangeLog docs %{_bindir}/sfconvert %{_bindir}/sfinfo -%{_libdir}/lib*.so.* +%{_libdir}/lib*.so.1* %{_mandir}/man1/* %files devel @@ -68,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Feb 06 2013 Adam Jackson 0.3.5-1 +- audiofile 0.3.5 + * Wed Oct 10 2012 Bastien Nocera 0.3.4-1 - Update to 0.3.4 diff --git a/sources b/sources index 8207d2d..a8f4e7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ed06d64ee552a2ce490f54351b86ccd audiofile-0.3.4.tar.gz +51a3d1652ebc94435c2c6c6532c24622 audiofile-0.3.5.tar.gz From c73bff4fe439dce1a65a933ffe6541c1943b168c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 7 Mar 2013 09:57:30 -0500 Subject: [PATCH 42/71] audiofile 0.3.6 --- .gitignore | 1 + audiofile.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 373db78..ac88a95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ audiofile-0.2.7.tar.gz /audiofile-0.3.4.tar.gz /audiofile-0.3.5.tar.gz +/audiofile-0.3.6.tar.gz diff --git a/audiofile.spec b/audiofile.spec index 5d949a2..d92542d 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,6 +1,6 @@ Summary: A library for accessing various audio file formats Name: audiofile -Version: 0.3.5 +Version: 0.3.6 Release: 1%{?dist} Epoch: 1 License: LGPLv2+ @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Mar 07 2013 Adam Jackson 0.3.6-1 +- audiofile 0.3.6 + * Wed Feb 06 2013 Adam Jackson 0.3.5-1 - audiofile 0.3.5 diff --git a/sources b/sources index a8f4e7e..d943ece 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51a3d1652ebc94435c2c6c6532c24622 audiofile-0.3.5.tar.gz +2731d79bec0acef3d30d2fc86b0b72fd audiofile-0.3.6.tar.gz From c776f5f8b340407c9ab3f2f26d221bad3dd33299 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 21:35:35 -0500 Subject: [PATCH 43/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index d92542d..0dd0e6f 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1:0.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Mar 07 2013 Adam Jackson 0.3.6-1 - audiofile 0.3.6 From 099fc3d988f899e28dced0aeabc09b2b3633db56 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:06:07 -0500 Subject: [PATCH 44/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 0dd0e6f..77862dc 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1:0.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1:0.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 42ff18de293cde85811dc4ecc4f100de596a613f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 21:49:00 +0000 Subject: [PATCH 45/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 77862dc..50b347b 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,7 +1,7 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1:0.3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1:0.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 3155af98c82d639e9db3a2e0c8f55773a5641ae7 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 11 Feb 2015 01:27:27 +0100 Subject: [PATCH 46/71] - Don't include docs subdir in base package. It duplicates the manual pages and their .txt sources. Include the *.3.txt manual sources in the -devel package instead. - Spec cleanup: drop %defattr, drop %clean and buildroot removal. - Drop explicit Requires on pkgconfig from -devel package (pkg-config 0.8 is from 2002 or so, btw). - Use %license and add file COPYING to it. - The two included programs are GPLv2+ licensed. - Include more doc files. - Add %?_isa to base package Requires. - Add %check section for included testsuite. [fix bogus dates in %changelog] --- audiofile.spec | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 50b347b..5eb2744 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,14 +1,19 @@ -Summary: A library for accessing various audio file formats +%global make_check 1 + +Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 -License: LGPLv2+ +# library is LGPL / the two programs GPL / see README +License: LGPLv2+ and GPLv2+ Group: System Environment/Libraries Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ BuildRequires: libtool BuildRequires: alsa-lib-devel +# optional for rebuilding manual pages from .txt +#BuildRequires: asciidoc %description The Audio File library is an implementation of the Audio File Library @@ -22,8 +27,7 @@ any of the sound file formats it can handle. %package devel Summary: Development files for Audio File applications Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig >= 1:0.8 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel The audiofile-devel package contains libraries, include files, and @@ -37,36 +41,52 @@ other resources you can use to develop Audio File applications. make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool" %install -rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f docs/Makefile* + + +%check +%if %{make_check} +make check +%endif + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-, root, root) -%doc COPYING TODO README ChangeLog docs +%license COPYING COPYING.GPL +%doc ACKNOWLEDGEMENTS AUTHORS NEWS NOTES README TODO %{_bindir}/sfconvert %{_bindir}/sfinfo %{_libdir}/lib*.so.1* %{_mandir}/man1/* %files devel -%defattr(-, root, root) +%doc ChangeLog docs/*.3.txt %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_mandir}/man3/* %changelog +* Tue Feb 10 2015 Michael Schwendt - 1:0.3.6-5 +- Don't include docs subdir in base package. It duplicates the manual + pages and their .txt sources. Include the *.3.txt manual sources in + the -devel package instead. +- Spec cleanup: drop %%defattr, drop %%clean and buildroot removal. +- Drop explicit Requires on pkgconfig from -devel package + (pkg-config 0.8 is from 2002 or so, btw). +- Use %%license and add file COPYING to it. +- The two included programs are GPLv2+ licensed. +- Include more doc files. +- Add %%?_isa to base package Requires. +- Add %%check section for included testsuite. + * Fri Aug 15 2014 Fedora Release Engineering - 1:0.3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -140,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Mar 17 2005 John (J5) Palmieri - 0.2.6-2 - rebuild for gcc 4.0 -* Thu Jul 30 2004 Colin Walters +* Fri Jul 30 2004 Colin Walters - Update to 0.2.6 - Rework description to not contain apostrophe that makes emacs unhappy From f2c825d1262c64f0f32a35ff3c07c105a41ac1f6 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 11 Feb 2015 14:16:00 +0100 Subject: [PATCH 47/71] BR flac-devel for FLAC support introduced in 0.3.6. --- audiofile.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 5eb2744..900b62d 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -12,6 +12,7 @@ Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ BuildRequires: libtool BuildRequires: alsa-lib-devel +BuildRequires: flac-devel # optional for rebuilding manual pages from .txt #BuildRequires: asciidoc @@ -74,6 +75,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Feb 11 2015 Michael Schwendt - 1:0.3.6-6 +- BR flac-devel for FLAC support introduced in 0.3.6. + * Tue Feb 10 2015 Michael Schwendt - 1:0.3.6-5 - Don't include docs subdir in base package. It duplicates the manual pages and their .txt sources. Include the *.3.txt manual sources in From 8f5ebd2e567e0f79ab70bbfafe4a1385425007e8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:43:19 +0200 Subject: [PATCH 48/71] Rebuilt for GCC 5 C++11 ABI change --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 900b62d..fd1ec43 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -75,6 +75,9 @@ make check %{_mandir}/man3/* %changelog +* Sat May 02 2015 Kalev Lember - 1:0.3.6-7 +- Rebuilt for GCC 5 C++11 ABI change + * Wed Feb 11 2015 Michael Schwendt - 1:0.3.6-6 - BR flac-devel for FLAC support introduced in 0.3.6. From 5911261274fb426583fa87e74fc339f29c9d60bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 01:20:01 +0000 Subject: [PATCH 49/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index fd1ec43..df4633e 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -75,6 +75,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1:0.3.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1:0.3.6-7 - Rebuilt for GCC 5 C++11 ABI change From 5fc49beef1a783391a613d12b36f2543ce0585d6 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 9 Oct 2015 18:15:51 +0200 Subject: [PATCH 50/71] Merge fix from upstream pull request #25 for CVE-2015-7747. Test conversion from e.g. 16-bit LE stereo to 8-bit LE mono no longer causes corruption. --- audiofile-0.3.6-CVE-2015-7747.patch | 12 ++++++++++++ audiofile.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 audiofile-0.3.6-CVE-2015-7747.patch diff --git a/audiofile-0.3.6-CVE-2015-7747.patch b/audiofile-0.3.6-CVE-2015-7747.patch new file mode 100644 index 0000000..fae65f6 --- /dev/null +++ b/audiofile-0.3.6-CVE-2015-7747.patch @@ -0,0 +1,12 @@ +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/libaudiofile/modules/ModuleState.cpp audiofile-0.3.6/libaudiofile/modules/ModuleState.cpp +--- audiofile-0.3.6-orig/libaudiofile/modules/ModuleState.cpp 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6/libaudiofile/modules/ModuleState.cpp 2015-10-08 11:29:51.846082162 +0200 +@@ -402,7 +402,7 @@ + addModule(new Transform(outfc, in.pcm, out.pcm)); + + if (in.channelCount != out.channelCount) +- addModule(new ApplyChannelMatrix(infc, isReading, ++ addModule(new ApplyChannelMatrix(outfc, isReading, + in.channelCount, out.channelCount, + in.pcm.minClip, in.pcm.maxClip, + track->channelMatrix)); diff --git a/audiofile.spec b/audiofile.spec index df4633e..8623c83 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -16,6 +16,8 @@ BuildRequires: flac-devel # optional for rebuilding manual pages from .txt #BuildRequires: asciidoc +Patch0: audiofile-0.3.6-CVE-2015-7747.patch + %description The Audio File library is an implementation of the Audio File Library from SGI, which provides an API for accessing audio file formats like @@ -36,6 +38,7 @@ other resources you can use to develop Audio File applications. %prep %setup -q +%patch0 -p1 -b .CVE-2015-7747 %build %configure --disable-static @@ -75,6 +78,11 @@ make check %{_mandir}/man3/* %changelog +* Thu Oct 8 2015 Michael Schwendt - 1:0.3.6-9 +- Merge fix from upstream pull request #25 for CVE-2015-7747. + Test conversion from e.g. 16-bit LE stereo to 8-bit LE mono + no longer causes corruption. + * Wed Jun 17 2015 Fedora Release Engineering - 1:0.3.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2c0ee4d763339ec02d1697762060574dafb80f9d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:42:19 +0000 Subject: [PATCH 51/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 8623c83..b86d76f 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -78,6 +78,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1:0.3.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 8 2015 Michael Schwendt - 1:0.3.6-9 - Merge fix from upstream pull request #25 for CVE-2015-7747. Test conversion from e.g. 16-bit LE stereo to 8-bit LE mono From 1f75efdeaa161a21a4e41d3240ce16811a5114b0 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 3 Feb 2016 22:19:55 +0100 Subject: [PATCH 52/71] patch to compile with GCC 6 --- audiofile-0.3.6-left-shift-neg.patch | 48 ++++++++++++++++++++++++++++ audiofile-0.3.6-narrowing.patch | 33 +++++++++++++++++++ audiofile.spec | 11 ++++++- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 audiofile-0.3.6-left-shift-neg.patch create mode 100644 audiofile-0.3.6-narrowing.patch diff --git a/audiofile-0.3.6-left-shift-neg.patch b/audiofile-0.3.6-left-shift-neg.patch new file mode 100644 index 0000000..6699969 --- /dev/null +++ b/audiofile-0.3.6-left-shift-neg.patch @@ -0,0 +1,48 @@ +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/libaudiofile/modules/SimpleModule.h audiofile-0.3.6/libaudiofile/modules/SimpleModule.h +--- audiofile-0.3.6-orig/libaudiofile/modules/SimpleModule.h 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6/libaudiofile/modules/SimpleModule.h 2016-02-03 21:19:43.065454454 +0100 +@@ -123,7 +123,7 @@ + typedef typename IntTypes::UnsignedType UnsignedType; + + static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; +- static const int kMinSignedValue = -1 << kScaleBits; ++ static const int kMinSignedValue = 0L-(1< + { +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/FloatToInt.cpp audiofile-0.3.6/test/FloatToInt.cpp +--- audiofile-0.3.6-orig/test/FloatToInt.cpp 2013-02-11 18:23:26.000000000 +0100 ++++ audiofile-0.3.6/test/FloatToInt.cpp 2016-02-03 21:21:14.714510229 +0100 +@@ -115,7 +115,7 @@ + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0L-(1<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + + TEST_F(FloatToIntTest, Int24) +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/IntToFloat.cpp audiofile-0.3.6/test/IntToFloat.cpp +--- audiofile-0.3.6-orig/test/IntToFloat.cpp 2013-02-11 18:23:26.000000000 +0100 ++++ audiofile-0.3.6/test/IntToFloat.cpp 2016-02-03 21:20:57.380445355 +0100 +@@ -117,7 +117,7 @@ + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0L-(1<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + + TEST_F(IntToFloatTest, Int24) +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/Sign.cpp audiofile-0.3.6/test/Sign.cpp +--- audiofile-0.3.6-orig/test/Sign.cpp 2013-02-11 18:23:26.000000000 +0100 ++++ audiofile-0.3.6/test/Sign.cpp 2016-02-03 21:20:38.742450826 +0100 +@@ -116,7 +116,7 @@ + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0L-(1<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + static const uint32_t kMaxUInt24 = (1<<24) - 1; + diff --git a/audiofile-0.3.6-narrowing.patch b/audiofile-0.3.6-narrowing.patch new file mode 100644 index 0000000..655a710 --- /dev/null +++ b/audiofile-0.3.6-narrowing.patch @@ -0,0 +1,33 @@ +diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/NeXT.cpp audiofile-0.3.6/test/NeXT.cpp +--- audiofile-0.3.6-orig/test/NeXT.cpp 2013-02-11 18:23:26.000000000 +0100 ++++ audiofile-0.3.6/test/NeXT.cpp 2016-02-03 21:49:10.867094322 +0100 +@@ -41,9 +41,9 @@ + { + '.', 's', 'n', 'd', + 0, 0, 0, 24, // offset of 24 bytes +- 0xff, 0xff, 0xff, 0xff, // unspecified length ++ -1, -1, -1, -1, // unspecified length + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -63,7 +63,7 @@ + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 20, // length of 20 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -158,7 +158,7 @@ + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 2, // 2 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 0, // 0 channels + 0, 1 + }; diff --git a/audiofile.spec b/audiofile.spec index b86d76f..0144c91 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -17,6 +17,9 @@ BuildRequires: flac-devel #BuildRequires: asciidoc Patch0: audiofile-0.3.6-CVE-2015-7747.patch +# fixes to make build with GCC 6 +Patch1: audiofile-0.3.6-left-shift-neg.patch +Patch2: audiofile-0.3.6-narrowing.patch %description The Audio File library is an implementation of the Audio File Library @@ -39,6 +42,9 @@ other resources you can use to develop Audio File applications. %prep %setup -q %patch0 -p1 -b .CVE-2015-7747 +%patch1 -p1 -b .left-shift-neg +%patch2 -p1 -b .narrowing-conversion + %build %configure --disable-static @@ -78,6 +84,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Feb 3 2016 Michael Schwendt - 1:0.3.6-11 +- patch to compile with GCC 6 + * Wed Feb 03 2016 Fedora Release Engineering - 1:0.3.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a4d2feea0b57944b70dc09fc1e87c3e80192e2be Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 4 Feb 2016 10:16:55 +0100 Subject: [PATCH 53/71] avoid int overflow too --- audiofile-0.3.6-left-shift-neg.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audiofile-0.3.6-left-shift-neg.patch b/audiofile-0.3.6-left-shift-neg.patch index 6699969..deef23c 100644 --- a/audiofile-0.3.6-left-shift-neg.patch +++ b/audiofile-0.3.6-left-shift-neg.patch @@ -6,7 +6,7 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/libaudiofile/modules/SimpleM static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; - static const int kMinSignedValue = -1 << kScaleBits; -+ static const int kMinSignedValue = 0L-(1< { @@ -18,7 +18,7 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/FloatToInt.cpp audiofil } -static const int32_t kMinInt24 = -1<<23; -+static const int32_t kMinInt24 = 0L-(1<<23); ++static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; TEST_F(FloatToIntTest, Int24) @@ -30,7 +30,7 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/IntToFloat.cpp audiofil } -static const int32_t kMinInt24 = -1<<23; -+static const int32_t kMinInt24 = 0L-(1<<23); ++static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; TEST_F(IntToFloatTest, Int24) @@ -42,7 +42,7 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/Sign.cpp audiofile-0.3. } -static const int32_t kMinInt24 = -1<<23; -+static const int32_t kMinInt24 = 0L-(1<<23); ++static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; static const uint32_t kMaxUInt24 = (1<<24) - 1; From b441c769b5bcf08ea2797ef291336559df75a21e Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 4 Feb 2016 10:40:54 +0100 Subject: [PATCH 54/71] char on ARM is unsigned by default --- audiofile-0.3.6-narrowing.patch | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/audiofile-0.3.6-narrowing.patch b/audiofile-0.3.6-narrowing.patch index 655a710..f701d89 100644 --- a/audiofile-0.3.6-narrowing.patch +++ b/audiofile-0.3.6-narrowing.patch @@ -1,7 +1,12 @@ -diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/NeXT.cpp audiofile-0.3.6/test/NeXT.cpp +diff -Nur audiofile-0.3.6-orig/test/NeXT.cpp audiofile-0.3.6/test/NeXT.cpp --- audiofile-0.3.6-orig/test/NeXT.cpp 2013-02-11 18:23:26.000000000 +0100 -+++ audiofile-0.3.6/test/NeXT.cpp 2016-02-03 21:49:10.867094322 +0100 -@@ -41,9 +41,9 @@ ++++ audiofile-0.3.6/test/NeXT.cpp 2016-02-04 10:37:32.457140823 +0100 +@@ -37,13 +37,13 @@ + + #include "TestUtilities.h" + +-const char kDataUnspecifiedLength[] = ++const signed char kDataUnspecifiedLength[] = { '.', 's', 'n', 'd', 0, 0, 0, 24, // offset of 24 bytes @@ -13,7 +18,14 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/NeXT.cpp audiofile-0.3. 0, 0, 0, 1, // 1 channel 0, 1, 0, 1, -@@ -63,7 +63,7 @@ +@@ -57,13 +57,13 @@ + 0, 55 + }; + +-const char kDataTruncated[] = ++const signed char kDataTruncated[] = + { + '.', 's', 'n', 'd', 0, 0, 0, 24, // offset of 24 bytes 0, 0, 0, 20, // length of 20 bytes 0, 0, 0, 3, // 16-bit linear @@ -22,7 +34,14 @@ diff -Nurb --strip-trailing-cr audiofile-0.3.6-orig/test/NeXT.cpp audiofile-0.3. 0, 0, 0, 1, // 1 channel 0, 1, 0, 1, -@@ -158,7 +158,7 @@ +@@ -152,13 +152,13 @@ + ASSERT_EQ(::unlink(testFileName.c_str()), 0); + } + +-const char kDataZeroChannels[] = ++const signed char kDataZeroChannels[] = + { + '.', 's', 'n', 'd', 0, 0, 0, 24, // offset of 24 bytes 0, 0, 0, 2, // 2 bytes 0, 0, 0, 3, // 16-bit linear From 74f0693a64647185dc79d7a3b1ac3d4d8ba8832e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:33:10 +0000 Subject: [PATCH 55/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 0144c91..1465da1 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -84,6 +84,9 @@ make check %{_mandir}/man3/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:0.3.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 3 2016 Michael Schwendt - 1:0.3.6-11 - patch to compile with GCC 6 From c604cfc9576cf3453b5378343b8185e983d61be4 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sun, 12 Mar 2017 11:49:48 +0100 Subject: [PATCH 56/71] Merge upstream pull requests #42,#43,#44 from Agostino Sarubbo to fix security issues. --- audiofile-0.3.6-pull42.patch | 176 +++++++++++++++++++++++++++++++++++ audiofile-0.3.6-pull43.patch | 21 +++++ audiofile-0.3.6-pull44.patch | 31 ++++++ audiofile.spec | 15 ++- 4 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 audiofile-0.3.6-pull42.patch create mode 100644 audiofile-0.3.6-pull43.patch create mode 100644 audiofile-0.3.6-pull44.patch diff --git a/audiofile-0.3.6-pull42.patch b/audiofile-0.3.6-pull42.patch new file mode 100644 index 0000000..3fab300 --- /dev/null +++ b/audiofile-0.3.6-pull42.patch @@ -0,0 +1,176 @@ +diff -Nur audiofile-0.3.6/libaudiofile/modules/BlockCodec.cpp audiofile-0.3.6-pull42/libaudiofile/modules/BlockCodec.cpp +--- audiofile-0.3.6/libaudiofile/modules/BlockCodec.cpp 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6-pull42/libaudiofile/modules/BlockCodec.cpp 2017-03-10 15:40:02.000000000 +0100 +@@ -52,8 +52,9 @@ + // Decompress into m_outChunk. + for (int i=0; i(m_inChunk->buffer) + i * m_bytesPerPacket, +- static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount); ++ if (decodeBlock(static_cast(m_inChunk->buffer) + i * m_bytesPerPacket, ++ static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0) ++ break; + + framesRead += m_framesPerPacket; + } +diff -Nur audiofile-0.3.6/libaudiofile/modules/MSADPCM.cpp audiofile-0.3.6-pull42/libaudiofile/modules/MSADPCM.cpp +--- audiofile-0.3.6/libaudiofile/modules/MSADPCM.cpp 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6-pull42/libaudiofile/modules/MSADPCM.cpp 2017-03-10 15:40:02.000000000 +0100 +@@ -101,24 +101,60 @@ + 768, 614, 512, 409, 307, 230, 230, 230 + }; + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++bool multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ ++ + // Compute a linear PCM value from the given differential coded value. + static int16_t decodeSample(ms_adpcm_state &state, +- uint8_t code, const int16_t *coefficient) ++ uint8_t code, const int16_t *coefficient, bool *ok=NULL) + { + int linearSample = (state.sample1 * coefficient[0] + + state.sample2 * coefficient[1]) >> 8; ++ int delta; + + linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta; + + linearSample = clamp(linearSample, MIN_INT16, MAX_INT16); + +- int delta = (state.delta * adaptationTable[code]) >> 8; ++ if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta)) ++ { ++ if (ok) *ok=false; ++ _af_error(AF_BAD_COMPRESSION, "Error decoding sample"); ++ return 0; ++ } ++ delta >>= 8; + if (delta < 16) + delta = 16; + + state.delta = delta; + state.sample2 = state.sample1; + state.sample1 = linearSample; ++ if (ok) *ok=true; + + return static_cast(linearSample); + } +@@ -212,13 +248,16 @@ + { + uint8_t code; + int16_t newSample; ++ bool ok; + + code = *encoded >> 4; +- newSample = decodeSample(*state[0], code, coefficient[0]); ++ newSample = decodeSample(*state[0], code, coefficient[0], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + code = *encoded & 0x0f; +- newSample = decodeSample(*state[1], code, coefficient[1]); ++ newSample = decodeSample(*state[1], code, coefficient[1], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + encoded++; +diff -Nur audiofile-0.3.6/libaudiofile/WAVE.cpp audiofile-0.3.6-pull42/libaudiofile/WAVE.cpp +--- audiofile-0.3.6/libaudiofile/WAVE.cpp 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6-pull42/libaudiofile/WAVE.cpp 2017-03-10 15:40:02.000000000 +0100 +@@ -281,6 +281,12 @@ + + /* numCoefficients should be at least 7. */ + assert(numCoefficients >= 7 && numCoefficients <= 255); ++ if (numCoefficients < 7 || numCoefficients > 255) ++ { ++ _af_error(AF_BAD_HEADER, ++ "Bad number of coefficients"); ++ return AF_FAIL; ++ } + + m_msadpcmNumCoefficients = numCoefficients; + +@@ -834,6 +840,8 @@ + } + + TrackSetup *track = setup->getTrack(); ++ if (!track) ++ return AF_NULL_FILESETUP; + + if (track->f.isCompressed()) + { +diff -Nur audiofile-0.3.6/sfcommands/sfconvert.c audiofile-0.3.6-pull42/sfcommands/sfconvert.c +--- audiofile-0.3.6/sfcommands/sfconvert.c 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6-pull42/sfcommands/sfconvert.c 2017-03-10 15:40:02.000000000 +0100 +@@ -45,6 +45,33 @@ + void usageerror (void); + bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid); + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++bool multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ + int main (int argc, char **argv) + { + if (argc == 2) +@@ -323,8 +350,11 @@ + { + int frameSize = afGetVirtualFrameSize(infile, trackid, 1); + +- const int kBufferFrameCount = 65536; +- void *buffer = malloc(kBufferFrameCount * frameSize); ++ int kBufferFrameCount = 65536; ++ int bufferSize; ++ while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize)) ++ kBufferFrameCount /= 2; ++ void *buffer = malloc(bufferSize); + + AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK); + AFframecount totalFramesWritten = 0; diff --git a/audiofile-0.3.6-pull43.patch b/audiofile-0.3.6-pull43.patch new file mode 100644 index 0000000..4ad1152 --- /dev/null +++ b/audiofile-0.3.6-pull43.patch @@ -0,0 +1,21 @@ +diff -Nur audiofile-0.3.6/libaudiofile/modules/IMA.cpp audiofile-0.3.6-pull43/libaudiofile/modules/IMA.cpp +--- audiofile-0.3.6/libaudiofile/modules/IMA.cpp 2013-03-06 06:30:03.000000000 +0100 ++++ audiofile-0.3.6-pull43/libaudiofile/modules/IMA.cpp 2017-03-06 18:06:35.000000000 +0100 +@@ -169,7 +169,7 @@ + if (encoded[1] & 0x80) + m_adpcmState[c].previousValue -= 0x10000; + +- m_adpcmState[c].index = encoded[2]; ++ m_adpcmState[c].index = clamp(encoded[2], 0, 88); + + *decoded++ = m_adpcmState[c].previousValue; + +@@ -210,7 +210,7 @@ + predictor -= 0x10000; + + state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16); +- state.index = encoded[1] & 0x7f; ++ state.index = clamp(encoded[1] & 0x7f, 0, 88); + encoded += 2; + + for (int n=0; nbuffer, m_bytesPerPacket * blockCount); +- int blocksRead = bytesRead >= 0 ? bytesRead / m_bytesPerPacket : 0; ++ int blocksRead = (bytesRead >= 0 && m_bytesPerPacket > 0) ? bytesRead / m_bytesPerPacket : 0; + + // Decompress into m_outChunk. + for (int i=0; if.sampleWidth = 16; diff --git a/audiofile.spec b/audiofile.spec index 1465da1..a199363 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -20,6 +20,11 @@ Patch0: audiofile-0.3.6-CVE-2015-7747.patch # fixes to make build with GCC 6 Patch1: audiofile-0.3.6-left-shift-neg.patch Patch2: audiofile-0.3.6-narrowing.patch +# pull requests #42,#43,#44 +Patch3: audiofile-0.3.6-pull42.patch +Patch4: audiofile-0.3.6-pull43.patch +Patch5: audiofile-0.3.6-pull44.patch + %description The Audio File library is an implementation of the Audio File Library @@ -44,7 +49,9 @@ other resources you can use to develop Audio File applications. %patch0 -p1 -b .CVE-2015-7747 %patch1 -p1 -b .left-shift-neg %patch2 -p1 -b .narrowing-conversion - +%patch3 -p1 -b .pull42 +%patch4 -p1 -b .pull43 +%patch5 -p1 -b .pull44 %build %configure --disable-static @@ -84,6 +91,10 @@ make check %{_mandir}/man3/* %changelog +* Sun Mar 12 2017 Michael Schwendt - 1:0.3.6-13 +- Merge upstream pull requests #42,#43,#44 from Agostino Sarubbo to fix + security issues. + * Fri Feb 10 2017 Fedora Release Engineering - 1:0.3.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b990eec9553495f9ed5de6490d367b593435e83d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 13 Mar 2017 23:42:38 +0100 Subject: [PATCH 57/71] CVEs assigned now: CVE-2017-6829, CVE-2017-6830, CVE-2017-6831, CVE-2017-6832, CVE-2017-6833, CVE-2017-6834, CVE-2017-6835, CVE-2017-6836, CVE-2017-6837, CVE-2017-6838, CVE-2017-6839 --- audiofile.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index a199363..20e12cf 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -93,7 +93,9 @@ make check %changelog * Sun Mar 12 2017 Michael Schwendt - 1:0.3.6-13 - Merge upstream pull requests #42,#43,#44 from Agostino Sarubbo to fix - security issues. + security issues. CVE-2017-6829, CVE-2017-6830, CVE-2017-6831, + CVE-2017-6832, CVE-2017-6833, CVE-2017-6834, CVE-2017-6835, + CVE-2017-6836, CVE-2017-6837, CVE-2017-6838, CVE-2017-6839 * Fri Feb 10 2017 Fedora Release Engineering - 1:0.3.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1fab1a93b767070e1bdba7e1602afd0f3a51f8fe Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 15 Mar 2017 10:22:01 +0100 Subject: [PATCH 58/71] more CVEs assigned: CVE-2017-6827, CVE-2017-6828 --- audiofile.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 20e12cf..01621e1 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -93,7 +93,8 @@ make check %changelog * Sun Mar 12 2017 Michael Schwendt - 1:0.3.6-13 - Merge upstream pull requests #42,#43,#44 from Agostino Sarubbo to fix - security issues. CVE-2017-6829, CVE-2017-6830, CVE-2017-6831, + security issues. CVE-2017-6827, CVE-2017-6828, + CVE-2017-6829, CVE-2017-6830, CVE-2017-6831, CVE-2017-6832, CVE-2017-6833, CVE-2017-6834, CVE-2017-6835, CVE-2017-6836, CVE-2017-6837, CVE-2017-6838, CVE-2017-6839 From b2fcfa7166970f8989df66519e2c06de780a6d21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:32:59 +0000 Subject: [PATCH 59/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 01621e1..cdb2ac8 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -91,6 +91,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:0.3.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Mar 12 2017 Michael Schwendt - 1:0.3.6-13 - Merge upstream pull requests #42,#43,#44 from Agostino Sarubbo to fix security issues. CVE-2017-6827, CVE-2017-6828, From bbaf5585b56e161919f7f219480dca1d85f48ee6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:59:04 +0000 Subject: [PATCH 60/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index cdb2ac8..a9f4b8b 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -91,6 +91,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1:0.3.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:0.3.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c96c267f4d9e2680fd648b61df4a568223b6c563 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 03:18:19 +0000 Subject: [PATCH 61/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index a9f4b8b..3837a8f 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -91,6 +91,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:0.3.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1:0.3.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 5354f12e6886f4fbfceecfe81d06448df515fa1f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:09 +0100 Subject: [PATCH 62/71] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- audiofile.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 3837a8f..649059c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -91,6 +91,9 @@ make check %{_mandir}/man3/* %changelog +* Fri Feb 09 2018 Igor Gnatenko - 1:0.3.6-17 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 1:0.3.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -273,7 +276,7 @@ make check - upgrade to 0.1.11. * Mon Aug 14 2000 Than Ngo -- add ldconfig to %post and %postun (Bug #15413) +- add ldconfig to %%post and %%postun (Bug #15413) * Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release @@ -306,7 +309,7 @@ make check - Version 0.1.6 * Sun Feb 21 1999 Michael Fulbright -- Removed libtoolize from %build +- Removed libtoolize from %%build * Wed Feb 3 1999 Jonathan Blandfor - Newer version with bug fix. Upped release. From 8cd6ce3da6cba59eae0c593abc52a24fdc34207a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:46:21 +0000 Subject: [PATCH 63/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 649059c..98bcd23 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -91,6 +91,9 @@ make check %{_mandir}/man3/* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1:0.3.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Igor Gnatenko - 1:0.3.6-17 - Escape macros in %%changelog From b2a0cbe738a180298f9ef9fc7d97b19a321c3c0b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 64/71] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- audiofile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/audiofile.spec b/audiofile.spec index 98bcd23..53d7dad 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -10,6 +10,7 @@ License: LGPLv2+ and GPLv2+ Group: System Environment/Libraries Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: alsa-lib-devel BuildRequires: flac-devel From af707bc2036e06f26e3b1433d51db29a632a3b79 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 13 Aug 2018 14:22:46 +0100 Subject: [PATCH 65/71] Fix build --- audiofile.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 53d7dad..5d3065c 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -55,11 +55,11 @@ other resources you can use to develop Audio File applications. %patch5 -p1 -b .pull44 %build -%configure --disable-static -make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool" +%configure +%make_build %install -make DESTDIR="$RPM_BUILD_ROOT" install +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -92,6 +92,9 @@ make check %{_mandir}/man3/* %changelog +* Mon Aug 13 2018 Leigh Scott - 1:0.3.6-19 +- Fix build + * Thu Jul 12 2018 Fedora Release Engineering - 1:0.3.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ea15332b6011c13bc453e998fcf95496ae371643 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 9 Oct 2018 08:46:57 -0500 Subject: [PATCH 66/71] Fix for CVE-2018-17095. --- ...732fd31ffcb78f6920001e9b1fbd815fa712.patch | 26 +++++++++++++++++++ audiofile.spec | 8 ++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 822b732fd31ffcb78f6920001e9b1fbd815fa712.patch diff --git a/822b732fd31ffcb78f6920001e9b1fbd815fa712.patch b/822b732fd31ffcb78f6920001e9b1fbd815fa712.patch new file mode 100644 index 0000000..231021b --- /dev/null +++ b/822b732fd31ffcb78f6920001e9b1fbd815fa712.patch @@ -0,0 +1,26 @@ +From 822b732fd31ffcb78f6920001e9b1fbd815fa712 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 27 Sep 2018 12:11:12 +0200 +Subject: [PATCH] SimpleModule: set output chunk framecount after pull + +After pulling the data, set the output chunk to the amount of +frames we pulled so that the next module in the chain has the correct +frame count. + +Fixes #50 and #51 +--- + libaudiofile/modules/SimpleModule.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libaudiofile/modules/SimpleModule.cpp b/libaudiofile/modules/SimpleModule.cpp +index 2bae1eb..e87932c 100644 +--- a/libaudiofile/modules/SimpleModule.cpp ++++ b/libaudiofile/modules/SimpleModule.cpp +@@ -26,6 +26,7 @@ + void SimpleModule::runPull() + { + pull(m_outChunk->frameCount); ++ m_outChunk->frameCount = m_inChunk->frameCount; + run(*m_inChunk, *m_outChunk); + } + diff --git a/audiofile.spec b/audiofile.spec index 5d3065c..26312f6 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -25,7 +25,7 @@ Patch2: audiofile-0.3.6-narrowing.patch Patch3: audiofile-0.3.6-pull42.patch Patch4: audiofile-0.3.6-pull43.patch Patch5: audiofile-0.3.6-pull44.patch - +Patch6: 822b732fd31ffcb78f6920001e9b1fbd815fa712.patch %description The Audio File library is an implementation of the Audio File Library @@ -53,6 +53,7 @@ other resources you can use to develop Audio File applications. %patch3 -p1 -b .pull42 %patch4 -p1 -b .pull43 %patch5 -p1 -b .pull44 +%patch6 -p1 -b .CVE-2018-17095 %build %configure @@ -92,6 +93,9 @@ make check %{_mandir}/man3/* %changelog +* Tue Oct 09 2018 Gwyn Ciesla - 1:0.3.6-20 +- Fix for CVE-2018-17095. + * Mon Aug 13 2018 Leigh Scott - 1:0.3.6-19 - Fix build From 0b51fee3ed3c33c2554af10680dd9850fc2bca50 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 9 Oct 2018 09:16:31 -0500 Subject: [PATCH 67/71] Patches for CVE-2018-13440. --- ...74c8c0e79007196d7f1e7afdc97689f869b3.patch | 21 ++++++++++++++ audiofile.spec | 10 ++++++- ...d79fb8363c4a329a184ef0b107156602b225.patch | 28 +++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 941774c8c0e79007196d7f1e7afdc97689f869b3.patch create mode 100644 fde6d79fb8363c4a329a184ef0b107156602b225.patch diff --git a/941774c8c0e79007196d7f1e7afdc97689f869b3.patch b/941774c8c0e79007196d7f1e7afdc97689f869b3.patch new file mode 100644 index 0000000..978d5f4 --- /dev/null +++ b/941774c8c0e79007196d7f1e7afdc97689f869b3.patch @@ -0,0 +1,21 @@ +From 941774c8c0e79007196d7f1e7afdc97689f869b3 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 27 Sep 2018 12:09:45 +0200 +Subject: [PATCH] ALAC: set chunk frameCount to 0 on short read + +--- + libaudiofile/modules/ALAC.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libaudiofile/modules/ALAC.cpp b/libaudiofile/modules/ALAC.cpp +index 7593c11..478e2af 100644 +--- a/libaudiofile/modules/ALAC.cpp ++++ b/libaudiofile/modules/ALAC.cpp +@@ -240,6 +240,7 @@ void ALAC::runPull() + if (read(m_inChunk->buffer, bytesPerPacket) < bytesPerPacket) + { + reportReadError(0, m_track->f.framesPerPacket); ++ m_outChunk->frameCount = 0; + return; + } + diff --git a/audiofile.spec b/audiofile.spec index 26312f6..1ed4e85 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -26,6 +26,8 @@ Patch3: audiofile-0.3.6-pull42.patch Patch4: audiofile-0.3.6-pull43.patch Patch5: audiofile-0.3.6-pull44.patch Patch6: 822b732fd31ffcb78f6920001e9b1fbd815fa712.patch +Patch7: 941774c8c0e79007196d7f1e7afdc97689f869b3.patch +Patch8: fde6d79fb8363c4a329a184ef0b107156602b225.patch %description The Audio File library is an implementation of the Audio File Library @@ -54,6 +56,9 @@ other resources you can use to develop Audio File applications. %patch4 -p1 -b .pull43 %patch5 -p1 -b .pull44 %patch6 -p1 -b .CVE-2018-17095 +%patch7 -p1 -b .CVE-2018-13440 +%patch8 -p1 -b .CVE-2018-13440 + %build %configure @@ -93,6 +98,9 @@ make check %{_mandir}/man3/* %changelog +* Tue Oct 09 2018 Gwyn Ciesla - 1:0.3.6-21 +- Fixes for CVE-2018-13440. + * Tue Oct 09 2018 Gwyn Ciesla - 1:0.3.6-20 - Fix for CVE-2018-17095. diff --git a/fde6d79fb8363c4a329a184ef0b107156602b225.patch b/fde6d79fb8363c4a329a184ef0b107156602b225.patch new file mode 100644 index 0000000..ffd65b4 --- /dev/null +++ b/fde6d79fb8363c4a329a184ef0b107156602b225.patch @@ -0,0 +1,28 @@ +From fde6d79fb8363c4a329a184ef0b107156602b225 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 27 Sep 2018 10:48:45 +0200 +Subject: [PATCH] ModuleState: handle compress/decompress init failure + +When the unit initcompress or initdecompress function fails, +m_fileModule is NULL. Return AF_FAIL in that case instead of +causing NULL pointer dereferences later. + +Fixes #49 +--- + libaudiofile/modules/ModuleState.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libaudiofile/modules/ModuleState.cpp b/libaudiofile/modules/ModuleState.cpp +index 0c29d7a..070fd9b 100644 +--- a/libaudiofile/modules/ModuleState.cpp ++++ b/libaudiofile/modules/ModuleState.cpp +@@ -75,6 +75,9 @@ status ModuleState::initFileModule(AFfilehandle file, Track *track) + m_fileModule = unit->initcompress(track, file->m_fh, file->m_seekok, + file->m_fileFormat == AF_FILE_RAWDATA, &chunkFrames); + ++ if (!m_fileModule) ++ return AF_FAIL; ++ + if (unit->needsRebuffer) + { + assert(unit->nativeSampleFormat == AF_SAMPFMT_TWOSCOMP); From 7f3f5c1d20aaf16e570600b7f0b5ac6818efd394 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:32 +0100 Subject: [PATCH 68/71] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- audiofile.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 1ed4e85..293849a 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -77,9 +77,7 @@ make check %endif -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From a41f2588ca6e9eceef38f66d3449eaf82a29a4d4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:39 +0100 Subject: [PATCH 69/71] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- audiofile.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/audiofile.spec b/audiofile.spec index 293849a..34349d3 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -7,7 +7,6 @@ Release: 21%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ -Group: System Environment/Libraries Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz URL: http://audiofile.68k.org/ BuildRequires: gcc-c++ @@ -40,7 +39,6 @@ any of the sound file formats it can handle. %package devel Summary: Development files for Audio File applications -Group: Development/Libraries Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel From a4174b09a2a36a2eebc79878c9de3217aea76db3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:09:21 +0000 Subject: [PATCH 70/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index 34349d3..cb9a978 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -94,6 +94,9 @@ make check %{_mandir}/man3/* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:0.3.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Oct 09 2018 Gwyn Ciesla - 1:0.3.6-21 - Fixes for CVE-2018-13440. From 25abac2c40900ade2c9bc74949d9cc00c4628c52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:47:03 +0000 Subject: [PATCH 71/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- audiofile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiofile.spec b/audiofile.spec index cb9a978..b09776b 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -3,7 +3,7 @@ Summary: Library for accessing various audio file formats Name: audiofile Version: 0.3.6 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 1 # library is LGPL / the two programs GPL / see README License: LGPLv2+ and GPLv2+ @@ -94,6 +94,9 @@ make check %{_mandir}/man3/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:0.3.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1:0.3.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild