Fix bug #331099 and consolidate patches

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 151 insertions, 106 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/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"
+}