fix hardcoded path to /sbin/ifconfig

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 39 insertions, 12 deletions

diff --git a/net-fs/tahoe-lafs/ChangeLog b/net-fs/tahoe-lafs/ChangeLog
index 96c4a1bde4f4..e13dc59722c3 100644
--- a/net-fs/tahoe-lafs/ChangeLog
+++ b/net-fs/tahoe-lafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/tahoe-lafs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/tahoe-lafs/ChangeLog,v 1.1 2013/08/01 13:02:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/tahoe-lafs/ChangeLog,v 1.2 2013/08/01 14:20:33 hasufell Exp $
+
+*tahoe-lafs-1.10.0-r1 (01 Aug 2013)
+
+  01 Aug 2013; Julian Ospald <hasufell@gentoo.org> -tahoe-lafs-1.10.0.ebuild,
+  +tahoe-lafs-1.10.0-r1.ebuild, +files/tahoe-lafs-1.10.0-ifconfig.patch:
+  fix hardcoded path to /sbin/ifconfig
 
 *tahoe-lafs-1.10.0 (01 Aug 2013)
 
diff --git a/net-fs/tahoe-lafs/Manifest b/net-fs/tahoe-lafs/Manifest
index 01d91942cf3c..16184518832b 100644
--- a/net-fs/tahoe-lafs/Manifest
+++ b/net-fs/tahoe-lafs/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tahoe-lafs-1.10.0-ifconfig.patch 847 SHA256 fd99c442cd7b0d32b5b39a92ae9a5fd3d7fbdd1d7d53cd98d2c0fa1ec46085ab SHA512 ed5134f47675c1dd21d429e39b165103df6af3922dee6655c4c3226225346820f5af68429ad80324e16661a901c6a6c776c09fcf24897219105e66088e3ac748 WHIRLPOOL 992c4bdfcc06a5054fce23bb9cb1a70a22ea72b9a56a734f9b104df147794bc9618f642d26b4cd4139f52553ee20a16fbd51a43566d5dc1018614743f32e52bb
 AUX tahoe-lafs-1.10.0-setup.patch 475 SHA256 e5b32e0782ce32486e22a100daf01630e9b257b60d7a7b09836dec4b9552c69a SHA512 1108f9700ba25abf4c3fbd78c5694ed4ea6b835e37d17fcda86bd38bdb0b66f9f94ca6cda698fcdaa79dd377679955ede167ce8a32a1bde0825a4f9076ecc447 WHIRLPOOL 435c2dcdf3bfb4b087e185e2a0116cb85cbafa8b592ce9738fd709bbfedf1cb8e98393f8d5ade1452d11b5e1d0dac4a0f2bd3a1fde0aa15372fa74e44aff70eb
 DIST allmydata-tahoe-1.10.0.tar.bz2 1174044 SHA256 9c5516700fe95fdf8c57eca1e2a7b4aebf2de9a4d327d50afd684ebf833ccfe2 SHA512 664e1cbff3061c54f750af97f74a9fd6f1a16d5f6da73db4cb0e80bc01c97a4e18bf17818c9642e0d95b4a0b3669dc8648f800e63c4793ffb9f2f1bd6de2d461 WHIRLPOOL 9f579783cf46374c329f209898ebe34f28bc3e851ed4ec3eabe7cbb5bd2aac4a7b5aad925b1c688a46dec33f218c8e539dd2d464bdda82c67f685887f5aebf18
-EBUILD tahoe-lafs-1.10.0.ebuild 1489 SHA256 433bda6d7193f46ad00f02d566455a3c7c6b8e97750e80590a9797714efbd96b SHA512 bfd9661e6b5e65cb4e93e94f38f01f50fe1f22b9ac274b50773aa53ec4e9b5ac875dc7ff4f385fffe6dbce0dbb41dfe86f1d6884aedfa5a98cee958954dc963d WHIRLPOOL 7854bbffb40b02bee08d77de8023cd15307c0c5ea1f0211e43d741a651ec0e45211ada8ed3ead10668b3e08ab176f3e7a0d04d78550b880bc161f0dc73ca541c
-MISC ChangeLog 406 SHA256 ec54cea441a4c61fb7a3f2544b18fd9cfd98bbbfaf65c4d7952b1ecfa9fed5a2 SHA512 594b9c24a93f0530565f6b3136156fa055a246c83212b8e752d9d6b8e7dab86287250488e3142513da54ccd0af46b2c1c8b2834fc565f09d0a59406f7d00e98b WHIRLPOOL f66d041eac5144a5bfefca8a113c2d0ffb119523ec9508742b423418ac2c3ad640670bb96714a47aed5cbc607860d95e2c53f57979f7b538597a2ef12438df68
+EBUILD tahoe-lafs-1.10.0-r1.ebuild 1503 SHA256 d9c1cab6e77e794422a87fb28eb162af7881a5e9d41640ca60fa4c7170ecdffb SHA512 b2a3e594a73239e10af6c11ea38986d3c70c7ab73ef15ebd6726dc296ba1bcb704b902c3ac81543e1ffdce3f8f4ac421170fd76d138602e359c54765a8f2434f WHIRLPOOL 01d3c2535b1632362488636e5fe64d62113418c62df7d99fb8eebd726b884890c9211dac16309cb90b6eb4cd0ba5175169999929c011d55202579a722d5b491c
+MISC ChangeLog 634 SHA256 546acfbc3453fb1efa6e3403980cee25d75a11866891f52513ce9da675c64318 SHA512 41db89c4fe801ea266ca4b6b5fba85c62f2cf1bbea3da500551d8b877abf82680bfc06692b611b7ca3dc82cce60a2a7850ed8c28d664df73afd9175f31fe8059 WHIRLPOOL ec2b06a4b03a9b2116734a3974b738eba6d7d6a5cfea2a7caabdd0f5474c874db77dcd8b7d0c283369a60133a954eddaa111fbb63077f3712764bb8058d32c07
 MISC metadata.xml 803 SHA256 9e37baf481fc1d2913a6e271660eb9af38b668157ff8afde0aebef358f8d7939 SHA512 e8548c8152e45513ee8a1ab70626439ee93c61cae3cae8ab8f10416190247a24265ad7e9006ff20acea1895da99af6c4bd9713695065c3f98a8b1aa352052e95 WHIRLPOOL 1377e11d97d6ad366d591e44bc7246e1b88abb22fe55e6cf556df51a7c5894d1f8f4a1fd06f3602bae19eda538a485d5357aa7f63669c976db54aa33fcd4c2a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+lxVAAoJEFpvPKfnPDWzpuEH/jnMV2OhkMb5Ngj3LA2Y1jz2
-ixuybJytULPyU7eA3w64rxEQ3t+6Ca2xNgJ3z0h1GD3QvmYx99KXEueupTrt7cuS
-mN8NKKrzflMAVxxL4FbBjMsWG17bdcTuzH+lkbKvVqAA+Hq7eDpG8CzhJrRx2ShU
-IguYy/RjfV0d8WCs2l1Zu+QkLXsnAFU/hoJbDbcYeshkqXMZa30jfT3uBc3ZYDIO
-w2yzhfFs7ziRQ+oSUNmL75Q2nuBtoSSrewkX/eG66MZaR9MqzvABC3y7/mDYFOIc
-vbREsVRGGpZY44yIUVX5m7G6zau7hM4zE40kBfGPB4yXRpTe8kRgdKNlXYIaaKY=
-=6/9h
+iQEcBAEBCAAGBQJR+m67AAoJEFpvPKfnPDWzOHkH/38D++ybZB6RZ6EnsYZUhHuj
+mZ3YJ5w36/Vfs3CfLlwX4KYE2tQgFdlDQ4PybJoVwp29RaXvV/0Ti1RILJVXQQIn
+0m0yb0ADxQuAc5DjoHhN+FlkbjzcmeUEZb0nd1U7SlKX+ETKMYpZ2wnRUI4ovJqu
+/M6b9qBMeEjYsV3PyM8ZduXEGZApIt31ZxN5cHHiUylcp4Dh59yUXkPz/bihjcRp
+wRgFr+mqmpzu1jIrcUbxZhh9nbyN6LsZtnx5EchQ6kw2xqtSOfBoc9C0awpQd8NV
+Nhi7mIOi9wT0OOLslLGO1fyD2OgbvPUAT7fuG0nHeOf1rk1FT73f8LcEr1pjTXo=
+=8ODA
 -----END PGP SIGNATURE-----
diff --git a/net-fs/tahoe-lafs/files/tahoe-lafs-1.10.0-ifconfig.patch b/net-fs/tahoe-lafs/files/tahoe-lafs-1.10.0-ifconfig.patch
new file mode 100644
index 000000000000..c760f60e1cc0
--- /dev/null
+++ b/net-fs/tahoe-lafs/files/tahoe-lafs-1.10.0-ifconfig.patch
@@ -0,0 +1,20 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug  1 14:17:10 UTC 2013
+Subject: don't hardcode ifconfig path
+
+--- allmydata-tahoe-1.10.0/src/allmydata/util/iputil.py
++++ allmydata-tahoe-1.10.0/src/allmydata/util/iputil.py
+@@ -177,11 +177,11 @@
+ _win32_re = re.compile('^\s*\d+\.\d+\.\d+\.\d+\s.+\s(?P<address>\d+\.\d+\.\d+\.\d+)\s+(?P<metric>\d+)\s*$', flags=re.M|re.I|re.S)
+ 
+ # These work in Redhat 6.x and Debian 2.2 potato
+-_linux_path = '/sbin/ifconfig'
++_linux_path = 'ifconfig'
+ _linux_re = re.compile('^\s*inet [a-zA-Z]*:?(?P<address>\d+\.\d+\.\d+\.\d+)\s.+$', flags=re.M|re.I|re.S)
+ 
+ # NetBSD 1.4 (submitted by Rhialto), Darwin, Mac OS X
+-_netbsd_path = '/sbin/ifconfig'
++_netbsd_path = 'ifconfig'
+ _netbsd_args = ('-a',)
+ _netbsd_re = re.compile('^\s+inet [a-zA-Z]*:?(?P<address>\d+\.\d+\.\d+\.\d+)\s.+$', flags=re.M|re.I|re.S)
+ 
diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.0.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r1.ebuild
index bd294ec12954..2527428a1e8a 100644
--- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.0.ebuild
+++ b/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-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/net-fs/tahoe-lafs/tahoe-lafs-1.10.0.ebuild,v 1.1 2013/08/01 13:02:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r1.ebuild,v 1.1 2013/08/01 14:20:33 hasufell Exp $
 
 EAPI=5
 
@@ -44,7 +44,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+PATCHES=( "${FILESDIR}"/${P}-{setup,ifconfig}.patch )
 
 src_prepare() {
 	rm -r setuptools* setup.cfg || die