Fix from FreeBSD for segfault with non-existent files #160080 by Timothy Redaelli.

(Portage version: 2.1.2_rc4-r6)

4 files changed, 72 insertions, 1 deletions

diff --git a/app-cdr/ccd2iso/ChangeLog b/app-cdr/ccd2iso/ChangeLog
index 11bd35ff6bda..b1d250ae79a5 100644
--- a/app-cdr/ccd2iso/ChangeLog
+++ b/app-cdr/ccd2iso/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/ccd2iso
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ChangeLog,v 1.11 2007/01/04 22:38:25 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ChangeLog,v 1.12 2007/01/05 09:49:38 vapier Exp $
+
+*ccd2iso-0.2-r2 (05 Jan 2007)
+
+  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/ccd2iso-0.2-segv.patch, +ccd2iso-0.2-r2.ebuild:
+  Fix from FreeBSD for segfault with non-existent files #160080 by Timothy
+  Redaelli.
 
   04 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> ccd2iso-0.2-r1.ebuild:
   Add ~x86-fbsd keyword
diff --git a/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild b/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild
new file mode 100644
index 000000000000..64f004126edf
--- /dev/null
+++ b/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild,v 1.1 2007/01/05 09:49:38 vapier Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+inherit autotools
+
+DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
+HOMEPAGE="http://sourceforge.net/projects/ccd2iso/"
+SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-segv.patch
+	# bundled autotools are all screwed up
+	eautoreconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-cdr/ccd2iso/files/ccd2iso-0.2-segv.patch b/app-cdr/ccd2iso/files/ccd2iso-0.2-segv.patch
new file mode 100644
index 000000000000..e4ea79cce0b0
--- /dev/null
+++ b/app-cdr/ccd2iso/files/ccd2iso-0.2-segv.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/160080
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/ccd2iso/files/patch-src-ccd2iso.c
+
+$FreeBSD: /repoman/r/pcvs/ports/sysutils/ccd2iso/files/patch-src-ccd2iso.c,v 1.1 2004/06/24 11:45:44 osa Exp $
+
+--- src/ccd2iso.c.orig	Thu Nov 13 06:43:41 2003
++++ src/ccd2iso.c	Thu Jun 24 15:31:04 2004
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <err.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+@@ -47,7 +48,12 @@
+ 	}
+ 
+ 	src_file = fopen(argv[1], "r");
++	if (src_file == NULL)
++		err(1, "%s", argv[1]);
++
+ 	dst_file = fopen(argv[2], "w");
++	if (dst_file == NULL)
++		err(1, "%s", argv[2]);
+ 
+ 	stat(argv[1], &stat_file);
+ 	total_bytes = stat_file.st_size;
diff --git a/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r2 b/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r2
new file mode 100644
index 000000000000..bb5bff9512e0
--- /dev/null
+++ b/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r2
@@ -0,0 +1,3 @@
+MD5 f53def956f937d5ef8fc3e89ff3e22c8 ccd2iso-0.2.tar.gz 179670
+RMD160 e8503e1df606ba09cb69328beb2811c0d64ef7e7 ccd2iso-0.2.tar.gz 179670
+SHA256 20e8db3278dee6b43f6e5767ed939b434c43e8691825e9465d0a3a708febcdbc ccd2iso-0.2.tar.gz 179670