Fill in blank "vendor" and "product_id" fields with "UNKNOWN", to make it

possible to match a valid entry in ~/.cdrdao-drivers.

6 files changed, 94 insertions, 1 deletions

diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 47efa35661f..42a6969751e 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.9 2004/06/20 19:05:25 dillo Exp $
+$NetBSD: distinfo,v 1.10 2004/07/19 02:21:57 fredb Exp $
 
 SHA1 (cdrdao-1.1.9.tar.gz) = e406940bbc2784ba249e3b7198ac7834ebda18f7
 Size (cdrdao-1.1.9.tar.gz) = 1581717 bytes
+SHA1 (patch-aa) = ac38ac97ffbd502c5b5ea4de771ce92c520ae10e
 SHA1 (patch-ab) = 5cbacba844e1fa3c55634bdbbe3ec8a998d20273
 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
 SHA1 (patch-ad) = 2c092aa6755f6029bbd07db9fee03e655081fdb7
+SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45
+SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
+SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
+SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f
diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa
new file mode 100644
index 00000000000..bb0deac3629
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.6 2004/07/19 02:21:57 fredb Exp $
+
+--- dao/ScsiIf-lib.cc.orig	2004-04-13 13:38:58.000000000 -0500
++++ dao/ScsiIf-lib.cc
+@@ -289,6 +289,12 @@
+     revision_[i] = 0;
+   }
+ 
++  if (vendor_[0] == 0)
++    strncpy(vendor_, "UNKNOWN", 8);
++
++  if (product_[0] == 0)
++    strncpy(product_, "UNKNOWN", 8);
++
+   return 0;
+ }
+ 
diff --git a/sysutils/cdrdao/patches/patch-ae b/sysutils/cdrdao/patches/patch-ae
new file mode 100644
index 00000000000..741f730dd1b
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.3 2004/07/19 02:21:57 fredb Exp $
+
+--- dao/ScsiIf-linux.cc.orig	2004-04-12 20:23:44.000000000 -0500
++++ dao/ScsiIf-linux.cc
+@@ -398,6 +398,12 @@
+   for (i = 3; i >= 0 && revision_[i] == ' '; i--) {
+     revision_[i] = 0;
+   }
++
++  if (vendor_[0] == 0)
++    strncpy(vendor_, "UNKNOWN", 8);
++
++  if (product_[0] == 0)
++    strncpy(product_, "UNKNOWN", 8);
+   
+   return 0;
+ }
diff --git a/sysutils/cdrdao/patches/patch-af b/sysutils/cdrdao/patches/patch-af
new file mode 100644
index 00000000000..d6a8c06be00
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2004/07/19 02:21:57 fredb Exp $
+
+--- dao/ScsiIf-nt.cc.orig	2001-09-03 12:37:42.000000000 -0500
++++ dao/ScsiIf-nt.cc
+@@ -332,6 +332,12 @@
+      revision_[i] = 0;
+   }
+ 
++  if (vendor_[0] == 0)
++    strncpy(vendor_, "UNKNOWN", 8);
++
++  if (product_[0] == 0)
++    strncpy(product_, "UNKNOWN", 8);
++
+   return 0;
+ }
+ 
diff --git a/sysutils/cdrdao/patches/patch-ag b/sysutils/cdrdao/patches/patch-ag
new file mode 100644
index 00000000000..a0b64e90cec
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.3 2004/07/19 02:21:57 fredb Exp $
+
+--- dao/ScsiIf-win.cc.orig	2001-09-03 12:37:42.000000000 -0500
++++ dao/ScsiIf-win.cc
+@@ -355,5 +355,15 @@
+      revision_[i] = 0;
+   }
+ 
++  if (vendor_[0] == 0)
++  {
++    strncpy(vendor_, "UNKNOWN", 8);
++  }
++
++  if (product_[0] == 0)
++  {
++    strncpy(product_, "UNKNOWN", 8);
++  }
++
+   return 0;
+ }
diff --git a/sysutils/cdrdao/patches/patch-ah b/sysutils/cdrdao/patches/patch-ah
new file mode 100644
index 00000000000..e2527f0c4a2
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2004/07/19 02:21:57 fredb Exp $
+
+--- dao/ScsiIf-freebsd-cam.cc.orig	2001-09-03 12:37:42.000000000 -0500
++++ dao/ScsiIf-freebsd-cam.cc
+@@ -220,6 +220,12 @@
+ 	for (i = 3; i >= 0 && revision_[i] == ' '; i--)
+ 		revision_[i] = 0;
+ 
++	if (vendor_[0] == 0)
++		strncpy(vendor_, "UNKNOWN", 8);
++
++	if (product_[0] == 0)
++		strncpy(product_, "UNKNOWN", 8);
++
+ 	return 0;
+ }
+