[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

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

5 files changed, 59 insertions, 4 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/Manifest b/app-emulation/xen-tools/Manifest
index e0de3033601a..8344bdcebd73 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ipxe-nopie.patch 952 RMD160 243c65b1e9e27fde14b10c5f605cce635de88032 SHA1 06870bb3bb063aabe16e721f487f0756a5889e8f SHA256 22d1e84568e4bdf204404c45cd4d323a78a1b5a5a29cc4a0707894e22f40bd48
 AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
 AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd
@@ -9,6 +12,8 @@ AUX xen-tools-3.4.2-fix-include.patch 894 RMD160 c1c17e63f4296b175159cae579b9d25
 AUX xen-tools-3.4.2-ldflags-respect.patch 1057 RMD160 d463f678e845e1d92012ec7013e211f52489839b SHA1 54916dd7f1d2c83df0219a5a092fcb2db8d2f71b SHA256 d1afe208eab5b00f5c3204b231b8f68a2d2335699a42b913f1ea9101f280736c
 AUX xen-tools-3.4.2-remove-default-cflags.patch 10646 RMD160 cc8175c33251310645fd6cc400c6180a7fcdcf75 SHA1 5e94fce8db6b67df6264e92a69f9f3802610b93f SHA256 f234c45b0a96c4eb5c97e7a8d76fb1f4a3dff110c4ea2ec68e8db71e03044d98
 AUX xen-tools-3.4.2-werror-idiocy-v2.patch 16827 RMD160 80fe78d3fd5f2d23d4852cf8608c616ae7e4e8b6 SHA1 619f42bf7ac7886a4b214bf813ad3369265f424b SHA256 45dfc85ea28c7a70bfcf94986758370e27c32698d78b90a2066335dd378f3669
+AUX xen-tools-4.1.1-bridge.patch 449 RMD160 165524a3a92014f79e886b0a20dba8b1c1920cc2 SHA1 32db884422a48819d71003860f99779b7b82540a SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db36c1882e20cf0ef8143af527782b
+AUX xen-tools-4.1.1-curl.patch 528 RMD160 372e11569eaabb968d766cd747495750a3c2b5c9 SHA1 105c57f9e6f2fa9802c9d85fe3414d149056abe8 SHA256 41494e0634a8620ca37d53d848e4b2524e8adfec949a37f4d799fd1f97bb2887
 AUX xen-tools-4.1.1-libxl-tap.patch 1071 RMD160 a345fab381af82ffdf7a4206d9db30f6845e5867 SHA1 bbe2ddd9eb8119ae172fd9671fe58bda80bf9095 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885
 AUX xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 RMD160 7d3bd028c5da4b2a48f1e992900bbf1866c9c4ea SHA1 55c5476e632649d4d635db1023193216455d076d SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f
 AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
@@ -27,7 +32,24 @@ DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 S
 EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51
 EBUILD xen-tools-3.4.2-r5.ebuild 7398 RMD160 08e9b12c23c9d853f5b59ee2613a5e07a9623038 SHA1 0859af01b9dace9451e24f509c4b436a76b9da39 SHA256 92682159a7961a7ebebf523541f793e59e7b4807755e32e8787e70658bc3ff54
 EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720
-EBUILD xen-tools-4.1.1-r6.ebuild 10482 RMD160 eb59e73c0a2a6b2e0914dbf99d118823ed90b14a SHA1 8c4a9e48ad4b4a85393b115039529489ee6f7d61 SHA256 7777cf83b79929546a5f48194e0878d2bf5f6adc224eb362b2cb797952bea676
+EBUILD xen-tools-4.1.1-r6.ebuild 10650 RMD160 ca9ed4794403b2db2aecf0f424d90dc32a9b8112 SHA1 f6d9c393831de33167698ffb84a42db946e894c7 SHA256 d5abd406cc5d2a1c96e3ebcc9ec697c890ca24cc408e76b286bc8fd4f0c4d586
 EBUILD xen-tools-9999.ebuild 9517 RMD160 a1fa4abc0c2a8cf160d05fd699f3b2ded872f113 SHA1 ae51b976fe1f07152444e0f1b01e8e513e8ce215 SHA256 bd832962adbf6388ed7d44530587596f97543a6596bc59b5593bff7c972bc926
-MISC ChangeLog 24996 RMD160 4aa044c2f37d0eb66d6f1c93b66a00af90ee944b SHA1 6bbaee4db6d7792a1058ed9849e4f87431961891 SHA256 bd78a0591c7b08771723e1c0b43f8f19f67f267952d73831d73e7677fcf703e9
+MISC ChangeLog 25300 RMD160 588ff3957d8d1ba851f3864ff59f775855469200 SHA1 3b99469a56d2956f2f6340e6e6922ea1197c3976 SHA256 eb42d6c1416cf03827dd1ddca8caba8a0e94bc3ad6847cafb5ad8571e88ef0ba
 MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOpVNlAAoJEOf+E+/4L5LmTSoP/1RFmmJtZYp53Wj6N26Clfvj
+/oQhzDkIC34Svpq5N0opgerA9fU1kK7ibKb3pQp1f1C1T/oR5UOa+pS8oq92wICt
+4e+DUafr3Q67Crf8mJ0GipCp8VZraV2n7WO/8y/hH7tk5O9A/p8GytYlYUjNKaHe
+kBSVqs4aGuQeTDl6hEg20vqx6jP/SsImgPX7xG9Yto/4S09xV8W+v6ovZtXDCuJU
+JgaB5TFvx4vsoTu0DXe9HKmXsWYKlv7OdbpNAiN6gLg6bJB8OJ5bI8hgKk7EtJBg
+LoHSfLj+74Xc4/uy1EzAkyeYWC0XkKlBstlRxQxTzcoZ3q+jFO+7zSovSF69Alfg
+hPk22gUIZGl5NhGeY0uePvHIW1miU09Osi9CKHVY6aprpRevA2McOuQJTYwrG3dX
+3CDdhKJWj3zkfwpbmGNLbGiYqX2+7XAxkMj8dtgvkjqwrJ1bTnQivbNNNVH3Bpvw
+5RQK7n7leSU7sQDvZX+z5Bu3QRPvNzW1cFsA5bDWIGKkhjjvHUE+Lj7VTPyW6GQL
+U33uAipAVGbM+djaNybVWSI+aRcKFZajIi6k/vPS/z9gLG0v+YajXwzg+6kEGvXO
+/x3ipJrZtxOXOj7uy3BOVS0EynA4jRLsJKet6dLIJEdNVUDc33LO/UFqkH+HMawb
+uwHMhE6lIvwag7PMNrc2
+=O5yi
+-----END PGP SIGNATURE-----
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"