CVS commit: src/external/bsd/ppp

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Nov 13 16:41:48 UTC 2026

Modified Files:
        src/external/bsd/ppp/dist: configure.ac
        src/external/bsd/ppp/dist/chat: chat.8 chat.c
        src/external/bsd/ppp/dist/pppd: auth.c ccp.c chap_ms.c crypto_ms.c
            eap-tls.c eap.c eap.h fsm.c ipcp.c ipcp.h ipv6cp.c lcp.c lcp.h
            main.c mppe.c multilink.c options.c pathnames.h peap.c
            pppd-private.h pppd.8 pppd.h session.c tty.c upap.c utils.c
        src/external/bsd/ppp/include: config.h pppdconf.h
        src/external/bsd/ppp/usr.sbin/pppd: Makefile sys-bsd.c
Removed Files:
        src/external/bsd/ppp/dist/m4: ax_check_atm.m4

Log Message:
merge conflicts between ppp-2.5.2 and ppp-2.5.5


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/chat/chat.8
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ppp/dist/m4/ax_check_atm.m4
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ppp/dist/pppd/auth.c \
    src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/eap.h \
    src/external/bsd/ppp/dist/pppd/fsm.c \
    src/external/bsd/ppp/dist/pppd/ipcp.c \
    src/external/bsd/ppp/dist/pppd/ipcp.h \
    src/external/bsd/ppp/dist/pppd/ipv6cp.c \
    src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
    src/external/bsd/ppp/dist/pppd/main.c \
    src/external/bsd/ppp/dist/pppd/multilink.c \
    src/external/bsd/ppp/dist/pppd/pathnames.h \
    src/external/bsd/ppp/dist/pppd/tty.c \
    src/external/bsd/ppp/dist/pppd/upap.c \
    src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ppp/dist/pppd/chap_ms.c \
    src/external/bsd/ppp/dist/pppd/eap.c \
    src/external/bsd/ppp/dist/pppd/options.c \
    src/external/bsd/ppp/dist/pppd/pppd.h \
    src/external/bsd/ppp/dist/pppd/session.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppd/crypto_ms.c \
    src/external/bsd/ppp/dist/pppd/eap-tls.c \
    src/external/bsd/ppp/dist/pppd/mppe.c \
    src/external/bsd/ppp/dist/pppd/peap.c \
    src/external/bsd/ppp/dist/pppd/pppd-private.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ppp/dist/pppd/pppd.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/include/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/include/pppdconf.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ppp/usr.sbin/pppd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.