Try a different combined fix for bug #291217 (selinux compile) and bug #293272 (parallel compile fix) that should work better than the previous revisions.

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

4 files changed, 251 insertions, 2 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index ee077ec71d75..2429644acbf4 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,15 @@
 # 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.184 2009/11/29 22:35:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.185 2009/11/29 23:44:24 robbat2 Exp $
+
+*lvm2-2.02.51-r3 (29 Nov 2009)
+
+  29 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +lvm2-2.02.51-r3.ebuild,
+  +files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch:
+  Try a different combined fix for bug #291217 (selinux compile) and bug
+  #293272 (parallel compile fix) that should work better than the previous
+  revisions.
 
   29 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.51-r1.ebuild,
   lvm2-2.02.51-r2.ebuild:
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a5e087587f57..a696c082b5e7 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -24,6 +24,7 @@ AUX lvm2-2.02.48-fix-pkgconfig.patch 1397 RMD160 1b877f041eebcf9af9a4ba15c0d8230
 AUX lvm2-2.02.49-lockdir-override.patch 16498 RMD160 b1596accbd838f43960c5f8b667b30ccf4bacfcb SHA1 cbd3ef9d4e892d776ed51eda1b8d275caaa53d8d SHA256 0ce59c669f1886f49861ea771d40b34650c257c7f8e9f9cf370075ed4e447cf7
 AUX lvm2-2.02.51-as-needed.patch 7750 RMD160 a40917f69f20359bc3ddb7cce1d28851a9bdd152 SHA1 506ddb18fd44d225936c2ab1b642b7162e26f09b SHA256 872495767e184baf412de65b61b8603cfcee2c5728eeca431bd6d53569cdc18f
 AUX lvm2-2.02.51-device-mapper-export-format.patch 11318 RMD160 f194ef2dd9105ba32abef39f36eefe5f01353288 SHA1 a89e39f1bd104ba13d666aff6b13b7cd5f6b388a SHA256 1a2014a6bd259d1fdbd7dd16d3d2c7f7549f6d063b78394816c738ff1611b01e
+AUX lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch 809 RMD160 4d8f2486426f0feba9cf44f55e7beb9eb6fbed7a SHA1 f9526d90f386ed4d0476b315dd9690d5d87c1f5d SHA256 8668fe3acf35390a06bc0aaf83b874f6e763b2c56edf0a2dcdea789031ede595
 AUX lvm2-2.02.51-dmsetup-selinux-linking-fix.patch 651 RMD160 34198b5959435ff37e6e0971737ee3e07a8b73b5 SHA1 ef46356219a4cc5d650846a45402b2dbf67d80a7 SHA256 5644b786cda599da2b3522d95d476ab105cee37e9418e43fbeb6dc029b300e9b
 AUX lvm2-2.02.51-fix-pvcreate.patch 3140 RMD160 c707cc280a893350a90c1258b0d73c154283738c SHA1 34c16b3a930ae2ab66ca3ea5b47ce19317de51d7 SHA256 7564a9ac374f53e3991f76967f1462709afa9661de4d2c6ff232f71d3d7b446f
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
@@ -64,6 +65,7 @@ EBUILD lvm2-2.02.49-r3.ebuild 6372 RMD160 24323e1b0e54d9a0b90d1089ef13d38a35ff5e
 EBUILD lvm2-2.02.49.ebuild 6338 RMD160 9d5c898a0eee19d4d9a751db817f6cef9b8e803a SHA1 d4e4fcb39b6a844aaa622b265d9ff658aeba2e90 SHA256 ebb8b0c905b5d5d54984ed4336b3a969dba515766c59307021e7d7d8775322ce
 EBUILD lvm2-2.02.51-r1.ebuild 6600 RMD160 ef590b3250a7e1da698236a66f2d75c57ee1c38f SHA1 2e88b68a90736de85984594250b9d35e29f1ec7a SHA256 1a543a3b3ef4003a651674ba18dab40ea7171310a8fa23a3f8d01013da2a308f
 EBUILD lvm2-2.02.51-r2.ebuild 6724 RMD160 025b636bad7edf3b1239b429ce3c53a379e5c88a SHA1 ee91101f583985cb8a6ebf77de5f59adcb84cbdf SHA256 61e8b1fc73c6b0690b0ec0c5cf6109db8beb009439fc29a8bc0c85dbe184b9fe
+EBUILD lvm2-2.02.51-r3.ebuild 6382 RMD160 29bb3fd33b1a937d2bd6ab9b09317a3eaffa2bcb SHA1 dd017cac09100ec515376dd6c2e181bb757bf197 SHA256 d6dfaeef3b23ba723dac430754e2df37ead4b4155d8718c7d4c73037ba33e41c
 EBUILD lvm2-2.02.51.ebuild 6374 RMD160 d78f74edba8bcd89132674476865ff5aebdf0727 SHA1 0841e2a6941720864cb2400a539055ea00b4daca SHA256 d06c72cf94bffdad5df089d214f1a288de2d1d8c709ddf53b353660a221fa847
-MISC ChangeLog 31707 RMD160 cf5959ccfc3bd0eaff98eadc9034a87ded0946b3 SHA1 839e11b353b7e05b1672679c6b14bf1f78fc2223 SHA256 37e7f737f590d7d113de0f2e370b07a5c5bd664ef3a6c70eadf868e33b322c80
+MISC ChangeLog 32041 RMD160 f29a8768c9ef912e89b4e84a46f9c212ff773c12 SHA1 23ee491ade51063c50741d76ea9a315460a11c39 SHA256 0bb6ebdc58d6c6541f534b9fa8cb065e68bc25c2d499942c2c4147ce263b560e
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch b/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
new file mode 100644
index 000000000000..9dfd80cd7ccf
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
@@ -0,0 +1,27 @@
+diff -Nuar LVM2.2.02.51.orig/tools/Makefile.in LVM2.2.02.51/tools/Makefile.in
+--- LVM2.2.02.51.orig/tools/Makefile.in	2009-11-29 22:41:54.008495958 +0000
++++ LVM2.2.02.51/tools/Makefile.in	2009-11-29 22:44:40.207625943 +0000
+@@ -98,6 +98,7 @@
+ endif
+ 
+ LVMLIBS += -ldevmapper
++SELINUX_LIBS += @SELINUX_LIBS@
+ 
+ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
+ 
+@@ -109,13 +110,13 @@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) \
+ 	      -L$(top_srcdir)/libdm \
+ 		  -o $@ dmsetup.o \
+-		  -ldevmapper $(LIB_PTHREAD)
++		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
+ 
+ dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static \
+ 	      -L$(interfacedir) \
+ 		  -o $@ dmsetup.o \
+-		  -ldevmapper $(LIB_PTHREAD)
++		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
+ 
+ all: device-mapper
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild
new file mode 100644
index 000000000000..06a35d134d1c
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild
@@ -0,0 +1,211 @@
+# 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.51-r3.ebuild,v 1.1 2009/11/29 23:44:24 robbat2 Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs autotools
+
+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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="readline +static clvm cman +lvm1 selinux"
+
+DEPEND="!!sys-fs/device-mapper
+	clvm? ( =sys-cluster/dlm-2*
+		cman? ( =sys-cluster/cman-2* ) )"
+
+RDEPEND="${DEPEND}
+	!<sys-apps/openrc-0.4
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	# 2. There are no longer any linking deps in /usr.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static the filename!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.02.45-dmeventd.patch
+	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+
+	# 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"
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		# For recent systems, there are no linkages against anything in /usr anyway.
+		# We explicitly provide the .static versions so that they can be included in
+		# initramfs environments.
+		myconf="${myconf} --enable-static_link"
+	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
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable 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) \
+		--enable-pkgconfig \
+		--libdir=/usr/$(get_libdir) \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+	
+	einfo "Starting main build"
+	emake || die "compile fail"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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.49-r3 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r3 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.51-r2 lvm || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+	fi
+
+	# move shared libs to /lib(64)
+	if use static; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+	fi
+	#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.51-r2 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	if use static; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+	fi
+	#gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || die
+
+	# do not rely on /lib -> /libXX link
+	sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
+
+	elog "USE flag nocman is deprecated and replaced"
+	elog "with the cman USE flag."
+	elog ""
+	elog "USE flags clvm and cman are masked"
+	elog "by default and need to be unmasked to use them"
+	elog ""
+	elog "Rebuild your genkernel initramfs if you are using lvm"
+}
+
+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"
+}