rpms/cdrkit/devel icedax-segfault.patch, NONE, 1.1 wodim-prtypo.patch, NONE, 1.1 cdrkit.spec, 1.6, 1.7

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28447

Modified Files:
	cdrkit.spec 
Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 11:06:50.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:06:50.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in %4d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);


Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrkit.spec	21 Sep 2007 08:07:34 -0000	1.6
+++ cdrkit.spec	21 Sep 2007 09:24:38 -0000	1.7
@@ -1,13 +1,15 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 
 Patch1: genisoimage-dlength.patch
+Patch2: icedax-segfault.patch
+Patch3: wodim-prtypo.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .dlength
+%patch2 -p1 -b .segf
+%patch3 -p1 -b .prtypo
 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 
 
@@ -205,6 +209,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
+- fixed rhbz#255001 - icedax --devices segfaults
+- fixed rhbz#249357 - Typo in wodim output
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards