From 713f439d750c5774b1ae86b9b830a35819d00d2e Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 31 Mar 1999 06:07:59 +0000 Subject: [PATCH] update version to 2.3.7 --- NeXT/Makefile.top | 4 +- NeXT/if_ppp.c | 4 +- README | 87 ++++++++++++++++++++++++++++++++++++------ README.linux | 22 ++++++----- include/linux/if_ppp.h | 6 +-- linux/ppp.c | 4 +- modules/if_ppp.c | 4 +- pppd/Makefile.linux | 4 +- pppd/patchlevel.h | 6 +-- pppd/sys-linux.c | 2 +- 10 files changed, 105 insertions(+), 38 deletions(-) diff --git a/NeXT/Makefile.top b/NeXT/Makefile.top index fbaebb9..b881bc5 100644 --- a/NeXT/Makefile.top +++ b/NeXT/Makefile.top @@ -1,6 +1,6 @@ # ppp top level makefile for NeXT systems # -# $Id: Makefile.top,v 1.5 1999/03/02 05:27:24 paulus Exp $ +# $Id: Makefile.top,v 1.6 1999/03/31 06:07:56 paulus Exp $ # # Change the values of ARCHFLAGS to include the @@ -155,7 +155,7 @@ NEXTPORT = \ # portdist: - echo NeXT-ppp2.3.6-`sed -e '/version_string/!d' \ + echo NeXT-ppp2.3.7-`sed -e '/version_string/!d' \ -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q ./NeXT/NeXT_Version.h` > .fname rm -rf `cat .fname` mkdir `cat .fname` diff --git a/NeXT/if_ppp.c b/NeXT/if_ppp.c index c2aeab8..9515d69 100644 --- a/NeXT/if_ppp.c +++ b/NeXT/if_ppp.c @@ -81,7 +81,7 @@ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ #if !defined(lint) -static char sccsid[] = "$Revision: 1.7 $ ($Date: 1999/03/02 05:27:24 $)"; +static char sccsid[] = "$Revision: 1.8 $ ($Date: 1999/03/31 06:07:56 $)"; #endif /* not lint*/ #define KERNEL 1 @@ -285,7 +285,7 @@ pppattach() register struct ppp_softc *sc; register int i = 0; - IOLog("\nPPP version 2.3.6-%s for NeXTSTEP and OPENSTEP\n", PPPVERSION); + IOLog("\nPPP version 2.3.7-%s for NeXTSTEP and OPENSTEP\n", PPPVERSION); IOLog("by Stephen Perkins, Philip Prindeville, and Pete French\n"); if (install_ppp_ld() < 0) { IOLog("ppp: Could not install line discipline\n"); diff --git a/README b/README index 4096879..c339e89 100644 --- a/README +++ b/README @@ -34,19 +34,21 @@ system, which contains more specific details for installing PPP on that system. The supported systems, and the corresponding README files, are: - Digital Unix (OSF/1) README.osf Linux README.linux + Solaris 2 README.sol2 + Digital Unix (OSF/1) README.osf NetBSD, FreeBSD README.bsd NeXTStep README.next - Solaris 2 README.sol2 SunOS 4.x README.sunos4 System V Release 4 README.svr4 Ultrix 4.x README.ultrix -Unfortunately, AIX 4 is no longer supported, since I don't have a -maintainer for the AIX 4 port. If you want to volunteer, contact me. -The Ultrix port is untested, as I no longer have access to an Ultrix -box. +In fact, only the Linux and Solaris 2 ports have been tested in this +release. Code for the other systems is still included; if you use it, +let me know how it works. If I don't hear from anyone it will +probably get dropped in a subsequent release. AIX 4 is no longer +supported, since I don't have a maintainer for the AIX 4 port. If you +want to volunteer, contact me. In each case you start by running the ./configure script. This works out which operating system you are using and creates symbolic links to @@ -67,9 +69,72 @@ use any IP address. (This only applies where the peer is authenticating itself to you, of course.) -What's new in ppp-2.3.6. +What's new in ppp-2.3.7. ************************ +* Pppd can now automatically allocate itself a pseudo-tty to use as + the serial device. This has made three new options possible: + + - `pty script' will run `script' with its standard input and output + connected to the master side of the pty. For example: + pppd pty 'ssh -t server.my.net pppd' + is a basic command for setting up a PPP link (tunnel) over ssh. + (In practice you may need to specify other options such as IP + addresses, etc.) + + - `notty' tells pppd to communicate over its standard input and + output, which do not have to be a terminal device. + + - `record filename' tells pppd to record all of the characters sent + and received over the serial device to a file called `filename'. + The data is recorded in a tagged format with timestamps, which can + be printed in a readable form with the pppdump program, which is + included in this distribution. + +* Pppd now logs the connect time and number of bytes sent and received + (at the level of the serial device) when the connection is + terminated. + +* If you use the updetach or nodetach option, pppd will print its + messages to standard output as well as logging them with syslog + (provided of course pppd isn't using its standard input or output as + its serial device). + +* There is a new `privgroup groupname' option (a privileged option). + If the user running pppd is in group `groupname', s/he can use + privileged options without restriction. + +* There is a new `receive-all' option, which causes pppd to accept all + control characters, even the ones that the peer should be escaping + (i.e. the receive asyncmap is 0). This is useful with some buggy + peers. + +* The default asyncmap is now 0. + +* There is a new `sync' option, currently only implemented under + Linux, which allows pppd to run on synchronous HDLC devices. + +* If a value for the device name or for the connect, disconnect, + welcome or pty option is given in a privileged option file + (i.e. /etc/ppp/options or a file loaded with the `call' option), it + cannot be overridden by a non-privileged user. + +* Many bugs have been fixed, notably: + - signals are not blocked unnecessarily, as they were in 2.3.6. + - the usepeerdns option should work now. + - the SPEED environment variable for scripts is set correctly. + - the /etc/ppp/auth-down script is not run until auth-up completes. + - the device is opened as root if it is the device on standard + input. + - pppd doesn't die with the ioctl(PPPIOCSASYNCMAP) error under linux + if a hangup occurs at the wrong time. + +* Some error messages have been changed to be clearer (I hope :-) + + +What was new in ppp-2.3.6. +************************** + * Pppd now opens the tty device as the user (rather than as root) if the device name was given by the user, i.e. on the command line or in the ~/.ppprc file. If the device name was given in @@ -290,13 +355,13 @@ questions like this that I get. If you find bugs in this package, please report them to the maintainer for the port for the operating system you are using: -Digital Unix (OSF/1) Sowmini Varadhan Linux Paul Mackerras +Solaris 2 Paul Mackerras +SunOS 4.x Paul Mackerras (for want of anybody better :-) +Digital Unix (OSF/1) Sowmini Varadhan NetBSD Matthew Green FreeBSD Peter Wemm NeXTStep Steve Perkins -Solaris 2 Paul Mackerras -SunOS 4.x Paul Mackerras (for want of anybody better :-) System V Release 4 Matthias Apitz Ultrix 4.x Paul Mackerras (for want of anybody better :-) @@ -315,4 +380,4 @@ The primary site for releases of this software is: ftp://cs.anu.edu.au/pub/software/ppp/ -($Id: README,v 1.15 1999/03/10 05:10:47 paulus Exp $) +($Id: README,v 1.16 1999/03/31 06:07:55 paulus Exp $) diff --git a/README.linux b/README.linux index c43c3e7..3842087 100644 --- a/README.linux +++ b/README.linux @@ -1,7 +1,7 @@ -PPP for Linux Version 2.3.6 +PPP for Linux Version 2.3.7 ============= based on - ppp-2.3.6 - February 1999 + ppp-2.3.7 + March 1999 Michael Callahan callahan@maths.ox.ac.uk Al Longyear longyear@netcom.com @@ -84,9 +84,9 @@ Paul Mackerras rewrote and restructured the code for improved performance and to make a cleaner separation between the network-interface and async TTY parts of the ppp driver. - Nick Walker added the code to query the peer for DNS server addresses. + INSTALLATION This version of PPP has been tested on various Linux kernel versions @@ -166,12 +166,14 @@ set of symbolic links to the makefiles. They should link 'Makefile' to 2. Update the kernel sources. If you are using a 2.2.x kernel (or a recent 2.1.x kernel), you do not -need to do this step. If your kernel is already configured for PPP, -then you only need to do steps 5 and 6. Otherwise, continue at step 3. - -If you are using a 2.0.x kernel, you need to update the kernel ppp -driver to the version in this package. You will need a copy of the -kernel source tree to do this. Issue the command: +need to do this step unless you need the synchronous HDLC support. If +your kernel is already configured for PPP, then you only need to do +steps 5 and 6. Otherwise, continue at step 3. + +If you are using a 2.0.x kernel, or you need the synchronous HDLC +support, you need to update the kernel ppp driver to the version in +this package. You will need a copy of the kernel source tree to do +this. Issue the command: make kernel diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h index 95c552e..1d103bd 100644 --- a/include/linux/if_ppp.h +++ b/include/linux/if_ppp.h @@ -1,4 +1,4 @@ -/* $Id: if_ppp.h,v 1.18 1999/03/30 06:33:07 paulus Exp $ */ +/* $Id: if_ppp.h,v 1.19 1999/03/31 06:07:57 paulus Exp $ */ /* * if_ppp.h - Point-to-Point Protocol definitions. @@ -21,7 +21,7 @@ */ /* - * ==FILEVERSION 990325== + * ==FILEVERSION 990331== * * NOTE TO MAINTAINERS: * If you modify this file at all, please set the above date. @@ -41,7 +41,7 @@ #define PPP_MTU 1500 /* Default MTU (size of Info field) */ #define PPP_MAXMRU 65000 /* Largest MRU we allow */ -#define PPP_VERSION "2.3.6" +#define PPP_VERSION "2.3.7" #define PPP_MAGIC 0x5002 /* Magic value for the ppp structure */ #define PROTO_IPX 0x002b /* protocol numbers */ #define PROTO_DNA_RT 0x0027 /* DNA Routing */ diff --git a/linux/ppp.c b/linux/ppp.c index 45a1c60..aa0ebc5 100644 --- a/linux/ppp.c +++ b/linux/ppp.c @@ -45,7 +45,7 @@ #define PPP_MAX_RCV_QLEN 32 /* max # frames we queue up for pppd */ -/* $Id: ppp.c,v 1.23 1999/03/31 05:29:08 paulus Exp $ */ +/* $Id: ppp.c,v 1.24 1999/03/31 06:07:57 paulus Exp $ */ #include #include @@ -104,7 +104,7 @@ #endif #undef PPP_VERSION -#define PPP_VERSION "2.3.6" +#define PPP_VERSION "2.3.7" #if LINUX_VERSION_CODE >= VERSION(2,1,4) diff --git a/modules/if_ppp.c b/modules/if_ppp.c index 852fd24..a2a20ab 100644 --- a/modules/if_ppp.c +++ b/modules/if_ppp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id: if_ppp.c,v 1.11 1999/03/02 05:37:32 paulus Exp $ + * $Id: if_ppp.c,v 1.12 1999/03/31 06:07:58 paulus Exp $ */ /* @@ -295,7 +295,7 @@ if_ppp_wput(q, mp) #endif ifp->if_output = if_ppp_output; #ifdef __osf__ - ifp->if_version = "Point-to-Point Protocol, version 2.3.6"; + ifp->if_version = "Point-to-Point Protocol, version 2.3.7"; ifp->if_mediamtu = PPP_MTU; ifp->if_type = IFT_PPP; ifp->if_hdrlen = PPP_HDRLEN; diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index 8c0ac11..249be85 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id: Makefile.linux,v 1.28 1999/03/30 06:01:42 paulus Exp $ +# $Id: Makefile.linux,v 1.29 1999/03/31 06:07:58 paulus Exp $ # # Default installation locations @@ -27,7 +27,7 @@ endif # CC = gcc # COPTS = -O2 -pipe -Wall -g -VER = 2.3.6 +VER = 2.3.7 LIBS = ifneq ($(wildcard /usr/lib/libcrypt*),) diff --git a/pppd/patchlevel.h b/pppd/patchlevel.h index 222683a..cce3645 100644 --- a/pppd/patchlevel.h +++ b/pppd/patchlevel.h @@ -1,6 +1,6 @@ -/* $Id: patchlevel.h,v 1.37 1999/03/30 06:02:05 paulus Exp $ */ +/* $Id: patchlevel.h,v 1.38 1999/03/31 06:07:59 paulus Exp $ */ #define PATCHLEVEL 7 #define VERSION "2.3" -#define IMPLEMENTATION "beta" -#define DATE "30 March 1999" +#define IMPLEMENTATION "" +#define DATE "31 March 1999" diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 718a678..a5989d3 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -1661,7 +1661,7 @@ int ppp_available(void) "This system lacks kernel support for PPP. This could be because\n" "the PPP kernel module is not loaded, or because the kernel is\n" "not configured for PPP. See the README.linux file in the\n" - "ppp-2.3.6 distribution.\n"; + "ppp-2.3.7 distribution.\n"; /* * This is the PPP device. Validate the version of the driver at this -- 2.39.2