Fixed location of ifconfig binary (bug #455902)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 65 insertions, 23 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index d2236ff83637..dc1e67d7fb75 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.142 2013/01/11 10:04:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.143 2013/02/09 17:25:35 polynomial-c Exp $
+
+*virtualbox-4.2.6-r1 (09 Feb 2013)
+
+  09 Feb 2013; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-4.1.22-r1.ebuild, virtualbox-4.1.24.ebuild,
+  virtualbox-4.2.4-r1.ebuild, -virtualbox-4.2.6.ebuild,
+  +virtualbox-4.2.6-r1.ebuild:
+  Fixed location of ifconfig binary. Thanks to David Parrish for reporting this
+  in bug #455902 and to Greg Kubaryk for pointing out where the fix needs to be
+  applied.
 
   11 Jan 2013; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-4.1.22-r1.ebuild, virtualbox-4.1.24.ebuild,
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 0e69e4fb2d09..fb0f1a7e17c6 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -16,27 +16,27 @@ DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
 DIST virtualbox-4.2.4-patches-01.tar.xz 5388 SHA256 f69935ee8014af2d0badec799d2a9c3dea7db54bffeab00ac372cffe1ee84000 SHA512 6f339771e3fe3260ccabb3692999260cce71b30230a13bf637b11d08fe0ef5adca10402655a4b9ad44d8e89cc2621f8a491fdbb0bba9fe152719dc9176c2824d WHIRLPOOL 36ae0888cf9cdec4e85d5cd99d4741c58bfc7fbe024776f7ece4fa62d96b42053818b672bba56ea0ea4c6e24b1023b9f45510813287399282e506f73f0cc1c20
 DIST virtualbox-4.2.6-patches-01.tar.xz 3908 SHA256 0e548fc49e2367fcc04837670d145a4ae21221d06f028c6858db28f888edc100 SHA512 b542a81a2330db86fb8a890d4fc333d43e0f8b6e3bb2f1a6ec54dcc3a180d2a2395216324f30972f3997b2e42f2db8ba76f0bde3e8ac8796722d8dce53bbd359 WHIRLPOOL 17f5dbedea69d54c41614be86047ee557ec17dd9aea90aab635dc2d69ddb82ac40f11d77d127adb45563bfe463b1262cf3c669923e468ba78bff5c6df62a89df
-EBUILD virtualbox-4.1.22-r1.ebuild 12030 SHA256 5a97598b6a697edb7fe5df33fc4764c7fc2a2aafad44e0ba3e712de3b68b3a1a SHA512 a8bd5cd7b6f18c302f869252987352d0e91c515ea19c72a5927e04b134904d5b3b2896740f792a5138ad57509eb144758237196bef3843d823933b919a187b05 WHIRLPOOL fc1e471861c670003a94eca8ef5e2d57056e4c39ee74b04fc3d57eb12c843beea87f93a341864e4336d55abe0fe61ac2b99278002f497923e9dd7b413e11012f
-EBUILD virtualbox-4.1.24.ebuild 12029 SHA256 773269f8e9b989c871f8a9d19bb134ab7291ce33416e513e7195897999ee943e SHA512 bf52b87147c1714cdd63b59266624bd2a12e4c507d5357505354556d0204df492cf3c360445266b4547b022dd2daf6f9ed1fa1003656dd1cc48c4be86e8ca291 WHIRLPOOL a3ffe3ee2b2375aea6740d13f772965daf678f0c5b83acf855ac6a38a2f5e57552d70611bbae5a19d4100557eaa82d5d68dd38e9c0ffcd5e2903a3eaed1c7e0a
-EBUILD virtualbox-4.2.4-r1.ebuild 12110 SHA256 1b87339388821ec268b201b4a120e1d94136bc97c3db3d6b1c2329a1e9c23582 SHA512 336a0cc690ec7500621cef6e171ed6dd98dd6720f10e44f473c51a9161e8e207418ae953d3ce8237708450d3a247f4d9b91f01251508c3c634c113065065491c WHIRLPOOL 1754d42c92579c89fb4305f25f83248bb53f976ad4b12fdc0538fdfe26a070fdfb38bdeb2ba16660871f7c33b831de35950fdf4e83c0cf79be4ca025466a89f8
-EBUILD virtualbox-4.2.6.ebuild 12131 SHA256 ee812473f9c80fcde7a9a297c66ce1667ffd0c5e122ed9b7a6ab59446c2787c4 SHA512 8ca19d96bf51378d496b892064c6f1c426a8c842fa514974dfcdce971fd3820090b7d64428ea1c64e734b099b4765d4a8b49c6826a82e9261d879b854b8ad9e5 WHIRLPOOL 6d6fa475bbbba4c09ae8f8f36f98216d1c5f1dd661563824bc492e441497fcdef20ca5c9327047736ccee5b9569949b9197b76801d6c5efdf2bee2564d0b417e
+EBUILD virtualbox-4.1.22-r1.ebuild 12287 SHA256 b141e2a7c3fffad4aebba94f24731ce2583772470f7459f17c402e8c49e04cf5 SHA512 bb79b778952b560cb51a30f964cb7e75fdef4f5d4678d62f14678c640455bbd09dc32cfa9da74757593f1eed5b368fdc3dd66881c734e2e8b1dd2509af15aaf7 WHIRLPOOL 98773a99d40391cc3a505c3305d78275586043391adb9ea06dc38df24c9c8a99a26fa8139d715a212e588af4280e0664824684c59db8dab96ccca508e2bacd18
+EBUILD virtualbox-4.1.24.ebuild 12286 SHA256 61b0cf906c7bb0c3eb831bfbebdc9dd91a3d49cc9e16a5e67a3d34f19b72d1d4 SHA512 03adf626c56944a2522d88523fa00407d04e356955d6ff843f12832e231f0b63a77c559facb6bdbf2df774c098da581a56ac9f8f722e59e72012788e3d1c4b58 WHIRLPOOL 585bbcca0da0ca704bfcd2cb81920d53c7f311c80e62533590cb16c87e2eb49ce2712f4642d801a9a96847ebcc731902600c02127b8e768b025b2c7649b938c1
+EBUILD virtualbox-4.2.4-r1.ebuild 12367 SHA256 684f0b85936241a73103ba77bd0e01fa84e076c5522e6dbf45b777eef2989347 SHA512 afe3fd4a754e5903a937f7fc26813b17051c7053de68f5388d64006d77c16461002805fc03d822cbf845eaaa27bf117eb605b87b2c6febed0ba76e67f8bff972 WHIRLPOOL 320f5a2bafbbd37ddd5c75e3a0e866d550f67711abb26380bd631a70ca8e801eae198e3570fe105b1f15773111bc9753de6a1725327892c1086f3e6f31c69adb
+EBUILD virtualbox-4.2.6-r1.ebuild 12391 SHA256 534d8b93c4f0360155bdc396c2baa8418f07e98f8c7d6473ad2cc0accf2a5cdb SHA512 394e817055a85ecd048aada9d821f5e46239ce07521bc17687b54a69347eca63e0649f32aa3bd3346743b53361366f21fd39b3099ada7b4b785237af80d3d534 WHIRLPOOL 4cc84878f19b5733a1c2881250d920bfa1b6e0629fe1e081af7676053da822769c63d8884d927a9fae441ef40ae9cebde74fb02c1e297c1092a7e80474b07f6b
 EBUILD virtualbox-9999.ebuild 5132 SHA256 220b4a0d0f7eeaa50a5904fa9effe75a8fdc8390555f18e5d762797d22e446a5 SHA512 be8f41729b8579ddba88134450937babfe1a2a95b115f5ca2cf9a8b7a31f0ae2f418ff43347adad85e1ea5989e2ad14551b3e65ebac92bbc9f4e9c05b2ab781e WHIRLPOOL 882c5c3e0949ffc375607f280384decaf7cb5910ff50757fbfb1a4f7671bb42a3bef7666305086f1a10514d949f79e60033e5f6630154b7d7e67f10108d48cf7
-MISC ChangeLog 19988 SHA256 b62cefeae961c7c3d440ceef41c052f34b57b6e00d3984395885e610fbad6198 SHA512 f2986bf546e2a09fc42c5e4d54365396aff40d59ed219a91e508ce4f264159cc00b12beec9552478f7f4fb9a4c6ad4d45b07182256dede6fdef7969ef9c0f46a WHIRLPOOL b3bb9c8fec34d53ceb09aa13b3df60d0dad72c4ab9d5603cb4ed4bfd83ead7bb59f5b0f639d385ad88c81b3749f672d9672c44bfc1a59be99d83f62c1de79598
+MISC ChangeLog 20394 SHA256 64edf85e9c0b8c94a8ffe104914a66fcc42f05a82a00d16a738cf87fe156fd07 SHA512 197b104524d0f8a0cfb27bd265a2fa3922c4ad143f02eb06a3730671781a3c553e5fb8db0deecc25c0599b29d281455b31eadfd087664c5591e315d31b489b86 WHIRLPOOL 64ac6357972b0a8808ffcf31ba2523616aef44d88c152ba248dc4f5ee8ebbf3ee92c577b370f92fc35d4f5b3d7d9ceb2afb5a43b1b874beaf02f952da01cade0
 MISC metadata.xml 766 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5 SHA512 60fca14fc1e69c4385145e5390f202c57fe270537db31e5e7ca86ea77a1a6b30053dcdecb09dfa8386abd4e3776137028832fa188cda2d78ee42bed3189f2499 WHIRLPOOL ce722dc1c7248f0230bd298f4079945dba4271c6209c2d0c2cd9269748422b21bd69ae284354085120c6f6309d28c16dac4e35eb19cae64b2d49da3bb574c9ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ7+O3AAoJEPiazRVxLXTFDWkQAMqVhSQpF1KusBDJ6alLgGVT
-lRA7qbwTGj8Nu1HtmG+UbFxsp+aXpgHm1vUcb7vQD8WjtvZiCMDJ5FT0d9T6Xtcx
-WzbeIGAHTlTBJzC3iNc+YbItorbygn2Q87JoOIV4wbJ6oag0ahcXsJZvedA4OC1x
-lPb1vZjiM6FAT0mcivVrVC3WDWsi4F/kWotp5xXTytJNCeRR1L8b8aCBu/f99aTG
-HAfnU3H7F7YCIw950P2W7xLJz06mZCu0aCCQWwVj/ZpwWER8+cvpkr1X0JWFjqcG
-CUf7dydtBmk5EPRkLyUIMwXoGZLQVFXYZubCgCaBVGiW1ExvRxCO4+Hyw1+s6g5j
-wGiYkLAOfR5p9ngWRkK/ZRpyoOP/ZhNvAcr9BMqHaLLkkUFU2DNEpkGA2aJpVFr/
-WpZCGMVZBZkI7YsS6DOIHnwE35fg00QMO9uoT2uFTvwBpYopRHY9Hf4K1G1PzS8Y
-WDyiKI0w+9U7SE4udc49okACR08BA6RAHIIuJ7v6oi7L1Mvo6o3TzIlvzc60RsJG
-YuJt1EnaLen/KJ0BSteNTu6CtY5pz2U5S0LmXMb+BH7QMC9tacrfAyG3gh5OCn/V
-SpIKSsSOwsQqmbVbRRqJZp0qEDtL78EQGSFfdUhNsCLjfhxVs/yXfvXnqC5K5nox
-IkgNGYhyPi4mXfAmm14a
-=ulMN
+iQIcBAEBCAAGBQJRFoaRAAoJEPiazRVxLXTFrqcQAM9QGLCmgUeWgQGZvLQDt9xl
+2M6rxVkMsIhHkJvZy7JZ7jtUg7+6xnMegN5NNblDdc8OY2xqhXJo6xYiwy+bMUhm
+KfjjY4msmLtXrLRM3NeAhZn1q9U0V/LjunQOis1SDVEO0nlG5syYBAAxfARgGDfC
+TaOpPuELAeJ5VspA+X6rPdA+dOS9TSSoS6A05hSCsO/HfCdrr2KKzKFqwXEi1SKX
+D3LvbENEt+SJ73T7JBubAHpUpH+j1bMlXaVItsYjjDSXTUVtA+782Ilw5af8TqGT
+jld1miHdlYfai/gWUoqDQOEIEBL2jYvW/ORklATcoUheYHmN8A5HcwhjcZoLka4N
+tM8/wo/RLqEdRqvlns7Iq3nRoA/Z3REfovhG2YJzBQfFK1KzF4d9x6cbwp0vFb/8
+WpfbHeTVvO9PNDbrhAxvphD7uU87lw55BM/SLPpwHt1DDwV0hccG/f5lFpNz22LZ
+xBvaHH+lSg33Iv1vexHxk+9S0Y9+3vMBoMOY3d/JWlGkDQxbu47vVGaq7h7AdKUV
++HbmgyMLraBejjO2K5bk59ldIHEpc6Lfxgj3gtc07W/Rx5lWi1nZc8RoQVpk2F26
+q8okpjlIkhK0pZUke2B724Gb/ZhViCfWmwYK0Wj0JwH2CL7f1Yf4mNucCjZld57q
+wBI6Mw1eo6/h+rRgvv9v
+=Xzd3
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild
index 9a3577853381..b9a116ec3a01 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild,v 1.2 2013/01/11 10:04:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22-r1.ebuild,v 1.3 2013/02/09 17:25:35 polynomial-c Exp $
 
 EAPI=4
 
@@ -169,6 +169,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patches
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.24.ebuild b/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
index cb830eb4b497..92d4c70e371f 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.24.ebuild,v 1.2 2013/01/11 10:04:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.24.ebuild,v 1.3 2013/02/09 17:25:35 polynomial-c Exp $
 
 EAPI=4
 
@@ -169,6 +169,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patches
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
index 15bdcf25f39a..2765b8812d46 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild,v 1.5 2013/01/11 10:04:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild,v 1.6 2013/02/09 17:25:35 polynomial-c Exp $
 
 EAPI=4
 
@@ -171,6 +171,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patches"
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.2.6.ebuild b/app-emulation/virtualbox/virtualbox-4.2.6-r1.ebuild
index 19cd57497153..09f66a375221 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.6.ebuild,v 1.2 2013/01/11 10:04:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.6-r1.ebuild,v 1.1 2013/02/09 17:25:35 polynomial-c Exp $
 
 EAPI=4
 
@@ -171,6 +171,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patches"
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
 }
 
 src_configure() {