head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.164 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.162 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.160 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.158 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.156 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.154 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.152 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.150 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.148 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.146 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.144 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.142 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.140 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.138 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.136 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.134 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.132 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.130 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.128 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.126 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.124 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.122 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.120 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.116 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.96 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.118 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.114 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.112 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.110 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.108 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.106 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.104 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.102 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.100 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.98 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.94 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.92 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.90 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.88 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.86 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.84 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.82 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.80 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.78 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.76 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.74 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.72 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.70 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.68 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.66 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.64 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.62 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.60 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.58 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.56 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.54 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.52 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.50 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.48 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.46 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.44 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.42 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.40 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.38 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.36 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.34 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.32 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.30 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.28 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.26 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.24 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.22 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.18 pkgsrc-2008Q1:1.4.0.16 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.14 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.12 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.10 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2006.05.12.09.30.55; author joerg; state Exp; branches; next 1.3; 1.3 date 2006.04.14.10.32.02; author rillig; state Exp; branches; next 1.2; 1.2 date 2006.03.14.13.53.57; author rillig; state Exp; branches; next 1.1; 1.1 date 2000.04.10.01.14.02; author jtk; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.04.10.01.14.02; author jtk; state Exp; branches; next ; desc @@ 1.4 log @Fix build on DragonFly. Add pptp.8 to PLIST. Bump revision. @ text @$NetBSD: patch-ab,v 1.3 2006/04/14 10:32:02 rillig Exp $ Added more logging. --- pptp.c.orig 2005-07-28 03:15:11.000000000 +0200 +++ pptp.c 2006-03-14 13:51:22.000000000 +0100 @@@@ -7,7 +7,7 @@@@ #include #include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #elif defined(__NetBSD__) || defined(__OpenBSD__) #include @@@@ -261,6 +261,8 @@@@ int main(int argc, char **argv, char **e inetaddr = get_ip_address(argv[optind]); optind++; + log("using remote IP address %s\n", inet_ntoa(inetaddr)); + /* Find the ppp options, extract phone number */ pppdargc = argc - optind; pppdargv = argv + optind; @@@@ -504,6 +506,12 @@@@ void launch_pppd(char *ttydev, int argc, for (j = 0; j < argc; j++) new_argv[i++] = argv[j]; new_argv[i] = NULL; + + fprintf(stderr, "running pppd:"); + for (i = 0; new_argv[i] != NULL; i++) + fprintf(stderr, " %s", new_argv[i]); + fprintf(stderr, "\n"); + execvp(new_argv[0], new_argv); } @ 1.3 log @Removed a dubious hunk from patch-ab that changed the order of two arguments in a function call, which had been introduced some years ago. Fixes PR 33232. Added patch-ah, which allows the package to be installed by unprivileged users. I had forgotten to add this to the last commit. Bumped PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2006/03/14 13:53:57 rillig Exp $ d7 9 @ 1.2 log @Updated pptp to 1.7.0. Release 1.7.0: (27th July 2005) - silently discard packets not for the call [Cameron/Jenkins] - adopt sigpipe for use with SIGALRM on control connection [Wolter/Cameron] - fixes known valgrind heap violations in 1.6.0 [Cameron/Thorne] - properly report control connection echo reply loss [Wolter] Release 1.6.0: (18th February 2005) - fix double-free on stop control connection reply [Kivity] - add --idle-wait option [Cameron] - fix segfault on fatal connection error [Kivity] - prevent a possible signal race [Kivity] - prevent kill of init [Shurdeek] - portability fix for non-Linux systems [Quinot] - rename package from pptp-linux to pptp [Cameron] Release 1.5.0: (22nd June 2004) - fix statistics when buffering disabled [Wilson] - do not inherit the GRE socket [Cameron] - fix a case of non-shutdown of call manager [Klazes] - add --nobuffer option to eliminate all buffering of packets [Wilson] - fix corruption of command line as shown by ps [Howarth] - fix CPU loop after pppd killed [Cameron] - fix compile for ARM architecture [Hopf] - add documentation for command-line options [Wilson] - do not hang when a connection is refused [McCurdy] - better describe a cause of EMSGSIZE [Cameron] Release 1.4.0: (2nd January 2004) - support options before hostname [Wilson] - defer OCRQ until after SCCRP [Cameron] - include uninstall target [Pieter] - only issue a warning if sync mode is different to pppd [Klazes] - reformat and tidy code [Klazes] - reduce transmitted ack-only packets from 40% to 0.8% [Klazes] Release 1.3.1: (11th June 2003) - fixed bug introduced since 1.2.0 that prevented simultaneous tunnels. Release 1.3.0: (10th June 2003) - rewrite command usage text. - increase call disconnect notification log message verbosity. - inherit more make command line options. - remove execute permissions on man page. - fixed inefficient acknowledgement immediately followed by data packet. - added statistics for link quality monitoring. - remove include of callmgr, do separate compile. - remove duplicate messages caused by code in header file. - compilation fixes for Apple MacOS X. - support multiple clients on alias IP addresses. Release 1.2.0: (14th February 2003) - subsecond packet timeout to improve performance on fast links. - rewrite INSTALL. - add man page to install target. - fix response to dropped packets. - fix man page, address must be before options. - adopt man page contributed by Thomas Quinot. - close stderr to prevent holding open ssh sessions. - minor hint added in case of EIO on read() of pty. - support synchronous HDLC ppp encoding. Synchronous mode results in an important improvement of the CPU efficiency. - handle out-of-order packets arriving on the GRE socket by buffering. - bind GRE socket early to prevent ICMP Unreachable response by client. Release 1.1.0: (20th March 2002) - New release engineer. - allow activation as a psuedo-tty child process from pppd. This allows on demand pptp links or automatically reconnect. - ADSL modem quirks handler by mulix@@actcom.co.il. Workarounds for Orckit ADSL modem. - workaround for Cisco PIX connection drop after 60 seconds. - enhance bad FCS error message. - ported to FreeBSD and NetBSD. - integrated call manager into pptp binary. - many bugfixes improving stability. Release 1.0.3: (7th May 2001) - New maintaining team. - Various bug fixes from the Debian package and FreeBSD port. - Incorporate patch to support erroneous return code with Alcatel ADSL 1000 modems. - Fix incorrect call id error. - New command line option: --phone (specify phone number). (Needed by the Dutch Mxstream ADSL service.) Contributed by Rein Klazes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2000/04/10 01:14:02 jtk Exp $ a15 9 @@@@ -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. */ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 6 Index: pptp.c --- pptp.c.orig 1998/09/02 14:40:54 +++ pptp.c 1999/02/12 14:23:28 @@@@ -71,6 +71,8 @@@@ /* Step 1: Get IP address for the hostname in argv[1] */ inetaddr = get_ip_address(argv[1]); d11 1 a11 1 + log("using remote IP address %s\n", inet_ntoa(inetaddr)); d13 9 a21 5 /* Step 2: Open connection to call manager * (Launch call manager if necessary.) */ @@@@ -127,8 +129,8 @@@@ } a22 5 /* Step 6: Do GRE copy until close. */ - pptp_gre_copy(call_id, peer_call_id, pty_fd, inetaddr); - + pptp_gre_copy(peer_call_id, call_id, pty_fd, inetaddr); + d24 12 a35 33 /* on close, kill all. */ kill(parent_pid, SIGTERM); @@@@ -140,13 +142,14 @@@@ struct in_addr get_ip_address(char *name) { struct in_addr retval; struct hostent *host = gethostbyname(name); - if (host==NULL) + if (host==NULL) { if (h_errno == HOST_NOT_FOUND) fatal("gethostbyname: HOST NOT FOUND"); else if (h_errno == NO_ADDRESS) fatal("gethostbyname: NO IP ADDRESS"); else fatal("gethostbyname: name server error"); + } if (host->h_addrtype != AF_INET) fatal("Host has non-internet address"); @@@@ -239,9 +242,14 @@@@ new_argv[0] = PPPD_BINARY; new_argv[1] = ttydev; new_argv[2] = "38400"; - for (i=0; i