Add patch to fix linking when using --as-needed, to fix bug #335205.

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

4 files changed, 297 insertions, 5 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index f55995828a0a..a0f7cc3a8a21 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.231 2010/08/28 22:38:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.232 2010/09/01 15:32:50 flameeyes Exp $
+
+*lvm2-2.02.73-r1 (01 Sep 2010)
+
+  01 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +lvm2-2.02.73-r1.ebuild, +files/lvm2-2.02.73-asneeded.patch:
+  Add patch to fix linking when using --as-needed, to fix bug #335205.
 
   28 Aug 2010; Markos Chandras <hwoarang@gentoo.org> lvm2-2.02.73.ebuild:
   Stable on amd64 wrt bug #334087
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 1200b5e381a8..88cda9b90255 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -47,6 +47,7 @@ AUX lvm2-2.02.67-createinitrd.patch 660 RMD160 8d95b2fdbc8d3eb9e173fd5326d78b789
 AUX lvm2-2.02.70-asneeded.patch 326 RMD160 725f7705903d4cc9ba94c8b1c8f76905ec3d9832 SHA1 3332b8671a31f255626299af894d89b0a972c4c4 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e
 AUX lvm2-2.02.70-locale-muck.patch 477 RMD160 60d3e1f1e49c6f27a20a0a0b6962d0791b236657 SHA1 99974c59b58572e367fc82bca18d317a28045a1e SHA256 95d92e13ca1c926ff6da2b10bf12da63555a21463bb2f8118c722a7394ca5e13
 AUX lvm2-2.02.72-dynamic-static-ldflags.patch 2912 RMD160 37a8b4261e63885e52fc82e4a42892cd299480d9 SHA1 ff4b6d6040a52b5d877f664f1e7c56d99f36d9c9 SHA256 536f57d7860ea078a4cc7f025d86c3b37befe2db9df7802d58b506bbeefa79d8
+AUX lvm2-2.02.73-asneeded.patch 640 RMD160 c3ac9b14d7bf6492461e4adb35dfb590000a2e9f SHA1 0e32b2eb0512d64372596eecc8ac3d663e75a0fa SHA256 f17df1abf6e36b7383b460eafa472f4395bc6bccee46c22c655a3381bd2ad306
 AUX lvm2-2.02.73-locale-muck.patch 605 RMD160 1f13c9e1c2d5ca4f7c47787089c488e2c7c170c5 SHA1 fa5ca4dabc530c4708655d753fbf28aef9a1eb3f SHA256 7e888d9c5dc9944c933ffd03755310bda48b5abcd686ec9c45fe852caa06d88f
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
@@ -110,13 +111,14 @@ EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f
 EBUILD lvm2-2.02.70-r1.ebuild 8470 RMD160 7c11815d265b3303750b7046a4125dd34e1cd5f9 SHA1 550847924c0162a852bf6cbd94e836fcadb21213 SHA256 478ee7870d4ef032ee835bcd473358773e57ee652b90827c8737eec5af812833
 EBUILD lvm2-2.02.70.ebuild 8401 RMD160 3493a62e42f11e3afc16ed8f2c185c9885f6c811 SHA1 9bc476b6f607c6bac0263202dc6a7dbb5d06fee9 SHA256 83a2c5435ec9f38dfc2ef053471654b09788f3f492649667b1a2f319a87e5989
 EBUILD lvm2-2.02.72.ebuild 8546 RMD160 892074ca7b7f86ffade1551fae2d2c756b0c039e SHA1 db21b81cf6b212fd4769378c4562fc2ed653bb86 SHA256 63f30b39f5088f0db0d0a3926f58ff6707097389793b3be756ddb359deac3b62
+EBUILD lvm2-2.02.73-r1.ebuild 8678 RMD160 f772fe3cc3ebb8475ddf0ea2ebe819e88e4ebf1c SHA1 2e8bde052e33bd4987466ce2a28cc74e0b496d3f SHA256 ac07e9c1d790eeecd01a78e1f35f4d8d4f08033f4993374a0719adf8a0c9bb71
 EBUILD lvm2-2.02.73.ebuild 8614 RMD160 257fc6784c5c027f487dad7e3c5e4e8fc077976d SHA1 e41bcb1e550b5077b56bb67b36989d13f4fe9d7f SHA256 a09f80dfb1008a9299a7db74c085512ea911ea32690fbc4d76bbdf875556b1e5
-MISC ChangeLog 41304 RMD160 b7ae5b985d280a6c6f4785c322f0483cb14326a8 SHA1 808994e643eb01a15bbc3a5bb457e97b4ec0b149 SHA256 d7f5a865ad5d502fe05b70d8d25a26d8b4b2e51d1007854a6c5e88c0196ad478
+MISC ChangeLog 41528 RMD160 424f96e2410e858915ca7a22edf5fe0f142c1477 SHA1 b75b731225b35f4ab52a954778f274122fd88d6f SHA256 270d250c1d40fa50253c8dc48cd4fd64265c27ffddccdbc0b8b81033dff2afe6
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx5j+sACgkQ9/cejkQaxBC+dwCfe89m3AepgcvI8dgh/lZ6OAP7
-VZIAnizJnEkeLjWCBDHEnTLC63jlDn0L
-=okg3
+iEYEARECAAYFAkx+ctYACgkQAiZjviIA2XgnYgCfag3iUA87NxmZ19rH2JK6KlDT
+v0UAoMhB65JeAkWTxCyzx01yIZvWb558
+=nRxP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.73-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.73-asneeded.patch
new file mode 100644
index 000000000000..ec0f7f6c6a95
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.73-asneeded.patch
@@ -0,0 +1,15 @@
+Index: LVM2.2.02.73/tools/Makefile.in
+===================================================================
+--- LVM2.2.02.73.orig/tools/Makefile.in
++++ LVM2.2.02.73/tools/Makefile.in
+@@ -149,8 +149,8 @@ liblvm2cmd-static.a: $(top_builddir)/lib
+ 
+ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
+ 	$(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
+-	$(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \
+-		@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@
++	$(CFLAGS) $(CLDFLAGS) -o $@ \
++		@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ $(LVMLIBS) $(LIBS)
+ 
+ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
+ 	$(LN_S) -f $< $@
diff --git a/sys-fs/lvm2/lvm2-2.02.73-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.73-r1.ebuild
new file mode 100644
index 000000000000..d1e96b3bb47f
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.73-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.73-r1.ebuild,v 1.1 2010/09/01 15:32:50 flameeyes Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+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 ~s390 ~sh ~sparc ~x86"
+
+IUSE="readline +static clvm cman +lvm1 selinux"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	clvm? ( =sys-cluster/dlm-2*
+			cman? ( =sys-cluster/cman-2* ) )
+	>=sys-fs/udev-151-r4"
+
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.4
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+	check_extra_config
+	# 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}"/lvm.conf-2.02.67.patch
+
+	# Should not be needed due to upstream re-arrangement of build
+	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+	# Should not be need with new upstream udev rules
+	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	# Fixed differently upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+	# bug 318513
+	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
+	# --as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.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
+			--with-dmeventd-path=/sbin/dmeventd"
+	econf $(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--libdir=/$(get_libdir) \
+		--with-usrlibdir=/usr/$(get_libdir) \
+		--enable-udev_rules \
+		--enable-udev_sync \
+		--with-udevdir=/$(get_libdir)/udev/rules.d/ \
+		${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 || die "Failed to emake install"
+
+	# All of this was change by upstream, and if we don't get any problems, we
+	# can probably drop it in .65
+	#X## Revamp all of our library handling for bug #316571
+	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
+	#X## libdir variable.
+	#X#dodir /$(get_libdir)
+	#X## .so -> /$(get_libdir)
+	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
+	#X#[[ "$(get_libdir)" != "lib" ]] && \
+	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
+	#X## .a -> /usr/$(get_libdir)
+	#X#[[ "$(get_libdir)" != "lib" ]] && \
+	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
+	#X## The upstream symlinks are borked. lets rebuild them instead.
+	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
+	#X#	| xargs rm -f 2>/dev/null
+	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
+	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
+	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
+	#X#done
+	#X## Now enable building properly
+	#X#for i in \
+	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
+	#X#	libdevmapper \
+	#X#	liblvm2{format1,snapshot,cmd,app} \
+	#X#	; do
+	#X#	gen_usr_ldscript ${i}.so || die
+	#X#done
+
+	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || 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)
+	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+	#gen_usr_ldscript libdevmapper.so
+
+	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+	dolib.a daemons/dmeventd/libdevmapper-event.a \
+	|| die "dolib.a libdevmapper-event.a"
+	#gen_usr_ldscript libdevmapper-event.so
+
+	#insinto /etc/udev/rules.d/
+	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 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 "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+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"
+}