Fix bug 257360, patch from redhat. Allow dvd-dl media to be burned even when less than 50% of the media is used. Exit with status !=0 when child processes do.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 117 insertions, 57 deletions

diff --git a/app-cdr/dvd+rw-tools/ChangeLog b/app-cdr/dvd+rw-tools/ChangeLog
index c573ee7139b8..61a3c18962e1 100644
--- a/app-cdr/dvd+rw-tools/ChangeLog
+++ b/app-cdr/dvd+rw-tools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-cdr/dvd+rw-tools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.66 2008/09/28 09:12:22 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.67 2009/02/08 15:42:00 loki_val Exp $
+
+*dvd+rw-tools-7.1-r1 (08 Feb 2009)
+
+  08 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/dvd+rw-tools-7.0-dvddl.patch,
+  +files/dvd+rw-tools-7.0-glibc2.6.90.patch,
+  +files/dvd+rw-tools-7.0-wctomb.patch, +files/dvd+rw-tools-7.0-wexit.patch,
+  -dvd+rw-tools-7.0.ebuild, +dvd+rw-tools-7.1-r1.ebuild:
+  Fix bug 257360, patch from redhat. Allow dvd-dl media to be burned even
+  when less than 50% of the media is used. Exit with status !=0 when child
+  processes do.
 
   28 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
   dvd+rw-tools-7.1.ebuild:
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 7e86c2a59f22..f7a6ef3f456e 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST dvd+rw-tools-7.0.tar.gz 131259 RMD160 d522ba5345eb74705e6e3970328034a3d01de75e SHA1 623fd1c2264a5dfaa721449cc8cc7be4ac2824ba SHA256 c9ffc46ac4e97153f1752f0232a135ebae5688a8e35e975d23e958b785951422
+AUX dvd+rw-tools-7.0-dvddl.patch 476 RMD160 ee8809c4b8af1805668c4a7f377b05cf3839f9f3 SHA1 d2c949bc15420f39a9055757b1f5bb5543c46b6c SHA256 194f39075c811ced6621ce680703eefb1b6c1788c62010469cc669e6f935a1ee
+AUX dvd+rw-tools-7.0-glibc2.6.90.patch 406 RMD160 cd1659ee07e506fdd5b4238cb62f89c511c78370 SHA1 6b2f496e8d95738501dcad5fb63a4faa32882202 SHA256 659c6508e350b4cd66ede8f05f00ee0f604f4a2c381b027f0f380f5cb24709ee
+AUX dvd+rw-tools-7.0-wctomb.patch 371 RMD160 f6f41b287637486d9612730662554461742193f7 SHA1 08ad4c2309ae1602b855cf1a2bbdbe0dab5037a2 SHA256 b8206d43d34355d4336ea255ab7a8e1c85f0e624a663f3b46d655ffeac637fdf
+AUX dvd+rw-tools-7.0-wexit.patch 382 RMD160 4c4edfbdd44606e92d48d22bd6b4a710724d1c81 SHA1 f50dc64f5d020f0dd64ffb38c18cfa3fbf03f8a2 SHA256 08ae4d2dc4da398adac2abf96269fde4e635265178b40bf9fb992c91baae1eb6
 DIST dvd+rw-tools-7.1.tar.gz 140846 RMD160 a98367861335ecf9acea86a6b44ad68636bfb5c4 SHA1 6400e013934ff589b4b224eced03fd9f42ed719b SHA256 f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca
-EBUILD dvd+rw-tools-7.0.ebuild 1063 RMD160 1f22423e259db42606e2fbf7b46dabed01772b8d SHA1 08844acd8e4cdcdfd37100deb7cfa0a56cc0ac0c SHA256 e01cc4b954cb0178f03c274420041bcbcf51aad5a111668c3e0a10d0428bfeaf
+EBUILD dvd+rw-tools-7.1-r1.ebuild 1624 RMD160 2637945ae0037be16e98d4665a5ecb996eb7d31e SHA1 c5e20494f2afb3238205e4c219625d84a414c208 SHA256 f0e44542f7b45d067db486ddf79d959c0668ec32bd65568eb98ed4312363441a
 EBUILD dvd+rw-tools-7.1.ebuild 1106 RMD160 e46807088e31cb08f1ceb7e8705a0a53f4cf4ae8 SHA1 622b0ff93f31b27a042787bf589d1005c1dddc82 SHA256 5828fdba406303699fa667ede11043e078ea8bc7c798febfc9df21a8de49e9fc
-MISC ChangeLog 8676 RMD160 aea12a7493b14a8d348eea32ef8fe6dd1cddca5b SHA1 84f5db596a3db3d3c581b6cea2c5c507643cfbad SHA256 80c8d780ae8b9231289ee3e9763dc469db9ecbef9b1c0bf54ae3c321a343e1f6
+MISC ChangeLog 9149 RMD160 cb1fc28f2b2ba75e237d0323543cd9ff1ba0bad8 SHA1 2905da3cf50fdf080eff271a4e54f8d2c605c637 SHA256 43401508e90f46f4e9d40beb0e0c3dceca427c765c6228336ed488c191b4e61e
 MISC metadata.xml 293 RMD160 b97e3360ba18362c52786ba89cd3bc68c2ad78fb SHA1 66f8a2850da3df8f4e9ccda87025711db142dae3 SHA256 38a4d78cd4b1b04f922df758442e6867ba011beb6e9bec7f2fb9993d32c94665
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkFVLwACgkQ67wieSYcaxd0LwCffU/3gr7FMc3vxlUtq987hozv
-2doAmwTdUvNI1Do6gHMq2BFe9piuhtos
-=VXCn
------END PGP SIGNATURE-----
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
deleted file mode 100644
index 91301bcdffdb..000000000000
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild,v 1.14 2008/02/17 07:18:00 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Linux compiler flags only include -O2 and are incremental
-	sed -i '/FLAGS/s:-O2::' Makefile.m4
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die
-}
-
-src_install() {
-	einstall || die
-	dohtml index.html
-}
-
-pkg_postinst() {
-	elog
-	elog "When you run growisofs if you receive:"
-	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
-	elog "error message please run 'ulimit -l unlimited'"
-	elog
-}
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
new file mode 100644
index 000000000000..5f87655dd6b1
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild,v 1.1 2009/02/08 15:42:00 loki_val Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental
+	sed -i '/FLAGS/s:-O2::' Makefile.m4
+
+	# Fix compilation when DFORTIFY_SOURCE=2
+	# https://bugs.gentoo.org/257360
+	# https://bugzilla.redhat.com/show_bug.cgi?id=426068
+	epatch "${FILESDIR}"/${PN}-7.0-wctomb.patch
+	epatch "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	# Allow burning small images on dvd-dl media.
+	# Patch snatched from Fedora, obviously correct.
+	epatch "${FILESDIR}"/${PN}-7.0-dvddl.patch
+	# Exit with non-zero status when child process does.
+	# https://bugzilla.redhat.com/show_bug.cgi?id=243036
+	epatch "${FILESDIR}"/${PN}-7.0-wexit.patch
+}
+
+src_compile() {
+	emake SHELL=/bin/bash CC=$(tc-getCC) CXX=$(tc-getCXX) || die
+}
+
+src_install() {
+	emake SHELL=/bin/bash prefix="${D}/usr" install || die
+	dohtml index.html
+}
+
+pkg_postinst() {
+	elog "When you run growisofs if you receive:"
+	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
+	elog "error message please run 'ulimit -l unlimited'"
+}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
new file mode 100644
index 000000000000..c1c6fb3332a2
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
@@ -0,0 +1,13 @@
+--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
++++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
new file mode 100644
index 000000000000..49742d3c4db0
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
@@ -0,0 +1,11 @@
+diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
+--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
++++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
new file mode 100644
index 000000000000..56bd72575e8f
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
@@ -0,0 +1,11 @@
+--- transport.hxx~	2008-03-25 21:24:47.000000000 -0400
++++ transport.hxx	2008-03-25 21:25:36.000000000 -0400
+@@ -116,7 +116,7 @@
+ extern "C" char *plusminus_locale()
+ { static class __plusminus {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
new file mode 100644
index 000000000000..e7910cbdd7b8
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
@@ -0,0 +1,11 @@
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
++++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
+@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
+ 	alarm(1);
+ 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
+ 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
+-	exit (0);
++	exit (WEXITSTATUS(i));
+     }
+ #endif
+