Revision bump, fixing the double free when using external journals (as reported on upstream bug 1684322).

(Portage version: 2.1.3.5)

4 files changed, 96 insertions, 1 deletions

diff --git a/sys-fs/jfsutils/ChangeLog b/sys-fs/jfsutils/ChangeLog
index eb596264b120..75bd8cbf0eca 100644
--- a/sys-fs/jfsutils/ChangeLog
+++ b/sys-fs/jfsutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/jfsutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/ChangeLog,v 1.38 2007/08/02 09:38:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/ChangeLog,v 1.39 2007/08/19 08:57:44 phreak Exp $
+
+*jfsutils-1.1.11-r2 (19 Aug 2007)
+
+  19 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +files/jfsutils-1.1.11-double-close.patch, +jfsutils-1.1.11-r2.ebuild:
+  Revision bump, fixing the double free when using external journals (as
+  reported on upstream bug 1684322).
 
 *jfsutils-1.1.11-r1 (02 Aug 2007)
 
diff --git a/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r2 b/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r2
new file mode 100644
index 000000000000..abb24c27d9b6
--- /dev/null
+++ b/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r2
@@ -0,0 +1,3 @@
+MD5 a741298f1d79f0ceb52f0187614e889e jfsutils-1.1.11.tar.gz 512082
+RMD160 e37edb1898e06ae5e0651685fcf689f9c6d73582 jfsutils-1.1.11.tar.gz 512082
+SHA256 a02658ae5a19808dc8d343a2a9e1ac87d4537269d3d9abeab58614d734ed36f6 jfsutils-1.1.11.tar.gz 512082
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch b/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch
new file mode 100644
index 000000000000..77f3f607cec7
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch
@@ -0,0 +1,46 @@
+Fix double close of journal file descriptor
+
+Index: libfs/logform.c
+===================================================================
+RCS file: /cvsroot/jfs/jfsutils/libfs/logform.c,v
+retrieving revision 1.19
+diff -u -p -r1.19 logform.c
+--- libfs/logform.c	22 Nov 2005 20:43:55 -0000	1.19
++++ libfs/logform.c	20 Mar 2007 14:08:51 -0000
+@@ -289,10 +289,7 @@ int jfs_logform(FILE *fp,		/* this is a 
+ 		}
+ 	}
+ 
+-	if (!inlinelog) {
+-		ujfs_flush_dev(fp);
+-		fclose(fp);
+-	}
++	ujfs_flush_dev(fp);
+ 
+ 	return (0);
+ 
+Index: mkfs/mkfs.c
+===================================================================
+RCS file: /cvsroot/jfs/jfsutils/mkfs/mkfs.c,v
+retrieving revision 1.45
+diff -u -p -r1.45 mkfs.c
+--- mkfs/mkfs.c	5 Jun 2006 19:31:41 -0000	1.45
++++ mkfs/mkfs.c	20 Mar 2007 14:08:51 -0000
+@@ -1036,7 +1036,7 @@ format_journal:
+ 			rc = ENOSPC;
+ 			message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG);
+ 			DBG_ERROR(("Internal error: Format failed rc=%x\n", rc))
+-			    fclose(dev_handle);
++			fclose(dev_handle);
+ 			return (rc);
+ 		}
+ 
+@@ -1049,7 +1049,7 @@ format_journal:
+ 		if (rc != 0) {
+ 			message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG);
+ 			DBG_ERROR(("Internal error: Format failed rc=%x\n", rc))
+-			    fclose(dev_handle);
++			fclose(dev_handle);
+ 			return (rc);
+ 		}
+ 	}
diff --git a/sys-fs/jfsutils/jfsutils-1.1.11-r2.ebuild b/sys-fs/jfsutils/jfsutils-1.1.11-r2.ebuild
new file mode 100644
index 000000000000..c5918916ccec
--- /dev/null
+++ b/sys-fs/jfsutils/jfsutils-1.1.11-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.11-r2.ebuild,v 1.1 2007/08/19 08:57:44 phreak Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
+HOMEPAGE="http://jfs.sourceforge.net/"
+SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fsck-n.patch
+	epatch "${FILESDIR}"/${P}-double-close.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf --sbindir=/sbin || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	rm -f ${D}/sbin/mkfs.jfs fsck.jfs
+	dosym /sbin/jfs_mkfs /sbin/mkfs.jfs
+	dosym /sbin/jfs_fsck /sbin/fsck.jfs
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README
+}