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

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/app-cdr/ccd2iso/ChangeLog b/app-cdr/ccd2iso/ChangeLog
index 11bd35ff6bda0fca6827fa13383565f34fab90de..b1d250ae79a51615076b8011052ca99ea19102c6 100644 (file)
--- 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/Manifest b/app-cdr/ccd2iso/Manifest
index 2275c689d4f16fdc1a56b042a6eef0968623144f..6342c9e67c310e183bf5317adadc932fa482b2c8 100644 (file)
--- a/app-cdr/ccd2iso/Manifest
+++ b/app-cdr/ccd2iso/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ccd2iso-0.2-segv.patch 713 RMD160 47c5be98fbecd60ab0d9613fb97cf2782482dbd6 SHA1 1ea8ce58e1a6f6ad8de2459955090160d9c25bf1 SHA256 7ee9a69813d05912622f55e608163468e547a126985f5599c505fc24bb7c11dc
+MD5 711302f9ed52ebaa0ee0079090811525 files/ccd2iso-0.2-segv.patch 713
+RMD160 47c5be98fbecd60ab0d9613fb97cf2782482dbd6 files/ccd2iso-0.2-segv.patch 713
+SHA256 7ee9a69813d05912622f55e608163468e547a126985f5599c505fc24bb7c11dc files/ccd2iso-0.2-segv.patch 713
 DIST ccd2iso-0.2.tar.gz 179670 RMD160 e8503e1df606ba09cb69328beb2811c0d64ef7e7 SHA1 8a85b1996ca8017a79a7ed30e7ae362b548e1635 SHA256 20e8db3278dee6b43f6e5767ed939b434c43e8691825e9465d0a3a708febcdbc
 EBUILD ccd2iso-0.2-r1.ebuild 747 RMD160 846ebe09966a18996c8f466f941b3a55db4c122e SHA1 2898dfcf24bb73d67f8012935827fdcaaea6a4e2 SHA256 07962b707e319c66429270b00adb92e30a1676da3234b5eabdd6adc1192b6d71
 MD5 80dcdcbb6aafdca2427e5c9b81e5d084 ccd2iso-0.2-r1.ebuild 747
 RMD160 846ebe09966a18996c8f466f941b3a55db4c122e ccd2iso-0.2-r1.ebuild 747
 SHA256 07962b707e319c66429270b00adb92e30a1676da3234b5eabdd6adc1192b6d71 ccd2iso-0.2-r1.ebuild 747
-MISC ChangeLog 1306 RMD160 440e7f4a7923fd6447cbc92feaa56ab41728311d SHA1 d82ab8e9ec447e9e2612944f892cf1f3e7742d9a SHA256 74eeee329c253174113eb11c0c478ca165a7f157926800da6dcef06e9e4fe39c
-MD5 f6c26af877000055770844774ac38eb5 ChangeLog 1306
-RMD160 440e7f4a7923fd6447cbc92feaa56ab41728311d ChangeLog 1306
-SHA256 74eeee329c253174113eb11c0c478ca165a7f157926800da6dcef06e9e4fe39c ChangeLog 1306
+EBUILD ccd2iso-0.2-r2.ebuild 785 RMD160 81deb35ed6883c3424899336ff17879526ced33a SHA1 fcc71028c03d4223f0697a88107e3c98c5392ca1 SHA256 e2c77432355a3e45b97f96990465278212631df11a64f42b4b3defb22e3b8fb6
+MD5 0b1cd54da62f70387d7ff50bb301c819 ccd2iso-0.2-r2.ebuild 785
+RMD160 81deb35ed6883c3424899336ff17879526ced33a ccd2iso-0.2-r2.ebuild 785
+SHA256 e2c77432355a3e45b97f96990465278212631df11a64f42b4b3defb22e3b8fb6 ccd2iso-0.2-r2.ebuild 785
+MISC ChangeLog 1532 RMD160 3d745de8e180f31bcb36cc6479078b052883090c SHA1 32703183c093e76f56451d2a38f385fbbb280f2e SHA256 a7cd84dfcd60fa45e3e8276ffb2e7ec6b2b91a727ffd9cc6c97d1572f715067d
+MD5 a56663907a732ff7b93d2840cfbbd18c ChangeLog 1532
+RMD160 3d745de8e180f31bcb36cc6479078b052883090c ChangeLog 1532
+SHA256 a7cd84dfcd60fa45e3e8276ffb2e7ec6b2b91a727ffd9cc6c97d1572f715067d ChangeLog 1532
 MISC metadata.xml 301 RMD160 f50adeebd74c61198910729b12f5020ef9219557 SHA1 e47f9eb53093ea0ba7764ba3cf838d301d84928d SHA256 d93be37293f443f8200fa834d3b9eb1b85c5bd1d0ccd0dd36d871ee1295ae021
 MD5 0524a6dd3bbef425769cea01bad9ebd5 metadata.xml 301
 RMD160 f50adeebd74c61198910729b12f5020ef9219557 metadata.xml 301
@@ -17,10 +25,13 @@ SHA256 d93be37293f443f8200fa834d3b9eb1b85c5bd1d0ccd0dd36d871ee1295ae021 metadata
 MD5 7307289a057727463ca61d156a48479b files/digest-ccd2iso-0.2-r1 235
 RMD160 efeee3b04baf12b00f2c5df39644c7cf88ad2e4d files/digest-ccd2iso-0.2-r1 235
 SHA256 443c83bf3e1e6e6b11361fa31d3787689de6db57090d5fd99f9f196e18b84d0e files/digest-ccd2iso-0.2-r1 235
+MD5 7307289a057727463ca61d156a48479b files/digest-ccd2iso-0.2-r2 235
+RMD160 efeee3b04baf12b00f2c5df39644c7cf88ad2e4d files/digest-ccd2iso-0.2-r2 235
+SHA256 443c83bf3e1e6e6b11361fa31d3787689de6db57090d5fd99f9f196e18b84d0e files/digest-ccd2iso-0.2-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnYHoGDyatLGpTbYRAqVqAJ9/8/BMfZaDmrT5m2jDyKU38F2gbQCaA3PL
-UECWKfRP3o6JMnaLatvDb/g=
-=0rlX
+iD8DBQFFnh878bi6rjpTunYRAoeVAJ9goBGLcZNR1GDFMizwfoy6a62WKQCgqot9
+r3/NdqLOQlRvd5KuylPLLzA=
+=JGPx
 -----END PGP SIGNATURE-----

diff --git a/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild b/app-cdr/ccd2iso/ccd2iso-0.2-r2.ebuild
new file mode 100644 (file)
index 0000000..64f0041
--- /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 (file)
index 0000000..e4ea79c
--- /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 (file)
index 0000000..bb5bff9
--- /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