summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-26 07:16:13 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-26 07:16:13 +0000
commitd1944fa15f6db3dd105f38827d3d1b25baed5f93 (patch)
tree10fad897ef4f7d37da9d02f40e7886cd85f38a18 /sys-fs
parentupdate URLs #224755 (diff)
downloadhistorical-d1944fa15f6db3dd105f38827d3d1b25baed5f93.tar.gz
historical-d1944fa15f6db3dd105f38827d3d1b25baed5f93.tar.bz2
historical-d1944fa15f6db3dd105f38827d3d1b25baed5f93.zip
Fix by Anders Aagaard for -p (preen) operation #237393.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/reiser4progs/ChangeLog9
-rw-r--r--sys-fs/reiser4progs/Manifest12
-rw-r--r--sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch17
-rw-r--r--sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild (renamed from sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild)2
4 files changed, 23 insertions, 17 deletions
diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index 52211bed1d13..d81a5a64ef59 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/reiser4progs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.34 2008/05/31 17:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.35 2008/10/26 07:16:13 vapier Exp $
+
+*reiser4progs-1.0.6-r2 (26 Oct 2008)
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+ files/reiser4progs-1.0.6-preen.patch, -reiser4progs-1.0.6-r1.ebuild,
+ +reiser4progs-1.0.6-r2.ebuild:
+ Fix by Anders Aagaard for -p (preen) operation #237393.
*reiser4progs-1.0.6-r1 (31 May 2008)
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index e33b10004963..e1d046cda5a1 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX reiser4progs-1.0.6-preen.patch 2420 RMD160 6dc3b1c7e26638373ce845872bb718d9994c7648 SHA1 c55a50891f923e4447149c52a70a516d2ae0c7f4 SHA256 e94b44b9964096a703626df81282a3b8a00bcda0921962d1359a1728e82091cd
+AUX reiser4progs-1.0.6-preen.patch 2401 RMD160 4c6819f04a791e006d8cc29ccb319aba9dd2dce4 SHA1 c7aaedbaa069fe668e2b1f33211b5bc0741b19a2 SHA256 65cfe93fb1aaa4fdd05f01b36e1213a0c21b7267ebc87a8c42000495072b34f4
DIST reiser4progs-1.0.6.tar.gz 799613 RMD160 1ed86a37f4f52fe47a5c873cb13d253c69c05ae7 SHA1 9acc4f829c5760ee159cb3f507e58478e578990d SHA256 a0d19b85fec4641d0d4189b756182110577c06719773825126e5c314fa35d574
-EBUILD reiser4progs-1.0.6-r1.ebuild 1668 RMD160 e4bd3ae57520fe8b7c1c1721dfc5fb0462070869 SHA1 cd5a684dee756a8ef3a35edaa70a76b1ab06568e SHA256 7a5590b167f5a9935518e134856ab90a26f35590fe3e8284b6e9c25912cb3d71
+EBUILD reiser4progs-1.0.6-r2.ebuild 1668 RMD160 2d3141d139bd16b3e43e868918ae12b99380ed54 SHA1 05310d8345f36697a58ef1982975a8682ff8d20f SHA256 23884507a5c8c3848984bef93c4272ac845d54a2078c1e50d069235ec1cbf9db
EBUILD reiser4progs-1.0.6.ebuild 1613 RMD160 e0d3f058f43264b09e16af50f8e0ff2ed3ea6388 SHA1 7b4a4ec31403fee40a9aa9caf240068bde26aebf SHA256 4dd4564286f21b948650b9aeaff17d5c497738e68d9d6b0328c1c8d989a50d06
-MISC ChangeLog 4802 RMD160 c433542c2d914c180f95a8db71088cb418ab1d8a SHA1 88fe3a3bcd54a441fd871fceff5ec1d608de82ff SHA256 74d9864e7a1c8767586eb084a916eaba086a3554253da9be5c4dddc334c825e4
+MISC ChangeLog 5053 RMD160 3054c452ef50334891e9685a8d2b5fe711d53b6a SHA1 9f5ae077926d69d7f4233f20bdded4a0ef4fb928 SHA256 11475d31f4864344abde3b88438049f4b8d6559d1cc04879e5977eb6d7c33fdd
MISC metadata.xml 267 RMD160 ff256714690dbcb9f54233ec9a4fbe77f11068f6 SHA1 f12cbf59a4688ee6b663b50b6a9a1871f096b71b SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkEFDQACgkQ67wieSYcaxeVWACgvna0MqFUzx7m62i1IKb2jEsV
-OtMAniQhqoxEMPn9bNj0/uyQ/pyBrnD6
-=p6Em
+iEYEARECAAYFAkkEGUMACgkQ67wieSYcaxdZHwCbBhbsWOdJ4PRL5JJ/Jz/PONIC
+g8gAoLfsQy/2fS1QjR4PQ8/wZI5KWr3Y
+=SFCh
-----END PGP SIGNATURE-----
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
index d6b8374108a9..c48eb0d54169 100644
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
@@ -1,4 +1,4 @@
-make -p mean "preen" like all other checkers
+Alias -p "preen" to -a "auto".
http://bugs.gentoo.org/195988
@@ -50,17 +50,16 @@ http://bugs.gentoo.org/195988
{"cache", required_argument, 0, 'c'},
{"override", required_argument, NULL, 'o'},
/* Fsck hidden options. */
-@@ -203,6 +205,9 @@
- case 'q':
- aux_gauge_set_handler(NULL, GT_PROGRESS);
+@@ -190,6 +192,8 @@
+ case 'f':
+ aal_set_bit(&data->options, FSCK_OPT_FORCE);
break;
+ case 'p':
-+ /* Fall through as preen should fix errors */
-+ mode = RM_FIX;
- case 'y':
- aal_set_bit(&data->options, FSCK_OPT_YES);
++ /* Fall through to auto, as preen is an alias for -a */
+ case 'a':
+ aal_set_bit(&data->options, FSCK_OPT_AUTO);
break;
-@@ -226,9 +231,6 @@
+@@ -226,9 +230,6 @@
case 'l':
mode = RM_SHOW_PLUG;
break;
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild
index b35c9cfd97fa..87fa534a09fe 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild,v 1.2 2008/10/26 06:54:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild,v 1.1 2008/10/26 07:16:13 vapier Exp $
inherit toolchain-funcs autotools