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

(Portage version: 2.1.2_rc1)

4 files changed, 69 insertions, 3 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/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
 }