rpms/cdrtools/devel cdrtools-2.01-dbg.patch, NONE, 1.1 cdrtools-2.01-isoinfo.patch, NONE, 1.1 cdrecord.conf, 1.2, 1.3 cdrtools.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/cdrtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3795

Modified Files:
	cdrecord.conf cdrtools.spec 
Added Files:
	cdrtools-2.01-dbg.patch cdrtools-2.01-isoinfo.patch 
Log Message:
- fixed isoinfo #167437
- fixed rscsi debug #152462


cdrtools-2.01-dbg.patch:
 rscsi.c   |   15 +++++++++++++--
 rscsi.dfl |    7 ++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE cdrtools-2.01-dbg.patch ---
diff -Nru cdrtools-2.01+01a01.old/rscsi/rscsi.c cdrtools-2.01+01a01/rscsi/rscsi.c
--- cdrtools-2.01+01a01.old/rscsi/rscsi.c	2003-11-26 01:28:27.000000000 +0100
+++ cdrtools-2.01+01a01/rscsi/rscsi.c	2005-01-20 12:41:21.000000000 +0100
@@ -163,8 +163,19 @@
 		debug_name = *argv;
 #endif
 
-	if (debug_name != NULL)
-		debug_file = fopen(debug_name, "w");
+	if (debug_name != NULL) {
+		/* Try to be careful when opening debug files, might be
+		 * created in an unsafe location 
+		 * */
+		int fd = open(debug_name, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0600);
+		if (fd > -1) 
+			debug_file = fdopen(fd, "w");
+		else {
+			rscsirespond(-1, geterrno());
+			exit(EX_BAD);
+		}
+	}
+
 		
 	if (argc > 0) {
 		if (debug_file == 0) {
diff -Nru cdrtools-2.01+01a01.old/rscsi/rscsi.dfl cdrtools-2.01+01a01/rscsi/rscsi.dfl
--- cdrtools-2.01+01a01.old/rscsi/rscsi.dfl	2000-11-14 02:24:03.000000000 +0100
+++ cdrtools-2.01+01a01/rscsi/rscsi.dfl	2005-01-20 12:42:57.000000000 +0100
@@ -9,10 +9,11 @@
 
 # 
 # The file where debug info should go to.
-# If you don't like debugging (e.g. for speed) comment out
-# the this line.
+# This is commented out by default to speed up the program.
+# If you enable it make sure you substitute SAFE_DIR to a safe directory
+# to debug to.
 #
-#DEBUG=/tmp/RSCSI
+#DEBUG=SAFE_DIR/rscsi.dbg
 
 #
 # Each USER= entry adds the listed user to the users who may run rscsi

cdrtools-2.01-isoinfo.patch:
 isoinfo.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cdrtools-2.01-isoinfo.patch ---
--- cdrtools-2.01/mkisofs/diag/isoinfo.c.isoinfo	2005-10-28 16:26:59.000000000 +0200
+++ cdrtools-2.01/mkisofs/diag/isoinfo.c	2005-10-28 16:27:17.000000000 +0200
@@ -1252,8 +1252,9 @@
 		parse_dir(td->name, td->extent, td->length);
 		td = td->next;
 	}
+	if (infile != NULL)
+		fclose(infile);
 
-	fclose(infile);
 	return (0);
 }
 


Index: cdrecord.conf
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrecord.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdrecord.conf	9 Sep 2004 03:48:52 -0000	1.2
+++ cdrecord.conf	28 Oct 2005 15:41:25 -0000	1.3
@@ -34,3 +34,4 @@
 # drive name	device	speed	fifosize driveropts
 #
 cdrom=		/dev/cdrom	-1	-1	burnfree
+


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cdrtools.spec	31 Aug 2005 13:42:45 -0000	1.34
+++ cdrtools.spec	28 Oct 2005 15:41:25 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.1
-Release: 10
+Release: 11
 %define tarversion 2.01
 License: GPL
 Group: Applications/System
@@ -27,6 +27,8 @@
 Patch25: cdrtools-2.01a32-scan.patch
 Patch30: cdrtools-2.0-O_EXCL.patch
 Patch31: mkisofs-padsize-123548.patch
+Patch32: cdrtools-2.01-isoinfo.patch
+Patch33: cdrtools-2.01-dbg.patch
 Patch41: cdrtools-2.01.1-gcc4.patch
 
 BuildRequires: perl, groff
@@ -112,6 +114,8 @@
 %patch25 -p1 -b .scan
 %patch30 -p1 -b .excl
 %patch31 -p1 -b .padsize
+%patch32 -p1 -b .isoinfo
+%patch33 -p1 -b .dbgsafe
 %patch41 -p1 -b .gcc4
 
 # Turn off buggy CD_EXTRA code.
@@ -228,6 +232,10 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Fri Sep 28 2005 Harald Hoyer <harald at redhat.com> 8:2.01.1-11
+- fixed isoinfo #167437
+- fixed rscsi debug #152462
+
 * Wed Aug 31 2005 Harald Hoyer <harald at redhat.com> 8:2.01.1-10
 - fixed mkisofs #166707 for gcc4