Fix bash code flow error in dm-start.sh, bug #153678

Package-Manager: portage-2.1.2_rc1

5 files changed, 84 insertions, 11 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 2ef118810f36..19d02a63c8eb 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.50 2006/10/30 02:01:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.51 2006/11/01 19:02:56 dsd Exp $
+
+*device-mapper-1.02.10-r1 (01 Nov 2006)
+
+  01 Nov 2006; Daniel Drake <dsd@gentoo.org> files/dm-start.sh,
+  +device-mapper-1.02.10-r1.ebuild:
+  Fix bash code flow error in dm-start.sh, bug #153678
 
   30 Oct 2006; Jason Wever <weeve@gentoo.org> device-mapper-1.02.10.ebuild:
   Stable on SPARC wrt bug #153169.
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 7e9ac08c261d..6f0a9e9859fd 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -1,7 +1,7 @@
-AUX dm-start.sh 1935 RMD160 958d82be017334926cb2b50444d03c70102e7431 SHA1 9fe65408dff552f6bd4e9985e6de4d56beb9e175 SHA256 8517fe91386350b236d6fc6fa1c69f4f5076a8a6c251a0d7c34fe16d08180dfa
-MD5 ab82e97df1e8ce801b65daa33c8cbfb0 files/dm-start.sh 1935
-RMD160 958d82be017334926cb2b50444d03c70102e7431 files/dm-start.sh 1935
-SHA256 8517fe91386350b236d6fc6fa1c69f4f5076a8a6c251a0d7c34fe16d08180dfa files/dm-start.sh 1935
+AUX dm-start.sh 2214 RMD160 a9b6f6d7994dd82a51f312c2a5a61805ead21f60 SHA1 0cc253da82c68b3568f3ff438fed608f0e326cdb SHA256 a15e4f6a63bb757d9d7bc2fc9f6196f7b96b1d351b1c23cb2fa64721f1138e3b
+MD5 3122f5bc84f85bede0a21f4d5290f6b0 files/dm-start.sh 2214
+RMD160 a9b6f6d7994dd82a51f312c2a5a61805ead21f60 files/dm-start.sh 2214
+SHA256 a15e4f6a63bb757d9d7bc2fc9f6196f7b96b1d351b1c23cb2fa64721f1138e3b files/dm-start.sh 2214
 AUX dmtab 426 RMD160 59b4a51881ec14c393f1a043d39732246854173e SHA1 042a5e3c539dd17f30718f6b60635a6c1fa4ddaa SHA256 a7d5976c780b23193ec78146e4ed12e0cd0deca853ee0198baa4eeaf2cdc53f2
 MD5 aaf96e8a4fd3711078f75fe3fac2072b files/dmtab 426
 RMD160 59b4a51881ec14c393f1a043d39732246854173e files/dmtab 426
@@ -12,14 +12,18 @@ EBUILD device-mapper-1.02.07.ebuild 1363 RMD160 637d967cebea2562664ba5048998faa0
 MD5 c629d137cf564d5b62d41cdfa9e6a0ac device-mapper-1.02.07.ebuild 1363
 RMD160 637d967cebea2562664ba5048998faa0f624a6a6 device-mapper-1.02.07.ebuild 1363
 SHA256 8f3bc8ab716ec9ace62f42508f55cd6719873cd5d852792e13296e35fbc3cd28 device-mapper-1.02.07.ebuild 1363
+EBUILD device-mapper-1.02.10-r1.ebuild 1390 RMD160 acf3744362947ee5613355c102afdd6da5520d3b SHA1 06565562800a06b375cacbc0f394bc42bc1cce47 SHA256 20c4f53229548f76a75b55e3eef3f2011990a841d95dc863c668e17afea7da04
+MD5 1758bfa2efd710c24ee8cecb1bdd0c80 device-mapper-1.02.10-r1.ebuild 1390
+RMD160 acf3744362947ee5613355c102afdd6da5520d3b device-mapper-1.02.10-r1.ebuild 1390
+SHA256 20c4f53229548f76a75b55e3eef3f2011990a841d95dc863c668e17afea7da04 device-mapper-1.02.10-r1.ebuild 1390
 EBUILD device-mapper-1.02.10.ebuild 1381 RMD160 2867ba516622cbb6074b31e51ee32bfcce5685e7 SHA1 948ec5596cb7f9ef9765a12f16817221dd009333 SHA256 c0fdb10dd911892e4ae0a7206f9879cc10b30847a6258248d0b95ad4ebfca118
 MD5 b9621617bb8e601ce3941fe2a7ae615f device-mapper-1.02.10.ebuild 1381
 RMD160 2867ba516622cbb6074b31e51ee32bfcce5685e7 device-mapper-1.02.10.ebuild 1381
 SHA256 c0fdb10dd911892e4ae0a7206f9879cc10b30847a6258248d0b95ad4ebfca118 device-mapper-1.02.10.ebuild 1381
-MISC ChangeLog 10869 RMD160 78568a297a80ca631912f5abf5dac3ff2d261a5f SHA1 3155f4abb666f2aff50e998ca5dc599dda54860c SHA256 f2463dead066c2adb81be1180350dbc0e111e74735ff759c3a4e5c3a5d09a095
-MD5 75c1e17556fc62225c9316ff14d33ada ChangeLog 10869
-RMD160 78568a297a80ca631912f5abf5dac3ff2d261a5f ChangeLog 10869
-SHA256 f2463dead066c2adb81be1180350dbc0e111e74735ff759c3a4e5c3a5d09a095 ChangeLog 10869
+MISC ChangeLog 11064 RMD160 cb0fe9cf8fec8c49623e859bf0eb7e1a57d4c5c4 SHA1 754e48f08ecb92cc8abe32b2b583967358ac32bc SHA256 58be9784dec2a840fc400173b8dd7e22e2cf07de136d80a9e5da3a48cce29271
+MD5 461733253199938bc484a3601b7aa94a ChangeLog 11064
+RMD160 cb0fe9cf8fec8c49623e859bf0eb7e1a57d4c5c4 ChangeLog 11064
+SHA256 58be9784dec2a840fc400173b8dd7e22e2cf07de136d80a9e5da3a48cce29271 ChangeLog 11064
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -30,3 +34,6 @@ SHA256 7377f2db0b472402533aaa4b8e50c732da498636b4910dbd0e4a10808158fc8e files/di
 MD5 4ebbe48045ce51ef6b50300a3b594100 files/digest-device-mapper-1.02.10 256
 RMD160 41d610dd8204dea1c1ff3cae4367657394220dda files/digest-device-mapper-1.02.10 256
 SHA256 1062901d292fb8e50bfeb2d76479139fcb37f3116c1e29cd410eae0ca1ef5bb2 files/digest-device-mapper-1.02.10 256
+MD5 4ebbe48045ce51ef6b50300a3b594100 files/digest-device-mapper-1.02.10-r1 256
+RMD160 41d610dd8204dea1c1ff3cae4367657394220dda files/digest-device-mapper-1.02.10-r1 256
+SHA256 1062901d292fb8e50bfeb2d76479139fcb37f3116c1e29cd410eae0ca1ef5bb2 files/digest-device-mapper-1.02.10-r1 256
diff --git a/sys-fs/device-mapper/device-mapper-1.02.10-r1.ebuild b/sys-fs/device-mapper/device-mapper-1.02.10-r1.ebuild
new file mode 100644
index 000000000000..141daedcafcb
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.10-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.10-r1.ebuild,v 1.1 2006/11/01 19:02:56 dsd Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S=${WORKDIR}/${PN}.${PV}
+
+src_compile() {
+	econf --sbindir=/sbin $(use_enable selinux) || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	# move shared libs to /
+	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
+	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l=${ROOT}/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+}
diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.10-r1 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.10-r1
new file mode 100644
index 000000000000..ddfb9f576f0f
--- /dev/null
+++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.10-r1
@@ -0,0 +1,3 @@
+MD5 26f189bfc37c3fa786f36e47fb0a0ba5 device-mapper.1.02.10.tgz 926142
+RMD160 e3e74f7745d6da547272c597ee2b99e57cce2749 device-mapper.1.02.10.tgz 926142
+SHA256 6678bcd004272605ac8fddee3faf4278c2ca084d9ba2e166c6298d2323c7841a device-mapper.1.02.10.tgz 926142
diff --git a/sys-fs/device-mapper/files/dm-start.sh b/sys-fs/device-mapper/files/dm-start.sh
index 505bc67fac4d..01b056165d84 100644
--- a/sys-fs/device-mapper/files/dm-start.sh
+++ b/sys-fs/device-mapper/files/dm-start.sh
@@ -1,5 +1,5 @@
 # /lib/rcscripts/addons/dm-start.sh:  Setup DM volumes at boot
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/dm-start.sh,v 1.2 2005/05/20 03:54:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/dm-start.sh,v 1.3 2006/11/01 19:02:56 dsd Exp $
 
 # char **get_new_dm_volumes(void)
 #
@@ -30,12 +30,20 @@ dmvolume_exists() {
 	/sbin/dmsetup ls 2>/dev/null | \
 	while read line ; do
 		for x in ${line} ; do
-			[[ ${x} == "${volume}" ]] && return 0
+			# the following conditonal return only breaks out
+			# of the while loop, as it is running in a pipe.
+			[[ ${x} == "${volume}" ]] && return 1
 			# We only want to check the volume name
 			break
 		done
 	done
 
+	# if 1 was returned from the above loop, then indicate that
+	# volume exists
+	[[ $? == 1 ]] && return 0
+
+	# otherwise the loop exited normally and the volume does not
+	# exist
 	return 1
 }