Bug #262833: fix rcscript location. Bug #217644: Try to fix dlopen failure.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 195 insertions, 2 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 32a1d7bbb51b..83f767b52636 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.155 2009/05/09 23:11:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.156 2009/05/09 23:40:37 robbat2 Exp $
+
+*lvm2-2.02.45-r1 (09 May 2009)
+
+  09 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +lvm2-2.02.45-r1.ebuild:
+  Bug #262833: fix rcscript location. Bug #217644: Try to fix dlopen
+  failure.
 
   09 May 2009; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.45.ebuild:
   Bug 268662: Fix more parallel build fun.
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 3b5440fc9fa1..87684e90c7b5 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -31,6 +31,7 @@ EBUILD lvm2-2.02.36.ebuild 4515 RMD160 c1437c78867df76de7300ec671bc71b41f67ae0b
 EBUILD lvm2-2.02.37.ebuild 4642 RMD160 3122102c33c454ba0bf85ea9f3fbec21f6f0d64a SHA1 6f20bce6acb2c963e5cb4857285bfddbb01f8b0b SHA256 510c1f640b149f8d62702857283cfd86bb8f5bb2b93365759de4c36c966b2abc
 EBUILD lvm2-2.02.39.ebuild 4705 RMD160 72fc922cd0ee3c17f931e3b34d43e458236e068d SHA1 110e9b07ab048a49b6df3df3a7a4b1612ecc6ec2 SHA256 59548262a0ada34d1917493617b9a667d466eeb3ba84dac83c28a6d14ef89a52
 EBUILD lvm2-2.02.42.ebuild 4705 RMD160 56ef98e954c6b9e2717aedcf771bfe1332f82e0f SHA1 b1502083354d25662dd0b74940fb381a9fdc096a SHA256 e6df77b5f42f98c3c09db16c769b4a95a33847ed906a981be69776f10dbb3913
+EBUILD lvm2-2.02.45-r1.ebuild 5715 RMD160 f48dee13e3ec1935da4ba6456931965f74c56b48 SHA1 ecf3695bdde9d7d9b659cd1a925f0612ef4e030c SHA256 576df8e17db68e68fa31a6c47af4a238ed82773a8ec8c3f31adecda5fadeced1
 EBUILD lvm2-2.02.45.ebuild 5748 RMD160 44663663c49e906d1fc9b7b6f0adae672d086f4b SHA1 9162aa871d1c7756e5153ba009ab4cbe710388fe SHA256 9f31d6397e44ecec804f0510cd0ade1cf84b0dfb6cadea1988a1155b50156187
-MISC ChangeLog 24621 RMD160 203a7aec4cf7acf32aae2af06ec6827de94d5b54 SHA1 9e11ed074ac2b99255bf046682d18559501ac784 SHA256 9991d752746b87896f8f452576ccec4f79c8af9b2b79fd41bcfa792846bac0e1
+MISC ChangeLog 24814 RMD160 52415a936c13043e0d275486a21f0a6ad984e2c2 SHA1 7378fed7f6fc82cf48ac7fad9367fb5cf2ae873b SHA256 fac945490ee0000f3fe872a7c6e20174b6dcde625486aa71205d7df59f551268
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
new file mode 100644
index 000000000000..5ec5e308aba3
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild,v 1.1 2009/05/09 23:40:37 robbat2 Exp $
+
+inherit eutils multilib toolchain-funcs
+
+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
+         ftp://sources.redhat.com/pub/lvm2/old/${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 lvm1 selinux"
+
+DEPEND="!sys-fs/device-mapper
+	clvm? ( >=sys-cluster/dlm-1.01.00
+		cman? ( >=sys-cluster/cman-1.01.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}"/${P}-dmeventd.patch
+	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
+	epatch "${FILESDIR}"/${P}-device-mapper-export-format.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"
+		#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
+
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	pushd libdm
+	emake || die "failed to build libdm"
+	popd
+
+	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{,-lvm2{mirror,snapshot}} \
+		libdevmapper \
+		liblvm2{format1,snapshot,cmd} \
+		; do
+		b="${D}"/usr/$(get_libdir)/${i}
+		if [ -f "${b}".so ]; then
+			mv -f "${b}".so* "${D}"/$(get_libdir) || die
+			gen_usr_ldscript ${i}.so || die
+		fi
+	done
+
+	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
+	insinto /$(get_libdir)/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
+
+	# move shared libs to /lib(64)
+	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a"
+	#gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	dolib.a daemons/dmeventd/libdevmapper-event.a || die
+	#gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || die
+
+	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"
+	elog "Do NOT add it if you are using baselayout-1 still."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}