From eeb995d5ae5ee505dbf0fad3bbb0d9ad5dc3f8fb Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Feb 10 2009 19:28:27 +0000 Subject: - cdparanoia-10.2-endian.patch: Backport a crash fix for host/drive endianness mismatch. (#466659) --- diff --git a/cdparanoia-10.2-endian.patch b/cdparanoia-10.2-endian.patch new file mode 100644 index 0000000..eaed961 --- /dev/null +++ b/cdparanoia-10.2-endian.patch @@ -0,0 +1,12 @@ +diff -up cdparanoia-III-10.2/interface/interface.c.jx cdparanoia-III-10.2/interface/interface.c +--- cdparanoia-III-10.2/interface/interface.c.jx 2009-02-10 14:25:02.000000000 -0500 ++++ cdparanoia-III-10.2/interface/interface.c 2009-02-10 14:25:49.000000000 -0500 +@@ -115,7 +115,7 @@ long cdda_read_timed(cdrom_drive *d, voi + + if(sectors>0){ + /* byteswap? */ +- if(d->bigendianp==-1) /* not determined yet */ ++ if(buffer && d->bigendianp==-1) /* not determined yet */ + d->bigendianp=data_bigendianp(d); + + if(d->bigendianp!=bigendianp()){ diff --git a/cdparanoia.spec b/cdparanoia.spec index 3380dd0..7af91aa 100644 --- a/cdparanoia.spec +++ b/cdparanoia.spec @@ -1,8 +1,6 @@ -%define ver 10 - Name: cdparanoia Version: 10.2 -Release: 2%{?dist} +Release: 3%{?dist} # the app is GPLv2, everything else is LGPLv2 License: GPLv2 and LGPLv2 Group: Applications/Multimedia @@ -11,6 +9,8 @@ Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tg # https://trac.xiph.org/changeset/15338 # https://bugzilla.redhat.com/show_bug.cgi?id=463009 Patch0: cdparanoia-10.2-#463009.patch +# #466659 +Patch1: cdparanoia-10.2-endian.patch Url: http://www.xiph.org/paranoia/index.html BuildRoot: %{_tmppath}/cdparanoia-%{version}-root Requires: cdparanoia-libs = %{version}-%{release} @@ -49,6 +49,7 @@ applications which read CD Digital Audio disks. %prep %setup -q -n %{name}-III-%{version} %patch0 -p3 -b .#463009 +%patch1 -p1 -b .endian %build rm -rf $RPM_BUILD_ROOT @@ -107,6 +108,10 @@ fi %{_libdir}/*.a %changelog +* Tue Feb 10 2009 Adam Jackson 10.2-3 +- cdparanoia-10.2-endian.patch: Backport a crash fix for host/drive + endianness mismatch. (#466659) + * Tue Sep 30 2008 Kevin Kofler 10.2-2 - fix cdda_interface.h C++ incompatibility (patch from upstream) (#463009)