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

(Portage version: 2.1.3_rc9)

4 files changed, 54 insertions, 2 deletions

diff --git a/sys-fs/reiserfsprogs/ChangeLog b/sys-fs/reiserfsprogs/ChangeLog
index 7be15774cbfa..6fd8185ddce6 100644
--- a/sys-fs/reiserfsprogs/ChangeLog
+++ b/sys-fs/reiserfsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/reiserfsprogs
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.39 2006/12/29 21:48:12 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.40 2007/08/02 09:20:20 uberlord Exp $
+
+*reiserfsprogs-3.6.20-r1 (02 Aug 2007)
+
+  02 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/reiserfsprogs-3.6.20-fsck-n.patch, +reiserfsprogs-3.6.20-r1.ebuild:
+  Add a patch to allow fsck -f -n to work, #116016
 
 *reiserfsprogs-3.6.19-r1 (29 Dec 2006)
 
diff --git a/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.20-r1 b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.20-r1
new file mode 100644
index 000000000000..5d1e4adfad16
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.20-r1
@@ -0,0 +1,3 @@
+MD5 3b3392f59c5d302cf858bc4cf194b258 reiserfsprogs-3.6.20.tar.gz 486333
+RMD160 977cb8c328136f90718a1ef95a4fa9f42ad9ec7f reiserfsprogs-3.6.20.tar.gz 486333
+SHA256 1441d802da72e224d91545fc47f6def7d38c1e4035f9058d08c813aa2eb25079 reiserfsprogs-3.6.20.tar.gz 486333
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch
new file mode 100644
index 000000000000..b29133ee65b4
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch
@@ -0,0 +1,12 @@
+diff -ur a/utils/fsck/main.c b/utils/fsck/main.c
+--- a/utils/fsck/main.c	2006-03-28 13:40:23.000000000 +0100
++++ b/utils/fsck/main.c	2007-08-02 10:13:53.000000000 +0100
+@@ -421,7 +421,7 @@
+ 	(data->log == stdout) ? "stdout" : 
+ 	(data->log_file_name ? data->log_file_name : "fsck.run"));
+     
+-    if (!(data->options & OPT_YES)) {
++    if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT)) {
+ 	    if (!util_user_confirmed(warn_to, "\nDo you want to run this "
+ 				     "program?[N/Yes] (note need to type "
+ 				     "Yes if you do):", "Yes\n"))
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.20-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.20-r1.ebuild
new file mode 100644
index 000000000000..f0ab652a657b
--- /dev/null
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.20-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.20-r1.ebuild,v 1.1 2007/08/02 09:20:20 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="Reiserfs Utilities"
+HOMEPAGE="http://www.namesys.com/"
+SRC_URI="http://www.namesys.com/pub/reiserfsprogs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# big endian has broken code (doesnt compile) #154294
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 -mips -ppc -ppc64 -sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fsck-n.patch
+}
+
+src_compile() {
+	econf --prefix=/ || die "Failed to configure"
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to install"
+	dodoc ChangeLog INSTALL README
+}