Fix wrong hardcoded path to ip utility (#284460).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 46 insertions, 8 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index aff3dc58e01a..5f3d9965121f 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.49 2009/06/20 09:00:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.50 2009/09/16 21:35:13 mrness Exp $
+
+*pptpclient-1.7.2-r1 (16 Sep 2009)
+
+  16 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  +files/pptpclient-1.7.2-ip-path.patch, -pptpclient-1.7.2.ebuild,
+  +pptpclient-1.7.2-r1.ebuild:
+  Fix wrong hardcoded path to ip utility (#284460).
 
 *pptpclient-1.7.2 (20 Jun 2009)
 
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index a7315164314a..e0762f49f0e4 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX pptp_fe.pl 8100 RMD160 4b8c4591645a5f79daf2ba27e3e657db24323ffe SHA1 ec6102be37a7a2107f796bee974feadb7a3bd7a1 SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648
 AUX pptpclient-1.7.1-process-name.patch 735 RMD160 df4e5d1fcbe18fdf823b403d8f190fd3e7d922c3 SHA1 49a918fcd5f8d03f1063067ae81c0cadfd73221e SHA256 db4386f18e959bf5fc60a0318f8f2722be9d6b3cdce39c2e115efb550b00c2a5
+AUX pptpclient-1.7.2-ip-path.patch 883 RMD160 6c89e92f99e72c88bb3ac09422d0b60cef67ff74 SHA1 cda0eb529094b732f7def6cfe8cde7af23d21b6c SHA256 e4b30e07b7af6f0085044a98644d7d57689a74f2302f7b5a8a9108a7613179d6
 AUX pptpclient-1.7.2-process-name.patch 1242 RMD160 fd10fc6506eb1e6ad2fdd1fc46dfb453d4623ec7 SHA1 b2edbe1f7ad781171142809bc48b6db05f0295ce SHA256 a16bc434f301af72f43cca41a17e8232006878295b0f4f2a3fc5dbe85b020b5e
 AUX xpptp_fe.pl 5620 RMD160 876401b301857b17e0ced6e191316f1ff89afe19 SHA1 003c9b054c521972adfd1b48c244ad7470ddb12b SHA256 18c6098a66721a4f5c5b387c2ea312c21224c11ad6b2ddaec83f63049b1ab053
 DIST pptp-1.7.1.tar.gz 229024 RMD160 f510262e8c06058d754d6d73d1b289fcdbc54dc7 SHA1 cc2e4f40c5e3316bede41ec0a092a32025682851 SHA256 8e3fa9f17c22818eae68419f66966865423206d736eb74d212a3501f62423276
 DIST pptp-1.7.2.tar.gz 81113 RMD160 fff47ef2c3546b06c69c27db01beebed7e6cda4b SHA1 1007eb1d4d21629fab390903e8b394d6157b4983 SHA256 e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc
 DIST pptp-command-20050401.gz 7662 RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 SHA1 546c437896ba00fe2b66b924671de884986de5d8 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d
 EBUILD pptpclient-1.7.1-r1.ebuild 1284 RMD160 006e1c5f30af48342b6831c7b9967c23e350de7e SHA1 29115bcbdbee75c07979c1e3332ad0017bab7232 SHA256 26e15729bc05a898855ad3fb841883d93e0ec1815cc31df2e75761e7d43b0005
-EBUILD pptpclient-1.7.2.ebuild 1284 RMD160 aa0b1f1176f93b4d5bec7373c424ff75455043a9 SHA1 4807e25990cada6a595bdf38a09851d05f02a075 SHA256 37c4116851153fffbf9e4634d784947d4d8e5112b4f51fbdbddeaada878961e3
-MISC ChangeLog 7194 RMD160 e8b5b29755d2470c8af24547d5afd0f016f64a1d SHA1 4359ef4af19a4a30e822167da687b5f56c8f96fe SHA256 f732250e6199a2815f9d77b27cddb5ec7912e9731b68ada4bdc8a653e7278a8a
+EBUILD pptpclient-1.7.2-r1.ebuild 1320 RMD160 2e6e03411f40f361bcf63201c12590fef4ffdc57 SHA1 a5211dac50e58d965ca5315837006d305fd92aaa SHA256 edaef52c2224fd9efed55f6461123325d9a301e383472c3c11cbeb3f8f6b554e
+MISC ChangeLog 7429 RMD160 c720d16dca7b02a1706531f00978201b205cd7d8 SHA1 c78def2914a90928c96e05b04571cca8fb80470e SHA256 bab7fb6ccce516e0bdebb16014fbc535df29d3182544eea4a023dc4caba8a613
 MISC metadata.xml 295 RMD160 db055ffb19549883c4f07256f391e498f0ed504d SHA1 c1601c40929a9fd88e233a2773f0efa7b672114e SHA256 86aeda200c41eff29b264a66ce96f3a68f1e1e5a142ffdccf2bb1cd46ac5f5be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko8pVAACgkQts85UDFmaOUaVgCfSLnN8kV1gnknwYwbpPd2uQrs
-fMwAmQGUYKRpiDw3DOE/lyOzSamghonr
-=Awe8
+iEYEARECAAYFAkqxWiMACgkQ9A5kJBGSrsuLzgCbBi9UggOKu24fV7VA6nUKNarh
+PLsAn1k68Vh5mf2DmrsPiSUMHkLdHQjC
+=ct74
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpclient/files/pptpclient-1.7.2-ip-path.patch b/net-dialup/pptpclient/files/pptpclient-1.7.2-ip-path.patch
new file mode 100644
index 000000000000..0e5902113f47
--- /dev/null
+++ b/net-dialup/pptpclient/files/pptpclient-1.7.2-ip-path.patch
@@ -0,0 +1,29 @@
+diff -Nru pptp-1.7.2.orig/routing.c pptp-1.7.2/routing.c
+--- pptp-1.7.2.orig/routing.c	2008-05-14 08:33:55.000000000 +0200
++++ pptp-1.7.2/routing.c	2009-09-16 23:28:11.000000000 +0200
+@@ -55,7 +55,7 @@
+ 
+ void routing_init(char *ip) {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route get %s", ip);
++  snprintf(buf, 255, "/sbin/ip route get %s", ip);
+   FILE *p = popen(buf, "r");
+   fgets(buf, 255, p);
+   /* TODO: check for failure of fgets */
+@@ -66,14 +66,14 @@
+ 
+ void routing_start() {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route replace %s", route);
++  snprintf(buf, 255, "/sbin/ip route replace %s", route);
+   FILE *p = popen(buf, "r");
+   pclose(p);
+ }
+ 
+ void routing_end() {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route delete %s", route);
++  snprintf(buf, 255, "/sbin/ip route delete %s", route);
+   FILE *p = popen(buf, "r");
+   pclose(p);
+ }
diff --git a/net-dialup/pptpclient/pptpclient-1.7.2.ebuild b/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild
index a53ad4d3fcd6..b0aea06f946d 100644
--- a/net-dialup/pptpclient/pptpclient-1.7.2.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2.ebuild,v 1.1 2009/06/20 09:00:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild,v 1.1 2009/09/16 21:35:13 mrness Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="tk"
 
-DEPEND=">=net-dialup/ppp-2.4.2
+DEPEND="net-dialup/ppp
 	dev-lang/perl
 	tk? ( dev-perl/perl-tk )"
 RDEPEND="${DEPEND}"
@@ -30,6 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-process-name.patch
+	epatch "${FILESDIR}"/${P}-ip-path.patch
 }
 
 src_compile() {