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

Package-Manager: portage-2.1.3.5

5 files changed, 121 insertions, 5 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/Manifest b/sys-fs/jfsutils/Manifest
index e96a7879a1b2..0f28484ddd96 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX jfsutils-1.1.11-double-close.patch 1291 RMD160 50288d2026a535a0f5d389b71716afbd47dfce42 SHA1 94dcd5c17b1daa3d1b8317d128b69a1df01d8cdb SHA256 89b8de5c75b9cd5a9e990fba6f2870faca0035c1a990eb195d4de8d53c5fabe5
+MD5 719fbcf9cad64b622818f4f0c34af5ef files/jfsutils-1.1.11-double-close.patch 1291
+RMD160 50288d2026a535a0f5d389b71716afbd47dfce42 files/jfsutils-1.1.11-double-close.patch 1291
+SHA256 89b8de5c75b9cd5a9e990fba6f2870faca0035c1a990eb195d4de8d53c5fabe5 files/jfsutils-1.1.11-double-close.patch 1291
 AUX jfsutils-1.1.11-fsck-n.patch 517 RMD160 432e3818fbad253becf0122d9805977eba679309 SHA1 f74e243e839ab3be41ce3cb7ff7b7635d66d0b46 SHA256 30776d168b5550f8d7e8232fcb2f80c41a0adaab1bf50d94a6c0e61044d4656e
 MD5 b0382576aabe25992d49a7da5f80d7ff files/jfsutils-1.1.11-fsck-n.patch 517
 RMD160 432e3818fbad253becf0122d9805977eba679309 files/jfsutils-1.1.11-fsck-n.patch 517
@@ -14,6 +21,10 @@ EBUILD jfsutils-1.1.11-r1.ebuild 989 RMD160 ed3d5bf89de58a237ee2418eff7036df6a1c
 MD5 0645710c2aa0ec6f109553c5d3a4591f jfsutils-1.1.11-r1.ebuild 989
 RMD160 ed3d5bf89de58a237ee2418eff7036df6a1c2536 jfsutils-1.1.11-r1.ebuild 989
 SHA256 961729e68cbadb1d0c8bb656c8880c14a484bf64ae09e69af3d2a27dcac5f146 jfsutils-1.1.11-r1.ebuild 989
+EBUILD jfsutils-1.1.11-r2.ebuild 1025 RMD160 14098f4a1379c199cda8daeca13d603d980d0f8b SHA1 166c35e6b014351b87ddd733e922ece63c59997b SHA256 27bbfacd3a6d5ff29e336e1b4bf51137318e899cc2213b691a76e1b9d6c69936
+MD5 01f90b4eb027eebf135403a20e8becb5 jfsutils-1.1.11-r2.ebuild 1025
+RMD160 14098f4a1379c199cda8daeca13d603d980d0f8b jfsutils-1.1.11-r2.ebuild 1025
+SHA256 27bbfacd3a6d5ff29e336e1b4bf51137318e899cc2213b691a76e1b9d6c69936 jfsutils-1.1.11-r2.ebuild 1025
 EBUILD jfsutils-1.1.11.ebuild 895 RMD160 634363a366da656d2dcabf86e544424604e304d6 SHA1 5a590734dc95e54229ddd3452c893ff33d88e1b8 SHA256 11b8253a74b294fbbc04d7f4332c218fa9f3b83e598445c0f60fbb37e881dfd2
 MD5 7a3acbcc3a473ff5a6fe60743419123a jfsutils-1.1.11.ebuild 895
 RMD160 634363a366da656d2dcabf86e544424604e304d6 jfsutils-1.1.11.ebuild 895
@@ -26,10 +37,10 @@ EBUILD jfsutils-1.1.8.ebuild 787 RMD160 d417e00e2b54363869faf285ea40c4720edb416f
 MD5 7debd8595ae0832de9bc4dfc6fb88731 jfsutils-1.1.8.ebuild 787
 RMD160 d417e00e2b54363869faf285ea40c4720edb416f jfsutils-1.1.8.ebuild 787
 SHA256 f1ef7403df33cc31f39e1e65388827dcd6c40a6ea91f4e41b460cc302d97e7e0 jfsutils-1.1.8.ebuild 787
-MISC ChangeLog 7988 RMD160 eb64e499aa0fc93b58b429e3d1a67233c24e5e87 SHA1 a2f078425c8d565be279f39b08b6b761bc383f81 SHA256 27ccdfc62ff4e16eb9c39001ad48b94f94417ee4973c149d85601b47da42b8f1
-MD5 59bd8f5c6db7a2a1624b27a18755c905 ChangeLog 7988
-RMD160 eb64e499aa0fc93b58b429e3d1a67233c24e5e87 ChangeLog 7988
-SHA256 27ccdfc62ff4e16eb9c39001ad48b94f94417ee4973c149d85601b47da42b8f1 ChangeLog 7988
+MISC ChangeLog 8255 RMD160 2a3aeba56d49947bb3ca20338236753d0e8ace72 SHA1 c65f4178593ca5cf8afec8372c7e019c7ad592f3 SHA256 2bf8228aab761b634d8e28b5f0803001a389ef3b286f4df9eaa39867c4f9bc3a
+MD5 88b296ab4783feaf220b35718bc4bea6 ChangeLog 8255
+RMD160 2a3aeba56d49947bb3ca20338236753d0e8ace72 ChangeLog 8255
+SHA256 2bf8228aab761b634d8e28b5f0803001a389ef3b286f4df9eaa39867c4f9bc3a ChangeLog 8255
 MISC metadata.xml 410 RMD160 0bc225e5a70a2d517fd79869f421720e4bbc7341 SHA1 bd561ffc0ad1e208b722f1e3a8c72469ef67c212 SHA256 d54b7eea18a83fae10ba99e78fc00d20200b3bca80f2b3e4147b2f4008ca92a0
 MD5 50282322ba80018fc86b2b1c6c248858 metadata.xml 410
 RMD160 0bc225e5a70a2d517fd79869f421720e4bbc7341 metadata.xml 410
@@ -43,9 +54,19 @@ SHA256 ee4e1df4f5c728c03f2ca3864ad581863032aa800bb2625bb0e46c9deae750e5 files/di
 MD5 b6ff0399c452dd99648bfcda124d627c files/digest-jfsutils-1.1.11-r1 247
 RMD160 2bfdd0f59db9af0120632b0cd1b3c4b180205f41 files/digest-jfsutils-1.1.11-r1 247
 SHA256 ee4e1df4f5c728c03f2ca3864ad581863032aa800bb2625bb0e46c9deae750e5 files/digest-jfsutils-1.1.11-r1 247
+MD5 b6ff0399c452dd99648bfcda124d627c files/digest-jfsutils-1.1.11-r2 247
+RMD160 2bfdd0f59db9af0120632b0cd1b3c4b180205f41 files/digest-jfsutils-1.1.11-r2 247
+SHA256 ee4e1df4f5c728c03f2ca3864ad581863032aa800bb2625bb0e46c9deae750e5 files/digest-jfsutils-1.1.11-r2 247
 MD5 5900c650307a2b27da377c354edcada7 files/digest-jfsutils-1.1.7 244
 RMD160 ecc099cb466ddd79077d3a9a907dd8dc311df633 files/digest-jfsutils-1.1.7 244
 SHA256 a42f34035e7ef5688ed7fa25e38ef37f66ca59646485bd1c01def284a3e3f922 files/digest-jfsutils-1.1.7 244
 MD5 75b5ee3f920652041cc0eec5b6311691 files/digest-jfsutils-1.1.8 244
 RMD160 2f4fd94cc1743527b7a2459cf5a3b6e98ceb206d files/digest-jfsutils-1.1.8 244
 SHA256 c4a1f513272d13a2e43ae7049a71c20f263e93d1516764b82b26cd35a6c19e9a files/digest-jfsutils-1.1.8 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGyAYSyuNVb5qfaOYRAnzMAKC5jrhYg2/0OQL7Y/krvSZMBJNpGwCgzz5v
+0wmc4TQGiP3qaFlv/uWUUyY=
+=UULS
+-----END PGP SIGNATURE-----
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
+}