Revbump and remove old. Specify the library directory before the library name (fixes bug #346345 by Benjamin Schulz) and fix buffer overflows (bug #329049 by vapier).

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

6 files changed, 58 insertions, 105 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index 0c9668b35f2c..09ae010065b1 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,17 @@
 # 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.34 2010/10/28 06:28:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.35 2010/11/28 21:34:59 radhermit Exp $
+
+*multipath-tools-0.4.9-r1 (28 Nov 2010)
+
+  28 Nov 2010; Tim Harder <radhermit@gentoo.org>
+  -multipath-tools-0.4.8-r2.ebuild, -multipath-tools-0.4.9.ebuild,
+  +multipath-tools-0.4.9-r1.ebuild,
+  +files/multipath-tools-0.4.9-buffer-overflows.patch,
+  files/multipath-tools-0.4.9-build.patch:
+  Revbump and remove old. Specify the library directory before the library name
+  (fixes bug #346345 by Benjamin Schulz) and fix buffer overflows (bug #329049
+  by vapier).
 
 *multipath-tools-0.4.9 (28 Oct 2010)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a28f1a09e327..658f1b5dae01 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -12,7 +12,8 @@ AUX multipath-tools-0.4.8-kparted-ext-partitions.patch 1046 RMD160 57b30b9299aa9
 AUX multipath-tools-0.4.8-r1-kpartx.patch 7076 RMD160 a5933b1a143fb7817e991a4a26d096259d7da534 SHA1 a1c18e52e36ab700c4a51dfe6817e7720d630c66 SHA256 0de7a21f1be7eba1ff389203e24c64b28d59be645e752de56c06d00275e0b703
 AUX multipath-tools-0.4.8-socket-cve-2009-0115.patch 848 RMD160 4e4298b87c60546b0d9ffad54f2070f386e34625 SHA1 2dbc4afd69df4d5227d9090e00e5b7d041eb1ae9 SHA256 2ed8234f7d37fbc4cd77dcf77e71de3bdbcca2bef6726e1f1a99d46878ac3a04
 AUX multipath-tools-0.4.8-udev-scsi_id-changes.patch 4125 RMD160 e7f6feca014bf462c0580caabedc73152e423e3c SHA1 bd8b5f30b0cbda8a3d15b3a2383812d58a5d7ced SHA256 dca166caf506ea496f7cb883a98d1b5b1c77f5a91afa343e1ddc27d2a89ef0e3
-AUX multipath-tools-0.4.9-build.patch 4831 RMD160 210b582ebcfb4b13096ad3a3b3b0a90c1e68eb00 SHA1 48d620c839d2d985e9e0af5182d9258910ac06d4 SHA256 004678610d0468c6d7be7ac5238b1162d41bf0a6e4423932ba503786650e5448
+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 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
@@ -20,19 +21,18 @@ DIST multipath-tools-0.4.9.tar.bz2 169180 RMD160 54b178ad23cefceb6b42131bd7079c2
 EBUILD multipath-tools-0.4.7-r1.ebuild 1624 RMD160 d57ed47bf52f1943db5010bbd959097ad65c4d5c SHA1 66b461c473d26be477918eed3bb63be66e3893b5 SHA256 e9ce5c4681dfe45848ff222c36e5ec38fb01abfe3ef1120396820a07835fd59d
 EBUILD multipath-tools-0.4.7-r2.ebuild 1666 RMD160 cb1022eff5a6e32af02f73ee07de3b20482c978d SHA1 77f0adf406a16412679fc0b8258411466785c318 SHA256 c918d16867c229178ffdae654cd56566b29d19b53335ab40f73c13d20e7b7c83
 EBUILD multipath-tools-0.4.8-r1.ebuild 2795 RMD160 38a031eab8dc1658ac501dc3aa3f1b939cc8ef58 SHA1 2b18593509ee8fc1fddd33fe30f17cb41ce447f1 SHA256 19eb94e7c57e5c218ee19c9fab169d314abb4785384f3a4c5d1c8ab1014adbba
-EBUILD multipath-tools-0.4.8-r2.ebuild 2902 RMD160 dd55dad3a0abd16401edd2cdf3e3e7c5ae27aea1 SHA1 b55f1edec2233062d5c649e7e2adbca93e1e1053 SHA256 4e3d1179309d6f05709d7692ea618c8c70a7c9f4c880d33cd3062aae0453d2b0
 EBUILD multipath-tools-0.4.8.ebuild 2353 RMD160 3d9fa33afadf53d9ae77caadecdbf4bdaca5cae8 SHA1 457961dddf7f3312bb71c6d237b23294f6b19c1b SHA256 b72c469e490c78138c0b1d147b19dfa8679a3746bb3bf984673c3ebeda421793
-EBUILD multipath-tools-0.4.9.ebuild 2405 RMD160 362ec34b6349aacb62394f47cf0014449e47a3b1 SHA1 09c91c7cd49be5a83fd3695260dd5e9f9ecf3558 SHA256 8389c63214329484f926ddf0746414e3c56086818dc1f461ed90336e815884b2
-MISC ChangeLog 6215 RMD160 4d575f047fc66a28f432b1c20fb0ab608e104364 SHA1 6cd33f3e148a2e04f4e191ee26ba9d7aa7e3ad2d SHA256 484574b879e057a9ebde64cf54870136a8775fc141887cd96b4c02d860323d02
+EBUILD multipath-tools-0.4.9-r1.ebuild 2473 RMD160 7b740052d0177dec1dd19c9d15bc7c19587bfac4 SHA1 d293b7dfdba772d3651d9abe77b5d75079b1d4ff SHA256 ceefb99fe8fb4e6f35319215d971284b3f2e4de2b29bf4df2b7d8a11d76b29c8
+MISC ChangeLog 6680 RMD160 8b62262817c493fe9a210f67661af2af2fa47f5c SHA1 ae124bb913f1b1206e283d44121d2392bc4a5035 SHA256 8a2c57da212b88a26f72dc6010fe7a90acc7701e9d45b844480ba71d6545efbc
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMyRgiAAoJEEqz6FtPBkyjiuoIAJxmhJrz1uu8FMYeNxVCzKpv
-KAOY0VHC76/rsvNSnNIUgojbQiQepjeoyrYGoN/EpMjkX6B1ZrywMeKDM3Ud5+F/
-XT6qLjga4lVUbJu5PiakBtVpniNGeIqn9Lh6NR4/17b+JwhAj56I+Mhp/ccUAapd
-dYyAbxGOLr6MZXqj678EHbEchNr/QhZ84ZZDN1PR1Z4+3ZskYRicAgMq0hvON/yi
-FvkI6MHIWtoj0cysdwb9U04PWN3Mf/AhMj7Aya+PfM21ZadcAxVF5CMKkW0RqIGq
-nEICWETn5BBZB2ZrLSiTvnZzshDUxNKOTbWVvwLxPgbEqTo6s7rvR82eoWqi9Lo=
-=R7aK
+iQEcBAEBAgAGBQJM8ssMAAoJEEqz6FtPBkyjDowH/ir3yw7ydBZQvx8gawZgB7ak
+jCpraNlGBghrCYoTmTNa03X5jxQKTW05OMytrrBkJPvI3QMez/2s+CNl8ATg6QtH
+0VhTmVaM6gmrAQdJkPkOExc0Il2+UB5lqsIs8UU5scPrXuuUZew/wKpLc8Xg0NR3
+3KommtBg12+tH87wBT04/j29AGYpUyeX1asPfgdo18pLgr7WG3VNUeArpTJ7S8h3
+R/iGWOUy9a1X34sN2W9TDaymi0/LGIJTOFaMr4mJOSwJpNPOR2T4KOXQ9vFjlVEy
+7M6tlnL0ugdFXkIn434zNJ4RgC5GiZkvDRdG/rKa+yjK24hWosYoZaSViNDqnmI=
+=LgK6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
new file mode 100644
index 000000000000..38719acebea6
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
@@ -0,0 +1,22 @@
+--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c	2010-11-28 12:22:12.037228583 -0800
+@@ -94,7 +94,7 @@
+ 	if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK)
+ 		return 0;
+ 
+-	snprintf(vendor, 9, "%.8s\n", inqBuffp + 8);
++	snprintf(vendor, 8, "%.8s\n", inqBuffp + 8);
+ 	snprintf(product, 17, "%.16s", inqBuffp + 16);
+ 	snprintf(luname, 21, "%.19s", inqBuffp + 36);
+ 	snprintf(wwpn, 17, "%.16s", inqBuffp + 96);
+--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c	2010-11-28 12:22:44.199483997 -0800
+@@ -123,7 +123,7 @@
+ 		return -1;
+ 	}
+ 
+-	snprintf (vendor, 9, "%.8s", inqBuffp + 8);
++	snprintf (vendor, 8, "%.8s", inqBuffp + 8);
+ 	snprintf (product, 17, "%.16s", inqBuffp + 16);
+ 	snprintf (serial, 5, "%.4s", inqBuffp + 40);
+ 	snprintf (ldev, 5, "%.4s", inqBuffp + 44);
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
index 8c4b1da45d44..c6196f73b579 100644
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
@@ -1,5 +1,5 @@
 --- multipath-tools-0.4.9.orig/kpartx/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/kpartx/Makefile	2010-10-22 00:48:25.615627572 -0700
++++ multipath-tools-0.4.9/kpartx/Makefile	2010-11-28 12:14:25.763531104 -0800
 @@ -6,7 +6,7 @@
  
  CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
@@ -39,7 +39,7 @@
 -	rm -f core *.o $(EXEC) *.gz
 +	rm -f core *.o $(EXEC)
 --- multipath-tools-0.4.9.orig/Makefile.inc	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/Makefile.inc	2010-10-21 23:51:12.768868148 -0700
++++ multipath-tools-0.4.9/Makefile.inc	2010-11-28 12:14:25.763531104 -0800
 @@ -32,11 +32,10 @@
  syslibdir   = $(prefix)/$(LIB)
  libdir	    = $(prefix)/$(LIB)/multipath
@@ -55,13 +55,13 @@
  
  %.o:	%.c
 --- multipath-tools-0.4.9.orig/multipath/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/multipath/Makefile	2010-10-22 00:47:13.952010117 -0700
++++ multipath-tools-0.4.9/multipath/Makefile	2010-11-28 12:14:46.718697048 -0800
 @@ -7,32 +7,30 @@
  OBJS = main.o
  
  CFLAGS += -I$(multipathdir)
 -LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
  
  EXEC = multipath
  
@@ -100,16 +100,18 @@
 -	rm -f core *.o $(EXEC) *.gz
 +	rm -f core *.o $(EXEC)
 --- multipath-tools-0.4.9.orig/multipathd/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/multipathd/Makefile	2010-10-22 00:48:02.502428428 -0700
-@@ -6,7 +6,7 @@
++++ multipath-tools-0.4.9/multipathd/Makefile	2010-11-28 12:15:46.624171566 -0800
+@@ -6,8 +6,8 @@
  # basic flags setting
  #
  CFLAGS += -I$(multipathdir)
 -LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
-+LIBS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
- 	   -lmultipath -L$(multipathdir)
+-	   -lmultipath -L$(multipathdir)
++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \
++	   -L$(multipathdir) -lmultipath
  
  #
+ # debuging stuff
 @@ -28,21 +28,20 @@
  all : $(EXEC)
  
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.8-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.8-r2.ebuild
deleted file mode 100644
index 1592368f60e9..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.8-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 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.8-r2.ebuild,v 1.1 2009/11/05 04:15:09 robbat2 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"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.8-build.patch
-	epatch "${FILESDIR}"/${PN}-0.4.8-udev-scsi_id-changes.patch
-	# Patch per upstream tree for 1GiB limit of kpartx
-	epatch "${FILESDIR}"/${PN}-0.4.8-r1-kpartx.patch
-	# CVE-2009-0115, world writable socket
-	epatch "${FILESDIR}"/${PN}-0.4.8-socket-cve-2009-0115.patch
-	# kpartx fails on extended partitions
-	epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
-}
-
-src_compile() {
-	# The -j1 is NOT a joke. The 0.4.8-era upstream code rebuilds several object
-	# files with different compiler defines. The upstream git, as yet unreleased
-	# moves to proper automake, but it's a large jump and is not being
-	# backported to 0.4.8.
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	make DESTDIR="${D}" install || die "install failed"
-
-	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
-	# This is the monitoring daemon
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	# This is the init script that fires the multipath addon for baselayout2
-	newinitd "${FILESDIR}"/init.d-multipath-0.4.8-r1 multipath
-	# Handle early-boot startup as well as shutdown of multipath devices
-	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/multipath-start.sh
-	doins "${FILESDIR}"/multipath-stop.sh
-
-	dodoc multipath.conf.*
-	dodoc 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 should ensure that a"
-	elog "'multipath' entry is present in your RC_VOLUME_ORDER variable!"
-	elog "If you use baselayout2, you must add 'multipath' into"
-	elog "your boot runlevel!"
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild
index e6f1cf76adfd..cc66ee3acb5c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.1 2010/10/28 06:28:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild,v 1.1 2010/11/28 21:34:59 radhermit Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 
 src_prepare() {
-	 epatch "${FILESDIR}"/${P}-build.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.9-build.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
 	 # kpartx fails on extended partitions
 	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
 }