Fixed location of ifconfig binary (bug #455902)

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 47 insertions, 5 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/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() {