From f7323e4f81ebd592bb67b853410bebe99eb83aaa Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Fri, 21 Sep 2007 09:24:38 +0000
Subject: [PATCH] - fixed rhbz#255001 - icedax --devices segfaults - fixed
 rhbz#249357 - Typo in wodim output

---
 cdrkit.spec           | 10 +++++++++-
 icedax-segfault.patch | 27 +++++++++++++++++++++++++++
 wodim-prtypo.patch    | 11 +++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 icedax-segfault.patch
 create mode 100644 wodim-prtypo.patch

diff --git a/cdrkit.spec b/cdrkit.spec
index e1eee6c..a42a7c7 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -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 @@ rates. Icedax can also be used as a CD player.
 %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 @@ fi
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald@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@redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards
diff --git a/icedax-segfault.patch b/icedax-segfault.patch
new file mode 100644
index 0000000..9bcda47
--- /dev/null
+++ b/icedax-segfault.patch
@@ -0,0 +1,27 @@
+--- 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);
diff --git a/wodim-prtypo.patch b/wodim-prtypo.patch
new file mode 100644
index 0000000..0cf6c00
--- /dev/null
+++ b/wodim-prtypo.patch
@@ -0,0 +1,11 @@
+--- 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);