From 814ccd55fe398318643aac5bc20a00d88b9427da Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 1 Sep 2004 08:03:09 +0000 Subject: Added patches for a couple bugs to close bug #62386. Thanks to Alan Swanson . --- .../cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch | 12 ++++++++++++ media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch | 14 ++++++++++++++ media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r2 | 1 + 3 files changed, 27 insertions(+) create mode 100644 media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch create mode 100644 media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch create mode 100644 media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r2 (limited to 'media-sound/cdparanoia/files') diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch new file mode 100644 index 000000000000..3e3634009c1e --- /dev/null +++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch @@ -0,0 +1,12 @@ +diff -uNr cdparanoia-III-alpha9.8/interface/scan_devices.c cdparanoia-III-alpha9.8-new/interface/scan_devices.c +--- cdparanoia-III-alpha9.8/interface/scan_devices.c Mon Mar 26 07:44:01 2001 ++++ cdparanoia-III-alpha9.8-new/interface/scan_devices.c Thu Sep 19 16:47:56 2002 +@@ -617,7 +617,7 @@ + + /* It would seem some TOSHIBA CDROMs gets things wrong */ + +- if (!strncmp (p + 8, "TOSHIBA", 7) && ++ if (p && !strncmp (p + 8, "TOSHIBA", 7) && + !strncmp (p + 16, "CD-ROM", 6) && + p[0] == TYPE_DISK) { + p[0] = TYPE_ROM; diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch new file mode 100644 index 000000000000..8fafb1eb79ea --- /dev/null +++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch @@ -0,0 +1,14 @@ +diff -urN cdparanoia-III-alpha9.8/interface/common_interface.c cdparanoia-III-alpha9.8.new/interface/common_interface.c +--- cdparanoia-III-alpha9.8/interface/common_interface.c 2000-04-20 00:40:42.000000000 +0200 ++++ cdparanoia-III-alpha9.8.new/interface/common_interface.c 2002-11-06 23:06:03.000000000 +0100 +@@ -223,7 +223,8 @@ + /* adjust end of last audio track to be in the first session */ + for (j = tracks-1; j >= 0; j--) { + if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) { +- if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) ++ if ((d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) && ++ (ms_str.addr.lba - 11400 > d->disc_toc[j-1].dwStartSector)) + d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400; + break; + } + diff --git a/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r2 b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r2 new file mode 100644 index 000000000000..3e520917e172 --- /dev/null +++ b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r2 @@ -0,0 +1 @@ +MD5 7218e778b5970a86c958e597f952f193 cdparanoia-III-alpha9.8.src.tgz 116591 -- cgit v1.2.3-65-gdbad