Add a patch to allow fsck -f -n to work, #116016

Package-Manager: portage-2.1.3_rc9

5 files changed, 80 insertions, 5 deletions

diff --git a/sys-fs/jfsutils/ChangeLog b/sys-fs/jfsutils/ChangeLog
index d30b8dbb016d..eb596264b120 100644
--- a/sys-fs/jfsutils/ChangeLog
+++ b/sys-fs/jfsutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2007/05/16 03:25:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/ChangeLog,v 1.38 2007/08/02 09:38:15 uberlord Exp $
+
+*jfsutils-1.1.11-r1 (02 Aug 2007)
+
+  02 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/jfsutils-1.1.11-fsck-n.patch, +jfsutils-1.1.11-r1.ebuild:
+  Add a patch to allow fsck -f -n to work, #116016
 
   16 May 2007; Joshua Kinard <kumba@gentoo.org> jfsutils-1.1.8.ebuild:
   Stable on mips.
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index 614063aecf53..e96a7879a1b2 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -1,3 +1,7 @@
+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
+SHA256 30776d168b5550f8d7e8232fcb2f80c41a0adaab1bf50d94a6c0e61044d4656e files/jfsutils-1.1.11-fsck-n.patch 517
 DIST jfsutils-1.1.10.tar.gz 512278 RMD160 85a5caa279beeda8c3619f029a58a7d2840751c2 SHA1 5ec30a4ed2dd184f4c4a722ca70c71a6668de5fc SHA256 13414a0b847e927c75a981e9c2cba6d668360e90536a6fdd6c72a2d497e36d57
 DIST jfsutils-1.1.11.tar.gz 512082 RMD160 e37edb1898e06ae5e0651685fcf689f9c6d73582 SHA1 27837760bd65f32758d6048803387b8b3443467f SHA256 a02658ae5a19808dc8d343a2a9e1ac87d4537269d3d9abeab58614d734ed36f6
 DIST jfsutils-1.1.7.tar.gz 496473 RMD160 2973abf64542a03e1fea39ed9e8f4bbe77eb507d SHA1 8eed24c98f0142df8c54aa4bb02ab2c76884e017 SHA256 f4986a605467a53c60bd1259786945651b7a3fd328ecaf9a99543171de7bbfcc
@@ -6,6 +10,10 @@ EBUILD jfsutils-1.1.10-r1.ebuild 882 RMD160 7098a70d321e2c05d883d511a03fdfe0cf56
 MD5 1840b40f288cc90e4548ee6ff073b89e jfsutils-1.1.10-r1.ebuild 882
 RMD160 7098a70d321e2c05d883d511a03fdfe0cf567a0c jfsutils-1.1.10-r1.ebuild 882
 SHA256 3e00b157274ffc64dbd34459a6d15521e4ffa49212667e8fea19867782debc7a jfsutils-1.1.10-r1.ebuild 882
+EBUILD jfsutils-1.1.11-r1.ebuild 989 RMD160 ed3d5bf89de58a237ee2418eff7036df6a1c2536 SHA1 16087ae82d5508e7df5a6669bb2121f77e98309b SHA256 961729e68cbadb1d0c8bb656c8880c14a484bf64ae09e69af3d2a27dcac5f146
+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.ebuild 895 RMD160 634363a366da656d2dcabf86e544424604e304d6 SHA1 5a590734dc95e54229ddd3452c893ff33d88e1b8 SHA256 11b8253a74b294fbbc04d7f4332c218fa9f3b83e598445c0f60fbb37e881dfd2
 MD5 7a3acbcc3a473ff5a6fe60743419123a jfsutils-1.1.11.ebuild 895
 RMD160 634363a366da656d2dcabf86e544424604e304d6 jfsutils-1.1.11.ebuild 895
@@ -18,10 +26,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 7782 RMD160 171938289a8f42c5aba1fedd6cda84d1c03355dd SHA1 93ff5ecafa2bc4a1515011a1ab3ea92c51c2fc50 SHA256 be5433d8cd8ce6998be24dbb53a3c4040ea1d8b714099b8d6357640812caf7d0
-MD5 f083c1bcd7170b77f22e5bf21274ed53 ChangeLog 7782
-RMD160 171938289a8f42c5aba1fedd6cda84d1c03355dd ChangeLog 7782
-SHA256 be5433d8cd8ce6998be24dbb53a3c4040ea1d8b714099b8d6357640812caf7d0 ChangeLog 7782
+MISC ChangeLog 7988 RMD160 eb64e499aa0fc93b58b429e3d1a67233c24e5e87 SHA1 a2f078425c8d565be279f39b08b6b761bc383f81 SHA256 27ccdfc62ff4e16eb9c39001ad48b94f94417ee4973c149d85601b47da42b8f1
+MD5 59bd8f5c6db7a2a1624b27a18755c905 ChangeLog 7988
+RMD160 eb64e499aa0fc93b58b429e3d1a67233c24e5e87 ChangeLog 7988
+SHA256 27ccdfc62ff4e16eb9c39001ad48b94f94417ee4973c149d85601b47da42b8f1 ChangeLog 7988
 MISC metadata.xml 410 RMD160 0bc225e5a70a2d517fd79869f421720e4bbc7341 SHA1 bd561ffc0ad1e208b722f1e3a8c72469ef67c212 SHA256 d54b7eea18a83fae10ba99e78fc00d20200b3bca80f2b3e4147b2f4008ca92a0
 MD5 50282322ba80018fc86b2b1c6c248858 metadata.xml 410
 RMD160 0bc225e5a70a2d517fd79869f421720e4bbc7341 metadata.xml 410
@@ -32,6 +40,9 @@ SHA256 cdefb97e8493b913dabb6d702110122af690e04bd31ef6be219251d14e07c104 files/di
 MD5 b6ff0399c452dd99648bfcda124d627c files/digest-jfsutils-1.1.11 247
 RMD160 2bfdd0f59db9af0120632b0cd1b3c4b180205f41 files/digest-jfsutils-1.1.11 247
 SHA256 ee4e1df4f5c728c03f2ca3864ad581863032aa800bb2625bb0e46c9deae750e5 files/digest-jfsutils-1.1.11 247
+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 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
diff --git a/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r1 b/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r1
new file mode 100644
index 000000000000..abb24c27d9b6
--- /dev/null
+++ b/sys-fs/jfsutils/files/digest-jfsutils-1.1.11-r1
@@ -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-fsck-n.patch b/sys-fs/jfsutils/files/jfsutils-1.1.11-fsck-n.patch
new file mode 100644
index 000000000000..d56a66d84886
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.11-fsck-n.patch
@@ -0,0 +1,17 @@
+diff -ur a/fsck/xchkdsk.c b/fsck/xchkdsk.c
+--- a/fsck/xchkdsk.c	2006-06-05 20:31:40.000000000 +0100
++++ b/fsck/xchkdsk.c	2007-05-02 15:31:24.000000000 +0100
+@@ -3028,8 +3028,13 @@
+ 		}
+ 		break;
+ 	default:
++		/* This is disabled as it's silly, we should be able to force
++		 * a read only check of the disk.
+ 		fsck_send_msg(fsck_PRMMUTEXCLLEVELS);
+ 		return (FSCK_FAILED);
++		*/
++		agg_recptr->parm_options[UFS_CHKDSK_LEVEL2] = 0;
++		break;
+ 	}
+ 	/*
+ 	 * the parms are valid.  record the messaging level they imply.
diff --git a/sys-fs/jfsutils/jfsutils-1.1.11-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..3cc4744cb0fe
--- /dev/null
+++ b/sys-fs/jfsutils/jfsutils-1.1.11-r1.ebuild
@@ -0,0 +1,38 @@
+# 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-r1.ebuild,v 1.1 2007/08/02 09:38:15 uberlord 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
+}
+
+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 INSTALL NEWS README
+}