clean old junk; 1.2.0 is latest stable

11 files changed, 5 insertions, 465 deletions

diff --git a/sys-apps/evms/ChangeLog b/sys-apps/evms/ChangeLog
index b59b7d53e9b2..5b3310319c40 100644
--- a/sys-apps/evms/ChangeLog
+++ b/sys-apps/evms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/evms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/ChangeLog,v 1.9 2002/10/02 09:31:11 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/ChangeLog,v 1.10 2002/10/12 22:09:05 woodchip Exp $
 
 *evms-1.2.0 (02 Oct 2002)
 
@@ -12,27 +12,23 @@
 
   27 Aug 2002; Donny Davies <woodchip@gentoo.org>: Removed the LVM clone tools.
 
-  07 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: New release version of evms
-  1.1.0.
+  07 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: New release version of evms 1.1.0.
 
 *evms-1.1.0_pre4 (31 Jul 2002)
 
-  31 Jul 2002; Daniel Robbins <drobbins@gentoo.org>: New version for evms 1.1.0
-  systems.
+  31 Jul 2002; Daniel Robbins <drobbins@gentoo.org>: New version for evms 1.1.0 systems.
 
 *evms-1.0.1 (08 May 2002)
 
   21 Jul 2002; Mark Guertin <gerk@gentoo.org>: updated keywords (-ppc)
 
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> evms-1.0.1.ebuild : Added
-  KEYWORDS.
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> evms-1.0.1.ebuild : Added KEYWORDS.
 
   08 May 2002; Donny Davies <woodchip@gentoo.org>: Updated to 1.0.1.
 
 *evms-1.0.0-r1 (30 Apr 2002)
 
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> evms-1.0.0-r1.ebuild :
-  Added KEYWORDS.
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> evms-1.0.0-r1.ebuild : Added KEYWORDS.
 
   30 Apr 2002; Donny Davies <woodchip@gentoo.org>: Moved the plugins to
   /lib/evms, where they belong.  Please unmerge the older version of this
diff --git a/sys-apps/evms/evms-1.0.0-r1.ebuild b/sys-apps/evms/evms-1.0.0-r1.ebuild
deleted file mode 100644
index 3b3a2905c8c0..000000000000
--- a/sys-apps/evms/evms-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.0.0-r1.ebuild,v 1.6 2002/10/05 05:39:24 drobbins Exp $
-
-IUSE="ncurses gtk"
-
-# You need to have an evms-patched kernel source tree in /usr/src/linux
-# to build this.  Either take care of that yourself or do these steps :
-#
-#   o get a vanilla 2.4.18 kernel and unpack it in /usr/src/linux
-#   o ebuild evms-1.0.0-r1.ebuild clean unpack
-#   o cd /usr/src/linux
-#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/evms-1.0.0-linux-2.4.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/evms-linux-2.4.18-common-files.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/linux-2.4.18-VFS-lock.patch
-#
-# The third patch isn't totally required.  Now configure your kernel
-# and select the evms features that you want.  If you plan on using
-# an evms volume on your /boot partition then you'll need to use the
-# included patch against lilo-22.2 in the same directory as above.
-# Please see their homepage for further information and details.
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-KEYWORDS="x86"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/${PN}/${P}.tar.gz"
-
-DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses )"
-
-LICENSE="GPL"
-SLOT="0"
-
-pkg_setup() {
-	if [ ! -f /usr/src/linux/include/linux/evms/evms.h ]
-	then
-		eerror "You dont appear to have an evms-patched kernel source"
-		eerror "tree in /usr/src/linux. Please fix that and try again"
-		return 1
-	fi
-}
-
-src_compile() {
-	local interfaces="CommandLine,LvmUtils,utilities"
-	use ncurses && interfaces="ncurses,${interfaces}"
-	use gtk && interfaces="evmsgui,${interfaces}"
-
-	cd engine
-	./configure \
-		--prefix=/usr \
-		--sbindir=/sbin \
-		--with-plugins=all \
-		--mandir=/usr/share/man \
-		--with-evmslib_dir=/lib \
-		--with-kernel=/usr/src/linux \
-		--with-interfaces=${interfaces} \
-		--host=${CHOST} || die "bad ./configure"
-	#1.0.0 doesn't support parallel make
-	make || die "compile problem"
-}
-
-src_install() {
-	make -C engine DESTDIR=${D} install || die
-	dodoc CHANGES COPYING EVMS*.txt PLUGIN.IDS
-
-	# no need for static libraries in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	# make the non-existant symlinks :/  i bet they'll fix
-	# this upstream in the near future...
-	cd ${D}/lib
-	rm -f libdlist.so libevms.so
-	ln -sf libevms-1.0.0.so libevms.so.1
-	ln -sf libevms.so.1 libevms.so
-	ln -sf libdlist-1.0.so libdlist.so.1
-	ln -sf libdlist.so.1 libdlist.so
-
-	# the gtk+ frontend should live in /usr/sbin though..
-	if [ -n "`use gtk`" ]
-	then
-		dodir /usr/sbin
-		mv ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms-init evms
-}
diff --git a/sys-apps/evms/evms-1.0.1.ebuild b/sys-apps/evms/evms-1.0.1.ebuild
deleted file mode 100644
index 74cd42781065..000000000000
--- a/sys-apps/evms/evms-1.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.0.1.ebuild,v 1.6 2002/10/05 05:39:24 drobbins Exp $
-
-IUSE="ncurses gtk"
-
-# You need to have an evms-patched kernel source tree in /usr/src/linux
-# to build this.  Either take care of that yourself or do these steps :
-#
-#   o get a vanilla 2.4.18 kernel and unpack it in /usr/src/linux
-#   o ebuild evms-1.0.1.ebuild clean unpack
-#   o cd /usr/src/linux
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/evms-1.0.1-linux-2.4.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/evms-linux-2.4.18-common-files.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/linux-2.4.18-VFS-lock.patch
-#
-# The third patch isn't totally required.  Now configure your kernel
-# and select the evms features that you want.  If you plan on using
-# an evms volume on your /boot partition then you'll need to use the
-# included patch against lilo-22.2 in the same directory as above.
-# Please see their homepage for further information and details.
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-KEYWORDS="x86 -ppc"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/${PN}/${P}.tar.gz"
-
-DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-pkg_setup() {
-	if [ ! -f /usr/src/linux/include/linux/evms/evms.h ]
-	then
-		eerror "You dont appear to have an evms-patched kernel source"
-		eerror "tree in /usr/src/linux. Please fix that and try again."
-		return 1
-	fi
-}
-
-src_compile() {
-	local interfaces="CommandLine,LvmUtils,utilities"
-	use ncurses && interfaces="ncurses,${interfaces}"
-	use gtk && interfaces="evmsgui,${interfaces}"
-
-	cd engine
-	./configure \
-		--prefix=/usr \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--with-plugins=all \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include \
-		--with-kernel=/usr/src/linux \
-		--with-interfaces=${interfaces} \
-		--host=${CHOST} || die "bad ./configure"
-	#1.0.1 doesn't support parallel make
-	make || die "compile problem"
-}
-
-src_install() {
-	make -C engine DESTDIR=${D} install || die
-	dodoc CHANGES COPYING EVMS*.txt PLUGIN.IDS
-
-	# no need for static libraries in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	# make the non-existant symlinks.  why doesn't their
-	# makefile do this?  :/
-	cd ${D}/lib
-	rm -f libdlist.so libevms.so
-	ln -sf libevms-${PV}.so libevms.so.1
-	ln -sf libevms.so.1 libevms.so
-	ln -sf libdlist-1.0.so libdlist.so.1
-	ln -sf libdlist.so.1 libdlist.so
-
-	# the gtk+ frontend should live in /usr/sbin though..
-	if [ -n "`use gtk`" ]
-	then
-		dodir /usr/sbin
-		mv ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms-init evms
-}
diff --git a/sys-apps/evms/evms-1.1.0.ebuild b/sys-apps/evms/evms-1.1.0.ebuild
deleted file mode 100644
index ae8a9becb93d..000000000000
--- a/sys-apps/evms/evms-1.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.1.0.ebuild,v 1.4 2002/10/05 05:39:24 drobbins Exp $
-
-IUSE="ncurses gtk"
-
-# You need to have an evms-patched kernel source tree in /usr/src/linux
-# to build these programs.  Either take care of that yourself, or apply
-# the patches inside the tarball against a current vanilla linux kernel.
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-KEYWORDS="x86 -ppc"
-
-NEWP=evms-1.1.0
-LIBV=1.1.0
-S=${WORKDIR}/${NEWP}
-SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/${PN}/${NEWP}.tar.gz"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses ) sys-apps/e2fsprogs"
-RDEPEND="${DEPEND}"
-LICENSE="GPL-2"
-SLOT="0"
-
-pkg_setup() {
-	if [ ! -f /usr/src/linux/include/linux/evms/evms.h ]
-	then
-		eerror "You dont appear to have an evms-patched kernel source"
-		eerror "tree in /usr/src/linux. Please fix that and try again."
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#this next patch fixes some missing libuuid symbols:
-	#patch -p1 < ${FILESDIR}/${NEWP}-gcc31.diff || die
-	#this next patch allows EVMS to recognize the new ReiserFS 3.6 versioning scheme
-	#patch -p1 < ${FILESDIR}/${NEWP}-reiserfs-3.6.diff || die
-}
-
-src_compile() {
-	local interfaces="CommandLine,utilities"
-	use ncurses && interfaces="ncurses,${interfaces}"
-	use gtk && interfaces="evmsgui,${interfaces}"
-
-	cd engine
-	./configure \
-		--prefix=/usr \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--with-plugins=all \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include \
-		--with-kernel=/usr/src/linux \
-		--with-interfaces=${interfaces} \
-		--host=${CHOST} || die "bad ./configure"
-	#1.1.0 doesn't support parallel make
-	make || die "compile problem"
-}
-
-src_install() {
-	make -C engine DESTDIR=${D} install || die
-	dodoc CHANGES COPYING EVMS*.txt PLUGIN.IDS
-
-	# move static libraries to /usr/lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	# realize these symlinks now so they get included
-	cd ${D}/lib
-	rm -f libdlist.so libevms.so
-	ln -sf libevms-${LIBV}.so libevms.so.1
-	ln -sf libevms.so.1 libevms.so
-	ln -sf libdlist-1.0.so libdlist.so.1
-	ln -sf libdlist.so.1 libdlist.so
-
-	# the gtk+ frontend should live in /usr/sbin
-	if [ -n "`use gtk`" ]
-	then
-		dodir /usr/sbin
-		mv ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms-init evms
-}
diff --git a/sys-apps/evms/evms-1.1.0_pre4.ebuild b/sys-apps/evms/evms-1.1.0_pre4.ebuild
deleted file mode 100644
index f60ddbdec9c2..000000000000
--- a/sys-apps/evms/evms-1.1.0_pre4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.1.0_pre4.ebuild,v 1.4 2002/10/05 05:39:24 drobbins Exp $
-
-IUSE="ncurses gtk"
-
-# You need to have an evms-patched kernel source tree in /usr/src/linux
-# to build this.  Either take care of that yourself or do these steps :
-#
-#   o get a vanilla 2.4.18 kernel and unpack it in /usr/src/linux
-#   o ebuild evms-1.0.1.ebuild clean unpack
-#   o cd /usr/src/linux
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/evms-1.0.1-linux-2.4.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/evms-linux-2.4.18-common-files.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.1/work/evms-1.0.1/kernel/linux-2.4.18-VFS-lock.patch
-#
-# The third patch isn't totally required.  Now configure your kernel
-# and select the evms features that you want.  If you plan on using
-# an evms volume on your /boot partition then you'll need to use the
-# included patch against lilo-22.2 in the same directory as above.
-# Please see their homepage for further information and details.
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-KEYWORDS="x86 -ppc"
-
-NEWP=evms-1.1.0-pre4
-LIBV=1.1.0
-S=${WORKDIR}/${NEWP}
-SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/${PN}/${NEWP}.tar.gz"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses ) sys-apps/e2fsprogs"
-LICENSE="GPL-2"
-SLOT="0"
-
-pkg_setup() {
-	if [ ! -f /usr/src/linux/include/linux/evms/evms.h ]
-	then
-		eerror "You dont appear to have an evms-patched kernel source"
-		eerror "tree in /usr/src/linux. Please fix that and try again."
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#this next patch fixes some missing libuuid symbols:
-	patch -p1 < ${FILESDIR}/${NEWP}-gcc31.diff || die
-	#this next patch allows EVMS to recognize the new ReiserFS 3.6 versioning scheme
-	patch -p1 < ${FILESDIR}/${NEWP}-reiserfs-3.6.diff || die
-}
-
-src_compile() {
-	local interfaces="CommandLine,LvmUtils,utilities"
-	use ncurses && interfaces="ncurses,${interfaces}"
-	use gtk && interfaces="evmsgui,${interfaces}"
-
-	cd engine
-	./configure \
-		--prefix=/usr \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--with-plugins=all \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include \
-		--with-kernel=/usr/src/linux \
-		--with-interfaces=${interfaces} \
-		--host=${CHOST} || die "bad ./configure"
-	#1.1.0 doesn't support parallel make
-	make || die "compile problem"
-}
-
-src_install() {
-	make -C engine DESTDIR=${D} install || die
-	dodoc CHANGES COPYING EVMS*.txt PLUGIN.IDS
-
-	# no need for static libraries in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	# make the non-existant symlinks.  why doesn't their
-	# makefile do this?  :/
-	cd ${D}/lib
-	rm -f libdlist.so libevms.so
-	ln -sf libevms-${LIBV}.so libevms.so.1
-	ln -sf libevms.so.1 libevms.so
-	ln -sf libdlist-1.0.so libdlist.so.1
-	ln -sf libdlist.so.1 libdlist.so
-
-	# the gtk+ frontend should live in /usr/sbin though..
-	if [ -n "`use gtk`" ]
-	then
-		dodir /usr/sbin
-		mv ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms-init evms
-}
diff --git a/sys-apps/evms/files/digest-evms-1.0.0-r1 b/sys-apps/evms/files/digest-evms-1.0.0-r1
deleted file mode 100644
index 28b34ad84b34..000000000000
--- a/sys-apps/evms/files/digest-evms-1.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bce6b73619b077c524c9a2a51cedc02 evms-1.0.0.tar.gz 1476451
diff --git a/sys-apps/evms/files/digest-evms-1.0.1 b/sys-apps/evms/files/digest-evms-1.0.1
deleted file mode 100644
index 9f786dcf96b0..000000000000
--- a/sys-apps/evms/files/digest-evms-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f359ece33b8a6049f7cee6b65d4e234d evms-1.0.1.tar.gz 1481538
diff --git a/sys-apps/evms/files/digest-evms-1.1.0 b/sys-apps/evms/files/digest-evms-1.1.0
deleted file mode 100644
index b86b7e41696c..000000000000
--- a/sys-apps/evms/files/digest-evms-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8526698995dc8a4e05afbed54aab52e8 evms-1.1.0.tar.gz 1790428
diff --git a/sys-apps/evms/files/digest-evms-1.1.0_pre4 b/sys-apps/evms/files/digest-evms-1.1.0_pre4
deleted file mode 100644
index 2b5fe62b3a3d..000000000000
--- a/sys-apps/evms/files/digest-evms-1.1.0_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d570e79fe545d64d47092b1a43b71dac evms-1.1.0-pre4.tar.gz 1505606
diff --git a/sys-apps/evms/files/evms-1.1.0-pre4-gcc31.diff b/sys-apps/evms/files/evms-1.1.0-pre4-gcc31.diff
deleted file mode 100644
index c35a771c286e..000000000000
--- a/sys-apps/evms/files/evms-1.1.0-pre4-gcc31.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN evms-1.1.0-pre4/engine/Plugins/gptsegmgr/Makefile evms-1.1.0-pre4.fixed/engine/Plugins/gptsegmgr/Makefile
---- evms-1.1.0-pre4/engine/Plugins/gptsegmgr/Makefile	Tue Apr 30 11:36:48 2002
-+++ evms-1.1.0-pre4.fixed/engine/Plugins/gptsegmgr/Makefile	Tue Jul 23 11:29:45 2002
-@@ -28,7 +28,7 @@
- 	rm -f $(DESTDIR)$(PLUGINS_DIR)/$(TARGET)
- 
- $(TARGET): $(OBJS)
--	$(CC) $(SO_CFLAGS) -luuid  -Wl,-soname,$(SONAME) -o $(TARGET) $(OBJS)
-+	$(CC) $(SO_CFLAGS) -Wl,-soname,$(SONAME) -o $(TARGET) $(OBJS) -luuid
- 
- clean:
- 	rm -f .depend *.o *.so $(TARGET)
-diff -urN evms-1.1.0-pre4/engine/Plugins/jfsfsim/Makefile evms-1.1.0-pre4.fixed/engine/Plugins/jfsfsim/Makefile
---- evms-1.1.0-pre4/engine/Plugins/jfsfsim/Makefile	Fri May 17 14:05:04 2002
-+++ evms-1.1.0-pre4.fixed/engine/Plugins/jfsfsim/Makefile	Tue Jul 23 11:30:02 2002
-@@ -28,7 +28,7 @@
- 	rm -f $(DESTDIR)$(PLUGINS_DIR)/$(TARGET)
- 
- $(TARGET): $(OBJS)
--	$(CC) $(SO_CFLAGS) -luuid -Wl,-soname,$(SONAME) -o $(TARGET) $(OBJS)
-+	$(CC) $(SO_CFLAGS) -Wl,-soname,$(SONAME) -o $(TARGET) $(OBJS) -luuid
- 
- clean:
- 	rm -f .depend *.o *.so $(TARGET)
diff --git a/sys-apps/evms/files/evms-1.1.0-pre4-reiserfs-3.6.diff b/sys-apps/evms/files/evms-1.1.0-pre4-reiserfs-3.6.diff
deleted file mode 100644
index e01307aaaa5f..000000000000
--- a/sys-apps/evms/files/evms-1.1.0-pre4-reiserfs-3.6.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -urN evms-1.1.0-pre4/engine/Plugins/reiserfsim/reiserfs.c evms-1.1.0-pre4.fixed/engine/Plugins/reiserfsim/reiserfs.c
---- evms-1.1.0-pre4/engine/Plugins/reiserfsim/reiserfs.c	Wed Jun 19 16:54:20 2002
-+++ evms-1.1.0-pre4.fixed/engine/Plugins/reiserfsim/reiserfs.c	Tue Jul 23 11:49:16 2002
-@@ -563,14 +563,18 @@
- 				if ((ver = strstr(buffer, "3.x.0"))) {
- 					reiser_version = 0;
- 					end = strstr(ver,"\n");
--					strncpy(reiser_version_text,ver,min((int)end - (int)ver,31));
-+					strncpy(reiser_version_text,ver,min(end - ver,31));
- 					rc = 0;
- 				} else if ((ver =strstr(buffer, "3.x.1"))) {
- 					end = strstr(ver,"\n");
- 					strncpy(reiser_version_text,ver,min(end - ver,31));
--//					strncpy(reiser_version_text,ver,31);
- 					reiser_version = 1;
- 					rc = 0;
-+				} else if ((ver = strstr(buffer, "3.6."))) {
-+					end = strstr(ver,"\n");
-+					strncpy(reiser_version_text,ver,min(end - ver,31));
-+					reiser_version = 2;
-+					rc = 0;
- 				}
- 			}
- 		}
-@@ -818,9 +822,9 @@
- 	LOGENTRY();
- 
- 	/* don't expand if mounted */
--	if (EngFncs->is_mounted(volume->name, NULL)) {
--		return EBUSY;
--	}
-+//	if (EngFncs->is_mounted(volume->name, NULL)) {
-+//		return EBUSY;
-+//	}
- 
- 	rc = pipe(fds1);
- 	if (rc) {
-@@ -1671,9 +1675,9 @@
- 	int  rc = 0;
- 
- 	LOGENTRY();
--	if (EngFncs->is_mounted(volume->name, NULL)) {
--		rc = EBUSY; // If mounted, can't expand
--	} else {
-+//	if (EngFncs->is_mounted(volume->name, NULL)) {
-+//		rc = EBUSY; // If mounted, can't expand
-+//	} else {
- 		fs_get_fs_limits( volume,		   // reset limits.
- 				  &volume->min_fs_size,
- 				  &volume->max_vol_size,
-@@ -1681,7 +1685,7 @@
- 		if (volume->fs_size + *delta > volume->max_fs_size) {
- 			*delta = volume->max_fs_size - volume->fs_size;
- 		}
--	}
-+//	}
- 	LOGEXITRC();
- 	return rc;
-