From f70ab7095ddfc8c1be1dfd58ed067e51c7088c16 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Feb 21 2008 18:36:44 +0000
Subject: - fixed loop on error message for old dev syntax (rhbz#429386)


---

diff --git a/cdrkit-1.1.6-oldsyn.patch b/cdrkit-1.1.6-oldsyn.patch
new file mode 100644
index 0000000..5169c5f
--- /dev/null
+++ b/cdrkit-1.1.6-oldsyn.patch
@@ -0,0 +1,19 @@
+diff -ur cdrkit-1.1.6/libusal/scsi-linux-sg.c cdrkit-1.1.6.oldsyn/libusal/scsi-linux-sg.c
+--- cdrkit-1.1.6/libusal/scsi-linux-sg.c	2008-02-21 19:08:29.000000000 +0100
++++ cdrkit-1.1.6.oldsyn/libusal/scsi-linux-sg.c	2008-02-21 19:08:11.000000000 +0100
+@@ -592,15 +592,6 @@
+ 			if (nopen > 0 && usalp->errstr)
+ 				usalp->errstr[0] = '\0';
+ 
+-			/* that's crap, should not be reached in non-scan mode.
+-			 * Let's see whether it can be mapped to an atapi
+-			 * device to emulate some old cludge's behaviour. */
+-			if(!in_scanmode && busno < 1000 && busno >=0) {
+-				fake_atabus=1;
+-				fprintf(stderr, "Unable to open this SCSI ID. Trying to map to old ATA syntax."
+-						"This workaround will disappear in the near future. Fix your configuration.");
+-				goto retry_scan_open;
+-			}
+ 		}
+ 	}
+ 
diff --git a/cdrkit.spec b/cdrkit.spec
index 8554873..651fdc1 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -10,6 +10,7 @@ Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 Patch1: genisoimage-dlength.patch
 Patch2: icedax-segfault.patch
 Patch3: wodim-prtypo.patch
+Patch4: cdrkit-1.1.6-oldsyn.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel
 
@@ -73,6 +74,7 @@ rates. Icedax can also be used as a CD player.
 %patch1 -p1 -b .dlength
 %patch2 -p1 -b .segf
 %patch3 -p1 -b .prtypo
+%patch4 -p1 -b .oldsyn
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -209,6 +211,9 @@ fi
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Thu Feb 21 2008 Harald Hoyer <harald@redhat.com> 1.1.6-9
+- fixed loop on error message for old dev syntax (rhbz#429386)
+
 * Thu Feb 21 2008 Harald Hoyer <harald@redhat.com> 1.1.6-8
 - added file-devel to build requirements