rpms/gcdmaster/F-8 cdrdao-1.1.7-endianness.patch, NONE, 1.1 cdrdao-1.2.2-errcheck.patch, NONE, 1.1 cdrtools-2.0-O_EXCL.patch, NONE, 1.1 cdrtools-2.01a27-silly-warnings.patch, NONE, 1.1 mkisofs-changelog.patch, NONE, 1.1 gcdmaster.spec, 1.7, 1.8

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/gcdmaster/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12022

Modified Files:
	gcdmaster.spec 
Added Files:
	cdrdao-1.1.7-endianness.patch cdrdao-1.2.2-errcheck.patch 
	cdrtools-2.0-O_EXCL.patch 
	cdrtools-2.01a27-silly-warnings.patch mkisofs-changelog.patch 
Log Message:
Added patches from current cdrdao package

cdrdao-1.1.7-endianness.patch:

--- NEW FILE cdrdao-1.1.7-endianness.patch ---
--- cdrdao-1.1.7/scsilib/include/btorder.h.endianness	2004-01-20 13:53:42.000000000 +0100
+++ cdrdao-1.1.7/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

cdrdao-1.2.2-errcheck.patch:

--- NEW FILE cdrdao-1.2.2-errcheck.patch ---
--- a/scsilib/libscg/scsi-linux-sg.c	2007-12-21 11:25:57.000000000 +0100
+++ b/scsilib/libscg/scsi-linux-sg.c	2007-12-21 11:27:13.000000000 +0100
@@ -460,13 +460,6 @@
 				if (scgp->errstr)
 					js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
 						    "Cannot open '/dev/scd*'");
-				if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EROFS) {
-					if (scgp->errstr)
-						js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
-							    "Cannot open '%s'", devname);
-					globfree(&globbuf);
-					return (0);
-				}
 			} else {
 				sg_clearnblock(f);	/* Be very proper about this */
 				if (sg_setup(scgp, f, busno, tgt, tlun, -1)) {

cdrtools-2.0-O_EXCL.patch:

--- NEW FILE cdrtools-2.0-O_EXCL.patch ---
--- cdrtools-2.01/scsilib/libscg/oexcl.c.excl	2004-09-22 12:03:23.426676328 +0200
+++ cdrtools-2.01/scsilib/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/scsilib/libscg/scsi-linux-ata.c.excl	2004-09-22 12:03:23.423676784 +0200
+++ cdrtools-2.01/scsilib/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/scsilib/libscg/oexcl.h.excl	2004-09-22 12:03:23.428676024 +0200
+++ cdrtools-2.01/scsilib/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
--- cdrtools-2.01/scsilib/libscg/Targets.excl	2002-10-19 20:33:37.000000000 +0200
+++ cdrtools-2.01/scsilib/libscg/Targets	2004-09-22 12:03:23.428676024 +0200
@@ -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/scsilib/libscg/scsi-linux-sg.c.excl	2004-09-22 12:03:23.422676936 +0200
+++ cdrtools-2.01/scsilib/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;*/
 

cdrtools-2.01a27-silly-warnings.patch:

--- NEW FILE cdrtools-2.01a27-silly-warnings.patch ---
--- cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c.silly	2004-05-20 15:42:12.000000000 +0200
+++ cdrtools-2.01/scsilib/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;*/

mkisofs-changelog.patch:

--- NEW FILE mkisofs-changelog.patch ---
--- cdrtools-1.10/mkisofs/ChangeLog.changelog	Sat Apr  7 17:34:04 2001
+++ cdrtools-1.10/mkisofs/ChangeLog	Thu Apr 19 01:02:24 2001
@@ -0,0 +1,6 @@
+**************** Packager's Note ******************
+Tue Aug  8 2000 Crutcher Dunnavant <crutcher at redhat.com>
+	* graft-points are NO LONGER assuemd,
+	  you must specify '-graft-points'
+
+


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcdmaster/F-8/gcdmaster.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcdmaster.spec	22 Aug 2007 11:35:58 -0000	1.7
+++ gcdmaster.spec	24 Dec 2007 13:20:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gcdmaster
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
 Group:          Applications/Multimedia
@@ -8,6 +8,11 @@
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://download.sourceforge.net/cdrdao/cdrdao-%{version}.tar.bz2
+Patch1: mkisofs-changelog.patch 
+Patch9: cdrdao-1.1.7-endianness.patch
+Patch23: cdrtools-2.01a27-silly-warnings.patch
+Patch30: cdrtools-2.0-O_EXCL.patch
+Patch40: cdrdao-1.2.2-errcheck.patch
 Requires:       cdrdao
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libgnomeuimm26-devel
@@ -27,6 +32,11 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
+%patch1 -p1 -b .changelog
+%patch9 -p1 -b .endian
+%patch23 -p1 -b .silly
+%patch30 -p1 -b .excl
+%patch40 -p1 -b .errcheck
 
 
 %build
@@ -83,6 +93,9 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Dec 24 2007 Denis Leroy <denis at poolshark.org> - 1.2.2-3
+- Added patches from current cdrdao package
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 1.2.2-2
 - License tag update
 - No longer build from cdrecord-devel