diff options
author | Sam Lawrance <lawrance@FreeBSD.org> | 2006-05-15 06:53:11 +0000 |
---|---|---|
committer | Sam Lawrance <lawrance@FreeBSD.org> | 2006-05-15 06:53:11 +0000 |
commit | 2d627f9f285817593c1c8fc70da15e5a5b3f39ca (patch) | |
tree | 1746303bfb7c55fc80e6e88670ccf2de035fa868 /net/poptop | |
parent | Adding port math/p5-Math-Symbolic-Custom-CCompiler, Compile Math::Symbolic tr... (diff) |
Patch pptpctrl.c so that it does not pass bogus parameters to ppp.
Bump PORTREVISION for the change above.
PR: ports/96386
Submitted by: Stefan Bethke <stb@lassitu.de>
Approved by: olmi@rentech.ru (maintainer, timeout 2 weeks)
Notes
Notes:
svn path=/head/; revision=162407
Diffstat (limited to 'net/poptop')
-rw-r--r-- | net/poptop/Makefile | 1 | ||||
-rw-r--r-- | net/poptop/files/patch-pptpctrl.c | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile index 6945f52268bd..ed930631cc39 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -7,6 +7,7 @@ PORTNAME= poptop PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net/poptop/files/patch-pptpctrl.c b/net/poptop/files/patch-pptpctrl.c index 6bc94d49668e..08cf87c02758 100644 --- a/net/poptop/files/patch-pptpctrl.c +++ b/net/poptop/files/patch-pptpctrl.c @@ -1,7 +1,15 @@ ---- pptpctrl.c.orig Fri Oct 21 16:23:58 2005 -+++ pptpctrl.c Fri Oct 21 16:24:28 2005 -@@ -770,7 +770,7 @@ - +--- pptpctrl.c.orig Mon Jan 24 23:04:13 2005 ++++ pptpctrl.c Sat May 6 12:48:55 2006 +@@ -742,7 +742,6 @@ + sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]); + pppd_argv[an++] = pppInterfaceIPs; + } +-#endif + + if (!noipparam) { + pppd_argv[an++] = "ipparam"; +@@ -751,10 +750,11 @@ + if (pptp_logwtmp) { pppd_argv[an++] = "plugin"; - pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so"; @@ -9,3 +17,7 @@ pppd_argv[an++] = "pptpd-original-ip"; pppd_argv[an++] = inet_ntoa(inetaddrs[1]); } ++#endif + + /* argv arrays must always be NULL terminated */ + pppd_argv[an++] = NULL; |