Version bump with security fix #68406.

8 files changed, 43 insertions, 71 deletions

diff --git a/sys-fs/lvm-user/ChangeLog b/sys-fs/lvm-user/ChangeLog
index 25c1735baa06..1f233fbb91d2 100644
--- a/sys-fs/lvm-user/ChangeLog
+++ b/sys-fs/lvm-user/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/lvm-user
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.6 2004/06/24 22:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.7 2004/11/10 05:57:03 vapier Exp $
+
+*lvm-user-1.0.7-r2 (10 Nov 2004)
+
+  10 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/lvm-user-1.0.7-statics.diff, +files/lvm-user-1.0.7-statics.patch,
+  +files/lvm-user-1.0.7-tmpfile.patch, -lvm-user-1.0.7-r1.ebuild,
+  +lvm-user-1.0.7-r2.ebuild, -lvm-user-1.0.7.ebuild:
+  Version bump with security fix #68406.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lvm-user-1.0.7-r1.ebuild:
   Add inherit eutils
diff --git a/sys-fs/lvm-user/Manifest b/sys-fs/lvm-user/Manifest
index f37faed66936..a9c6071e8c70 100644
--- a/sys-fs/lvm-user/Manifest
+++ b/sys-fs/lvm-user/Manifest
@@ -1,7 +1,6 @@
-MD5 835ffbbfb0ddd5bef64a1f651aec397f ChangeLog 4456
-MD5 340fc0882277938e469ba3417c62b972 lvm-user-1.0.7-r1.ebuild 1672
-MD5 b281cb689f2b79965365a5a824e4a3c1 lvm-user-1.0.7.ebuild 1285
+MD5 250022cc4ace02039e8148d8e40b6794 ChangeLog 4774
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7 61
-MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r1 61
-MD5 7484cb0ecb2a997be4910a8612e951cf files/lvm-user-1.0.7-statics.diff 1040
+MD5 7f92c5ec2f170256735409be93e67918 lvm-user-1.0.7-r2.ebuild 1701
+MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r2 61
+MD5 5a13a84be2257b542d2ff7dce74e3af7 files/lvm-user-1.0.7-tmpfile.patch 554
+MD5 7484cb0ecb2a997be4910a8612e951cf files/lvm-user-1.0.7-statics.patch 1040
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1
deleted file mode 100644
index b22fd4463c8c..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de56e9ab0384596b795702802f1c1e6a lvm_1.0.7.tar.gz 372838
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.7 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r2
index b22fd4463c8c..b22fd4463c8c 100644
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.7
+++ b/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r2
diff --git a/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.diff b/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.patch
index 1ec0e112f79b..1ec0e112f79b 100644
--- a/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.diff
+++ b/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.patch
diff --git a/sys-fs/lvm-user/files/lvm-user-1.0.7-tmpfile.patch b/sys-fs/lvm-user/files/lvm-user-1.0.7-tmpfile.patch
new file mode 100644
index 000000000000..6198d3758638
--- /dev/null
+++ b/sys-fs/lvm-user/files/lvm-user-1.0.7-tmpfile.patch
@@ -0,0 +1,14 @@
+diff -ur LVM.orig/1.0.8/tools/lvmcreate_initrd LVM/1.0.8/tools/lvmcreate_initrd
+--- LVM.orig/1.0.8/tools/lvmcreate_initrd	2003-11-17 16:58:56.000000000 +0100
++++ LVM/1.0.8/tools/lvmcreate_initrd	2004-09-13 12:07:23.000000000 +0200
+@@ -233,6 +233,10 @@
+ # run out of room on the ramdisk while stripping the libraries.
+ echo "$cmd -- stripping shared libraries"
+ mkdir $TMPLIB
++if [ $? -ne 0 ]; then
++   echo "$cmd -- ERROR making $TMPLIB"
++   cleanup 1
++fi
+ for LIB in $SHLIBS; do
+    verbose "copy $LIB to $TMPLIB$LIB"
+    mkdir -p `dirname $TMPLIB$LIB`
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7-r2.ebuild
index deef2061055a..3b9d67e11123 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7-r2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 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.7-r1.ebuild,v 1.8 2004/11/09 22:30:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r2.ebuild,v 1.1 2004/11/10 05:57:04 vapier Exp $
 
 inherit flag-o-matic eutils
 
-S=${WORKDIR}/LVM/${PV}
 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="~x86 -ppc ~sparc alpha ~hppa ~amd64"
+KEYWORDS="alpha amd64 hppa -ppc sparc x86"
 IUSE="static"
 
 RDEPEND="!sys-fs/lvm2"
@@ -19,26 +18,34 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0
 	virtual/linux-sources"
 
+S=${WORKDIR}/LVM/${PV}
+
 pkg_setup() {
 	check_KV
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-tmpfile.patch
+}
+
 src_compile() {
 	local myconf
 
-	# bug 598 -- -pipe used by default
-	filter-flags "-fomit-frame-pointer -pipe"
+	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.diff
+		epatch ${FILESDIR}/lvm-user-1.0.7-statics.patch
 	fi
 
 	./configure --prefix=/ \
 		--mandir=/usr/share/man \
-		--with-kernel_dir="/usr/src/linux" ${myconf} || die "configure failed"
+		--with-kernel_dir="/usr/src/linux" \
+		${myconf} || die "configure failed"
 
 	# Fix flags
 	sed -i -e "54,56d" -e "73d" make.tmpl
@@ -47,7 +54,6 @@ src_compile() {
 }
 
 src_install() {
-
 	einstall sbindir=${D}/sbin libdir=${D}/lib
 
 	if use static; then
@@ -64,5 +70,5 @@ src_install() {
 	dodir /usr/lib
 	mv ${D}/lib/*.a ${D}/usr/lib
 
-	dodoc ABSTRACT CONTRIBUTORS COPYING* INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
+	dodoc ABSTRACT CONTRIBUTORS INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
 }
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
deleted file mode 100644
index a49237d6d068..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 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.7.ebuild,v 1.7 2004/11/09 22:30:51 mr_bones_ Exp $
-
-inherit flag-o-matic
-
-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="x86 -ppc sparc hppa amd64"
-IUSE="static"
-
-RDEPEND="!sys-fs/lvm2"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0
-	virtual/linux-sources"
-
-S=${WORKDIR}/LVM/${PV}
-
-pkg_setup() {
-	check_KV
-}
-
-src_compile() {
-	local myconf
-
-	# bug 598 -- -pipe used by default
-	filter-flags "-fomit-frame-pointer -pipe"
-
-	use static && myconf="--enable-static_link"
-
-	./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
-
-	make || die "Make failed"
-}
-
-src_install() {
-
-	einstall sbindir=${D}/sbin libdir=${D}/lib
-
-	# no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	dodoc ABSTRACT CONTRIBUTORS COPYING* INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
-}