Fix bug 99605

(Portage version: 2.0.51.22-r1)

5 files changed, 134 insertions, 2 deletions

diff --git a/sys-fs/lvm-user/ChangeLog b/sys-fs/lvm-user/ChangeLog
index b73b68c7dec3..11865a6fd400 100644
--- a/sys-fs/lvm-user/ChangeLog
+++ b/sys-fs/lvm-user/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm-user
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.11 2005/06/28 17:56:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.12 2005/07/20 14:10:16 rocket Exp $
+
+*lvm-user-1.0.8-r1 (20 Jul 2005)
+
+  20 Jul 2005; Eric Edgar <rocket@gentoo.org> +files/lvm-user-gcc-3.4.patch,
+  +lvm-user-1.0.8-r1.ebuild:
+  Fix bug 99605
 
 *lvm-user-1.0.8 (28 Jun 2005)
 
diff --git a/sys-fs/lvm-user/Manifest b/sys-fs/lvm-user/Manifest
index 46e428f1385c..2766b6e0ce44 100644
--- a/sys-fs/lvm-user/Manifest
+++ b/sys-fs/lvm-user/Manifest
@@ -2,8 +2,9 @@ MD5 2c0f0c295b886eff7a4fef23c4822669 lvm-user-1.0.7-r2.ebuild 1790
 MD5 6c4843e465bc701edfd2848bc61b9816 lvm-user-1.0.7-r3.ebuild 1923
 MD5 7b301d7420e1c916ab2c582cf98928ff metadata.xml 256
 MD5 af522a2bf30dd73356656143e3068b2f lvm-user-1.0.7-r4.ebuild 2063
-MD5 25df1db3f2ccd4d1f283c8e989c2e90c ChangeLog 5532
+MD5 cd80260fda5d618e55b497eae03b97f2 ChangeLog 5689
 MD5 92336fa695c6dca54cc10b46cd44bdef lvm-user-1.0.8.ebuild 2061
+MD5 56033b3adece9bc85235b5e318c268ad lvm-user-1.0.8-r1.ebuild 2142
 MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r2 61
 MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r3 61
 MD5 7484cb0ecb2a997be4910a8612e951cf files/lvm-user-1.0.7-statics.patch 1040
@@ -12,3 +13,5 @@ MD5 aba804ce68a3bbfe20f5312a3891958e files/lvm-user-start.sh 789
 MD5 79c525e785e11238d90c6a4f2d0283d5 files/lvm-user-stop.sh 440
 MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r4 61
 MD5 a8fa868a4e24685af74bec39b76e33a9 files/digest-lvm-user-1.0.8 61
+MD5 89c60d1ba90b7e04abb957c0fee57449 files/lvm-user-gcc-3.4.patch 1736
+MD5 a8fa868a4e24685af74bec39b76e33a9 files/digest-lvm-user-1.0.8-r1 61
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.8-r1 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.8-r1
new file mode 100644
index 000000000000..f30fe0b62190
--- /dev/null
+++ b/sys-fs/lvm-user/files/digest-lvm-user-1.0.8-r1
@@ -0,0 +1 @@
+MD5 f8520b9e100970ff13328fd08eb64dcd lvm_1.0.8.tar.gz 373482
diff --git a/sys-fs/lvm-user/files/lvm-user-gcc-3.4.patch b/sys-fs/lvm-user/files/lvm-user-gcc-3.4.patch
new file mode 100644
index 000000000000..767ae39babd1
--- /dev/null
+++ b/sys-fs/lvm-user/files/lvm-user-gcc-3.4.patch
@@ -0,0 +1,35 @@
+diff -Naur LVM.orig/1.0.7/tools/lib/pv_read_all_pv_of_vg.c LVM/1.0.7/tools/lib/pv_read_all_pv_of_vg.c
+--- LVM.orig/1.0.7/tools/lib/pv_read_all_pv_of_vg.c	2003-02-06 09:05:34.000000000 -0600
++++ LVM/1.0.7/tools/lib/pv_read_all_pv_of_vg.c	2005-07-19 19:21:52.000000000 -0500
+@@ -130,6 +130,7 @@
+             }
+             pv_this[p] = NULL;
+ uuid_check_end:
++		;
+          }
+          for ( pp = 0; pp < p - 2; pp++) {
+             if ( pv_this[pp] == NULL) {
+diff -Naur LVM.orig/1.0.7/tools/lib/pv_read_uuidlist.c LVM/1.0.7/tools/lib/pv_read_uuidlist.c
+--- LVM.orig/1.0.7/tools/lib/pv_read_uuidlist.c	2003-02-06 09:05:34.000000000 -0600
++++ LVM/1.0.7/tools/lib/pv_read_uuidlist.c	2005-07-19 19:21:02.000000000 -0500
+@@ -50,7 +50,7 @@
+    static char *this_pv_uuidlist = NULL;
+    int num;
+ 
+-   debug_enter(__FUNCTION__ " -- CALLED with %s\n", pv ? pv->pv_name : "NULL");
++   debug_enter(__FUNCTION__, " -- CALLED with %s\n", pv ? pv->pv_name : "NULL");
+ 
+    if (pv == NULL || pv_uuidlist == NULL)
+       return -LVM_EPARAM;
+diff -Naur LVM.orig/1.0.7/tools/lib/pv_write_uuidlist.c LVM/1.0.7/tools/lib/pv_write_uuidlist.c
+--- LVM.orig/1.0.7/tools/lib/pv_write_uuidlist.c	2003-02-06 09:05:34.000000000 -0600
++++ LVM/1.0.7/tools/lib/pv_write_uuidlist.c	2005-07-19 19:20:16.000000000 -0500
+@@ -71,7 +71,7 @@
+ 
+             /* Create/fix UUIDs for any PVs that need it */
+             if (lvm_check_uuid(pv->pv_uuid) < 0) {
+-               debug(__FUNCTION__ " -- creating new UUID for PV %s\n",
++               debug(__FUNCTION__, " -- creating new UUID for PV %s\n",
+                      pv->pv_name);
+                memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid));
+                memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN);
diff --git a/sys-fs/lvm-user/lvm-user-1.0.8-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..742eeab9c22e
--- /dev/null
+++ b/sys-fs/lvm-user/lvm-user-1.0.8-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.8-r1.ebuild,v 1.1 2005/07/20 14:10:16 rocket Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
+HOMEPAGE="http://www.sistina.com/products_lvm.htm"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
+
+LICENSE=" || ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa -ppc ~sparc ~x86"
+IUSE="static"
+
+RDEPEND="!sys-fs/lvm2"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0
+	!>=sys-kernel/linux-headers-2.6
+	virtual/linux-sources" # Use lvm2 for 2.6; lvm-user is for 2.4; see #90897.
+
+S=${WORKDIR}/LVM/${PV}
+
+pkg_setup() {
+	check_KV
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#epatch ${FILESDIR}/${P}-tmpfile.patch
+}
+
+src_compile() {
+	local myconf
+
+	filter-flags -fomit-frame-pointer #598
+
+	if use static; then
+		myconf="--enable-static_link"
+	else
+		# bug 29694 -- make static vgscan and vgchange for initrds
+		epatch ${FILESDIR}/lvm-user-1.0.7-statics.patch
+	fi
+
+	# bug 99605 -- Compile with gcc-3.4
+	epatch ${FILESDIR}/lvm-user-gcc-3.4.patch
+
+	./configure --prefix=/ \
+		--mandir=/usr/share/man \
+		--with-kernel_dir="/usr/src/linux" \
+		${myconf} || die "configure failed"
+
+	# Fix flags
+	sed -i -e "54,56d" -e "73d" make.tmpl
+
+	# Fix tail
+	# bug 27420 -- lvmcreate_initrd contains obsolete use of `tail -1'
+	sed -i -e 's/tail -1/tail -n 1/' tools/lvmcreate_initrd
+
+	make || die "Make failed"
+}
+
+src_install() {
+	einstall sbindir=${D}/sbin libdir=${D}/lib
+
+	if use static; then
+		# already static, make symlinks
+		dosym vgscan /sbin/vgscan.static
+		dosym vgchange /sbin/vgchange.static
+	else
+		# install vgscan.static and vgchange.static
+		into /
+		dosbin ${S}/tools/{vgscan,vgchange}.static
+	fi
+
+	# no need for a static library in /lib
+	dodir /usr/lib
+	mv ${D}/lib/*.a ${D}/usr/lib
+
+	dodoc ABSTRACT CONTRIBUTORS INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
+
+	insinto /lib/rcscripts/addons
+	newins ${FILESDIR}/lvm-user-start.sh lvm-start.sh
+	newins ${FILESDIR}/lvm-user-stop.sh lvm-stop.sh
+
+}