Fix gcc4.3 compilation failure, patch from Magnus Granberg in bug #232100

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686

4 files changed, 72 insertions, 2 deletions

diff --git a/sys-fs/udftools/ChangeLog b/sys-fs/udftools/ChangeLog
index 452fa04851af..929d71da18f4 100644
--- a/sys-fs/udftools/ChangeLog
+++ b/sys-fs/udftools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udftools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.23 2008/12/04 21:20:04 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.24 2008/12/04 21:33:52 dsd Exp $
+
+*udftools-1.0.0b-r9 (04 Dec 2008)
+
+  04 Dec 2008; Daniel Drake <dsd@gentoo.org>
+  +files/udftools-1.0.0b-openflags.patch, +udftools-1.0.0b-r9.ebuild:
+  Fix gcc4.3 compilation failure, patch from Magnus Granberg in bug #232100
 
   04 Dec 2008; Daniel Drake <dsd@gentoo.org> metadata.xml:
   Drop maintainership. I'll still help on bugs, but probably not on a timely
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 1e6f5a4760c9..48c758affc25 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -2,10 +2,12 @@ AUX cdrwtool-linux2.6-fix-v2.patch 876 RMD160 5cbc14db22843af35de801757551e0f4a6
 AUX pktcdvd.init 1412 RMD160 b3f2d373eeb64f322b2d0761ed6fb41b29173298 SHA1 9e60b921ada80f9227f41f00417e0cb2d55f67cc SHA256 2a8314e0f438dda3d8e35cc5844a421ecf7a9ab4fedb4a9048b3104fe9888b2e
 AUX udftools-1.0.0b-bigendian.patch 946 RMD160 e562a456363c34eccb9f13cdc0db04294600a3e2 SHA1 b58d5e2b33aa220d823c66c00762ce9df252b1da SHA256 7325446dc0a2a6c3afe8fd0314c301e86291a4019bcef774b4b3d22ad58d6fde
 AUX udftools-1.0.0b-gcc4.patch 478 RMD160 77b2bd7a6b856ec0ed5e11a3a48fd92d884fb517 SHA1 fecea46c5795bc48b789a2e19ccea03a018aec16 SHA256 ac4b8e62b1d726b93086c2e41607c8a1966a473ad56938a8a988a0313f546fc7
+AUX udftools-1.0.0b-openflags.patch 595 RMD160 cce26266e16bcb5964362cbde17ea0f30d74f543 SHA1 2df184aba5c608ab4269fdb5b50686f009323de4 SHA256 5ab15e86c4c5bbca6a82cb0a6fcb80cbac5f8bda0af343d397fa38821ccf54b4
 DIST udftools-1.0.0b3.patch.bz2 3372 RMD160 f7773f0c46e4d6eeb3883eb0fd85aa121e3fce5f SHA1 54d06dd2d1b3d3197c2e9461fe9d45c7fef8e007 SHA256 4c35eb06da92677203137ee407ba29bdf0bec574550567cc6cecb63158099dbb
 DIST udftools-1.0.0b3.tar.gz 293257 RMD160 81cefe71f64611c1c5aca920bddacd9b18400fa7 SHA1 f1ceaff8dad3ddd5fe55c0b8db804fe7ca3b4308 SHA256 c5079e878d4d8e03de0fd75bfecf485a299689b8289a5288f18b2e793e0904a0
 EBUILD udftools-1.0.0b-r6.ebuild 1071 RMD160 2be037490c45a251e7e15cc16b85f23b24f2b29a SHA1 3a5a3ef96751139e42374a53fefddd327cd42cfb SHA256 848a8eff9086c5f32b71390201e13e34b609bae003f5c9d14e6e1507e0edde07
 EBUILD udftools-1.0.0b-r7.ebuild 1111 RMD160 1872d63f0d5d2d51fae4126ce757f8a75dbd6e48 SHA1 3fc230f2265148eae1a64b1079c3bced67619ebb SHA256 b155e042dfa574e3541142c121c8ab196ec457cda4d1d984baf27867fd817328
 EBUILD udftools-1.0.0b-r8.ebuild 1112 RMD160 e997f8bb4cf55df7871069a9b0235952426a312e SHA1 9b8beb98047f5bfe283fbd62651aa90e53c6e255 SHA256 24ccedde691424bf85e24fee70d60dfdfed79d0333462802b503002259c0a97f
-MISC ChangeLog 3770 RMD160 6874d6c25f9b290ea7e0a2feb10e6d0972a92051 SHA1 c4e0edba0bc550d71eee772d1d1648185331d5a2 SHA256 bd2867c6f0197981c89c0afa26b75cb6e239f80dea993874fa783de693d22ee3
+EBUILD udftools-1.0.0b-r9.ebuild 1184 RMD160 a74f318767087a2c663374ac1687a6cb9755409f SHA1 b31aa1f07c38ee33eb7073d766e6c5953a941dbe SHA256 c0cf4537ab2d8346695197899429c9355f01cf926210c526a8342c92654c7235
+MISC ChangeLog 3997 RMD160 de9abbe81125f14ffbea912aeb207bc126b4082a SHA1 063ccb22b1e5c48e242532c03cd1f2788f850e8f SHA256 1a62def1327cef5796693ce017baa9504b3b28e82c564285c99f9b4f91b4ab8d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
new file mode 100644
index 000000000000..a1408746b699
--- /dev/null
+++ b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
@@ -0,0 +1,16 @@
+From: Magnus Granberg <zorry@ume.nu>
+https://bugs.gentoo.org/show_bug.cgi?id=232100
+Remove nonsense O_CREAT flag
+
+diff -Nur /var/tmp/portage/sys-fs/udftools-1.0.0b-r7/work/udftools-1.0.0b3/pktsetup/pktsetup.c /root/hardened/udftools-1.0.0b3/pktsetup/pktsetup.c
+--- pktsetup/pktsetup.c	2008-06-19 00:27:08.000000000 +0200
++++ pktsetup/pktsetup.c	2008-06-19 00:20:31.000000000 +0200
+@@ -85,7 +85,7 @@
+ {
+ 	int pkt_fd, dev_fd, cmd;
+ 
+-	if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) {
++	if ((pkt_fd = open(pkt_device, O_RDONLY)) == -1) {
+ 		perror("open packet device");
+ 		return;
+ 	}
diff --git a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
new file mode 100644
index 000000000000..718ad10f6050
--- /dev/null
+++ b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r9.ebuild,v 1.1 2008/12/04 21:33:52 dsd Exp $
+
+inherit eutils
+
+MY_P="${P}3"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
+HOMEPAGE="http://sourceforge.net/projects/linux-udf/"
+SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
+	http://w1.894.telia.com/~u89404340/patches/packet/${MY_P}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# For new kernel packet writing driver
+	epatch "${WORKDIR}"/${MY_P}.patch
+
+	# Fix CD blanking for 2.6.8 and newer
+	epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
+
+	# gcc4 compat, bug #112122
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
+	# BE fix, bug #120245
+	epatch "${FILESDIR}"/${P}-bigendian.patch
+
+	# gcc 4.3 fix, bug #232100
+	epatch "${FILESDIR}"/${P}-openflags.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog
+	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
+	dosym /usr/bin/udffsck /usr/sbin/fsck.udf
+}