From owner-cvs-usrsbin  Fri Aug 22 06:53:19 1997
Return-Path: <owner-cvs-usrsbin>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id GAA09766
          for cvs-usrsbin-outgoing; Fri, 22 Aug 1997 06:53:19 -0700 (PDT)
Received: from precipice.shockwave.com (ppp-206-170-5-176.rdcy01.pacbell.net [206.170.5.176])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id GAA09759;
          Fri, 22 Aug 1997 06:53:03 -0700 (PDT)
Received: from shockwave.com (localhost [127.0.0.1]) by precipice.shockwave.com (8.8.6/8.7.3) with ESMTP id GAA13433; Fri, 22 Aug 1997 06:52:26 -0700 (PDT)
Message-Id: <199708221352.GAA13433@precipice.shockwave.com>
To: Peter Wemm <peter@FreeBSD.ORG>
cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-usrsbin@FreeBSD.ORG
Subject: Re: cvs commit: src/usr.sbin/pppd - Imported sources 
In-reply-to: Your message of "Fri, 22 Aug 1997 04:21:10 PDT."
             <199708221121.EAA13331@freefall.freebsd.org> 
Date: Fri, 22 Aug 1997 06:52:26 -0700
From: Paul Traina <pst@shockwave.com>
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

Peter, were the release notes (RELNOTES) not updated for 2.3.1?

  From: Peter Wemm <peter@FreeBSD.ORG>
  Subject: cvs commit: src/usr.sbin/pppd - Imported sources
  peter       1997/08/22 04:21:09 PDT
  
    src/usr.sbin/pppd - Imported sources
    Update of /home/ncvs/src/usr.sbin/pppd
    In directory freefall.freebsd.org:/tmp/cvs-serv13153
    
    Log Message:
    Import pppd from ppp-2.3.1 package onto vendor branch for reference.
    
    Obtained from: Paul Mackerras <paulus@cs.anu.edu.au>
    	       at ftp://cs.anu.edu.au/pub/software/ppp/
    
    Status:
    
    Vendor Tag:	MACKERRAS
    Release Tags:	ppp_2_3_1
    		
    U src/usr.sbin/pppd/upap.c
    U src/usr.sbin/pppd/Makefile
    U src/usr.sbin/pppd/sys-bsd.c
    U src/usr.sbin/pppd/pppd.h
    U src/usr.sbin/pppd/pppd.8
    U src/usr.sbin/pppd/pathnames.h
    C src/usr.sbin/pppd/patchlevel.h
    C src/usr.sbin/pppd/options.c
    C src/usr.sbin/pppd/main.c
    U src/usr.sbin/pppd/magic.h
    U src/usr.sbin/pppd/magic.c
    U src/usr.sbin/pppd/lcp.h
    U src/usr.sbin/pppd/lcp.c
    U src/usr.sbin/pppd/ipxcp.h
    U src/usr.sbin/pppd/ipxcp.c
    U src/usr.sbin/pppd/ipcp.h
    C src/usr.sbin/pppd/ipcp.c
    U src/usr.sbin/pppd/fsm.h
    U src/usr.sbin/pppd/fsm.c
    U src/usr.sbin/pppd/demand.c
    U src/usr.sbin/pppd/chap_ms.h
    U src/usr.sbin/pppd/chap_ms.c
    U src/usr.sbin/pppd/chap.h
    U src/usr.sbin/pppd/chap.c
    U src/usr.sbin/pppd/ccp.h
    U src/usr.sbin/pppd/ccp.c
    U src/usr.sbin/pppd/cbcp.h
    U src/usr.sbin/pppd/cbcp.c
    C src/usr.sbin/pppd/auth.c
    U src/usr.sbin/pppd/upap.h
    
    5 conflicts created by this import.
    Use the following command to help the merge:
    
    	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd