Module Name: src
Committed By: christos
Date: Wed Jan 8 19:59:41 UTC 2025
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 cbcp.c cbcp.h ccp.c ccp.h
chap-md5.c chap-md5.h chap_ms.c chap_ms.h crypto.h crypto_ms.c
demand.c eap-tls.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c
fsm.h ipcp.c ipcp.h ipv6cp.c ipv6cp.h lcp.c lcp.h magic.c magic.h
main.c mppe.c mppe.h multilink.c multilink.h options.c pathnames.h
peap.c pppd-private.h pppd.8 pppd.h session.c session.h tls.h tty.c
upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppdump: pppdump.c
src/external/bsd/ppp/dist/pppstats: pppstats.c
src/external/bsd/ppp/usr.sbin/pppd: Makefile sys-bsd.c
src/external/bsd/ppp/usr.sbin/pppdump: Makefile
Added Files:
src/external/bsd/ppp/include: config.h pppdconf.h
Removed Files:
src/external/bsd/ppp/dist/pppd: chap-new.c chap-new.h ipxcp.c ipxcp.h
patchlevel.h pppcrypt.c pppcrypt.h
src/external/bsd/ppp/dist/pppd/plugins/pppoe: config.h debug.c
src/external/bsd/ppp/dist/pppdump: bsd-comp.c deflate.c
src/external/bsd/ppp/dist/sample: options.ttyXX
Log Message:
Merge conflicts between ppp-2.4.9 and ppp-2.5.2
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ppp/dist/configure.ac
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/chat/chat.8
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.h src/external/bsd/ppp/dist/pppd/ecp.c \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
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/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.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/session.c \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppd/cbcp.h \
src/external/bsd/ppp/dist/pppd/chap-md5.c \
src/external/bsd/ppp/dist/pppd/chap-md5.h \
src/external/bsd/ppp/dist/pppd/ecp.h \
src/external/bsd/ppp/dist/pppd/mppe.h \
src/external/bsd/ppp/dist/pppd/pppd.8 \
src/external/bsd/ppp/dist/pppd/session.h
cvs rdiff -u -r1.5 -r0 src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h
cvs rdiff -u -r1.6 -r1.7 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
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ppp/dist/pppd/crypto.h \
src/external/bsd/ppp/dist/pppd/crypto_ms.c \
src/external/bsd/ppp/dist/pppd/mppe.c \
src/external/bsd/ppp/dist/pppd/multilink.h \
src/external/bsd/ppp/dist/pppd/peap.c \
src/external/bsd/ppp/dist/pppd/pppd-private.h \
src/external/bsd/ppp/dist/pppd/tls.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ppp/dist/pppd/eap-tls.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/ppp/dist/pppd/patchlevel.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ppp/dist/pppd/plugins/pppoe/config.h \
src/external/bsd/ppp/dist/pppd/plugins/pppoe/debug.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/ppp/dist/pppdump/bsd-comp.c
cvs rdiff -u -r1.5 -r0 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppdump/pppdump.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ppp/dist/pppstats/pppstats.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ppp/dist/sample/options.ttyXX
cvs rdiff -u -r0 -r1.1 src/external/bsd/ppp/include/config.h \
src/external/bsd/ppp/include/pppdconf.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/usr.sbin/pppd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppdump/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
