Fix bug #331099 and consolidate patches

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

6 files changed, 158 insertions, 113 deletions

diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog
index 8ce8ecd94166..877d55d493f5 100644
--- a/sys-apps/usermode-utilities/ChangeLog
+++ b/sys-apps/usermode-utilities/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/usermode-utilities
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.32 2010/04/10 13:20:48 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.33 2010/08/05 02:31:51 dang Exp $
+
+*usermode-utilities-20070815-r2 (05 Aug 2010)
+
+  05 Aug 2010; Daniel Gryniewicz <dang@gentoo.org>
+  -files/20040406-CAN-2004-1295.patch,
+  -files/usermode-utilities-20060323-nostrip.patch,
+  +usermode-utilities-20070815-r2.ebuild,
+  +files/usermode-utilities-20070815-rollup.patch:
+  Fix bug #331099 and consolidate patches
 
 *usermode-utilities-20070815-r1 (10 Apr 2010)
 
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index 643ae33cc8eb..84a1baae5711 100644
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 20040406-CAN-2004-1295.patch 668 RMD160 34a3fa4a5994acef97be62149acdaeacf97aa71d SHA1 8c315f56cbed27e48fd92f76a2429ae19d2f0d73 SHA256 0fcf6b1d3d7af58749b22c2cae139c2f51aa3dc1a90e59bbeba7c7ae9e3feefc
 AUX usermode-utilities-20060216-unlazy.patch 566 RMD160 9939b86aec08c96fd16defd11adb9d4d2e5535f1 SHA1 4916dd7afbd9221ddbe87dbaf26f0dfb6ec8a608 SHA256 8fa28878ef85f531cf385fb8b6724978a805ba44c4d54bd5a2d6b3c519e2c972
-AUX usermode-utilities-20060323-nostrip.patch 4013 RMD160 8cd09aa46bda25c5f064a9e13fb6805d5330d85c SHA1 f9aa69460ee7ad7f678358abc433f4b8d1ff1762 SHA256 c7fb2502012f959f908d1e62684d8afe4cd20ff39541475e37c6a051c0f21de2
 AUX usermode-utilities-20070815-nostrip.patch 4438 RMD160 7e471979b63676187e78f7c7ad894c870d11c7a0 SHA1 51ad783e58ccab5bb26e5b9e222abdb3d54c39cb SHA256 ba90c88f4d7f4f296154aceacbcbec64c8bbe62c3a632896f00c88ad28151c14
+AUX usermode-utilities-20070815-rollup.patch 4619 RMD160 186d330a4cddf097270b8de0730bf098c3742668 SHA1 0428be479128804018a7a91c1f494115fa7ae59f SHA256 06b9b613d94006cc4bda2baabf371e8de352593262417373bbd23698dd4710db
 DIST uml_utilities_20070815.tar.bz2 50159 RMD160 f231ae4ebe5892a6acdd725fec446692b04dddcb SHA1 4e10de8e0f5bf681fa295572009518b77fd8a1dd SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e
 EBUILD usermode-utilities-20070815-r1.ebuild 1319 RMD160 10b2d5efd6ad105a5c76b8d501d5d46a82be7f76 SHA1 93a3fa7d9ba77734ea9ae228a34c4c6982564ffb SHA256 991c71c3bec44f56ac1209bd2bd114ba1977a5175bb4cf5a84fae365beb1bb8b
+EBUILD usermode-utilities-20070815-r2.ebuild 1319 RMD160 1b2849d252e048b84a3f2454dd7139cf91bea282 SHA1 2750f4b30c7f90d4a916365124d146d7108f5953 SHA256 3baf057b9815e96c7a5fa462233c50ebd5d597d51004551388e803312a2b7340
 EBUILD usermode-utilities-20070815.ebuild 1118 RMD160 eb8f487c65420e4ebd3a3a5227f16281cfce6b33 SHA1 ed99f01ad78af318bb01daeada788f299a088d82 SHA256 1014a4987d22b781df156189e69baa6676715f458ab18e01680e0c8125d7d46f
-MISC ChangeLog 5645 RMD160 15d19e5cba2e929f5c2f8bef47487c5a12734f3b SHA1 e838286876884a5882dd34f4827957df698da8e4 SHA256 496ef24ef73fcbfe2410d865c82f0caa52c6fb3c1f2a277e1b13d8750416aa62
+MISC ChangeLog 5970 RMD160 41770eaeabddcb91a0b0bfa39c8d949a34f615d6 SHA1 51ff18692e29f09be79df6e814adb512ba1a7dcb SHA256 1e9e515a80ef267bbea6289ef5625d1d0b2565070af2e60aa146b0892fff754d
 MISC metadata.xml 336 RMD160 4e386b707a12089941830c6af733742fafe9c3bd SHA1 83d274af40fdbdfbe5afee5ca2df3f6c265302b4 SHA256 294be96abec9f27d9bdf05bc0fe460da3bbc4cf50952f08ec0547972d934116f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvAexMACgkQomPajV0RnrGbJACfcAB/1wuHxEKfnWZcjoysgE7J
-zIcAnj0yiotwGPWMY85cRIInGLoKDMnU
-=2Uwp
+iEYEARECAAYFAkxaIm8ACgkQomPajV0RnrFGegCeLyi8uj9fGJSWvPrEkFnBLDFB
+c7IAnRgejlqibeKdtaV06bZPH0zpC15y
+=NL/4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usermode-utilities/files/20040406-CAN-2004-1295.patch b/sys-apps/usermode-utilities/files/20040406-CAN-2004-1295.patch
deleted file mode 100644
index 08a31b82e545..000000000000
--- a/sys-apps/usermode-utilities/files/20040406-CAN-2004-1295.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools-20040406.old/uml_net/slip.c	2002-04-28 15:47:35.000000000 -0400
-+++ tools-20040406.new/uml_net/slip.c	2005-03-07 10:40:37.000000000 -0500
-@@ -111,7 +111,7 @@
- void slip_v4(int argc, char **argv)
- {
-   struct output output = INIT_OUTPUT;
--  char *op;
-+  char *op, dev[sizeof("slnnnnn\0")];
- 
-   if(setreuid(0, 0) < 0){
-     output_errno(&output, "slip - setreuid failed");
-@@ -135,7 +135,8 @@
-     slip_up(0, argv[1], NULL, NULL, &output);
-   }
-   else if(!strcmp(op, "down")){
--    slip_down(argv[1], NULL, NULL, &output);
-+    slip_name(0, dev, &output);
-+    slip_down(dev, NULL, NULL, &output);
-   }
-   else {
-     printf("slip - Unknown op '%s'\n", op);
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20060323-nostrip.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20060323-nostrip.patch
deleted file mode 100644
index fb88ad3ffeb1..000000000000
--- a/sys-apps/usermode-utilities/files/usermode-utilities-20060323-nostrip.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/jail/Makefile tools-20060323/jail/Makefile
---- tools-20060323.orig/jail/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/jail/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -11,7 +11,7 @@ $(BIN) : $(OBJS)
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(SBIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
-+	install $(BIN) $(DESTDIR)$(SBIN_DIR)
- 	
- clean :
- 	rm -rf *~ $(BIN) $(OBJS) cell[0-9]* core* tty_log_cell*
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/jailtest/Makefile tools-20060323/jailtest/Makefile
---- tools-20060323.orig/jailtest/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/jailtest/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -14,4 +14,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/mconsole/Makefile tools-20060323/mconsole/Makefile
---- tools-20060323.orig/mconsole/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/mconsole/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -14,4 +14,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/moo/Makefile tools-20060323/moo/Makefile
---- tools-20060323.orig/moo/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/moo/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -23,4 +23,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/port-helper/Makefile tools-20060323/port-helper/Makefile
---- tools-20060323.orig/port-helper/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/port-helper/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -12,4 +12,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(LIB_DIR)
--	install -s $(BIN) $(DESTDIR)$(LIB_DIR)
-+	install $(BIN) $(DESTDIR)$(LIB_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/tunctl/Makefile tools-20060323/tunctl/Makefile
---- tools-20060323.orig/tunctl/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/tunctl/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -14,4 +14,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/uml_net/Makefile tools-20060323/uml_net/Makefile
---- tools-20060323.orig/uml_net/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/uml_net/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -22,4 +22,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/uml_switch/Makefile tools-20060323/uml_switch/Makefile
---- tools-20060323.orig/uml_switch/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/uml_switch/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -21,4 +21,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN tools-20060323.orig/watchdog/Makefile tools-20060323/watchdog/Makefile
---- tools-20060323.orig/watchdog/Makefile	2006-02-25 07:57:21.000000000 -0500
-+++ tools-20060323/watchdog/Makefile	2007-06-11 12:06:25.000000000 -0400
-@@ -14,4 +14,4 @@ clean : 
- 
- install : $(BIN)
- 	install -d $(DESTDIR)$(BIN_DIR)
--	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+	install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
new file mode 100644
index 000000000000..f88e20663f5b
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
@@ -0,0 +1,101 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jail/Makefile tools-20070815/jail/Makefile
+--- tools-20070815.orig/jail/Makefile	2006-02-27 14:51:46.000000000 -0500
++++ tools-20070815/jail/Makefile	2010-08-04 22:17:56.869103217 -0400
+@@ -11,7 +11,7 @@ $(BIN) : $(OBJS)
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(SBIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
++	install $(BIN) $(DESTDIR)$(SBIN_DIR)
+ 
+ clean :
+ 	rm -rf *~ $(BIN) $(OBJS) cell[0-9]* core* tty_log_cell*
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jailtest/Makefile tools-20070815/jailtest/Makefile
+--- tools-20070815.orig/jailtest/Makefile	2006-02-27 14:52:53.000000000 -0500
++++ tools-20070815/jailtest/Makefile	2010-08-04 22:17:56.870032258 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/mconsole/Makefile tools-20070815/mconsole/Makefile
+--- tools-20070815.orig/mconsole/Makefile	2006-02-27 15:03:01.000000000 -0500
++++ tools-20070815/mconsole/Makefile	2010-08-04 22:17:56.916031770 -0400
+@@ -15,4 +15,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/moo/Makefile tools-20070815/moo/Makefile
+--- tools-20070815.orig/moo/Makefile	2006-02-27 15:08:49.000000000 -0500
++++ tools-20070815/moo/Makefile	2010-08-04 22:17:56.938282085 -0400
+@@ -23,4 +23,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/port-helper/Makefile tools-20070815/port-helper/Makefile
+--- tools-20070815.orig/port-helper/Makefile	2006-02-27 15:18:40.000000000 -0500
++++ tools-20070815/port-helper/Makefile	2010-08-04 22:17:56.938282085 -0400
+@@ -15,4 +15,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(LIB_DIR)
+-	install -s $(BIN) $(DESTDIR)$(LIB_DIR)
++	install $(BIN) $(DESTDIR)$(LIB_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/tunctl/Makefile tools-20070815/tunctl/Makefile
+--- tools-20070815.orig/tunctl/Makefile	2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/tunctl/Makefile	2010-08-04 22:17:56.939282225 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/umlfs/Makefile tools-20070815/umlfs/Makefile
+--- tools-20070815.orig/umlfs/Makefile	2006-02-27 16:11:25.000000000 -0500
++++ tools-20070815/umlfs/Makefile	2010-08-04 22:17:56.940282085 -0400
+@@ -16,4 +16,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_net/Makefile tools-20070815/uml_net/Makefile
+--- tools-20070815.orig/uml_net/Makefile	2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/uml_net/Makefile	2010-08-04 22:23:40.459151826 -0400
+@@ -2,6 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux
+ 
+ BIN = uml_net
+ CFLAGS ?= -g -Wall
++LDFLAGS += -Wl,-z,now
+ override CFLAGS += $(TUNTAP)
+ 
+ BIN_DIR ?= /usr/bin
+@@ -22,4 +23,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_switch/Makefile tools-20070815/uml_switch/Makefile
+--- tools-20070815.orig/uml_switch/Makefile	2006-02-27 15:20:26.000000000 -0500
++++ tools-20070815/uml_switch/Makefile	2010-08-04 22:17:56.942283133 -0400
+@@ -21,4 +21,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/watchdog/Makefile tools-20070815/watchdog/Makefile
+--- tools-20070815.orig/watchdog/Makefile	2006-02-27 15:55:34.000000000 -0500
++++ tools-20070815/watchdog/Makefile	2010-08-04 22:17:56.943282225 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r2.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r2.ebuild
new file mode 100644
index 000000000000..15a74c00fa97
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20070815-r2.ebuild,v 1.1 2010/08/05 02:31:51 dang Exp $
+
+inherit eutils
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="fuse"
+
+RDEPEND="fuse? ( sys-fs/fuse )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Merge previous patches with fix for bug #331099
+	epatch "${FILESDIR}"/${P}-rollup.patch
+	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+	if ! use fuse; then
+		einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+		sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+	fi
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all || die "Compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}