Version bump (bug #321331 by Krzysiek). Update build patch and remove patches applied upstream, remove -j1 limitation, and use emake instead of make.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 237 insertions, 7 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index a79c4b861431..0c9668b35f2c 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/multipath-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.33 2009/11/13 01:01:06 josejx Exp $
+# 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 $
+
+*multipath-tools-0.4.9 (28 Oct 2010)
+
+  28 Oct 2010; Tim Harder <radhermit@gentoo.org>
+  +multipath-tools-0.4.9.ebuild, +files/multipath-tools-0.4.9-build.patch:
+  Version bump (bug #321331 by Krzysiek). Update build patch and remove
+  patches applied upstream, remove -j1 limitation, and use emake instead of
+  make.
 
   13 Nov 2009; Joseph Jezak <josejx@gentoo.org>
   multipath-tools-0.4.8-r1.ebuild:
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index fd89eb4dba85..a28f1a09e327 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -12,20 +12,27 @@ 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 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
+DIST multipath-tools-0.4.9.tar.bz2 169180 RMD160 54b178ad23cefceb6b42131bd7079c226c568a0d SHA1 e2263033934f9073962e7e54b42824355291f19f SHA256 8d44c8815144b5589cc3e604cb3fc16c76a028aef08aa1bec334ff70bf9ac712
 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
-MISC ChangeLog 5893 RMD160 3c9b269a2fedcaf1a4c23cc1576ad1160c13a6fe SHA1 825c57955db838058e9c800973f500f295308114 SHA256 702a3712084207ad4a48112986cfaf952f3dcacbea84b1fe7aa48597de13d2cb
+EBUILD multipath-tools-0.4.9.ebuild 2405 RMD160 362ec34b6349aacb62394f47cf0014449e47a3b1 SHA1 09c91c7cd49be5a83fd3695260dd5e9f9ecf3558 SHA256 8389c63214329484f926ddf0746414e3c56086818dc1f461ed90336e815884b2
+MISC ChangeLog 6215 RMD160 4d575f047fc66a28f432b1c20fb0ab608e104364 SHA1 6cd33f3e148a2e04f4e191ee26ba9d7aa7e3ad2d SHA256 484574b879e057a9ebde64cf54870136a8775fc141887cd96b4c02d860323d02
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkr8r84ACgkQcsIHjyDViGSltACfWDXeWmz2mdePIgOd/f7NskAg
-75wAoJi5LPwyhJDbAr5OoiIyX6zcjq3Y
-=x89U
+iQEcBAEBAgAGBQJMyRgiAAoJEEqz6FtPBkyjiuoIAJxmhJrz1uu8FMYeNxVCzKpv
+KAOY0VHC76/rsvNSnNIUgojbQiQepjeoyrYGoN/EpMjkX6B1ZrywMeKDM3Ud5+F/
+XT6qLjga4lVUbJu5PiakBtVpniNGeIqn9Lh6NR4/17b+JwhAj56I+Mhp/ccUAapd
+dYyAbxGOLr6MZXqj678EHbEchNr/QhZ84ZZDN1PR1Z4+3ZskYRicAgMq0hvON/yi
+FvkI6MHIWtoj0cysdwb9U04PWN3Mf/AhMj7Aya+PfM21ZadcAxVF5CMKkW0RqIGq
+nEICWETn5BBZB2ZrLSiTvnZzshDUxNKOTbWVvwLxPgbEqTo6s7rvR82eoWqi9Lo=
+=R7aK
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..8c4b1da45d44
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
@@ -0,0 +1,138 @@
+--- 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
+@@ -6,7 +6,7 @@
+ 
+ CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-LDFLAGS = -ldevmapper
++LIBS = -ldevmapper
+ OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
+        gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
+ EXEC = kpartx
+@@ -14,8 +14,7 @@
+ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 	
+ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -23,13 +22,14 @@
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
+ 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+-	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
++	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
+-	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
++	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
+ 
+ clean:
+-	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
+@@ -32,11 +32,10 @@
+ syslibdir   = $(prefix)/$(LIB)
+ libdir	    = $(prefix)/$(LIB)/multipath
+ 
+-GZIP        = /bin/gzip -9 -c
+ INSTALL_PROGRAM = install
+ 
+-OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
+-CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
++OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
++CFLAGS	     += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
+ SHARED_FLAGS = -shared
+ 
+ %.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
+@@ -7,32 +7,30 @@
+ OBJS = main.o
+ 
+ CFLAGS += -I$(multipathdir)
+-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
++LIBS = -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
+ 
+ EXEC = multipath
+ 
+ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+-	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+-	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
++	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+ 
+ uninstall:
+-	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
+-	rm $(DESTDIR)$(bindir)/$(EXEC)
+-	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
+-	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++	rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
++	rm -f $(DESTDIR)$(bindir)/$(EXEC)
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
++	rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+ 
+ clean:
+-	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 @@
+ # basic flags setting
+ #
+ CFLAGS += -I$(multipathdir)
+-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
++LIBS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
+ 	   -lmultipath -L$(multipathdir)
+ 
+ #
+@@ -28,21 +28,20 @@
+ all : $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
+ 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
+-	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
+ 
+ clean:
+-	rm -f core *.o $(EXEC) *.gz
++	rm -f core *.o $(EXEC)
+ 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9.ebuild
new file mode 100644
index 000000000000..e6f1cf76adfd
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.9.ebuild
@@ -0,0 +1,77 @@
+# 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 $
+
+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}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	 epatch "${FILESDIR}"/${P}-build.patch
+	 # kpartx fails on extended partitions
+	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man8
+	emake DESTDIR="${D}" install || die "emake 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!"
+}