Rewrite new init.d script that lacks proc checking bugs #368765 by Samuel BAUER.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 115 insertions, 12 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index 09ae010065b1..7e37f27820eb 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/multipath-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.35 2010/11/28 21:34:59 radhermit Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.36 2011/06/03 21:35:00 vapier Exp $
+
+*multipath-tools-0.4.9-r2 (03 Jun 2011)
+
+  03 Jun 2011; Mike Frysinger <vapier@gentoo.org>
+  +multipath-tools-0.4.9-r2.ebuild, +files/multipath.rc:
+  Rewrite new init.d script that lacks proc checking bugs #368765 by Samuel
+  BAUER.
 
 *multipath-tools-0.4.9-r1 (28 Nov 2010)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 658f1b5dae01..d4cc2748fcab 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX init.d-multipath 676 RMD160 88fc59447975de5728499c9946b63c1f17f7d345 SHA1 27997c9285ebddebcfbdf2425a0b5e73aa1c4f7c SHA256 3555b42a7da9cc8d976b51a8371ba00bdd04f9ed855cf740080a8ce620ca23af
 AUX init.d-multipath-0.4.8-r1 990 RMD160 7ae4a8decafaa6fe226a37b658e7e88a9be04aea SHA1 4af4d8242116835eeb4627eb10087b3e1b3eb3e2 SHA256 4b6e4d09828c58fbe7394c33d7950a54ecd2ae48064594e2117516367119f677
@@ -14,6 +14,7 @@ AUX multipath-tools-0.4.8-socket-cve-2009-0115.patch 848 RMD160 4e4298b87c60546b
 AUX multipath-tools-0.4.8-udev-scsi_id-changes.patch 4125 RMD160 e7f6feca014bf462c0580caabedc73152e423e3c SHA1 bd8b5f30b0cbda8a3d15b3a2383812d58a5d7ced SHA256 dca166caf506ea496f7cb883a98d1b5b1c77f5a91afa343e1ddc27d2a89ef0e3
 AUX multipath-tools-0.4.9-buffer-overflows.patch 993 RMD160 095c502f5df6bc11d933a73c4b01e22ec039b5b5 SHA1 713c5238c0953ea52c2577357eb4928c5f574ff0 SHA256 1f9ca1d26fee69dc7d5c1b65a835d23e1b8dd8de6fd3678faf3e7b499611d15d
 AUX multipath-tools-0.4.9-build.patch 4883 RMD160 0355cc7b6056404947b4ff8af3e287aa6259a9a2 SHA1 8e985a34a2d96d66c49a5fd56735f0d38e2fb18c SHA256 b543d2e012b0baedf959e4ccb097d8299bd721a5f543c82f2be01728fa2851a2
+AUX multipath.rc 622 RMD160 8c0ac06f0d6cf18dfe499487120a7e963bc82444 SHA1 54eb3e4f1aaefe7e5b32a78d7f97cecdc6b1996e SHA256 9b68396afda8114610058d456318dc201a4d8799fb1d0504538e34966a7fd3d8
 AUX rc-multipathd 517 RMD160 9963ca90fa08c6631b7768df7fb99414de53343d SHA1 a2c7c8c8836360ca208bfa82c406419c16045be2 SHA256 d96e3d7ca1edbbbc92f1336d4c340f1b516e71c49c85e990e3f4063c1b5db241
 DIST multipath-tools-0.4.7.tar.bz2 139312 RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d SHA1 c78e53ec5934180e37f376348d5ef5db790f3689 SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7
 DIST multipath-tools-0.4.8.tar.bz2 160706 RMD160 18a6f2c8180516c67bc7c634133218213cfa7dfc SHA1 aadc7c7ed072c3df2e32c64a2ab1ba7fac850d7a SHA256 b76d93d244f51e328969203366939d4336c89bd572e275d6a0d50d0bc8b4cd23
@@ -23,16 +24,13 @@ EBUILD multipath-tools-0.4.7-r2.ebuild 1666 RMD160 cb1022eff5a6e32af02f73ee07de3
 EBUILD multipath-tools-0.4.8-r1.ebuild 2795 RMD160 38a031eab8dc1658ac501dc3aa3f1b939cc8ef58 SHA1 2b18593509ee8fc1fddd33fe30f17cb41ce447f1 SHA256 19eb94e7c57e5c218ee19c9fab169d314abb4785384f3a4c5d1c8ab1014adbba
 EBUILD multipath-tools-0.4.8.ebuild 2353 RMD160 3d9fa33afadf53d9ae77caadecdbf4bdaca5cae8 SHA1 457961dddf7f3312bb71c6d237b23294f6b19c1b SHA256 b72c469e490c78138c0b1d147b19dfa8679a3746bb3bf984673c3ebeda421793
 EBUILD multipath-tools-0.4.9-r1.ebuild 2473 RMD160 7b740052d0177dec1dd19c9d15bc7c19587bfac4 SHA1 d293b7dfdba772d3651d9abe77b5d75079b1d4ff SHA256 ceefb99fe8fb4e6f35319215d971284b3f2e4de2b29bf4df2b7d8a11d76b29c8
-MISC ChangeLog 6680 RMD160 8b62262817c493fe9a210f67661af2af2fa47f5c SHA1 ae124bb913f1b1206e283d44121d2392bc4a5035 SHA256 8a2c57da212b88a26f72dc6010fe7a90acc7701e9d45b844480ba71d6545efbc
+EBUILD multipath-tools-0.4.9-r2.ebuild 1999 RMD160 0f08f9cdd8958d5c7a9a04bfdf75478ef5aac116 SHA1 755ae443ab540e9c70102b9c5ec3b1f5dc4f468b SHA256 6015ce4be0439d90d5603e26453706b3c44abdccc85a01c9ccc1ab2f34a8bc67
+MISC ChangeLog 6911 RMD160 cf7d8e55bce72f126a553f2165729b9e0a8ebc89 SHA1 93fd0f4a44bb8d2760b8ee0ad06a06fcee315cbd SHA256 364f06dab11f2d35142da620184ca2877eb617d5e865ec5d527b0eab676817ab
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM8ssMAAoJEEqz6FtPBkyjDowH/ir3yw7ydBZQvx8gawZgB7ak
-jCpraNlGBghrCYoTmTNa03X5jxQKTW05OMytrrBkJPvI3QMez/2s+CNl8ATg6QtH
-0VhTmVaM6gmrAQdJkPkOExc0Il2+UB5lqsIs8UU5scPrXuuUZew/wKpLc8Xg0NR3
-3KommtBg12+tH87wBT04/j29AGYpUyeX1asPfgdo18pLgr7WG3VNUeArpTJ7S8h3
-R/iGWOUy9a1X34sN2W9TDaymi0/LGIJTOFaMr4mJOSwJpNPOR2T4KOXQ9vFjlVEy
-7M6tlnL0ugdFXkIn434zNJ4RgC5GiZkvDRdG/rKa+yjK24hWosYoZaSViNDqnmI=
-=LgK6
+iF4EAREIAAYFAk3pU4oACgkQaC/OocHi7JaXbQD8DsrrE/cO5hNrgWfsE3Dd43e1
+YmPdhyRDSP6m6wsORtQA/3wfxg1zwSzshwuX2Wk8HBBKw4C4lAwqZI0s9tVWo7Zo
+=PebS
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/multipath.rc b/sys-fs/multipath-tools/files/multipath.rc
new file mode 100755
index 000000000000..dab686e52c16
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath.rc
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/files/multipath.rc,v 1.1 2011/06/03 21:34:59 vapier Exp $
+
+depend() {
+	before checkfs fsck multipathd lvm
+	after modules device-mapper
+}
+
+start() {
+	if ! grep -qs device-mapper /proc/devices /proc/misc ; then
+		[ -e /proc/modules ] && modprobe -q dm-mod
+	fi
+
+	ebegin "Activating Multipath devices"
+	multipath -v0 >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down Multipath devices"
+	multipath -v0 -F >/dev/null
+	eend $?
+}
+
+# vim:ts=4
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild
new file mode 100644
index 000000000000..5408e25e2cdf
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild,v 1.1 2011/06/03 21:35:00 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.19-r1
+	)
+	>=sys-fs/udev-124
+	sys-fs/sysfsutils
+	dev-libs/libaio
+	!<sys-apps/baselayout-2"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	 epatch "${FILESDIR}"/${PN}-0.4.9-build.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man8
+	emake DESTDIR="${D}" install || die
+
+	insinto /etc
+	newins "${S}"/multipath.conf.annotated multipath.conf
+	fperms 644 /etc/udev/rules.d/65-multipath.rules
+	fperms 644 /etc/udev/rules.d/66-kpartx.rules
+	newinitd "${FILESDIR}"/rc-multipathd multipathd || die
+	newinitd "${FILESDIR}"/multipath.rc multipath || die
+
+	dodoc multipath.conf.* AUTHOR ChangeLog FAQ README TODO
+	docinto kpartx
+	dodoc kpartx/ChangeLog kpartx/README
+}
+
+pkg_preinst() {
+	# The dev.d script was previously wrong and is now removed (the udev rules
+	# file does the job instead), but it won't be removed from live systems due
+	# to cfgprotect.
+	# This should help out a little...
+	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
+		mkdir -p "${D}"/etc/dev.d/block
+		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/65-multipath.rules" \
+			> "${D}"/etc/dev.d/block/multipath.dev
+	fi
+}
+
+pkg_postinst() {
+	elog "If you need multipath on your system, you must"
+	elog "add 'multipath' into your boot runlevel!"
+}