Version bump, related to bug #207612.

Package-Manager: portage-2.1.4.1

4 files changed, 240 insertions, 12 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 97c9acbec664..7ec574e81807 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.127 2008/02/01 12:40:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.128 2008/02/07 02:01:49 robbat2 Exp $
+
+*lvm2-2.02.33 (07 Feb 2008)
+
+  07 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lvm.conf-2.02.33.patch, +lvm2-2.02.33.ebuild:
+  Version bump, related to bug #207612.
 
   01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   files/lvm.rc-2.02.28-r1, files/lvm.rc-2.02.28-r2, files/lvm.rc:
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 354faa2db1ed..743af94dc793 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX clvmd.rc 3667 RMD160 65d5037bc251db5fd84a07aa5ce75512b55a61ea SHA1 4eb1b4e79c9690bb5d7b0bf4466f9cb9acca5026 SHA256 8770fbafcc061ceda9add71795a5c81b28c1be4a10c8e8a722b33f9bdd12c0c1
 AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519
 AUX lvm.conf-2.02.28-r3.patch 2719 RMD160 6c1bfee374b2a58b3229984646b21443a9b34ad2 SHA1 6c6c524b3ec2e7a1b43dee19ff4c71495bae88fc SHA256 9304c543aca526b43a2b5b681ca3f50acc91db8b7f019f0e426e7ac5874a0c55
+AUX lvm.conf-2.02.33.patch 3304 RMD160 33bc90541fcf5eafd93974dedcf69ef15dbe4004 SHA1 bb4b6eabeb248bde8d9da05ee10025643047bf8d SHA256 7ffbf869d5dd933ed2e3b6f2d7927566465dc0b711e5dc4d80620748880f91fd
 AUX lvm.confd-2.02.28-r2 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA1 e8186ebb91d12247d0865285dc62346d1cbc207a SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844
 AUX lvm.rc 846 RMD160 51907ac7b673b7b7af1c18040039e01fa1656b3b SHA1 1aa78f00ffe171cd3dad78f022ce12c929b2a0da SHA256 4698309a89c2b02305d9c850078381b01b9566c7b17b0dd11e147b95cf676834
 AUX lvm.rc-2.02.28-r1 627 RMD160 d02598eb66ea14834384800cebe162779a46c7cd SHA1 f27684bc444e47d21dae926ecf28f57dfc961d39 SHA256 bcc93217cac4699402a68e452a79214b1e1bd29c2a3c547abb1c253219636a10
@@ -15,6 +13,7 @@ AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf3
 AUX lvm2-stop.sh-2.02.28-r5 2055 RMD160 54ad47b7e48b651f1909df5e5b68440ebeb6d9f2 SHA1 07a85433d5a5d7295e781a8261f9265d050fe963 SHA256 3dd704eef9f7bd0cd97fc0afdb384c1d6e6163144c6c79b00f2dd8d27877f574
 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
 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
@@ -22,12 +21,6 @@ EBUILD lvm2-2.02.28-r3.ebuild 4427 RMD160 6828d9432b60d15e40df1ca4e8ff45294ceb54
 EBUILD lvm2-2.02.28-r4.ebuild 4358 RMD160 aa41f57955ef3bddc46fb3d791c1caa8685b6251 SHA1 1cd394ea0a58d68ca76c6b9bca4ff246bcfa9e4f SHA256 516ab0aa4f72e77980b95db78599ef460d42f6a4965854ab80684347a6a63f82
 EBUILD lvm2-2.02.28-r5.ebuild 4368 RMD160 6bce4fc20209889f1ad33f2b56dbb3d8d5a63da3 SHA1 b3d9c4b4cc0fcb5ba27cdeb9b24f4d67b31f2d68 SHA256 f672c2cd8711124f23ce99cb059e4d9e05559950631da7f23eea24eb02a85666
 EBUILD lvm2-2.02.28.ebuild 3370 RMD160 4f446bef10ca71ab2fc62b260ff5c07a751dbb60 SHA1 674fe51da0d20c3f0a0a0b074c35018f46a26341 SHA256 7798af898a4b64304e0bd8b69b1a5c81f9f89f5ef5a063c654c42ed1276178e5
-MISC ChangeLog 19809 RMD160 b3b3a2fd0d94efe12b91e27713a453db4fbdba88 SHA1 12973fa37f116d79ad70320286e154d2c3bcfafb SHA256 ce61fa282aca5280f76e2190163118d8b2bd70ea08679ab38cad2645ad47b822
+EBUILD lvm2-2.02.33.ebuild 4363 RMD160 aafa6c075b0d7bdbf0d627e9190a64a39f46e047 SHA1 97596fde84502e2611d09ed414c53d05f7d6fdfe SHA256 37ddc2d7404a23218f9498581f402e4d7d55301491fbbefe5b1346b67215ff88
+MISC ChangeLog 19985 RMD160 466487453c0d403a8548d08de9c7893d21ddb9ee SHA1 da8bfd99685cf3e8172bd7ba3841fa049a2d1053 SHA256 45a5258f240e1255f0ab792f4585a47c09083b6a630c0e006755f6967890b2e2
 MISC metadata.xml 703 RMD160 b717628fbf06a8cbe39fb1d5bf680594a7dfaef6 SHA1 2e1f89a04aa9b40c8c7152217c953f827b5e8c5e SHA256 74147c334ed7c4596991af8dcaa2c08196a6dfd5a522d18d0a5d09da51290d65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHoxNOAiZjviIA2XgRAmmaAKCs6QZy/e4uPA++HoitzrTBvz98EQCg3blS
-H5BBhTaITXklbueb/4U7JPY=
-=jyzs
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.33.patch b/sys-fs/lvm2/files/lvm.conf-2.02.33.patch
new file mode 100644
index 000000000000..459da5e3960b
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm.conf-2.02.33.patch
@@ -0,0 +1,89 @@
+diff -Nuar --exclude '*.rej' --exclude '*.orig' /dev/shm/portage/sys-fs/lvm2-2.02.33/work/LVM2.2.02.33.orig/doc/example.conf /dev/shm/portage/sys-fs/lvm2-2.02.33/work/LVM2.2.02.33/doc/example.conf
+--- /dev/shm/portage/sys-fs/lvm2-2.02.33/work/LVM2.2.02.33.orig/doc/example.conf	2008-01-09 07:32:19.000000000 -0800
++++ /dev/shm/portage/sys-fs/lvm2-2.02.33/work/LVM2.2.02.33/doc/example.conf	2008-02-06 17:39:20.439958042 -0800
+@@ -49,7 +49,9 @@
+ 
+ 
+     # By default we accept every block device:
+-    filter = [ "a/.*/" ]
++    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
++    # noise when you probed while not available.
++    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
+ 
+     # Exclude the cdrom drive
+     # filter = [ "r|/dev/cdrom|" ]
+@@ -85,7 +87,7 @@
+     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
+     # the block devices it believes are valid.
+     # 1 enables; 0 disables.
+-    sysfs_scan = 1	
++    sysfs_scan = 1
+ 
+     # By default, LVM2 will ignore devices used as components of
+     # software RAID (md) devices by looking for md superblocks.
+@@ -218,12 +220,14 @@
+     # e.g. vgscan.lvm1 and they will stop working after you start using
+     # the new lvm2 on-disk metadata format.
+     # The default value is set when the tools are built.
+-    # fallback_to_lvm1 = 0
++    # Gentoo: the LVM tools are a seperate package.
++    fallback_to_lvm1 = 0
+ 
+     # The default metadata format that commands should use - "lvm1" or "lvm2".
+     # The command line override is -M1 or -M2.
+     # Defaults to "lvm1" if compiled in, else "lvm2".
+-    # format = "lvm1"
++    # Gentoo: default to LVM2 format
++    format = "lvm2"
+ 
+     # Location of proc filesystem
+     proc = "/proc"
+@@ -350,12 +354,12 @@
+ 
+ # Metadata settings
+ #
+-# metadata {
++metadata {
+     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
+     # You might want to override it from the command line with 0 
+     # when running pvcreate on new PVs which are to be added to large VGs.
+-
+-    # pvmetadatacopies = 1
++    # Gentoo: enabled for data safety
++    pvmetadatacopies = 2
+ 
+     # Approximate default size of on-disk metadata areas in sectors.
+     # You should increase this if you have large volume groups or
+@@ -377,11 +381,11 @@
+     # the supplied toolset to make changes (e.g. vgcfgrestore).
+ 
+     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
+-#}
++}
+ 
+ # Event daemon
+-#
+-# dmeventd {
++# Gentoo: uncommented, since we provide the dmeventd init script
++dmeventd {
+     # mirror_library is the library used when monitoring a mirror device.
+     #
+     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
+@@ -389,7 +393,7 @@
+     # reconfigures a mirror as necessary. If no mirror library is
+     # provided, mirrors are not monitored through dmeventd.
+ 
+-    # mirror_library = "libdevmapper-event-lvm2mirror.so"
++    mirror_library = "libdevmapper-event-lvm2mirror.so"
+ 
+     # snapshot_library is the library used when monitoring a snapshot device.
+     #
+@@ -398,6 +402,6 @@
+     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
+     # 95% of the snapshot are filled.
+ 
+-    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+-#}
++    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
++}
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.33.ebuild b/sys-fs/lvm2/lvm2-2.02.33.ebuild
new file mode 100644
index 000000000000..aee3b123400d
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.33.ebuild
@@ -0,0 +1,140 @@
+# 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.33.ebuild,v 1.1 2008/02/07 02:01:49 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.22-r5
+		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}
+	epatch "${FILESDIR}"/lvm.conf-2.02.33.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!
+		local clvmd="none"
+		use cman && clvmd="cman"
+		use gulm && clvmd="${clvmd}gulm"
+		clvmd="${clvmd/cmangulm/all}"
+		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} || 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.28-r5 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"
+}