diff options
author | 2003-09-23 17:29:13 +0000 | |
---|---|---|
committer | 2003-09-23 17:29:13 +0000 | |
commit | 5c04d488f469d57b7001f492f505e61ecf1bf31e (patch) | |
tree | a512beb2b2506ff9d3d3c1fbb00bd759b3b4ceb7 | |
parent | New rev with a fix for IA-64 (diff) | |
download | gentoo-2-5c04d488f469d57b7001f492f505e61ecf1bf31e.tar.gz gentoo-2-5c04d488f469d57b7001f492f505e61ecf1bf31e.tar.bz2 gentoo-2-5c04d488f469d57b7001f492f505e61ecf1bf31e.zip |
New rev with a fix for IA-64
-rw-r--r-- | sys-fs/reiserfsprogs/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/reiserfsprogs/Manifest | 6 | ||||
-rw-r--r-- | sys-fs/reiserfsprogs/files/blk_size.patch | 54 | ||||
-rw-r--r-- | sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.11-r1 | 1 | ||||
-rw-r--r-- | sys-fs/reiserfsprogs/reiserfsprogs-3.6.11-r1.ebuild | 44 |
5 files changed, 110 insertions, 4 deletions
diff --git a/sys-fs/reiserfsprogs/ChangeLog b/sys-fs/reiserfsprogs/ChangeLog index 2325dc996afe..47696e73e21e 100644 --- a/sys-fs/reiserfsprogs/ChangeLog +++ b/sys-fs/reiserfsprogs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/reiserfsprogs # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.2 2003/09/17 01:48:28 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.3 2003/09/23 17:29:11 drobbins Exp $ + +*reiserfsprogs-3.6.11-r1 (23 Sep 2003) + + 23 Sep 2003; Daniel Robbins <drobbins@gentoo.org>: + reiserfsprogs-3.6.11-r1.ebuild: includes an important fix for IA-64 + systems that prevents reiserfsck errors. Thanks to Vitaly Fertman of the + Namesys/ReiserFS team for this fix. 16 Sep 2003; Jason Wever <weeve@gentoo.org> reiserfsprogs-3.6.8.ebuild: Marked stable for sparc. diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest index 6d36c572b3ae..cd20d8533138 100644 --- a/sys-fs/reiserfsprogs/Manifest +++ b/sys-fs/reiserfsprogs/Manifest @@ -3,11 +3,11 @@ MD5 381caedad1d5286be4954152ec37f25e reiserfsprogs-3.6.4-r1.ebuild 1374 MD5 b43af77642254c858530b2f42f20639a reiserfsprogs-3.6.11.ebuild 829 MD5 17c5a5f2cea42601e349f5d74f8b0491 reiserfsprogs-3.6.8.ebuild 815 MD5 222550931a80e6c9b5834828c48bee8f reiserfsprogs-3.6.3.ebuild 681 -MD5 125cb4d4891a73697e3ee4a1172e70d7 reiserfsprogs-3.6.11-r1.ebuild 922 +MD5 aceeb2bb53058d7cb649a4aae6fd128e reiserfsprogs-3.6.11-r1.ebuild 1129 MD5 112f01b379dcd6ddf4810954c3105b47 reiserfsprogs-3.6.10.ebuild 823 -MD5 9dfcc612eabb916168ad5e0f32a81582 ChangeLog 4564 +MD5 fcff944fe3b0e6693dd955070cc5cc41 ChangeLog 4847 MD5 7895b3d698cdc1cc5b4aecdfc2c49e30 files/digest-reiserfsprogs-3.6.4-r1 71 -MD5 b65daeab80cbc77635f4f9946b1c39fd files/debug.patch 771 +MD5 b4eeb93b06e335142e6fd3984030f841 files/blk_size.patch 1254 MD5 209924bdef4a9feb2bd452f3ca3b06dc files/reiserfsprogs-3.6.5-flush_buffers-bug.patch 3086 MD5 a8b0f4b8e4a5f18892ccfd1dc32cc7d3 files/digest-reiserfsprogs-3.6.3 71 MD5 f71b5a7289045ceb19f83e04ff079e09 files/digest-reiserfsprogs-3.6.8 71 diff --git a/sys-fs/reiserfsprogs/files/blk_size.patch b/sys-fs/reiserfsprogs/files/blk_size.patch new file mode 100644 index 000000000000..e989907b7c30 --- /dev/null +++ b/sys-fs/reiserfsprogs/files/blk_size.patch @@ -0,0 +1,54 @@ +===== lib/misc.c 1.39 vs edited ===== +--- 1.39/reiserfsprogs/lib/misc.c Wed Jul 30 12:05:41 2003 ++++ edited/lib/misc.c Tue Sep 23 17:37:48 2003 +@@ -407,8 +407,9 @@ + fflush (fp); + } + +- +- ++/* To not have problem with last sectors on the block device when switching ++ to smaller one. */ ++#define MAX_BS (64 * 1024) + + /* calculates number of blocks in a file. Returns 0 for "sparse" + regular files and files other than regular files and block devices */ +@@ -429,10 +430,12 @@ + #ifdef BLKGETSIZE64 + { + if (ioctl (fd, BLKGETSIZE64, &size) >= 0) { +- size = (size / 4096) * 4096 / blocksize; ++ size = (size / MAX_BS) * MAX_BS / blocksize; + sz = size; + if ((__u64)sz != size) + die ("count_blocks: block device too large"); ++ ++ close(fd); + return sz; + } + } +@@ -443,7 +446,9 @@ + { + if (ioctl (fd, BLKGETSIZE, &sz) >= 0) { + size = sz; +- return (size * 512 / 4096) * 4096 / blocksize; ++ ++ close(fd); ++ return (size * 512 / MAX_BS) * MAX_BS / blocksize; + } + } + #endif +@@ -459,11 +464,11 @@ + else + high = mid; + } ++ + valid_offset (fd, 0); + + close (fd); +- +- return (low + 1) * 4096 / 4096 / blocksize ; ++ return (low + 1) * MAX_BS / MAX_BS / blocksize; + } + + diff --git a/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.11-r1 b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.11-r1 new file mode 100644 index 000000000000..07a2a209df70 --- /dev/null +++ b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.11-r1 @@ -0,0 +1 @@ +MD5 f587c888de663603d4f6fa6cfdd82741 reiserfsprogs-3.6.11.tar.gz 369959 diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11-r1.ebuild new file mode 100644 index 000000000000..2e548091f61c --- /dev/null +++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11-r1.ebuild,v 1.1 2003/09/23 17:29:11 drobbins Exp $ + +inherit flag-o-matic eutils + +filter-flags -fPIC + +S=${WORKDIR}/${P} +DESCRIPTION="Reiserfs Utilities" +SRC_URI="http://www.namesys.com/pub/${PN}/${P}.tar.gz" +HOMEPAGE="http://www.namesys.com" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="ia64" + +src_unpack() { + unpack ${A} + if [ "$ARCH" = "ia64" ] + then + #Should work on everything, but needed on IA-64. Thanks + #to Vitaly Fertman from the Namesys/ReiserFS team for + #this fix. Makes reiserfsck work. (drobbins, 23 Sep 03) + cd ${S} + cat ${FILESDIR}/blk_size.patch | patch -p2 || die "patch application failure" + fi +} + +src_compile() { + ./configure --prefix=/ || die "Failed to configure" + emake || die "Failed to compile" +} + +src_install() { + make DESTDIR="${D}" install || die "Failed to install" + dodir /usr/share + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README + + cd ${D} + mv man usr/share + dosym /sbin/reiserfsck /sbin/fsck.reiserfs +} + |