[app-emulation/xen-tools] Patch to curl config, fixes Bug #386487, tiny change to bridging fixes Bug #362575 by Klas Meder Boqvist, patch prepared by Ian Delaney aka idella4

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

4 files changed, 35 insertions, 2 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index a3098782d406..6d794896b81c 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.101 2011/10/23 10:49:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.102 2011/10/24 12:02:08 alexxy Exp $
+
+  24 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r6.ebuild,
+  +files/xen-tools-4.1.1-bridge.patch, +files/xen-tools-4.1.1-curl.patch:
+  Patch to curl config, fixes Bug #386487, tiny change to bridging fixes Bug
+  #362575 by Klas Meder Boqvist, patch prepared by Ian Delaney aka idella4
 
   23 Oct 2011; Patrick Lauer <patrick@gentoo.org> xen-tools-9999.ebuild:
   Bump for #386461, thanks to Ian Delaney
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch
new file mode 100644
index 000000000000..4b3a4bac1ec1
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.1.1-bridge.patch
@@ -0,0 +1,12 @@
+diff -ur xen-4.1.1.orig//tools/hotplug/Linux/network-bridge xen-4.1.1/tools/hotplug/Linux/network-bridge
+--- xen-4.1.1.orig//tools/hotplug/Linux/network-bridge	2011-10-14 02:28:43.481714285 +0800
++++ xen-4.1.1/tools/hotplug/Linux/network-bridge	2011-10-16 01:06:11.226673108 +0800
+@@ -216,7 +216,7 @@
+ 	return
+     fi
+ 
+-    if [ `brctl show | wc -l` != 1 ]; then
++    if [ `brctl show | grep $netdev | wc -l` != 0 ]; then
+         return
+     fi
+ 
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch
new file mode 100644
index 000000000000..f9d6d5ac40b0
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch
@@ -0,0 +1,10 @@
+diff -ur xen-4.1.1.orig//tools/check/check_curl xen-4.1.1/tools/check/check_curl
+--- xen-4.1.1.orig//tools/check/check_curl	2011-06-15 00:03:44.000000000 +0800
++++ xen-4.1.1/tools/check/check_curl	2011-10-14 00:42:08.189717078 +0800
+@@ -9,5 +9,5 @@
+ fi
+ 
+ has_or_fail curl-config
+-curl_libs=`curl-config --libs` || fail "curl-config --libs failed"
++curl_libs=`echo $curl_libs |sed -e 's/-W[^[:space:]]*[[:space:]]//'` || fail "curl-config --libs failed"
+ test_link $curl_libs || fail "dependency libraries for curl are missing"
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
index 2470c69f59b9..f46835576545 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.1 2011/10/22 23:25:50 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.2 2011/10/24 12:02:08 alexxy Exp $
 
 EAPI="3"
 
@@ -193,6 +193,12 @@ src_prepare() {
 		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
 		-i tools/firmware/etherboot/Makefile || die
 
+	# Fix bridge by idella4, bug #362575
+	epatch "${FILESDIR}/${P}-bridge.patch"
+
+	# Patch for curl-config from bug #386487
+	epatch "${FILESDIR}/${P}-curl.patch" || die
+
 	# Don't build ipxe with pie on hardened, Bug #360805
 	if gcc-specs-pie ; then
 		epatch "${FILESDIR}/ipxe-nopie.patch" || die "Could not apply ipxe-nopie patch"