diff options
| -rw-r--r-- | sys-fs/lvm2/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-fs/lvm2/Manifest | 10 | ||||
| -rw-r--r-- | sys-fs/lvm2/files/digest-lvm2-2.02.04-r1 | 1 | ||||
| -rw-r--r-- | sys-fs/lvm2/files/lvm2-2.01.14-static.patch | 30 | ||||
| -rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.04-vgid.patch | 72 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.02-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.04-r1.ebuild | 107 |
7 files changed, 226 insertions, 8 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 7028882293b0..7e46ec95eaee 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-fs/lvm2 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.61 2006/04/21 14:56:30 rocket Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.62 2006/04/21 18:14:57 rocket Exp $ + +*lvm2-2.02.04-r1 (21 Apr 2006) + + 21 Apr 2006; Eric Edgar <rocket@gentoo.org> + +files/lvm2-2.01.14-static.patch, +files/lvm2-2.02.04-vgid.patch, + +lvm2-2.02.04-r1.ebuild: + lvm2-2.02.04 with vgid termination patch to fix bug# 130626. Patch obtained + from upstream cvs. Will be included in lvm2-2.02.05 Replace missing + lvm2-2.01.14-static patch 21 Apr 2006; Eric Edgar <rocket@gentoo.org> -lvm2-2.02.03.ebuild, -lvm2-2.02.04.ebuild: diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index a6e27fa5b124..6bee44687344 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,13 +1,14 @@ -MD5 a61fe137589723ac69e81a71126bbfb4 ChangeLog 9941 +MD5 e4eb5fd032c5849e264099ebc49ca3c1 ChangeLog 10173 MD5 26327d6617337f8db55913f03d87d19a files/clvmd.rc 3667 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09-r1 61 MD5 d1e295db9aa6771cdc6506033bc98f69 files/digest-lvm2-2.01.13 61 MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14-r1 61 MD5 5ae9ef0569741a9c0e43621ca61cc270 files/digest-lvm2-2.02.02-r1 61 -MD5 75bc19619bdb87793f11cf26faaaf7a6 files/digest-lvm2-2.02.03 61 -MD5 48c308553f535bb57a58ecef7f0548c5 files/digest-lvm2-2.02.04 61 +MD5 48c308553f535bb57a58ecef7f0548c5 files/digest-lvm2-2.02.04-r1 61 +MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14-static.patch 1034 MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14.patch 1034 +MD5 330a2eaf6e782fcc230e9a5003432076 files/lvm2-2.02.04-vgid.patch 2304 MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990 MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940 MD5 03b3cb1f6d49f4b6fe96c6ad3a9c47f0 lvm2-2.01.09-r1.ebuild 1399 @@ -15,6 +16,5 @@ MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277 MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402 MD5 68ce8d0c58bc2d71ff72354b5299f359 lvm2-2.01.14-r1.ebuild 1586 MD5 1d06d2c5ebd0856003cbd46286c34aa4 lvm2-2.02.02-r1.ebuild 2976 -MD5 c9f500898e2adeac30a43963c8d79100 lvm2-2.02.03.ebuild 2974 -MD5 9810844cb60c8ccadebba9cdb8c4c593 lvm2-2.02.04.ebuild 2972 +MD5 c769e73da799849956373911ab869e7e lvm2-2.02.04-r1.ebuild 3082 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250 diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.04-r1 b/sys-fs/lvm2/files/digest-lvm2-2.02.04-r1 new file mode 100644 index 000000000000..8a8c57a1a014 --- /dev/null +++ b/sys-fs/lvm2/files/digest-lvm2-2.02.04-r1 @@ -0,0 +1 @@ +MD5 954c41c42d3cfa50f12562f197bdd1a0 LVM2.2.02.04.tgz 473585 diff --git a/sys-fs/lvm2/files/lvm2-2.01.14-static.patch b/sys-fs/lvm2/files/lvm2-2.01.14-static.patch new file mode 100644 index 000000000000..049d5e8fcc39 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.01.14-static.patch @@ -0,0 +1,30 @@ +Index: LVM2.2.01.14/lib/mm/pool-fast.c +=================================================================== +--- LVM2.2.01.14.orig/lib/mm/pool-fast.c ++++ LVM2.2.01.14/lib/mm/pool-fast.c +@@ -30,8 +30,8 @@ struct pool { + unsigned object_alignment; + }; + +-void _align_chunk(struct chunk *c, unsigned alignment); +-struct chunk *_new_chunk(struct pool *p, size_t s); ++static void _align_chunk(struct chunk *c, unsigned alignment); ++static struct chunk *_new_chunk(struct pool *p, size_t s); + + /* by default things come out aligned for doubles */ + #define DEFAULT_ALIGNMENT __alignof__ (double) +@@ -204,12 +204,12 @@ void pool_abandon_object(struct pool *p) + p->object_alignment = DEFAULT_ALIGNMENT; + } + +-void _align_chunk(struct chunk *c, unsigned alignment) ++static void _align_chunk(struct chunk *c, unsigned alignment) + { + c->begin += alignment - ((unsigned long) c->begin & (alignment - 1)); + } + +-struct chunk *_new_chunk(struct pool *p, size_t s) ++static struct chunk *_new_chunk(struct pool *p, size_t s) + { + struct chunk *c; + diff --git a/sys-fs/lvm2/files/lvm2-2.02.04-vgid.patch b/sys-fs/lvm2/files/lvm2-2.02.04-vgid.patch new file mode 100644 index 000000000000..61e053c182a4 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.02.04-vgid.patch @@ -0,0 +1,72 @@ +diff -urN LVM2.2.02.04/lib/cache/lvmcache.c LVM2_nocvs/lib/cache/lvmcache.c +--- LVM2.2.02.04/lib/cache/lvmcache.c 2006-04-13 16:08:29.000000000 -0500 ++++ LVM2_nocvs/lib/cache/lvmcache.c 2006-04-21 12:53:48.978501224 -0500 +@@ -99,7 +99,7 @@ + + if (vgid) + do +- if (!strncmp(vgid, vginfo->vgid, sizeof(vginfo->vgid))) ++ if (!strncmp(vgid, vginfo->vgid, ID_LEN)) + return vginfo; + while ((vginfo = vginfo->next)); + +@@ -139,7 +139,7 @@ + + /* If vginfo changed, caller needs to rescan */ + if (!(vginfo = vginfo_from_vgname(vgname, vgid_found)) || +- strncmp(vginfo->vgid, vgid_found, sizeof(vgid_found))) ++ strncmp(vginfo->vgid, vgid_found, ID_LEN)) + return NULL; + + return vginfo->fmt; +@@ -413,8 +413,8 @@ + + static int _lvmcache_update_vgid(struct lvmcache_info *info, const char *vgid) + { +- if (!vgid || !info->vginfo || !strncmp(info->vginfo->vgid, vgid, +- sizeof(info->vginfo->vgid))) ++ if (!vgid || !info->vginfo || ++ !strncmp(info->vginfo->vgid, vgid, ID_LEN)) + return 1; + + if (info->vginfo && *info->vginfo->vgid) +@@ -424,8 +424,8 @@ + return 1; + } + +- strncpy(info->vginfo->vgid, vgid, sizeof(info->vginfo->vgid)); +- info->vginfo->vgid[sizeof(info->vginfo->vgid) - 1] = '\0'; ++ strncpy(info->vginfo->vgid, vgid, ID_LEN); ++ info->vginfo->vgid[ID_LEN] = '\0'; + if (!dm_hash_insert(_vgid_hash, info->vginfo->vgid, info->vginfo)) { + log_error("_lvmcache_update: vgid hash insertion failed: %s", + info->vginfo->vgid); +diff -urN LVM2.2.02.04/lib/format_text/format-text.c LVM2_nocvs/lib/format_text/format-text.c +--- LVM2.2.02.04/lib/format_text/format-text.c 2006-04-19 10:33:06.000000000 -0500 ++++ LVM2_nocvs/lib/format_text/format-text.c 2006-04-21 12:53:49.129478272 -0500 +@@ -884,6 +884,7 @@ + const char *vgname = NULL; + unsigned int len = 0; + char buf[NAME_LEN + 1]; ++ char uuid[64]; + + if (!dev_open(dev_area->dev)) { + stack; +@@ -939,10 +940,16 @@ + goto out; + } + ++ if (!id_write_format(vgid, uuid, sizeof(uuid))) { ++ stack; ++ vgname = NULL; ++ goto out; ++ } ++ + log_debug("%s: Found metadata at %" PRIu64 " size %" PRIu64 + " for %s (%s)", + dev_name(dev_area->dev), dev_area->start + rlocn->offset, +- rlocn->size, vgname, vgid->uuid); ++ rlocn->size, vgname, uuid); + + out: + if (!dev_close(dev_area->dev)) diff --git a/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild index b1d4a4444313..eee22568fcfb 100644 --- a/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild,v 1.2 2006/04/20 20:06:47 rocket Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.02-r1.ebuild,v 1.3 2006/04/21 18:14:57 rocket Exp $ DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." HOMEPAGE="http://sources.redhat.com/lvm2/" @@ -95,7 +95,6 @@ src_install() { ewarn "" ewarn "use flags clvm,cman and gulm are masked" ewarn "by default and need to be unmasked to use them" - ewarn "" ewarn "Rebuild your genkernel initramfs if you are using lvm" } diff --git a/sys-fs/lvm2/lvm2-2.02.04-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.04-r1.ebuild new file mode 100644 index 000000000000..461ea242e062 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.04-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.04-r1.ebuild,v 1.1 2006/04/21 18:14:57 rocket Exp $ + +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 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="readline nolvmstatic clvm cman gulm nolvm1 nosnapshots nomirrors selinux" + +DEPEND=">=sys-fs/device-mapper-1.02.03 + 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}" + +inherit eutils +src_unpack() { + unpack ${A} + cd ${S} || die + epatch ${FILESDIR}/lvm2-2.02.04-vgid.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 + + if ! use nolvmstatic + then + myconf="${myconf} --enable-static_link" + use nosnapshots || myconf="${myconf} --with-snapshots=internal" + use nomirrors || myconf="${myconf} --with-mirrors=internal" + if use nolvm1 + then + myconf="${myconf} --with-lvm1=none" + else + myconf="${myconf} --with-lvm1=internal" + fi + else + use nosnapshots || myconf="${myconf} --with-snapshots=shared" + use nomirrors || myconf="${myconf} --with-mirrors=shared" + if use nolvm1 + then + myconf="${myconf} --with-lvm1=none" + else + myconf="${myconf} --with-lvm1=shared" + fi + fi + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + use hppa && myconf="${myconf} --disable-o_direct" + + if use clvm; then + if use nolvmstatic + then + myconf="${myconf} --with-cluster=shared" + else + myconf="${myconf} --with-cluster=internal" + fi + if useq cman && useq gulm; then + myconf="${myconf} --with-clvmd=all" + fi + if useq cman && ! useq gulm; then + myconf="${myconf} --with-clvmd=cman" + fi + if useq gulm && ! useq cman; then + myconf="${myconf} --with-clvmd=gulm" + fi + if ! useq gulm && ! useq cman; then + myconf="${myconf} --with-clvmd=none" + fi + fi + + econf $(use_enable readline) $(use_enable selinux) ${myconf} || die + emake || die "compile problem" +} + +src_install() { + einstall sbindir="${D}/sbin" staticdir="${D}/sbin" confdir="${D}/etc/lvm" + mv -f "${D}/sbin/lvm.static" "${D}/sbin/lvm" + + dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt} + insinto /lib/rcscripts/addons + newins ${FILESDIR}/lvm2-start.sh lvm-start.sh || die + newins ${FILESDIR}/lvm2-stop.sh lvm-stop.sh || die + if use clvm; then + newinitd ${FILESDIR}/clvmd.rc clvmd || die + fi + + ewarn "use flag nocman is deprecated and replaced" + ewarn "with cman and gulm use flags." + ewarn "" + ewarn "use flags clvm,cman and gulm are masked" + ewarn "by default and need to be unmasked to use them" + ewarn "" + ewarn "Rebuild your genkernel initramfs if you are using lvm" +} |