pkg/33232: pptp+pppd don't work due to incorrect patches/patch-ab

[cheusov%tut.by@localhost]

>Number:         33232
>Category:       pkg
>Synopsis:       pptp+pppd don't work due to incorrect patches/patch-ab
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 10 19:45:00 +0000 2006
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 3.0_STABLE
>Organization:
Best regards, Aleksey Cheusov.
>Environment:
System: NetBSD chen.chizhovka.net 3.0_STABLE NetBSD 3.0_STABLE (GENERIC) #2: 
Sun Mar 12 12:49:58 GMT 2006 
cheusov@chen:/usr/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
/usr/pkgsrc/bin/pptp doesn't work while upstream version do its work
well. This is because of incorrect patches/patch-ab.
'/usr/sbin/pppd call <provider>' doesn't make ppp0 interface up.
It just hangs for a several second and than exits with no success.
>How-To-Repeat:
I place here my configuration files for pppd and pptp.
You can easily repeate my situation.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
/etc/ppp/peers/inet:
file /etc/ppp/pppd_pptp.options
name cheusov
pty "/usr/pkg/sbin/pptp 10.1.2.1 --nolaunchpppd"

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
/etc/ppp/pppd_pptp.options:
lock noauth nobsdcomp nodeflate
usepeerdns
defaultroute
persist
debug
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
/etc/ppp/chap-secrets:
<MY_ISP_NAME> * <MY_ISP_PASSWD> *
>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/pptp/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    14 Mar 2006 13:53:57 -0000      1.4
+++ distinfo    10 Apr 2006 19:38:17 -0000
@@ -3,7 +3,6 @@
 SHA1 (pptp-1.7.0.tar.gz) = fc96e8a765bf17eb02ce1584d8e9d024b68ab5a7
 RMD160 (pptp-1.7.0.tar.gz) = 62c947379c44102945a198ddc914d5aa634db13c
 Size (pptp-1.7.0.tar.gz) = 227699 bytes
-SHA1 (patch-ab) = 564949ffc4ab97af5e0845b930880cc48ee00a6b
+SHA1 (patch-ab) = a03b32272157ccfbc6d2836a3220dfc2d7fbdb97
 SHA1 (patch-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52
 SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf
-SHA1 (patch-ah) = 9f1739cbb375c1c5d15c559490d2ec44abc72ce6
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/pptp/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab    14 Mar 2006 13:53:57 -0000      1.2
+++ patches/patch-ab    10 Apr 2006 19:38:17 -0000
@@ -13,15 +13,6 @@
      /* Find the ppp options, extract phone number */
      pppdargc = argc - optind;
      pppdargv = argv + optind;
-@@ -356,7 +358,7 @@ int main(int argc, char **argv, char **e
-     signal(SIGUSR1, sigstats);
- 
-     /* Do GRE copy until close. */
--    pptp_gre_copy(call_id, peer_call_id, pty_fd, gre_fd);
-+    pptp_gre_copy(peer_call_id, call_id, pty_fd, gre_fd);
- 
- shutdown:
-     /* on close, kill all. */
 @@ -504,6 +506,12 @@ void launch_pppd(char *ttydev, int argc,
      for (j = 0; j < argc; j++)
          new_argv[i++] = argv[j];