Version bump. Fixes bugs #210879, and #214194 (same as #202058). Make sure you hvae the new .26 of device-mapper.

Package-Manager: portage-2.1.5.4

4 files changed, 226 insertions, 2 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 85198c50f722..d16273b51c15 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.134 2008/04/30 06:53:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.135 2008/06/08 19:54:05 robbat2 Exp $
+
+*lvm2-2.02.37 (08 Jun 2008)
+
+  08 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lvm2-stop.sh-2.02.37, +lvm2-2.02.37.ebuild:
+  Version bump. Fixes bugs #210879, and #214194 (same as #202058). Make sure
+  you hvae the new .26 of device-mapper.
 
 *lvm2-2.02.36 (30 Apr 2008)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ebaefecc3d45..647a2a6249d4 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -12,10 +12,12 @@ AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a8
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf316b02fb5f79bb6c0464cc3c1606704cec7b SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c
 AUX lvm2-stop.sh-2.02.28-r5 2055 RMD160 54ad47b7e48b651f1909df5e5b68440ebeb6d9f2 SHA1 07a85433d5a5d7295e781a8261f9265d050fe963 SHA256 3dd704eef9f7bd0cd97fc0afdb384c1d6e6163144c6c79b00f2dd8d27877f574
+AUX lvm2-stop.sh-2.02.37 2060 RMD160 1cd419f466c58382c852257878ab6bbbdd0061f9 SHA1 b487acbf219171afee029562f3b71188ca876dfc SHA256 e295acf3b53e00d6e868607ac422bbb196843165885a8f37323bfff4d147fa42
 DIST LVM2.2.01.13.tgz 463900 RMD160 5bbee0800fe4b04c3452445a5851c0d1960fb521 SHA1 34b18451aec6914da7e58f2d098a92216bb306f2 SHA256 f98495cbf43128a67bf20fe21e74ef9aa8fb872de80c980f1f506b45b922df50
 DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
 DIST LVM2.2.02.33.tgz 558820 RMD160 903d72844c4b309f26f9e58c4245b4f7377e23c7 SHA1 eb96a9f0cd90bdb61a8d5d5d44bd0b066420b70a SHA256 f8af333573e37b73ecc17eb0422e2ae9918e1e4f87a72f8e4054663e7d05e4b8
 DIST LVM2.2.02.36.tgz 568884 RMD160 dae1925160373c9f8e3c58954b394015c654c667 SHA1 29ddaf10a49868fb8d85afd21c8e7f6943846eae SHA256 359000abf276c65a4cab0ac682be3d0891130b75733a09543e340bce22486df7
+DIST LVM2.2.02.37.tgz 571462 RMD160 5fd5247f7fb977eb13b1db0caa6c570fecaacd83 SHA1 d24beacf4b9b60ae47aec253e3c48aead87dac5b SHA256 1f4a6c9de07442e8311b8a230fed55d273b62222164978ef104956bb50c1eb20
 EBUILD lvm2-2.01.13.ebuild 1405 RMD160 75af657ff62c63fb6f71dc285bf97e1fa24e5a30 SHA1 f3f606f47e22cfd9d7c39c5315893ece32a95a79 SHA256 910e07dab05a3b3ccb49828a9d956d60a52d60da4dab066e6a626f2f8bb9a37b
 EBUILD lvm2-2.02.28-r1.ebuild 3384 RMD160 706348e067da633764fe54e1d4ec8793dbcd44c2 SHA1 d7e41c2020133b90b815fd8245a8a3ad56af2214 SHA256 382b06023148b69f4181921b7b0fb779cecf15b007c5801a1d15c1ca62b52290
 EBUILD lvm2-2.02.28-r2.ebuild 3441 RMD160 5475d3f131ef109b0d415bb790fdace91aac5159 SHA1 eee55d3f56dc18e9c4a558fa3ade60182ef7acb9 SHA256 95e6ffa94296444b769c8d0ce988eec58cd44fb5fc30ce08fb7c875ed50c0f7b
@@ -26,5 +28,6 @@ EBUILD lvm2-2.02.28.ebuild 3370 RMD160 4f446bef10ca71ab2fc62b260ff5c07a751dbb60
 EBUILD lvm2-2.02.33-r1.ebuild 4530 RMD160 200dab0e86d30484de952f4bfc3848fa7e142473 SHA1 d0872e43146638475b1e29c9ab827ba1b05433a4 SHA256 02f5a054020195bc0fd761730eb4d7ccefc9f7c19a5cb23d1354d05bcb703289
 EBUILD lvm2-2.02.33.ebuild 4501 RMD160 8587ed75d3340deddae670a7289ee472217f4a7d SHA1 8567a695c7d7f25f884450ada577c3f24e5244a9 SHA256 1113d0369689b47d2c60e4ffd5847147db96a776868c7554b1e6e9b86c75c4b1
 EBUILD lvm2-2.02.36.ebuild 4527 RMD160 194f8bb1710cf3122a7ce2dfdded0c705c100619 SHA1 ab76c824f2597cb2eb6ee3752201ceab862aa2d9 SHA256 5eaef8329ef7f82d702ce7659947fb14793d6e7576b46854dd37c5bdfc3b63bb
-MISC ChangeLog 20956 RMD160 129ccedb76612b319accfefdff017b0ce19f6c97 SHA1 cf278d44779da4a409687174ac8339fddd88b3ac SHA256 497b1e1e2e050bd87eb4eb36f57bfc81fe6fe69e58e54b5eb523803420f20783
+EBUILD lvm2-2.02.37.ebuild 4654 RMD160 76e77918c70ddd66d1e793c1f1c96e6d284c0372 SHA1 51babaa6628e9c63b6b6e0933db742adab78c3bc SHA256 20ecea0354c16dcc266b2e7df145e780847ef9abd75f4dcb3ff33e13ca763897
+MISC ChangeLog 21210 RMD160 5c5ad7b2b138661c08fc4d992aa98201135a893b SHA1 7655a1e96288b1b2dd8438f2c7037725967fa383 SHA256 f40d4d67ca65f33f96f83a9e8d5647a08b46460b63c0e84885be9b38bdea2e67
 MISC metadata.xml 629 RMD160 262a84b00a5047ceb0376fcb2b8766212911a2de SHA1 66739ae9c1b4ca2c621370d7988fd4ccc18d74f7 SHA256 046b48cc8022050fa345dd70c6ad44b07080027b5b86b0215a46ea17586c815d
diff --git a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37
new file mode 100755
index 000000000000..fccc7f9ef699
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37
@@ -0,0 +1,65 @@
+# /lib/rcscripts/addons/lvm-stop.sh
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37,v 1.1 2008/06/08 19:54:05 robbat2 Exp $
+
+# Stop LVM2
+if [ -x /sbin/vgchange ] && \
+   [ -x /sbin/lvdisplay ] && \
+   [ -x /sbin/vgdisplay ] && \
+   [ -x /sbin/lvchange ] && \
+   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
+   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+then
+	einfo "Shutting down the Logical Volume Manager"
+	# If these commands fail it is not currently an issue
+	# as the system is going down anyway based on the current LVM 
+	# functionality as described in this forum thread
+	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
+
+	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
+	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
+	for x in ${LOGICAL_VOLUMES}
+	do
+		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
+		if [ "${LV_IS_ACTIVE}" = 0 ]
+		then
+			ebegin "  Shutting Down logical volume: ${x} "
+			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
+			eend $?
+		fi
+	done
+
+	for x in ${VOLUME_GROUPS}
+	do
+		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
+		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
+		then
+			ebegin "  Shutting Down volume group: ${x} "
+			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
+			eend
+		fi
+	done
+
+	for x in ${LOGICAL_VOLUMES}
+	do
+		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
+		if [ "${LV_IS_ACTIVE}" = 1 ]
+		then
+			if type mountinfo >/dev/null 2>&1; then
+				ROOT_DEVICE=`mountinfo -t /`
+			else
+				ROOT_DEVICE=`mount | awk '{if($3 == "/" && $1 != "rootfs"){print $1}}'`
+			fi
+
+			MOUNTED_DEVICE=${x}
+			[ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
+			[ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
+			if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
+			then
+				ewarn "  Unable to shutdown: ${x} "
+			fi
+		fi
+	done
+	einfo "Finished Shutting down the Logical Volume Manager"
+fi
+
+# vim:ts=4
diff --git a/sys-fs/lvm2/lvm2-2.02.37.ebuild b/sys-fs/lvm2/lvm2-2.02.37.ebuild
new file mode 100644
index 000000000000..396b1690b8d4
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.37.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.37.ebuild,v 1.1 2008/06/08 19:54:05 robbat2 Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="readline static clvm cman gulm lvm1 selinux"
+
+DEPEND=">=sys-fs/device-mapper-1.02.26
+		clvm? ( >=sys-cluster/dlm-1.01.00
+			cman? ( >=sys-cluster/cman-1.01.00 )
+			gulm? ( >=sys-cluster/gulm-1.00.00 ) )"
+
+RDEPEND="${DEPEND}
+	!sys-fs/lvm-user
+	!sys-fs/clvm"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
+	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/lvm.conf-2.02.36.patch
+}
+
+src_compile() {
+	# Static compile of lvm2 so that the install described in the handbook works
+	# http://www.gentoo.org/doc/en/lvm2.xml
+	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
+	local myconf
+	local buildmode
+
+	# fsadm is broken, don't include it (2.02.28)
+	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		myconf="${myconf} --enable-static_link"
+		buildmode="internal"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		local clvmd=""
+		use cman && clvmd="cman"
+		use gulm && clvmd="${clvmd}gulm"
+		clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin"
+	econf $(use_enable readline) \
+		$(use_enable selinux) \
+		--libdir=/usr/$(get_libdir) \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# TODO: At some point in the future, we need to stop installing the static
+	# as the /sbin/lvm name, and have both variants seperate.
+	if use static; then
+		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
+			|| die "Failed to copy lvm.static"
+	fi
+
+	dodir /$(get_libdir)
+	# Put these in root so we can reach before /usr is up
+	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
+		b="${D}"/usr/$(get_libdir)/${i}
+		if [ -f "${b}".so ]; then
+			mv -f "${b}".so* "${D}"/$(get_libdir) || die
+		fi
+	done
+
+	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
+	insinto /lib/rcscripts/addons
+	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
+	fi
+
+	elog "use flag nocman is deprecated and replaced"
+	elog "with cman and gulm use flags."
+	elog ""
+	elog "use flags clvm,cman and gulm are masked"
+	elog "by default and need to be unmasked to use them"
+	elog ""
+	elog "Rebuild your genkernel initramfs if you are using lvm"
+	use nolvmstatic && \
+		elog "USE=nolvmstatic has changed to USE=static via package.use"
+	use nolvm1 && \
+		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
+}
+
+pkg_postinst() {
+	elog "lvm volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add lvm boot"
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}