pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/pptp Updated pptp to 1.7.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/91db391eb7c8
branches: trunk
changeset: 509764:91db391eb7c8
user: rillig <rillig%pkgsrc.org@localhost>
date: Tue Mar 14 13:53:57 2006 +0000
description:
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@localhost.
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 <rklazes%xs4all.nl@localhost>
diffstat:
net/pptp/DESCR | 22 +-
net/pptp/Makefile | 24 +-
net/pptp/PLIST | 18 +-
net/pptp/distinfo | 19 +-
net/pptp/patches/patch-aa | 51 -----
net/pptp/patches/patch-ab | 81 ++-----
net/pptp/patches/patch-ac | 464 ++++++++++++++++++++++-----------------------
net/pptp/patches/patch-ad | 100 ++++-----
net/pptp/patches/patch-ae | 28 --
net/pptp/patches/patch-af | 14 -
net/pptp/patches/patch-ag | 65 ------
11 files changed, 343 insertions(+), 543 deletions(-)
diffs (truncated from 976 to 300 lines):
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/DESCR
--- a/net/pptp/DESCR Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/DESCR Tue Mar 14 13:53:57 2006 +0000
@@ -1,21 +1,13 @@
-pptp-linux
-
-pptp-linux is an implementation of the PPTP protocol for Linux and
-other Unix systems.
+pptp is an implementation of the PPTP protocol for Linux and other Unix
+systems.
The code is released under the terms of the GPL; see the file COPYING
for details.
-You can find notes on installing and using this package in the file
-USING; design notes are in the Documentation directory; and the
-standards documents used to implement pptp-linux can be found in the
+You can find notes on installing in the file INSTALL, usage notes in
+the file USING, design notes in the Documentation directory, and the
+standards documents used to implement pptp can be found in the
Reference directory.
-Discussion of this code is ongoing on the mailing list pptp%debs.fuller.edu@localhost,
-subscribe by sending "subscribe" in the body on an email to
-pptp-request%debs.fuller.edu@localhost, or look at http://debs.fuller.edu.
-Christoph Lameter is the list organizer.
-
-Re-organization and patches are of course greatly welcomed.
-
-C. Scott Ananian <cananian%alumni.princeton.edu@localhost>
+New versions and additional documentation can be found on the PPTP
+Client project page, at http://pptpclient.sourceforge.net/
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/Makefile
--- a/net/pptp/Makefile Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/Makefile Tue Mar 14 13:53:57 2006 +0000
@@ -1,17 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/14 13:53:57 rillig Exp $
-DISTNAME= pptp-linux-1.0.2
-PKGNAME= pptp-1.0.2
+DISTNAME= pptp-1.7.0
CATEGORIES= net
-MASTER_SITES= http://www.pdos.lcs.mit.edu/~cananian/Synaptics/release/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.pdos.lcs.mit.edu/~cananian/Projects/PPTP/
+HOMEPAGE= http://pptpclient.sourceforge.net/
COMMENT= PPTP client package for Microsoft VPN servers (no encryption yet)
-#LICENSE= GPL
+NOT_FOR_PLATFORM= Interix-*-*
+
+MAKE_FLAGS+= BINDIR=${PREFIX:Q}/sbin
+MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man8
+MAKE_FLAGS+= PPPDIR=${PREFIX:Q}/share/examples/pptp
-NOT_FOR_PLATFORM= Interix-*-*
+INSTALLATION_DIRS= bin ${PKGMANDIR:Q}/man8 share/examples/pptp
+INSTALLATION_DIRS+= share/doc/pptp/Documentation share/doc/pptp/Reference
+DOCDIR= ${PREFIX}/share/doc/pptp
+
+post-install:
+ cd ${WRKSRC:Q}/Documentation && ${INSTALL_DATA} * ${DOCDIR:Q}/Documentation
+ cd ${WRKSRC:Q}/Reference && ${INSTALL_DATA} * ${DOCDIR:Q}/Reference
+ cd ${WRKSRC:Q} && ${INSTALL_DATA} INSTALL NEWS README USING ${DOCDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/PLIST
--- a/net/pptp/PLIST Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/PLIST Tue Mar 14 13:53:57 2006 +0000
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/14 13:53:57 rillig Exp $
sbin/pptp
-share/doc/pptp/USING
+share/doc/pptp/Documentation/DESIGN.CALLMGR
+share/doc/pptp/Documentation/DESIGN.PPTP
+share/doc/pptp/Documentation/PORTING
share/doc/pptp/INSTALL
+share/doc/pptp/NEWS
share/doc/pptp/README
-share/doc/pptp/NEWS
share/doc/pptp/Reference/README
+share/doc/pptp/Reference/README.Reference
share/doc/pptp/Reference/ms-chap.txt
share/doc/pptp/Reference/pptp-draft.txt
share/doc/pptp/Reference/rfc1661.txt
@@ -14,10 +17,9 @@
share/doc/pptp/Reference/rfc1990.txt
share/doc/pptp/Reference/rfc791.txt
share/doc/pptp/Reference/rfc793.txt
-share/doc/pptp/Documentation/DESIGN.CALLMGR
-share/doc/pptp/Documentation/DESIGN.PPTP
-share/doc/pptp/Documentation/PORTING
-man/man8/pptp.8
+share/doc/pptp/USING
+share/examples/pptp/options.pptp
+@dirrm share/examples/pptp
+@dirrm share/doc/pptp/Reference
@dirrm share/doc/pptp/Documentation
-@dirrm share/doc/pptp/Reference
@dirrm share/doc/pptp
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/distinfo
--- a/net/pptp/distinfo Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/distinfo Tue Mar 14 13:53:57 2006 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:14:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/03/14 13:53:57 rillig Exp $
-SHA1 (pptp-linux-1.0.2.tar.gz) = fe7c7ea298483de37052d57f2641977753817fcf
-RMD160 (pptp-linux-1.0.2.tar.gz) = d82bb10a9ca78848bd9c44cad451aead31ee11b5
-Size (pptp-linux-1.0.2.tar.gz) = 193299 bytes
-SHA1 (patch-aa) = 66724c2083970fdcced1cf81bbb9e3a70daf8b5d
-SHA1 (patch-ab) = b6fa33037515042f13057f2593e3a073f694f932
-SHA1 (patch-ac) = 71685d2992349a2b6796fc08fd598b8bf5b60226
-SHA1 (patch-ad) = 22da1feec4d0d80e760839e15d97e89bfee6216f
-SHA1 (patch-ae) = 82b15dce081e938351876e86866eea308829c7d0
-SHA1 (patch-af) = 56b7f7eece4b9b92de6a113886ae80c27c30b5e6
-SHA1 (patch-ag) = c272983a86ba4fbaf96baed678cb10cd95c1ac0e
+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-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52
+SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf
+SHA1 (patch-ah) = 9f1739cbb375c1c5d15c559490d2ec44abc72ce6
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/patches/patch-aa
--- a/net/pptp/patches/patch-aa Tue Mar 14 12:43:10 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/10 01:14:02 jtk Exp $
-
-Index: Makefile
---- Makefile.orig Wed Feb 18 17:42:14 1998
-+++ Makefile Sun Apr 9 21:07:17 2000
-@@ -1,10 +1,11 @@
--VERSION = 1.0.2
--VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"'
-+VERSION = 1.0.2+NetBSD
-+VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"' -DPROGRAM_NAME='"pptp"'
-
- CC = gcc -Wall
--DEBUG = -g
-+RM = rm
-+DEBUG = -g -O2 # -O9
- INCLUDE =
--CFLAGS = -O9 $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
-+CFLAGS = $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
- LIBS =
- LDFLAGS =
-
-@@ -24,7 +25,19 @@
- CALLMGR_OBJS = pptp_callmgr.o pptp_ctrl.o dirutil.o util.o vector.o version.o
- CALLMGR_DEPS = pptp_callmgr.h pptp_ctrl.h dirutil.h pptp_msg.h vector.h
-
--all: $(PPTP_BIN) $(CALLMGR_BIN)
-+MANPAGE=pptp.8
-+
-+all: $(PPTP_BIN) $(MANPAGE)
-+
-+install:
-+ $(INSTALL) -c $(PPTP_BIN) ${PREFIX}/sbin/${PPTP_BIN}
-+ $(INSTALL) -c -m 444 $(MANPAGE) ${PREFIX}/man/man8/$(MANPAGE)
-+ mkdir -p ${PREFIX}/share/doc/pptp
-+ $(INSTALL) -c -m 444 USING ${PREFIX}/share/doc/pptp/USING
-+ $(INSTALL) -c -m 444 README ${PREFIX}/share/doc/pptp/README
-+ $(INSTALL) -c -m 444 INSTALL ${PREFIX}/share/doc/pptp/INSTALL
-+ $(INSTALL) -c -m 444 NEWS ${PREFIX}/share/doc/pptp/NEWS
-+ tar cf - Reference Documentation |(cd ${PREFIX}/share/doc/pptp && tar xpBf -)
-
- $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS)
- $(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS)
-@@ -36,7 +49,7 @@
- $(CC) -o vector_test vector_test.o vector.o
-
- clean:
-- $(RM) *.o *~
-+ $(RM) -f *.o *~
-
- clobber: clean
- $(RM) $(PPTP_BIN) $(CALLMGR_BIN) vector_test
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/patches/patch-ab
--- a/net/pptp/patches/patch-ab Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/patches/patch-ab Tue Mar 14 13:53:57 2006 +0000
@@ -1,58 +1,37 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/10 01:14:02 jtk Exp $
+$NetBSD: patch-ab,v 1.2 2006/03/14 13:53:57 rillig Exp $
+
+Added more logging.
-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]);
+--- pptp.c.orig 2005-07-28 03:15:11.000000000 +0200
++++ pptp.c 2006-03-14 13:51:22.000000000 +0100
+@@ -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));
++ log("using remote IP address %s\n", inet_ntoa(inetaddr));
+
- /* Step 2: Open connection to call manager
- * (Launch call manager if necessary.)
- */
-@@ -127,8 +129,8 @@
- }
+ /* 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);
- /* 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);
-+
+ /* 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. */
- 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<argc; i++)
-- new_argv[i+3] = argv[i];
-+ fprintf(stderr, "running pppd: %s %s %s", new_argv[0], new_argv[1], new_argv[2]);
-+ for (i=0; i<argc; i++) {
-+ fprintf(stderr, " %s", argv[i]);
-+ new_argv[i+3] = argv[i];
-+ }
-+ fprintf(stderr, "\n");
- new_argv[i+3] = NULL;
-+
- execvp(new_argv[0], new_argv);
+ /* 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];
+ 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);
}
diff -r 6861f125ff4a -r 91db391eb7c8 net/pptp/patches/patch-ac
--- a/net/pptp/patches/patch-ac Tue Mar 14 12:43:10 2006 +0000
+++ b/net/pptp/patches/patch-ac Tue Mar 14 13:53:57 2006 +0000
@@ -1,241 +1,233 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/04/10 01:14:02 jtk Exp $
+$NetBSD: patch-ac,v 1.2 2006/03/14 13:53:57 rillig Exp $
+
+Added more logging and made its appearance more consistent.
-Index: pptp_ctrl.c
---- pptp_ctrl.c.orig 1998/09/02 14:40:54
-+++ pptp_ctrl.c 1999/02/12 14:23:29
-@@ -159,6 +159,7 @@
- hton16(PPTP_MAX_CHANNELS), hton16(PPTP_FIRMWARE_VERSION),
- PPTP_HOSTNAME, PPTP_VENDOR
- };
-+ log("sending start ctrl conn rqst");
- if (pptp_send_ctrl_packet(conn, &packet, sizeof(packet)))
- conn->conn_state = CONN_WAIT_CTL_REPLY;
- else return NULL; /* could not send initial start request. */
-@@ -211,6 +212,7 @@
- hton32(PPTP_BEARER_CAP), hton32(PPTP_FRAME_CAP),
- hton16(PPTP_WINDOW), 0, 0, 0, {0}, {0}
- };
Home |
Main Index |
Thread Index |
Old Index