From da23cba2f64b66790e2156b1e4003d6bc45ad979 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 22 Jun 2000 00:41:17 +0000
Subject: Don't dump core if device isn't recognized as valid CD-ROM drive.

---
 audio/cdparanoia/files/patch-sum  |  4 ++--
 audio/cdparanoia/patches/patch-cf | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'audio')

diff --git a/audio/cdparanoia/files/patch-sum b/audio/cdparanoia/files/patch-sum
index 2db879b8b23..cf731a202d9 100644
--- a/audio/cdparanoia/files/patch-sum
+++ b/audio/cdparanoia/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/05/02 11:37:05 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/22 00:41:17 wiz Exp $
 
 MD5 (patch-aa) = 598f4761b68407f819fa9b8c67ba627c
 MD5 (patch-ab) = c3ef67eeb817732c2f29c11dd7048ba4
@@ -11,5 +11,5 @@ MD5 (patch-cb) = 60d5539a6bdd1ec81bb1cd4bb9f6dbbd
 MD5 (patch-cc) = 795d7c9f4971ad7804229f757ab4479e
 MD5 (patch-cd) = ab3d1eaaa4706c77a0e4795f20759c8c
 MD5 (patch-ce) = 6f15e3f28c38a0058428c5f5981029ad
-MD5 (patch-cf) = 021d133eafbefb81ffdcbe06f6805842
+MD5 (patch-cf) = 5d4fa67d7aeb2fec2439f3eba97fc6d6
 MD5 (patch-cg) = 36caf1ef348cef0016c6e95eb3ac3650
diff --git a/audio/cdparanoia/patches/patch-cf b/audio/cdparanoia/patches/patch-cf
index 1737f9111aa..9c809695bd7 100644
--- a/audio/cdparanoia/patches/patch-cf
+++ b/audio/cdparanoia/patches/patch-cf
@@ -1,7 +1,7 @@
-$NetBSD: patch-cf,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-cf,v 1.2 2000/06/22 00:41:18 wiz Exp $
 
---- interface/scan_devices.c.orig	Tue Dec 14 16:30:23 1999
-+++ interface/scan_devices.c	Sat Jan 15 20:09:29 2000
+--- interface/scan_devices.c.orig	Tue Dec 14 08:30:23 1999
++++ interface/scan_devices.c	Thu Jun 22 02:36:44 2000
 @@ -17,6 +17,8 @@
  #include "common_interface.h"
  #include "utils.h"
@@ -172,10 +172,11 @@ $NetBSD: patch-cf,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
    
    d=calloc(1,sizeof(cdrom_drive));
  
-@@ -564,6 +610,15 @@
+@@ -564,7 +610,16 @@
  
    /* It would seem some TOSHIBA CDROM gets things wrong */
   
+-  if (!strncmp (p + 8, "TOSHIBA", 7) &&
 +#ifndef TYPE_DISK
 +#define TYPE_DISK	0	/* direct */
 +#endif
@@ -185,6 +186,7 @@ $NetBSD: patch-cf,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
 +#ifndef TYPE_ROM
 +#define TYPE_ROM	5	/* CD-ROM */
 +#endif
-   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;
-- 
cgit v1.2.3