scsilib.patch

diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/.cvsignore scsilib/.cvsignore
--- scsilib.orig/.cvsignore	1969-12-31 16:00:00.000000000 -0800
+++ scsilib/.cvsignore	2004-04-05 12:00:08.000000000 -0700
@@ -0,0 +1,3 @@
+Gmake.linux
+Makefile
+rc.pp
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/DEFAULTS/Defaults.linux scsilib/DEFAULTS/Defaults.linux
--- scsilib.orig/DEFAULTS/Defaults.linux	2003-02-15 16:01:48.000000000 -0800
+++ scsilib/DEFAULTS/Defaults.linux	2004-05-17 15:46:33.000000000 -0700
@@ -18,7 +18,7 @@
 ###########################################################################
 CWARNOPTS=
 
-DEFINCDIRS=	$(SRCROOT)/include /usr/src/linux/include
+DEFINCDIRS=	$(SRCROOT)/include
 LDPATH=		-L/opt/schily/lib
 RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
 
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/export/Makefile scsilib/export/Makefile
--- scsilib.orig/export/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ scsilib/export/Makefile	2004-04-12 19:03:25.000000000 -0700
@@ -0,0 +1,46 @@
+#ident %W% %E% %Q%
+###########################################################################
+# Written 1999 by Andreas Mueller
+###########################################################################
+# Makefile for local dynamic configuration
+###########################################################################
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+###########################################################################
+SRCROOT=	..
+RULESDIR=	RULES
+include		$(SRCROOT)/$(RULESDIR)/rules.top
+###########################################################################
+
+all: clobber
+	$(LN) -s $(SRCROOT)/include libschily
+	$(LN) -s $(SRCROOT)/libscg/scg scg
+	$(LN) -s $(SRCROOT)/incs/$(OARCH)/xconfig.h xconfig.h
+	$(LN) -s $(SRCROOT)/libs/$(OARCH)/libschily.a libschily.a
+	$(LN) -s $(SRCROOT)/libs/$(OARCH)/libscg.a libscg.a 
+	$(LN) -s $(SRCROOT)/libs/$(OARCH)/librscg.a librscg.a
+
+clobber:
+	$(RM_F) -r libschily scg xconfig.h libschily.a libscg.a librscg.a
+
+distclean: clobber
+
+clean: clobber
+
+OTHERTARGETS=	install ibins depend rmdep \
+		TAGS tags rmtarget relink
+
+$(OTHERTARGETS):
+	@echo "$@: nothing to make"
+
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/libscg/scsi-linux-sg.c scsilib/libscg/scsi-linux-sg.c
--- scsilib.orig/libscg/scsi-linux-sg.c	2004-01-14 09:54:01.000000000 -0800
+++ scsilib/libscg/scsi-linux-sg.c	2004-04-29 11:17:22.000000000 -0700
@@ -65,6 +65,14 @@
 
 #if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
 #if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced somewhere. */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+	#define __KERNEL__
+	#include <asm/types.h>
+	#include <asm/byteorder.h>
+	#undef __KERNEL__
+#endif
+
 /* Need to fine tune the ifdef so we get the transition point right. */
 #include <scsi/scsi.h>
 #else
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/Makefile scsilib/Makefile
--- scsilib.orig/Makefile	1998-09-20 15:58:30.000000000 -0700
+++ scsilib/Makefile	2004-04-12 18:56:23.000000000 -0700
@@ -13,3 +13,13 @@
 #
 include		$(SRCROOT)/$(RULESDIR)/rules.rdi
 ###########################################################################
+
+install:
+	@
+
+check:
+
+uninstall:
+	@
+
+distclean: clean
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a31/README.cdrdao scsilib/README.cdrdao
--- scsilib.orig/README.cdrdao 1969-12-31 16:00:00.000000000 -0800
+++ scsilib/README.cdrdao       2004-06-03 18:51:10.000000000 -0700
@@ -0,0 +1,7 @@
+This is a snapshot of Joerg Schilling's SCSI library from cdrtools-2.01a31.
+
+The additional directory 'export' is used to hold some links to include
+files and built libraries for easy access by the remaining cdrdao package.
+
+It is also possible to use an installed SCSI library. See "INSTALL" in the
+main directory for more information.
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/RULES/rules1.dir scsilib/RULES/rules1.dir
--- scsilib.orig/RULES/rules1.dir	2002-10-23 10:48:08.000000000 -0700
+++ scsilib/RULES/rules1.dir	2004-04-29 17:10:44.000000000 -0700
@@ -29,14 +29,12 @@
 		list=`echo TARGETS/[0-9][0-9]* | sed -e 's;TARGETS/[0-9][0-9];;g' | sed -e 's;!@!;/;g'`;\
 	for DIR in $${list} ;							\
 	do									\
-		(								\
-		echo "	==> MAKING \"$@\" ON SUBDIRECTORY \"$(CURDIR)/$$DIR\"";\
-		if [ -d ./$$DIR -a -r ./$$DIR/Makefile ] ; then			\
-			cd ./$$DIR;"$(MAKE)" $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@;		\
+		echo "	==> MAKING \"$@\" ON SUBDIRECTORY \"$(CURDIR)/$$DIR\""; \
+		if [ -d ./$$DIR -a -r ./$$DIR/Makefile ] ; then		\
+			"$(MAKE)" -C ./$$DIR $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@ || exit -1 ; \
 		else								\
 			echo "NOTICE: Partial source ($(CURDIR)/$$DIR) missing";\
-		fi								\
-		);								\
+		fi ;								\
 	done
 
 tinfo:
diff -ru --unidirectional-new-file /home/denis/packages/cdrtools-2.01a25/TARGETS/99export scsilib/TARGETS/99export
--- scsilib.orig/TARGETS/99export	1969-12-31 16:00:00.000000000 -0800
+++ scsilib/TARGETS/99export	2003-03-01 10:53:25.000000000 -0800
@@ -0,0 +1 @@
+Export
--- scsilib/RULES/mk-gmake.id.old	2004-09-08 09:10:02.000000000 -0700
+++ scsilib/RULES/mk-gmake.id	2005-04-26 14:15:21.000000000 -0700
@@ -37,9 +37,7 @@
 
 ifndef		ARCH_DONE
 
-__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 5)
-
-_MACHCMD=	(mach || uname -p || true)	2> /dev/null
+_MACHCMD=	(uname -p || true)	2> /dev/null
 _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
 
 XP_ARCH:=	$(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
--- scsilib/RULES.orig/ppc64-linux-cc.rul	1970-01-01 00:00:00.000000000 +0000
+++ scsilib/RULES/ppc64-linux-cc.rul	2004-12-23 16:02:37.343901376 +0000
@@ -0,0 +1,70 @@
+#ident "@(#)i586-linux-cc.rul	1.5 02/10/15 "
+###########################################################################
+# Written 1996 by J. Schilling
+###########################################################################
+#
+# Platform dependent MACROS for Linux
+#
+###########################################################################
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/rules.prg
+###########################################################################
+
+CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
+CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+
+CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+COPTS=
+CWOPTS=		-Wall -Wtraditional \
+		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
+COPTOPT=	-O
+KDEFINES=	-DKERNEL -D_KERNEL
+COPTDYN=	-fpic
+COPTGPROF=	-pg
+
+LIB_PREFIX=	lib
+LIB_SUFFIX=	.a
+SHL_SUFFIX=	.so.1.0
+
+#LIB_SOCKET=	-lsocket -lnsl -ldl
+LIB_SOCKET=	
+LIB_MATH=	-lm
+#LIB_KVM=	-lkvm
+LIB_KVM=	
+
+LIBS_PATH=	-L$(OLIBSDIR)
+
+LDFLAGS=	$(LDOPTS) $(LDOPTX)
+LDLIBS=		$(LIBS) $(LIBX)
+
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
+LDOPTS=		$(LIBS_PATH) $(LDPATH)
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET)
+LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
+
+FLOAT_OPTIONS=	
+
+CC=		@echo "	==> COMPILING \"$@\""; gcc
+LDCC=		@echo "	==> LINKING \"$@\""; gcc
+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
+RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; true
+ARFLAGS=	cr
+LORDER=		echo
+TSORT=		cat
+
+RMDEP=		:
+MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP_OUT=
diff -ruN --recursive scsilib/RULES.orig/ppc64-linux-gcc.rul scsilib/RULES/ppc64-linux-gcc.rul
--- scsilib/RULES.orig/ppc64-linux-gcc.rul	1970-01-01 00:00:00.000000000 +0000
+++ scsilib/RULES/ppc64-linux-gcc.rul	2004-12-23 16:02:43.008978904 +0000
@@ -0,0 +1,70 @@
+#ident "@(#)i586-linux-gcc.rul	1.5 02/10/15 "
+###########################################################################
+# Written 1996 by J. Schilling
+###########################################################################
+#
+# Platform dependent MACROS for Linux
+#
+###########################################################################
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/rules.prg
+###########################################################################
+
+CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
+CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+
+CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+COPTS=
+CWOPTS=		-Wall -Wtraditional \
+		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
+COPTOPT=	-O
+KDEFINES=	-DKERNEL -D_KERNEL
+COPTDYN=	-fpic
+COPTGPROF=	-pg
+
+LIB_PREFIX=	lib
+LIB_SUFFIX=	.a
+SHL_SUFFIX=	.so.1.0
+
+#LIB_SOCKET=	-lsocket -lnsl -ldl
+LIB_SOCKET=	
+LIB_MATH=	-lm
+#LIB_KVM=	-lkvm
+LIB_KVM=	
+
+LIBS_PATH=	-L$(OLIBSDIR)
+
+LDFLAGS=	$(LDOPTS) $(LDOPTX)
+LDLIBS=		$(LIBS) $(LIBX)
+
+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
+LDOPTS=		$(LIBS_PATH) $(LDPATH)
+LDOPTDYN=	-shared -Wl,-soname,$(TARGET)
+LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
+
+FLOAT_OPTIONS=	
+
+CC=		@echo "	==> COMPILING \"$@\""; gcc
+LDCC=		@echo "	==> LINKING \"$@\""; gcc
+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
+RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; true
+ARFLAGS=	cr
+LORDER=		echo
+TSORT=		cat
+
+RMDEP=		:
+MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP_OUT=
--- scsilib/libscg/scsi-linux-ata.c.scan	2005-02-05 22:45:03.422964296 +0100
+++ scsilib/libscg/scsi-linux-ata.c	2005-02-05 22:39:59.748129888 +0100
@@ -689,7 +689,7 @@ sg_amapdev(scgp, f, device, schillybus, 
 		return (FALSE);
 
 	result = lstat(device, &buf);
-	if (!result && S_ISLNK(buf.st_mode)) {
+	if (0 && !result && S_ISLNK(buf.st_mode)) {
 		result = readlink(device, tmp, LOCAL_MAX_PATH);
 		if (result > 0 && result < LOCAL_MAX_PATH) {
 			tmp[result] = '\0';
--- scsilib/libscg/scsi-linux-sg.c.scan	2004-09-22 12:57:24.313986568 +0200
+++ scsilib/libscg/scsi-linux-sg.c	2004-09-22 12:57:24.327984440 +0200
@@ -287,6 +287,8 @@
 	return (0);
 }
 
+#include <glob.h>
+
 LOCAL int
 scgo_open(scgp, device)
 	SCSI	*scgp;
@@ -301,8 +303,9 @@
 	register int	t;
 	register int	l;
 	register int	nopen = 0;
-	char		devname[64];
-		BOOL	use_ata = FALSE;
+	char		*devname;
+	BOOL	use_ata = FALSE;
+	glob_t globbuf;
 
 	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
 		errno = EINVAL;
@@ -383,103 +386,86 @@
 	 * look silly but there may be users that did boot from a SCSI hdd
 	 * and connected 4 CD/DVD writers to both IDE cables in the PC.
 	 */
-	if (use_ata) for (i = 0; i <= 25; i++) {
-		js_snprintf(devname, sizeof (devname), "/dev/hd%c", i+'a');
-					/* O_NONBLOCK is dangerous */
-		f = open(devname, O_RDWR | O_NONBLOCK);
-		if (f < 0) {
-			/*
-			 * Set up error string but let us clear it later
-			 * if at least one open succeeded.
-			 */
-			if (scgp->errstr)
-				js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '/dev/hd*'");
-			if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
+	if (use_ata) {
+		glob("/dev/hd[a-z]", GLOB_NOSORT, NULL, &globbuf);
+		
+		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
+			devname = globbuf.gl_pathv[i];
+			f = open(devname, O_RDWR | O_NONBLOCK);
+			if (f < 0) {
+				/*
+				 * Set up error string but let us clear it later
+				 * if at least one open succeeded.
+				 */
 				if (scgp->errstr)
 					js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '%s'", devname);
-				return (0);
-			}
-		} else {
-			int	iparm;
-
-			if (ioctl(f, SG_GET_TIMEOUT, &iparm) < 0) {
-				if (scgp->errstr)
-					js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"SCSI unsupported with '/dev/hd*'");
-				close(f);
-				continue;
+						    "Cannot open '/dev/hd*'");
+				if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
+					if (scgp->errstr)
+						js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+							    "Cannot open '%s'", devname);
+					globfree(&globbuf);
+					return (0);
+				}
+			} else {
+				int	iparm;
+				
+				if (ioctl(f, SG_GET_TIMEOUT, &iparm) < 0) {
+					if (scgp->errstr)
+						js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+							    "SCSI unsupported with '/dev/hd*'");
+					close(f);
+					continue;
+				}
+				sg_clearnblock(f);	/* Be very proper about this */
+				if (sg_setup(scgp, f, busno, tgt, tlun, devname[7]-'a')) {
+					globfree(&globbuf);
+					return (++nopen);
+				}
+				if (busno < 0 && tgt < 0 && tlun < 0)
+					nopen++;
 			}
-			sg_clearnblock(f);	/* Be very proper about this */
-			if (sg_setup(scgp, f, busno, tgt, tlun, i))
-				return (++nopen);
-			if (busno < 0 && tgt < 0 && tlun < 0)
-				nopen++;
 		}
+		globfree(&globbuf);
 	}
 	if (use_ata && nopen == 0)
 		return (0);
 	if (nopen > 0 && scgp->errstr)
 		scgp->errstr[0] = '\0';
 
-	if (nopen == 0) for (i = 0; i < 32; i++) {
-		js_snprintf(devname, sizeof (devname), "/dev/sg%d", i);
-					/* O_NONBLOCK is dangerous */
-		f = open(devname, O_RDWR | O_NONBLOCK);
-		if (f < 0) {
-			/*
-			 * Set up error string but let us clear it later
-			 * if at least one open succeeded.
-			 */
-			if (scgp->errstr)
-				js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '/dev/sg*'");
-			if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
+	if (nopen == 0) {
+		glob("/dev/scd[0-9]", GLOB_NOSORT, NULL, &globbuf);
+		glob("/dev/scd[0-9][0-9]", GLOB_NOSORT|GLOB_APPEND, NULL, &globbuf);
+		glob("/dev/sg[a-z]", GLOB_NOSORT|GLOB_APPEND, NULL, &globbuf);
+		glob("/dev/sg[0-9]", GLOB_NOSORT|GLOB_APPEND, NULL, &globbuf);
+		glob("/dev/sr[0-9]", GLOB_NOSORT|GLOB_APPEND, NULL, &globbuf);
+		
+		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
+			devname = globbuf.gl_pathv[i];
+
+			f = open(devname, O_RDWR | O_NONBLOCK);
+			if (f < 0) {
+				/*
+				 * Set up error string but let us clear it later
+				 * if at least one open succeeded.
+				 */
 				if (scgp->errstr)
 					js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '%s'", devname);
-				return (0);
+						    "Cannot open '/dev/scd*'");
+			} else {
+				sg_clearnblock(f);	/* Be very proper about this */
+				if (sg_setup(scgp, f, busno, tgt, tlun, -1)) {
+					globfree(&globbuf);
+					return (++nopen);
+				}
+				if (busno < 0 && tgt < 0 && tlun < 0)
+					nopen++;
 			}
-		} else {
-			sg_clearnblock(f);	/* Be very proper about this */
-			if (sg_setup(scgp, f, busno, tgt, tlun, -1))
-				return (++nopen);
-			if (busno < 0 && tgt < 0 && tlun < 0)
-				nopen++;
 		}
 	}
 	if (nopen > 0 && scgp->errstr)
 		scgp->errstr[0] = '\0';
 
-	if (nopen == 0) for (i = 0; i <= 25; i++) {
-		js_snprintf(devname, sizeof (devname), "/dev/sg%c", i+'a');
-					/* O_NONBLOCK is dangerous */
-		f = open(devname, O_RDWR | O_NONBLOCK);
-		if (f < 0) {
-			/*
-			 * Set up error string but let us clear it later
-			 * if at least one open succeeded.
-			 */
-			if (scgp->errstr)
-				js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '/dev/sg*'");
-			if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
-				if (scgp->errstr)
-					js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '%s'", devname);
-				return (0);
-			}
-		} else {
-			sg_clearnblock(f);	/* Be very proper about this */
-			if (sg_setup(scgp, f, busno, tgt, tlun, -1))
-				return (++nopen);
-			if (busno < 0 && tgt < 0 && tlun < 0)
-				nopen++;
-		}
-	}
-	if (nopen > 0 && scgp->errstr)
-		scgp->errstr[0] = '\0';
 
 openbydev:
 	if (device != NULL && *device != '\0') {
--- scsilib/libscg/scsi-linux-ata.c.scan	2004-06-12 12:48:12.000000000 +0200
+++ scsilib/libscg/scsi-linux-ata.c	2004-09-22 12:57:24.330983984 +0200
@@ -267,7 +267,7 @@
 			starget,
 			slun;
 
-		f = open(device, O_RDONLY | O_NONBLOCK);
+		f = open(device, O_RDWR | O_NONBLOCK);
 
 		if (f < 0) {
 			if (scgp->errstr)
@@ -283,6 +283,9 @@
 	return (nopen);
 }
 
+#include <glob.h>
+
+
 LOCAL int
 scan_internal(scgp, nopen)
 	SCSI	*scgp;
@@ -293,118 +296,62 @@
 	int	schilly_bus,
 		target,
 		lun;
-	char	device[128];
+	char	*device;
+        glob_t globbuf;
+
 	/*
 	 * try always with devfs
 	 * unfortunatelly the solution with test of existing
 	 * of '/dev/.devfsd' don't work, because it root.root 700
 	 * and i don't like run suid root
 	 */
-	BOOL	DEVFS = TRUE;
+	BOOL	DEVFS = FALSE;
 
-	if (DEVFS) {
-		for (i = 0; ; i++) {
-			sprintf(device, "/dev/cdroms/cdrom%i", i);
-			if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
-				if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
-					if (scgp->debug > 4) {
-						js_fprintf((FILE *) scgp->errfile,
-						"try open(%s) return %i, errno %i, cancel\n", device, f, errno);
-					}
-					return (-2);
-				} else if (errno == ENOENT || errno == ENODEV) {
-					if (scgp->debug > 4) {
-						js_fprintf((FILE *) scgp->errfile,
-						"try open(%s) return %i, errno %i\n", device, f, errno);
-					}
-					if (0 == i) {
-						DEVFS = FALSE;
-						if (scgp->debug > 4) {
-							js_fprintf((FILE *) scgp->errfile,
-							"DEVFS not detected, continuing with old dev\n");
-						}
-					}
-					break;
-				}
+	glob("/dev/cdroms/cdrom*", 
+	     GLOB_NOSORT, 
+	     NULL, &globbuf);
+	glob("/dev/hd[a-z]", 
+	     GLOB_NOSORT|GLOB_APPEND, 
+	     NULL, &globbuf);
+	/*glob("/dev/scd*",  
+	     GLOB_NOSORT|GLOB_APPEND, 
+	     NULL, &globbuf);*/
+
+	for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
+		device = globbuf.gl_pathv[i];
+		if ((f = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+			if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
 				if (scgp->debug > 4) {
-					if (errno == EACCES) {
-						js_fprintf((FILE *) scgp->errfile,
-						"errno (EACCESS), you don't have the needed rights for %s\n",
-						device);
-					}
 					js_fprintf((FILE *) scgp->errfile,
-					"try open(%s) return %i, errno %i, trying next cdrom\n",
-					device, f, errno);
+						   "try open(%s) return %i, errno %i, cancel\n", device, f, errno);
 				}
-			} else {
-				if (scgp->debug > 4) {
+				globfree(&globbuf);
+				return (-2);
+			} 
+			if (scgp->debug > 4) {
+				if (errno == EACCES) {
 					js_fprintf((FILE *) scgp->errfile,
-					"try open(%s) return %i errno %i calling sg_mapdev(...)\n",
-					device, f, errno);
-				}
-				if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
-					(++(*nopen));
-				} else {
-					close(f);
+						   "errno (EACCESS), you don't have the needed rights for %s\n",
+						   device);
 				}
+				js_fprintf((FILE *) scgp->errfile,
+					   "try open(%s) return %i, errno %i, trying next cdrom\n",
+					   device, f, errno);
 			}
-		}
-	}
-	if (!DEVFS) {
-		/* for /dev/sr0 - /dev/sr? */
-		for (i = 0; ; i++) {
-			sprintf(device, "/dev/sr%i", i);
-			if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
-				if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
-					if (scgp->debug > 4) {
-						js_fprintf((FILE *) scgp->errfile,
-						"try open(%s) return %i, errno %i, cancel\n",
-						device, f, errno);
-					}
-					return (-2);
-				} else if (errno == ENOENT || errno == ENODEV) {
-					break;
-				}
-			} else {
-				if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
-					(++(*nopen));
-				} else {
-					close(f);
-				}
+		} else {
+			if (scgp->debug > 4) {
+				js_fprintf((FILE *) scgp->errfile,
+					   "try open(%s) return %i errno %i calling sg_mapdev(...)\n",
+					   device, f, errno);
 			}
-		}
-
-		/* for /dev/hda - /dev/hdz */
-		for (i = 'a'; i <= 'z'; i++) {
-			sprintf(device, "/dev/hd%c", i);
-			if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
-				if (errno != ENOENT && errno != ENXIO && errno != EACCES) {
-					if (scgp->debug > 4) {
-						js_fprintf((FILE *) scgp->errfile,
-						"try open(%s) return %i, errno %i, cancel\n",
-						device, f, errno);
-					}
-					return (-2);
-				} else if (errno == ENOENT || errno == ENODEV) {
-					break;
-				}
+			if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
+				(++(*nopen));
 			} else {
-				/* ugly hack, make better, when you can. Alex */
-				if (0 > ioctl(f, CDROM_DRIVE_STATUS, CDSL_CURRENT)) {
-					if (scgp->debug > 4) {
-						js_fprintf((FILE *) scgp->errfile,
-						"%s is not a cdrom, skipping\n",
-						device);
-					}
-					close(f);
-				} else if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
-					(++(*nopen));
-				} else {
-					close(f);
-				}
+				close(f);
 			}
 		}
 	}
+	globfree(&globbuf);
 	return (0);
 }
 
--- scsilib/libscg/scsi-linux-pg.c.scan	2004-01-15 01:54:36.000000000 +0100
+++ scsilib/libscg/scsi-linux-pg.c	2004-09-22 12:59:04.107815600 +0200
@@ -130,6 +130,8 @@
 	return (0);
 }
 
+#include <glob.h>
+
 LOCAL int
 scgo_open(scgp, device)
 	SCSI	*scgp;
@@ -146,6 +148,8 @@
 #endif
 	register int	nopen = 0;
 	char		devname[32];
+        glob_t globbuf;
+        int i;
 
 	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
 		errno = EINVAL;
@@ -217,10 +221,14 @@
 		scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
 		return (1);
 	} else {
+		const char *dev;
 		tlun = 0;
-		for (tgt = 0; tgt < MAX_TGT; tgt++) {
-			js_snprintf(devname, sizeof (devname), "/dev/pg%d", tgt);
-			f = open(devname, O_RDWR | O_NONBLOCK);
+		glob("/dev/pg[0-9]", GLOB_NOSORT, NULL, &globbuf);
+		glob("/dev/pg[0-9][0-9]", GLOB_NOSORT|GLOB_APPEND, NULL, &globbuf);
+		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
+		        dev = globbuf.gl_pathv[i];
+			tgt = atoi(&dev[7]);
+			f = open(dev, O_RDWR | O_NONBLOCK);
 			if (f < 0) {
 				/*
 				 * Set up error string but let us clear it later
@@ -232,7 +240,8 @@
 				if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
 					if (scgp->errstr)
 						js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							"Cannot open '%s'", devname);
+							"Cannot open '%s'", dev);
+					globfree(&globbuf);
 					return (0);
 				}
 			} else {
@@ -240,6 +249,8 @@
 				nopen++;
 			}
 		}
+		globfree(&globbuf);
+
 	}
 	if (nopen > 0 && scgp->errstr)
 		scgp->errstr[0] = '\0';
--- scsilib/include/btorder.h.endianness	2004-01-20 13:53:42.000000000 +0100
+++ scsilib/include/btorder.h	2004-01-20 13:55:24.000000000 +0100
@@ -100,6 +100,7 @@
 #	endif
 
 #	if defined(__i386__) || defined(__i386) || defined(i386) || \
+	    defined(__ia64__) || defined(__ia64) || defined(ia64) || \
 	    defined(__alpha__) || defined(__alpha) || defined(alpha) || \
 	    defined(__arm__) || defined(__arm) || defined(arm)
 #		define _BIT_FIELDS_LTOH
--- cdrtools-2.01/libscg/scsi-linux-sg.c.silly	2004-05-20 15:42:12.000000000 +0200
+++ cdrtools-2.01/libscg/scsi-linux-sg.c	2004-09-08 11:37:47.670038792 +0200
@@ -315,6 +315,10 @@
 	if (device != NULL && *device != '\0') {
 #ifdef	USE_ATA
 		if (strncmp(device, "ATAPI", 5) == 0) {
+			if (scgp->overbose) {
+				js_fprintf((FILE *)scgp->errfile,
+				"Use of ATA is preferred over ATAPI.\n");
+			}
 			scgp->ops = &ata_ops;
 			return (SCGO_OPEN(scgp, device));
 		}
@@ -336,18 +340,6 @@
 			 */
 			use_ata = TRUE;
 			device = NULL;
-			if (scgp->overbose) {
-				/*
-				 * I strongly encourage people who believe that
-				 * they need to patch this message away to read
-				 * the messages in the Solaris USCSI libscg
-				 * layer instead of wetting their tissues while
-				 * being unwilling to look besides their
-				 * own belly button.
-				 */
-				js_fprintf((FILE *)scgp->errfile,
-				"Warning: Using badly designed ATAPI via /dev/hd* interface.\n");
-			}
 		}
 	}
 
@@ -497,20 +489,7 @@
 			if (b < 0 || b > 25)
 				b = -1;
 		}
-		if (scgp->overbose) {
-			/*
-			 * Before you patch this away, are you sure that you
-			 * know what you are going to to?
-			 *
-			 * Note that this is a warning that helps users from
-			 * cdda2wav, mkisofs and other programs (that
-			 * distinguish SCSI addresses from file names) from
-			 * getting unexpected results.
-			 */
-			js_fprintf((FILE *)scgp->errfile,
-			"Warning: Open by 'devname' is unintentional and not supported.\n");
-		}
-					/* O_NONBLOCK is dangerous */
+		/* O_NONBLOCK is dangerous */
 		f = open(device, O_RDWR | O_NONBLOCK);
 /*		if (f < 0 && errno == ENOENT)*/
 /*			goto openpg;*/
diff -u -r -3 cdrtools-2.01/include/utypes.h cdrtools-2.01.ossdvd/include/utypes.h
--- cdrtools-2.01/include/utypes.h	2003-06-15 23:41:23.000000000 +0200
+++ cdrtools-2.01.ossdvd/include/utypes.h	2004-08-27 07:13:09.076574488 +0200
@@ -75,6 +75,25 @@
 typedef	unsigned char	Uchar;
 
 /*
+ * Added these cause Linux distro's using kernel 2.6.x seems 
+ * to want them.
+ */
+typedef	unsigned char	u8;
+typedef	unsigned short	u16;
+typedef	unsigned int	u32;
+#if defined(__GNUC__)		/* this is defined gcc-3.x */
+typedef	unsigned long long u64;
+#endif
+
+/*
+ * Dodge the __attribute_const__ out of sneaky kernel includes.
+ * cdrtools is a userland program, so no kernel attribute's
+ */
+#ifndef __attribute_const__
+# define __attribute_const__    /* unimplemented */
+#endif
+
+/*
  * This is a definition for a compiler dependant 64 bit type.
  * It currently is silently a long if the compiler does not
  * support it. Check if this is the right way.
--- cdrtools/include/mconfig.h.xc	2004-07-11 00:46:53.000000000 +0200
+++ cdrtools/include/mconfig.h	2006-06-02 17:21:55.000000000 +0200
@@ -49,6 +49,70 @@
 extern "C" {
 #endif
 
+
+#define HAVE_BROKEN_SRC_LINUX_EXT2_FS_H	1 /* whether /usr/src/linux/include/linux/ext2_fs.h is broken */
+#undef DEV_MINOR_BITS		/* # if bits needed to hold minor device number */
+/*
+ * Byteorder/Bitorder
+ */
+#define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+#if defined(__BIG_ENDIAN__)
+#define WORDS_BIGENDIAN	1	/* If using network byte order             */
+#endif
+#define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+#if defined(__BIG_ENDIAN__)
+#define BITFIELDS_HTOL	1	/* If high bits come first in structures   */
+#endif
+
+/*
+ * Types/Keywords
+ */
+
+#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
+#define SIZEOF_LONG_INT 8
+#define SIZEOF_CHAR_P 8
+#define SIZEOF_UNSIGNED_LONG_INT 8
+#define SIZEOF_UNSIGNED_CHAR_P 8
+#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__)
+#define SIZEOF_LONG_INT 4
+#define SIZEOF_CHAR_P 4
+#define SIZEOF_UNSIGNED_LONG_INT 4
+#define SIZEOF_UNSIGNED_CHAR_P 4
+#else
+#error Architecture not defined here!
+#endif
+
+#define SIZEOF_CHAR 1
+#define SIZEOF_SHORT_INT 2
+#define SIZEOF_INT 4
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF_UNSIGNED_CHAR 1
+#define SIZEOF_UNSIGNED_SHORT_INT 2
+#define SIZEOF_UNSIGNED_INT 4
+#define SIZEOF_UNSIGNED_LONG_LONG 8
+
+#if defined(__LONG_LONG_MAX__)
+#define HAVE_LONGLONG 1         /* Compiler defines long long type */
+#endif
+
+#if defined(__CHAR_UNSIGNED__)
+#define CHAR_IS_UNSIGNED 1	/* Compiler defines char to be unsigned */
+#endif
+
+#define VA_LIST_IS_ARRAY	1	/* va_list is an array */
+#define _FILE_OFFSET_BITS 64	/* # of bits in off_t if settable	   */
+#define _LARGEFILE_SOURCE 1	/* To make ftello() visible (HP-UX 10.20). */
+
+/*
+ * Strings that help to maintain OS/platform id's in C-programs
+ */
+#define HOST_ALIAS "pc-linux-gnu"		/* Output from config.guess (orig)	*/
+#define HOST_SUB   "pc-linux-gnu"		/* Output from config.sub (modified)	*/
+#define HOST_CPU   "cpu" 		/* CPU part from HOST_SUB		*/
+#define HOST_VENDOR "pc"		/* VENDOR part from HOST_SUB		*/
+#define HOST_OS	"linux-gnu"		/* CPU part from HOST_SUB		*/
+
+
 /*
  * The NetBSD people want to bother us.
  * They removed the definition for 'unix' and are bleating for every test
--- cdrtools/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
+++ cdrtools/conf/xconfig.h.in	2006-06-02 17:22:06.000000000 +0200
@@ -408,38 +406,11 @@
 #undef HAVE_ST_FLAGS		/* if struct stat contains st_flags */
 #undef STAT_MACROS_BROKEN	/* if the macros S_ISDIR, S_ISREG .. don't work */
 
-#undef DEV_MINOR_BITS		/* # if bits needed to hold minor device number */
 #undef DEV_MINOR_NONCONTIG	/* if bits in minor device number are noncontiguous */
 
 #undef HAVE_SOCKADDR_STORAGE	/* if socket.h defines struct sockaddr_storage */
 
 
-/*
- * Byteorder/Bitorder
- */
-#define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
-#undef WORDS_BIGENDIAN		/* If using network byte order             */
-#define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
-#undef BITFIELDS_HTOL		/* If high bits come first in structures   */
-
-/*
- * Types/Keywords
- */
-#undef SIZEOF_CHAR
-#undef SIZEOF_SHORT_INT
-#undef SIZEOF_INT
-#undef SIZEOF_LONG_INT
-#undef SIZEOF_LONG_LONG
-#undef SIZEOF_CHAR_P
-#undef SIZEOF_UNSIGNED_CHAR
-#undef SIZEOF_UNSIGNED_SHORT_INT
-#undef SIZEOF_UNSIGNED_INT
-#undef SIZEOF_UNSIGNED_LONG_INT
-#undef SIZEOF_UNSIGNED_LONG_LONG
-#undef SIZEOF_UNSIGNED_CHAR_P
-
-#undef HAVE_LONGLONG		/* Compiler defines long long type */
-#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
 
 #undef const			/* Define to empty if const doesn't work */
 #undef uid_t			/* To be used if uid_t is not present  */
@@ -479,7 +450,6 @@
 
 /*#undef HAVE_SIZE_T*/
 /*#undef NO_SIZE_T*/
-#undef VA_LIST_IS_ARRAY		/* va_list is an array */
 #undef GETGROUPS_T
 #define GID_T		GETGROUPS_T
 
@@ -498,8 +468,6 @@
 #ifdef	HAVE_LARGEFILES		/* If we have working largefiles at all	   */
 				/* This is not defined with glibc-2.1.3	   */
 
-#undef _FILE_OFFSET_BITS	/* # of bits in off_t if settable	   */
-#undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
 #undef _LARGE_FILES		/* Large file defined on AIX-style hosts.  */
 #undef _XOPEN_SOURCE		/* To make ftello() visible (glibc 2.1.3). */
 				/* XXX We don't use this because glibc2.1.3*/
@@ -583,15 +551,6 @@
 #undef NO_USER_MALLOC		/* If we cannot define our own malloc()	*/
 #undef HAVE_DYN_ARRAYS		/* If the compiler allows dynamic sized arrays */
 
-/*
- * Strings that help to maintain OS/platform id's in C-programs
- */
-#undef HOST_ALIAS		/* Output from config.guess (orig)	*/
-#undef HOST_SUB			/* Output from config.sub (modified)	*/
-#undef HOST_CPU			/* CPU part from HOST_SUB		*/
-#undef HOST_VENDOR		/* VENDOR part from HOST_SUB		*/
-#undef HOST_OS			/* CPU part from HOST_SUB		*/
-
 
 /*
  * Begin restricted code for quality assurance.
--- cdrtools-2.01/libscg/oexcl.c.excl	2004-09-22 12:03:23.426676328 +0200
+++ cdrtools-2.01/libscg/oexcl.c	2004-09-22 12:03:23.426676328 +0200
@@ -0,0 +1,29 @@
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+int openexcl(const char *device, int mode)
+{
+  int f, i;
+
+  f = open(device, mode | O_EXCL);
+
+  if (f < 0) {
+    f = open(device, mode);
+
+    if (f >= 0) {
+      close(f);
+      f = -1;
+      for (i = 0; (i < 10) && (f == -1); i++) {
+	fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
+	usleep(1000000 + 100000.0 * rand()/(RAND_MAX+1.0));
+	f = open(device, O_RDONLY | O_NONBLOCK | O_EXCL);
+      }
+    }
+  }
+
+  return f;
+}
--- cdrtools-2.01/libscg/scsi-linux-ata.c.excl	2004-09-22 12:03:23.423676784 +0200
+++ cdrtools-2.01/libscg/scsi-linux-ata.c	2004-09-22 12:03:23.427676176 +0200
@@ -112,6 +112,7 @@
 LOCAL	void	sglog		__PR((const char *fmt, ...));
 
 #include <vadefs.h>
+#include "oexcl.h"
 
 /* VARARGS1 */
 #ifdef	PROTOTYPES
@@ -267,7 +268,7 @@
 			starget,
 			slun;
 
-		f = open(device, O_RDWR | O_NONBLOCK);
+		f = openexcl(device, O_RDWR | O_NONBLOCK);
 
 		if (f < 0) {
 			if (scgp->errstr)
--- cdrtools-2.01/libscg/oexcl.h.excl	2004-09-22 12:03:23.428676024 +0200
+++ cdrtools-2.01/libscg/oexcl.h	2004-09-22 12:03:23.428676024 +0200
@@ -0,0 +1,5 @@
+#ifndef OEXCL_H
+
+extern int openexcl(const char *device, int mode);
+
+#endif
--- scsilib/libscg/Targets.orig	2007-12-15 11:49:22.000000000 +0100
+++ scsilib/libscg/Targets	2007-12-15 11:49:29.000000000 +0100
@@ -1,3 +1,3 @@
 CFILES=		scsitransp.c scsihack.c scsiopen.c scgsettarget.c \
-		scsierrs.c scgtimes.c scsihelp.c \
+		scsierrs.c scgtimes.c scsihelp.c oexcl.c \
 		rdummy.c
--- cdrtools-2.01/libscg/scsi-linux-sg.c	2004-09-22 12:12:49.271654816 +0200
+++ cdrtools-2.01/libscg/scsi-linux-sg.c	2004-09-22 12:12:49.271654816 +0200
@@ -79,6 +79,7 @@
 #endif
 
 #include "scsi/sg.h"
+#include "oexcl.h"
 
 #undef sense			/* conflict in struct cdrom_generic_command */
 #include <linux/cdrom.h>
@@ -94,7 +95,7 @@
  *	Choose your name instead of "schily" and make clear that the version
  *	string is related to a modified source.
  */
-LOCAL	char	_scg_trans_version[] = "scsi-linux-sg.c-1.83";	/* The version for this transport*/
+LOCAL	char	_scg_trans_version[] = "scsi-linux-sg.c-1.83-RH";	/* The version for this transport*/
 
 #ifndef	SCSI_IOCTL_GET_BUS_NUMBER
 #define	SCSI_IOCTL_GET_BUS_NUMBER 0x5386
@@ -247,7 +249,7 @@
 		 * return "schily" for the SCG_AUTHOR request.
 		 */
 		case SCG_AUTHOR:
-			return (_scg_auth_schily);
+			return ("schily - Red Hat");
 		case SCG_SCCS_ID:
 			return (__sccsid);
 		case SCG_KVERSION:
@@ -479,7 +483,7 @@
 				b = -1;
 		}
 		/* O_NONBLOCK is dangerous */
-		f = open(device, O_RDWR | O_NONBLOCK);
+		f = openexcl(device, O_RDWR | O_NONBLOCK);
 /*		if (f < 0 && errno == ENOENT)*/
 /*			goto openpg;*/
 
--- scsilib/inc/avoffset.c.orig	Sun May  9 13:06:08 2004
+++ scsilib/inc/avoffset.c	Sat Feb 21 17:34:31 2009
@@ -78,6 +78,9 @@
 	signal(SIGBUS, handler);
 #endif
 	signal(SIGSEGV, handler);
+#ifdef	SIGILL
+	signal(SIGILL, handler);
+#endif
 
 	printf("/*\n");
 	printf(" * This file has been generated automatically\n");
--- scsilib/include/mconfig.h.orig	2009-02-11 09:54:43.000000000 +0100
+++ scsilib/include/mconfig.h	2009-02-21 17:54:43.000000000 +0100
@@ -72,12 +72,12 @@
  * Types/Keywords
  */
 
-#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__)
 #define SIZEOF_LONG_INT 8
 #define SIZEOF_CHAR_P 8
 #define SIZEOF_UNSIGNED_LONG_INT 8
 #define SIZEOF_UNSIGNED_CHAR_P 8
-#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__)
+#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
 #define SIZEOF_LONG_INT 4
 #define SIZEOF_CHAR_P 4
 #define SIZEOF_UNSIGNED_LONG_INT 4
--- scsilib/libscg/scsi-bsd.c.orig	Thu Jan 15 00:13:05 2004
+++ scsilib/libscg/scsi-bsd.c	Sat Feb 21 17:18:15 2009
@@ -674,6 +674,9 @@
 	 * system.
 	 */
 	ccb.ccb_h.func_code = XPT_DEV_MATCH;
+	ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
+	ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
+	ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
 
 	/*
 	 * Setup the result buffer.
--- scsilib/RULES/MKLINKS.orig	2004-09-08 12:11:47.000000000 -0400
+++ scsilib/RULES/MKLINKS	2009-04-22 13:24:30.000000000 -0400
@@ -105,12 +105,26 @@
 ln -s	i586-linux-gcc.rul	m68k-linux-gcc.rul
 ln -s	i586-linux-cc.rul	armv4l-linux-cc.rul
 ln -s	i586-linux-gcc.rul	armv4l-linux-gcc.rul
+ln -s	i586-linux-cc.rul	armv4l-linux-cc.rul
+ln -s	i586-linux-gcc.rul	armv4l-linux-gcc.rul
+ln -s	i586-linux-cc.rul	armv4tl-linux-cc.rul
+ln -s	i586-linux-gcc.rul	armv4tl-linux-gcc.rul
+ln -s	i586-linux-cc.rul	armv5tel-linux-cc.rul
+ln -s	i586-linux-gcc.rul	armv5tel-linux-gcc.rul
+ln -s	i586-linux-cc.rul	armv5tejl-linux-cc.rul
+ln -s	i586-linux-gcc.rul	armv5tejl-linux-gcc.rul
+ln -s	i586-linux-cc.rul	armv6l-linux-cc.rul
+ln -s	i586-linux-gcc.rul	armv6l-linux-gcc.rul
 ln -s	i586-linux-cc.rul	mips-linux-cc.rul
 ln -s	i586-linux-gcc.rul	mips-linux-gcc.rul
+ln -s	i586-linux-cc.rul	mips64-linux-cc.rul
+ln -s	i586-linux-gcc.rul	mips64-linux-gcc.rul
 ln -s	i586-linux-cc.rul	mipsel-linux-cc.rul
 ln -s	i586-linux-gcc.rul	mipsel-linux-gcc.rul
 ln -s	i586-linux-cc.rul	s390-linux-cc.rul
 ln -s	i586-linux-gcc.rul	s390-linux-gcc.rul
+ln -s	i586-linux-cc.rul	s390x-linux-cc.rul
+ln -s	i586-linux-gcc.rul	s390x-linux-gcc.rul
 ln -s	i586-linux-cc.rul	parisc-linux-cc.rul
 ln -s	i586-linux-gcc.rul	parisc-linux-gcc.rul
 ln -s	i586-linux-cc.rul	parisc64-linux-cc.rul