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

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686)

3 files changed, 69 insertions, 1 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/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
+}