diff options
Diffstat (limited to 'package/ppp')
18 files changed, 541 insertions, 1650 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 85386cb08..d6e6043c1 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -30,9 +30,11 @@ $(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_ $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UMTS},${PKG_DESCR},${PKG_SECTION})) +CONFIG_STYLE:= minimal +CONFIGURE_ARGS+= --system=Linux CONFIGURE_ENV+= UNAME_S="Linux" XAKE_FLAGS+= STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \ - DESTDIR="${WRKINST}/usr" \ + DESTDIR="${WRKINST}/usr" STRIP='' \ TARGET_AR='${TARGET_CROSS}ar' post-install: diff --git a/package/ppp/patches/patch-chat_Makefile_linux b/package/ppp/patches/patch-chat_Makefile_linux index 3d0c3fdff..07f1a31cb 100644 --- a/package/ppp/patches/patch-chat_Makefile_linux +++ b/package/ppp/patches/patch-chat_Makefile_linux @@ -1,31 +1,51 @@ --- ppp-2.4.5.orig/chat/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/chat/Makefile.linux 2011-01-16 15:56:59.000000000 +0100 -@@ -10,22 +10,23 @@ CDEF3= -UNO_SLEEP # Use the usleep fun - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) ++++ ppp-2.4.5/chat/Makefile.linux 2011-01-21 21:29:57.958658254 +0100 +@@ -1,32 +1,27 @@ + # $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $ + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-MANDIR = $(DESTDIR)/share/man/man8 +- +-CDEF1= -DTERMIOS # Use the termios structure +-CDEF2= -DSIGTYPE=void # Standard definition +-CDEF3= -UNO_SLEEP # Use the usleep function +-CDEF4= -DFNDELAY=O_NDELAY # Old name value +-CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) ++include ../Makedefs.com -COPTS= -O2 -g -pipe -CFLAGS= $(COPTS) $(CDEFS) -+CPPFLAGS?= -+CFLAGS?=-O2 -g -pipe -+LDFLAGS?= ++CDEF1=-DTERMIOS # Use the termios structure ++CDEF2=-DSIGTYPE=void # Standard definition ++CDEF3=-UNO_SLEEP # Use the usleep function ++CDEF4=-DFNDELAY=O_NDELA # Old name value ++CDEFS=$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - INSTALL= install +-INSTALL= install ++CPPFLAGS += $(CDEFS) - all: chat +-all: chat ++PROG = chat ++OBJS = chat.o - chat: chat.o +-chat: chat.o - $(CC) -o chat chat.o -+ $(CC) $(LDFLAGS) -o chat chat.o ++all: $(PROG) - chat.o: chat.c +-chat.o: chat.c - $(CC) -c $(CFLAGS) -o chat.o chat.c -+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o chat.o chat.c ++$(PROG): $(OBJS) - install: chat - mkdir -p $(BINDIR) $(MANDIR) +-install: chat +- mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) ++install: $(PROG) ++ $(INSTALL) -d -m 755 $(BINDIR) ++ $(INSTALL) -d -m 755 $(MANDIR) ++ $(INSTALL) $(STRIP) -c $(PROG) $(BINDIR) $(INSTALL) -c -m 644 chat.8 $(MANDIR) clean: +- rm -f chat.o chat *~ ++ rm -f $(OBJS) $(PROG) *~ diff --git a/package/ppp/patches/patch-configure b/package/ppp/patches/patch-configure index 4ec084e2e..b4be911dd 100644 --- a/package/ppp/patches/patch-configure +++ b/package/ppp/patches/patch-configure @@ -1,15 +1,87 @@ ---- ppp-2.4.4.orig/configure 2005-07-09 02:23:05.000000000 +0200 -+++ ppp-2.4.4/configure 2009-06-05 19:12:00.000000000 +0200 -@@ -8,9 +8,9 @@ SYSCONF=/etc +--- ppp-2.4.5.orig/configure 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/configure 2011-01-21 21:29:57.977408326 +0100 +@@ -5,12 +5,42 @@ + DESTDIR=/usr/local + SYSCONF=/etc + ++# Parse arguments ++while [ $# -gt 0 ]; do ++ arg=$1 ++ val= ++ shift ++ case $arg in ++ *=*) ++ val=`expr "x$arg" : 'x[^=]*=\(.*\)'` ++ arg=`expr "x$arg" : 'x\([^=]*\)=.*'` ++ ;; ++ --prefix|--sysconf|--system|--arch|--release) ++ if [ $# -eq 0 ]; then ++ echo "error: the $arg argument requires a value" 1>&2 ++ exit 1 ++ fi ++ val=$1 ++ shift ++ ;; ++ esac ++ case $arg in ++ --prefix) DESTDIR=$val ;; ++ --sysconfdir) SYSCONF=$val ;; ++ --system) system=$val ;; ++ --release) release=$val ;; ++ --arch) arch=$val ;; ++ esac ++done ++ ++echo "DESTDIR is $DESTDIR" ++ # if [ -d /NextApps ]; then # system="NeXTStep" # else - system=`uname -s` - release=`uname -r` - arch=`uname -m` -+ system=${UNAME_S:-`uname -s`} -+ release=${UNAME_R:-`uname -r`} -+ arch=${UNAME_M:-`uname -m`} ++if [ -z "$system" ];then system=`uname -s`;fi ++if [ -z "$release" ];then release=`uname -r`;fi ++if [ -z "$arch" ];then arch=`uname -m`;fi # fi state="unknown" +@@ -18,6 +48,7 @@ case $system in + Linux) + makext="linux"; + ksrc="linux"; ++ compiletype=.gcc; + state="known";; + SunOS) + karch=`/usr/bin/isainfo -k` +@@ -156,30 +187,6 @@ case $state in + echo "Configuring for $system";; + esac + +-# Parse arguments +-while [ $# -gt 0 ]; do +- arg=$1 +- val= +- shift +- case $arg in +- *=*) +- val=`expr "x$arg" : 'x[^=]*=\(.*\)'` +- arg=`expr "x$arg" : 'x\([^=]*\)=.*'` +- ;; +- --prefix|--sysconf) +- if [ $# -eq 0 ]; then +- echo "error: the $arg argument requires a value" 1>&2 +- exit 1 +- fi +- val=$1 +- shift +- ;; +- esac +- case $arg in +- --prefix) DESTDIR=$val ;; +- --sysconfdir) SYSCONF=$val ;; +- esac +-done + + mkmkf() { + rm -f $2 diff --git a/package/ppp/patches/patch-linux_Makefile_top b/package/ppp/patches/patch-linux_Makefile_top new file mode 100644 index 000000000..b433c4dd9 --- /dev/null +++ b/package/ppp/patches/patch-linux_Makefile_top @@ -0,0 +1,17 @@ +--- ppp-2.4.5.orig/linux/Makefile.top 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/linux/Makefile.top 2011-01-21 21:29:58.018658307 +0100 +@@ -1,13 +1,6 @@ + # PPP top-level Makefile for Linux. + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-INCDIR = $(DESTDIR)/include +-MANDIR = $(DESTDIR)/share/man +-ETCDIR = $(INSTROOT)@SYSCONF@/ppp +- +-# uid 0 = root +-INSTALL= install ++include Makedefs.com + + all: + cd chat; $(MAKE) $(MFLAGS) all diff --git a/package/ppp/patches/patch-pppd_Makefile_linux b/package/ppp/patches/patch-pppd_Makefile_linux index a447ae1ea..0096f7018 100644 --- a/package/ppp/patches/patch-pppd_Makefile_linux +++ b/package/ppp/patches/patch-pppd_Makefile_linux @@ -1,109 +1,215 @@ --- ppp-2.4.5.orig/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/Makefile.linux 2011-01-16 17:09:40.000000000 +0100 -@@ -2,12 +2,7 @@ - # pppd makefile for Linux ++++ ppp-2.4.5/pppd/Makefile.linux 2011-01-21 21:40:47.384898388 +0100 +@@ -3,11 +3,7 @@ # $Id: Makefile.linux,v 1.70 2007/06/19 02:08:34 carlsonj Exp $ # -- + -# Default installation locations -DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 -INCDIR = $(DESTDIR)/include -+include ../makedefs.linux ++include ../Makedefs.com TARGETS = pppd -@@ -30,10 +25,6 @@ ifeq (.depend,$(wildcard .depend)) - include .depend - endif +@@ -24,17 +20,6 @@ PPPDOBJS = main.o magic.o fsm.o lcp.o ip + ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \ + eap.o chap-md5.o session.o +-# +-# include dependencies if present +-ifeq (.depend,$(wildcard .depend)) +-include .depend +-endif +- -# CC = gcc -# -COPTS = -O2 -pipe -Wall -g -LIBS = - +- # Uncomment the next 2 lines to include support for Microsoft's # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. -@@ -48,7 +39,7 @@ MPPE=y - # Uncomment the next line to include support for PPP packet filtering. - # This requires that the libpcap library and headers be installed - # and that the kernel driver support PPP packet filtering. --FILTER=y -+#FILTER=y - - # Uncomment the next line to enable multilink PPP (enabled by default) - # Linux distributions: Please leave multilink ENABLED in your builds -@@ -58,9 +49,9 @@ HAVE_MULTILINK=y - # Uncomment the next line to enable the TDB database (enabled by default.) - # If you enable multilink, then TDB is automatically enabled also. - # Linux distributions: Please leave TDB ENABLED in your builds. --USE_TDB=y -+#USE_TDB=y - --HAS_SHADOW=y -+#HAS_SHADOW=y - #USE_PAM=y - #HAVE_INET6=y - -@@ -75,11 +66,10 @@ PLUGIN=y + CHAPMS=y +@@ -75,28 +60,25 @@ PLUGIN=y MAXOCTETS=y -INCLUDE_DIRS= -I../include - -COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -+CPPFLAGS += -I../include -+CPPFLAGS += -DHAVE_PATHS_H -DHAVE_MMAP - +- -CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' -+CFLAGS+= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' ++CPPFLAGS += -I../include ++CPPFLAGS += -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP '-DDESTDIR="@DESTDIR@"' ifdef CHAPMS - CFLAGS += -DCHAPMS=1 -@@ -99,7 +89,7 @@ ifdef USE_SRP - CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include +-CFLAGS += -DCHAPMS=1 ++CPPFLAGS += -DCHAPMS=1 + NEEDDES=y + PPPDOBJS += md4.o chap_ms.o + HEADERS += md4.h chap_ms.h + ifdef MSLANMAN +-CFLAGS += -DMSLANMAN=1 ++CPPFLAGS += -DMSLANMAN=1 + endif + ifdef MPPE +-CFLAGS += -DMPPE=1 ++CPPFLAGS += -DMPPE=1 + endif + endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include ++CPPFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -117,10 +107,8 @@ CFLAGS += -DHAS_SHADOW + EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry +@@ -113,12 +95,12 @@ PPPDOBJS += sha1.o + endif + + ifdef HAS_SHADOW +-CFLAGS += -DHAS_SHADOW ++CPPFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard /usr/include/crypt.h),) - CFLAGS += -DHAVE_CRYPT_H=1 + ifneq ($(wildcard /usr/include/crypt.h),) +-CFLAGS += -DHAVE_CRYPT_H=1 ++CPPFLAGS += -DHAVE_CRYPT_H=1 LIBS += -lcrypt --endif + endif - ifdef NEEDDES +@@ -126,7 +108,7 @@ ifdef NEEDDES ifndef USE_CRYPT -@@ -200,16 +188,16 @@ all: $(TARGETS) + LIBS += -ldes $(LIBS) + else +-CFLAGS += -DUSE_CRYPT=1 ++CPPFLAGS += -DUSE_CRYPT=1 + endif + PPPDOBJS += pppcrypt.o + HEADERS += pppcrypt.h +@@ -134,36 +116,36 @@ endif + + # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/. + ifdef USE_PAM +-CFLAGS += -DUSE_PAM ++CPPFLAGS += -DUSE_PAM + LIBS += -lpam -ldl + endif + + # Multi-linnk + ifdef HAVE_MULTILINK +- # Multilink implies the use of TDB +- USE_TDB=y ++# Multilink implies the use of TDB ++USE_TDB=y + +- CFLAGS += -DHAVE_MULTILINK +- PPPDSRCS += multilink.c +- PPPDOBJS += multilink.o ++CPPFLAGS += -DHAVE_MULTILINK ++PPPDSRCS += multilink.c ++PPPDOBJS += multilink.o + endif + + # TDB + ifdef USE_TDB +- CFLAGS += -DUSE_TDB=1 +- PPPDSRCS += tdb.c spinlock.c +- PPPDOBJS += tdb.o spinlock.o +- HEADERS += tdb.h spinlock.h ++CPPFLAGS += -DUSE_TDB=1 ++PPPDSRCS += tdb.c spinlock.c ++PPPDOBJS += tdb.o spinlock.o ++HEADERS += tdb.h spinlock.h + endif + + # Lock library binary for Linux is included in 'linux' subdirectory. + ifdef LOCKLIB + LIBS += -llock +-CFLAGS += -DLOCKLIB=1 ++CPPFLAGS += -DLOCKLIB=1 + endif + + ifdef PLUGIN +-CFLAGS += -DPLUGIN ++CPPFLAGS += -DPLUGIN + LDFLAGS += -Wl,-E + LIBS += -ldl + endif +@@ -171,52 +153,51 @@ endif + ifdef FILTER + ifneq ($(wildcard /usr/include/pcap-bpf.h),) + LIBS += -lpcap +-CFLAGS += -DPPP_FILTER ++CPPFLAGS += -DPPP_FILTER + endif + endif + + ifdef HAVE_INET6 +- PPPDSRCS += ipv6cp.c eui64.c +- HEADERS += ipv6cp.h eui64.h +- PPPDOBJS += ipv6cp.o eui64.o +- CFLAGS += -DINET6=1 ++PPPDSRCS += ipv6cp.c eui64.c ++HEADERS += ipv6cp.h eui64.h ++PPPDOBJS += ipv6cp.o eui64.o ++CPPFLAGS += -DINET6=1 + endif + + ifdef CBCP +- PPPDSRCS += cbcp.c +- PPPDOBJS += cbcp.o +- CFLAGS += -DCBCP_SUPPORT +- HEADERS += cbcp.h ++PPPDSRCS += cbcp.c ++PPPDOBJS += cbcp.o ++CPPFLAGS += -DCBCP_SUPPORT ++HEADERS += cbcp.h + endif + + ifdef MAXOCTETS +- CFLAGS += -DMAXOCTETS ++CPPFLAGS += -DMAXOCTETS + endif + +-INSTALL= install +- + all: $(TARGETS) + ++# generate dependencies ++#include $(PPPDSRCS:.c=.d) ++ install: pppd - mkdir -p $(BINDIR) $(MANDIR) +- mkdir -p $(BINDIR) $(MANDIR) ++ $(INSTALL) -d -m 755 $(BINDIR) ++ $(INSTALL) -d -m 755 $(MANDIR) $(EXTRAINSTALL) - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd ++ $(INSTALL) $(STRIP) -c -m 555 pppd $(BINDIR)/pppd if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ chmod o-rx,u+s $(BINDIR)/pppd; fi $(INSTALL) -c -m 444 pppd.8 $(MANDIR) pppd: $(PPPDOBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - srp-entry: srp-entry.c +-srp-entry: srp-entry.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) ++srp-entry: srp-entry.o ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) install-devel: - mkdir -p $(INCDIR)/pppd -@@ -219,4 +207,4 @@ clean: - rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core +- mkdir -p $(INCDIR)/pppd ++ $(INSTALL) -d -m 755 $(INCDIR)/pppd + $(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd - depend: + clean: +- rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core +- +-depend: - $(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend -+ $(CPP) -M $(CPPFLAGS) $(CFLAGS) $(PPPDSRCS) >.depend ++ rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *.d *~ #* core diff --git a/package/ppp/patches/patch-pppd_ccp_c b/package/ppp/patches/patch-pppd_ccp_c deleted file mode 100644 index 66b76b03d..000000000 --- a/package/ppp/patches/patch-pppd_ccp_c +++ /dev/null @@ -1,1362 +0,0 @@ ---- ppp-2.4.4.orig/pppd/ccp.c 2005-07-09 02:23:05.000000000 +0200 -+++ ppp-2.4.4/pppd/ccp.c 2009-06-05 19:12:00.000000000 +0200 -@@ -62,12 +62,10 @@ static int setdeflate __P((char **)); - static char bsd_value[8]; - static char deflate_value[8]; - --/* -- * Option variables. -- */ - #ifdef MPPE --bool refuse_mppe_stateful = 1; /* Allow stateful mode? */ --#endif -+static int setmppe(char **); -+static int setnomppe(void); -+#endif /* MPPE */ - - static option_t ccp_option_list[] = { - { "noccp", o_bool, &ccp_protent.enabled_flag, -@@ -108,54 +106,36 @@ static option_t ccp_option_list[] = { - "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, - &ccp_allowoptions[0].predictor_1 }, - --#ifdef MPPE -- /* MPPE options are symmetrical ... we only set wantoptions here */ -- { "require-mppe", o_bool, &ccp_wantoptions[0].mppe, -- "require MPPE encryption", -- OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, -- { "+mppe", o_bool, &ccp_wantoptions[0].mppe, -- "require MPPE encryption", -- OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, -- { "nomppe", o_bool, &ccp_wantoptions[0].mppe, -- "don't allow MPPE encryption", OPT_PRIO }, -- { "-mppe", o_bool, &ccp_wantoptions[0].mppe, -- "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO }, -- -- /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */ -- { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe, -- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, -- &ccp_wantoptions[0].mppe }, -- { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe, -- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, -- &ccp_wantoptions[0].mppe }, -- { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe, -- "don't allow MPPE 40-bit encryption", -- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe }, -- { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe, -- "don't allow MPPE 40-bit encryption", -- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, -- &ccp_wantoptions[0].mppe }, -- -- { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe, -- "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128, -- &ccp_wantoptions[0].mppe }, -- { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe, -- "require MPPE 128-bit encryption", -- OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128, -- &ccp_wantoptions[0].mppe }, -- { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe, -- "don't allow MPPE 128-bit encryption", -- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe }, -- { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe, -- "don't allow MPPE 128-bit encryption", -- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, -- &ccp_wantoptions[0].mppe }, -+ { "lzs", o_bool, &ccp_wantoptions[0].lzs, -+ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO }, -+ { "+lzs", o_bool, &ccp_wantoptions[0].lzs, -+ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO }, -+ { "nolzs", o_bool, &ccp_wantoptions[0].lzs, -+ "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR, -+ &ccp_allowoptions[0].lzs }, -+ { "-lzs", o_bool, &ccp_wantoptions[0].lzs, -+ "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, -+ &ccp_allowoptions[0].lzs }, - -- /* strange one; we always request stateless, but will we allow stateful? */ -- { "mppe-stateful", o_bool, &refuse_mppe_stateful, -- "allow MPPE stateful mode", OPT_PRIO }, -- { "nomppe-stateful", o_bool, &refuse_mppe_stateful, -- "disallow MPPE stateful mode", OPT_PRIO | 1 }, -+#ifdef MPPE -+ { "mppc", o_bool, &ccp_wantoptions[0].mppc, -+ "request MPPC compression", 1, &ccp_allowoptions[0].mppc }, -+ { "+mppc", o_bool, &ccp_wantoptions[0].mppc, -+ "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS }, -+ { "nomppc", o_bool, &ccp_wantoptions[0].mppc, -+ "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR, -+ &ccp_allowoptions[0].mppc }, -+ { "-mppc", o_bool, &ccp_wantoptions[0].mppc, -+ "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, -+ &ccp_allowoptions[0].mppc }, -+ { "mppe", o_special, (void *)setmppe, -+ "request MPPE encryption" }, -+ { "+mppe", o_special, (void *)setmppe, -+ "request MPPE encryption" }, -+ { "nomppe", o_special_noarg, (void *)setnomppe, -+ "don't allow MPPE encryption" }, -+ { "-mppe", o_special_noarg, (void *)setnomppe, -+ "don't allow MPPE encryption" }, - #endif /* MPPE */ - - { NULL } -@@ -241,7 +221,7 @@ static fsm_callbacks ccp_callbacks = { - */ - #define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \ - || (opt).predictor_1 || (opt).predictor_2 \ -- || (opt).mppe) -+ || (opt).lzs || (opt).mppc || (opt).mppe) - - /* - * Local state (mainly for handling reset-reqs and reset-acks). -@@ -344,6 +324,100 @@ setdeflate(argv) - return 1; - } - -+#ifdef MPPE -+/* -+ * Functions called from config options -+ */ -+/* -+ MPPE suboptions: -+ required - require MPPE; disconnect if peer doesn't support it -+ stateless - use stateless mode -+ no40 - disable 40 bit keys -+ no56 - disable 56 bit keys -+ no128 - disable 128 bit keys -+*/ -+int setmppe(char **argv) -+{ -+ int i; -+ char *str, cmdbuf[16]; -+ -+ ccp_allowoptions[0].mppe = 1; -+ ccp_allowoptions[0].mppe_40 = 1; -+ ccp_allowoptions[0].mppe_56 = 1; -+ ccp_allowoptions[0].mppe_128 = 1; -+ ccp_allowoptions[0].mppe_stateless = 0; -+ ccp_wantoptions[0].mppe = 0; -+ -+ str = *argv; -+ -+ while (1) { -+ i = 0; -+ memset(cmdbuf, '\0', 16); -+ while ((i < 16) && (*str != ',') && (*str != '\0')) -+ cmdbuf[i++] = *str++; -+ cmdbuf[i] = '\0'; -+ if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) { -+ ccp_allowoptions[0].mppe_40 = 0; -+ goto next_param; -+ } else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) { -+ ccp_allowoptions[0].mppe_56 = 0; -+ goto next_param; -+ } else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) { -+ ccp_allowoptions[0].mppe_128 = 0; -+ goto next_param; -+ } else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) { -+ ccp_allowoptions[0].mppe_stateless = 1; -+ goto next_param; -+ } else if (!strncasecmp(cmdbuf, "required", strlen("required"))) { -+ ccp_wantoptions[0].mppe = 1; -+ goto next_param; -+ } else { -+ option_error("invalid parameter '%s' for mppe option", cmdbuf); -+ return 0; -+ } -+ -+ next_param: -+ if (*str == ',') { -+ str++; -+ continue; -+ } -+ if (*str == '\0') { -+ if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 || -+ ccp_allowoptions[0].mppe_128)) { -+ if (ccp_wantoptions[0].mppe == 1) { -+ option_error("You require MPPE but you have switched off " -+ "all encryption key lengths."); -+ return 0; -+ } -+ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; -+ ccp_wantoptions[0].mppe_stateless = -+ ccp_allowoptions[0].mppe_stateless = 0; -+ } else { -+ ccp_allowoptions[0].mppe = 1; -+ ccp_wantoptions[0].mppe_stateless = -+ ccp_allowoptions[0].mppe_stateless; -+ if (ccp_wantoptions[0].mppe == 1) { -+ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40; -+ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56; -+ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128; -+ } -+ } -+ return 1; -+ } -+ } -+} -+ -+int setnomppe(void) -+{ -+ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; -+ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0; -+ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0; -+ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0; -+ ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0; -+ return 1; -+} -+#endif /* MPPE */ -+ - /* - * ccp_init - initialize CCP. - */ -@@ -378,6 +452,30 @@ ccp_init(unit) - ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS; - - ccp_allowoptions[0].predictor_1 = 1; -+ -+ ccp_wantoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ -+ ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ; -+ ccp_wantoptions[0].lzs_hists = 1; -+ ccp_allowoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ -+ ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ; -+ ccp_allowoptions[0].lzs_hists = 1; -+ -+#ifdef MPPE -+ /* by default allow and request MPPC... */ -+ ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1; -+ -+ /* ... and allow but don't request MPPE */ -+ ccp_allowoptions[0].mppe = 1; -+ ccp_allowoptions[0].mppe_40 = 1; -+ ccp_allowoptions[0].mppe_56 = 1; -+ ccp_allowoptions[0].mppe_128 = 1; -+ ccp_allowoptions[0].mppe_stateless = 1; -+ ccp_wantoptions[0].mppe = 0; -+ ccp_wantoptions[0].mppe_40 = 0; -+ ccp_wantoptions[0].mppe_56 = 0; -+ ccp_wantoptions[0].mppe_128 = 0; -+ ccp_wantoptions[0].mppe_stateless = 0; -+#endif /* MPPE */ - } - - /* -@@ -455,11 +553,11 @@ ccp_input(unit, p, len) - if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) { - notice("Compression disabled by peer."); - #ifdef MPPE -- if (ccp_gotoptions[unit].mppe) { -+ if (ccp_wantoptions[unit].mppe) { - error("MPPE disabled, closing LCP"); - lcp_close(unit, "MPPE disabled by peer"); - } --#endif -+#endif /* MPPE */ - } - - /* -@@ -487,6 +585,15 @@ ccp_extcode(f, code, id, p, len) - break; - /* send a reset-ack, which the transmitter will see and - reset its compression state. */ -+ -+ /* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK, -+ but we do it in order to reset compressor; CCP_RESETACK is -+ then silently discarded. See functions ppp_send_frame and -+ ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the -+ confusion is caused by the fact that CCP code is splited -+ into two parts - one part is handled by pppd, the other one -+ is handled by kernel. */ -+ - fsm_sdata(f, CCP_RESETACK, id, NULL, 0); - break; - -@@ -515,12 +622,11 @@ ccp_protrej(unit) - fsm_lowerdown(&ccp_fsm[unit]); - - #ifdef MPPE -- if (ccp_gotoptions[unit].mppe) { -+ if (ccp_wantoptions[unit].mppe) { - error("MPPE required but peer negotiation failed"); - lcp_close(unit, "MPPE required but peer negotiation failed"); - } --#endif -- -+#endif /* MPPE */ - } - - /* -@@ -537,7 +643,7 @@ ccp_resetci(f) - all_rejected[f->unit] = 0; - - #ifdef MPPE -- if (go->mppe) { -+ if (go->mppe || go->mppc) { - ccp_options *ao = &ccp_allowoptions[f->unit]; - int auth_mschap_bits = auth_done[f->unit]; - int numbits; -@@ -551,80 +657,109 @@ ccp_resetci(f) - * NB: If MPPE is required, all other compression opts are invalid. - * So, we return right away if we can't do it. - */ -+ if (ccp_wantoptions[f->unit].mppe) { -+ /* Leave only the mschap auth bits set */ -+ auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | -+ CHAP_MS2_WITHPEER | CHAP_MS2_PEER); -+ /* Count the mschap auths */ -+ auth_mschap_bits >>= CHAP_MS_SHIFT; -+ numbits = 0; -+ do { -+ numbits += auth_mschap_bits & 1; -+ auth_mschap_bits >>= 1; -+ } while (auth_mschap_bits); -+ if (numbits > 1) { -+ error("MPPE required, but auth done in both directions."); -+ lcp_close(f->unit, "MPPE required but not available"); -+ return; -+ } -+ if (!numbits) { -+ error("MPPE required, but MS-CHAP[v2] auth not performed."); -+ lcp_close(f->unit, "MPPE required but not available"); -+ return; -+ } - -- /* Leave only the mschap auth bits set */ -- auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | -- CHAP_MS2_WITHPEER | CHAP_MS2_PEER); -- /* Count the mschap auths */ -- auth_mschap_bits >>= CHAP_MS_SHIFT; -- numbits = 0; -- do { -- numbits += auth_mschap_bits & 1; -- auth_mschap_bits >>= 1; -- } while (auth_mschap_bits); -- if (numbits > 1) { -- error("MPPE required, but auth done in both directions."); -- lcp_close(f->unit, "MPPE required but not available"); -- return; -- } -- if (!numbits) { -- error("MPPE required, but MS-CHAP[v2] auth not performed."); -- lcp_close(f->unit, "MPPE required but not available"); -- return; -+ /* A plugin (eg radius) may not have obtained key material. */ -+ if (!mppe_keys_set) { -+ error("MPPE required, but keys are not available. " -+ "Possible plugin problem?"); -+ lcp_close(f->unit, "MPPE required but not available"); -+ return; -+ } - } - -- /* A plugin (eg radius) may not have obtained key material. */ -- if (!mppe_keys_set) { -- error("MPPE required, but keys are not available. " -- "Possible plugin problem?"); -- lcp_close(f->unit, "MPPE required but not available"); -- return; -+ /* -+ * Check whether the kernel knows about the various -+ * compression methods we might request. Key material -+ * unimportant here. -+ */ -+ if (go->mppc) { -+ opt_buf[0] = CI_MPPE; -+ opt_buf[1] = CILEN_MPPE; -+ opt_buf[2] = 0; -+ opt_buf[3] = 0; -+ opt_buf[4] = 0; -+ opt_buf[5] = MPPE_MPPC; -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0) -+ go->mppc = 0; - } -- -- /* LM auth not supported for MPPE */ -- if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) { -- /* This might be noise */ -- if (go->mppe & MPPE_OPT_40) { -- notice("Disabling 40-bit MPPE; MS-CHAP LM not supported"); -- go->mppe &= ~MPPE_OPT_40; -- ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40; -- } -+ if (go->mppe_40) { -+ opt_buf[0] = CI_MPPE; -+ opt_buf[1] = CILEN_MPPE; -+ opt_buf[2] = MPPE_STATELESS; -+ opt_buf[3] = 0; -+ opt_buf[4] = 0; -+ opt_buf[5] = MPPE_40BIT; -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) -+ go->mppe_40 = 0; - } -- -- /* Last check: can we actually negotiate something? */ -- if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) { -- /* Could be misconfig, could be 40-bit disabled above. */ -- error("MPPE required, but both 40-bit and 128-bit disabled."); -- lcp_close(f->unit, "MPPE required but not available"); -- return; -+ if (go->mppe_56) { -+ opt_buf[0] = CI_MPPE; -+ opt_buf[1] = CILEN_MPPE; -+ opt_buf[2] = MPPE_STATELESS; -+ opt_buf[3] = 0; -+ opt_buf[4] = 0; -+ opt_buf[5] = MPPE_56BIT; -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) -+ go->mppe_56 = 0; -+ } -+ if (go->mppe_128) { -+ opt_buf[0] = CI_MPPE; -+ opt_buf[1] = CILEN_MPPE; -+ opt_buf[2] = MPPE_STATELESS; -+ opt_buf[3] = 0; -+ opt_buf[4] = 0; -+ opt_buf[5] = MPPE_128BIT; -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) -+ go->mppe_128 = 0; -+ } -+ if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) { -+ if (ccp_wantoptions[f->unit].mppe) { -+ error("MPPE required, but kernel has no support."); -+ lcp_close(f->unit, "MPPE required but not available"); -+ } -+ go->mppe = go->mppe_stateless = 0; -+ } else { -+ /* MPPE is not compatible with other compression types */ -+ if (ccp_wantoptions[f->unit].mppe) { -+ ao->bsd_compress = go->bsd_compress = 0; -+ ao->predictor_1 = go->predictor_1 = 0; -+ ao->predictor_2 = go->predictor_2 = 0; -+ ao->deflate = go->deflate = 0; -+ ao->lzs = go->lzs = 0; -+ } - } -- -- /* sync options */ -- ao->mppe = go->mppe; -- /* MPPE is not compatible with other compression types */ -- ao->bsd_compress = go->bsd_compress = 0; -- ao->predictor_1 = go->predictor_1 = 0; -- ao->predictor_2 = go->predictor_2 = 0; -- ao->deflate = go->deflate = 0; - } - #endif /* MPPE */ -- -- /* -- * Check whether the kernel knows about the various -- * compression methods we might request. -- */ --#ifdef MPPE -- if (go->mppe) { -- opt_buf[0] = CI_MPPE; -- opt_buf[1] = CILEN_MPPE; -- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); -- /* Key material unimportant here. */ -- if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) { -- error("MPPE required, but kernel has no support."); -- lcp_close(f->unit, "MPPE required but not available"); -- } -+ if (go->lzs) { -+ opt_buf[0] = CI_LZS; -+ opt_buf[1] = CILEN_LZS; -+ opt_buf[2] = go->lzs_hists >> 8; -+ opt_buf[3] = go->lzs_hists & 0xff; -+ opt_buf[4] = LZS_MODE_SEQ; -+ if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0) -+ go->lzs = 0; - } --#endif - if (go->bsd_compress) { - opt_buf[0] = CI_BSD_COMPRESS; - opt_buf[1] = CILEN_BSD_COMPRESS; -@@ -679,7 +814,8 @@ ccp_cilen(f) - + (go->deflate? CILEN_DEFLATE: 0) - + (go->predictor_1? CILEN_PREDICTOR_1: 0) - + (go->predictor_2? CILEN_PREDICTOR_2: 0) -- + (go->mppe? CILEN_MPPE: 0); -+ + (go->lzs? CILEN_LZS: 0) -+ + ((go->mppe || go->mppc)? CILEN_MPPE: 0); - } - - /* -@@ -693,6 +829,8 @@ ccp_addci(f, p, lenp) - { - int res; - ccp_options *go = &ccp_gotoptions[f->unit]; -+ ccp_options *ao = &ccp_allowoptions[f->unit]; -+ ccp_options *wo = &ccp_wantoptions[f->unit]; - u_char *p0 = p; - - /* -@@ -701,22 +839,43 @@ ccp_addci(f, p, lenp) - * in case it gets Acked. - */ - #ifdef MPPE -- if (go->mppe) { -+ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { - u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; - -- p[0] = opt_buf[0] = CI_MPPE; -- p[1] = opt_buf[1] = CILEN_MPPE; -- MPPE_OPTS_TO_CI(go->mppe, &p[2]); -- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); -+ p[0] = CI_MPPE; -+ p[1] = CILEN_MPPE; -+ p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0); -+ p[3] = 0; -+ p[4] = 0; -+ p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) | -+ (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0); -+ -+ BCOPY(p, opt_buf, CILEN_MPPE); - BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN); - res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0); -- if (res > 0) -+ if (res > 0) { - p += CILEN_MPPE; -- else -+ } else { - /* This shouldn't happen, we've already tested it! */ -- lcp_close(f->unit, "MPPE required but not available in kernel"); -+ go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 = -+ go->mppe_stateless = go->mppc = 0; -+ if (ccp_wantoptions[f->unit].mppe) -+ lcp_close(f->unit, "MPPE required but not available in kernel"); -+ } -+ } -+#endif /* MPPE */ -+ if (go->lzs) { -+ p[0] = CI_LZS; -+ p[1] = CILEN_LZS; -+ p[2] = go->lzs_hists >> 8; -+ p[3] = go->lzs_hists & 0xff; -+ p[4] = LZS_MODE_SEQ; -+ res = ccp_test(f->unit, p, CILEN_LZS, 0); -+ if (res > 0) { -+ p += CILEN_LZS; -+ } else -+ go->lzs = 0; - } --#endif - if (go->deflate) { - p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT; - p[1] = CILEN_DEFLATE; -@@ -802,7 +961,7 @@ ccp_addci(f, p, lenp) - - /* - * ccp_ackci - process a received configure-ack, and return -- * 1 iff the packet was OK. -+ * 1 if the packet was OK. - */ - static int - ccp_ackci(f, p, len) -@@ -811,24 +970,44 @@ ccp_ackci(f, p, len) - int len; - { - ccp_options *go = &ccp_gotoptions[f->unit]; -+ ccp_options *ao = &ccp_allowoptions[f->unit]; -+ ccp_options *wo = &ccp_wantoptions[f->unit]; - u_char *p0 = p; - - #ifdef MPPE -- if (go->mppe) { -- u_char opt_buf[CILEN_MPPE]; -- -- opt_buf[0] = CI_MPPE; -- opt_buf[1] = CILEN_MPPE; -- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); -- if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE)) -+ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { -+ if (len < CILEN_MPPE -+ || p[1] != CILEN_MPPE || p[0] != CI_MPPE -+ || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) -+ || p[3] != 0 -+ || p[4] != 0 -+ || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | -+ (go->mppc ? MPPE_MPPC : 0)) -+ && p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) | -+ (go->mppc ? MPPE_MPPC : 0)) -+ && p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) | -+ (go->mppc ? MPPE_MPPC : 0)))) - return 0; -+ if (go->mppe_40 || go->mppe_56 || go->mppe_128) -+ go->mppe = 1; - p += CILEN_MPPE; - len -= CILEN_MPPE; -+ /* Cope with first/fast ack */ -+ if (p == p0 && len == 0) -+ return 1; -+ } -+#endif /* MPPE */ -+ if (go->lzs) { -+ if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS -+ || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) -+ || p[4] != LZS_MODE_SEQ) -+ return 0; -+ p += CILEN_LZS; -+ len -= CILEN_LZS; - /* XXX Cope with first/fast ack */ -- if (len == 0) -+ if (p == p0 && len == 0) - return 1; - } --#endif - if (go->deflate) { - if (len < CILEN_DEFLATE - || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) -@@ -891,7 +1070,7 @@ ccp_ackci(f, p, len) - - /* - * ccp_nakci - process received configure-nak. -- * Returns 1 iff the nak was OK. -+ * Returns 1 if the nak was OK. - */ - static int - ccp_nakci(f, p, len, treat_as_reject) -@@ -901,6 +1080,8 @@ ccp_nakci(f, p, len, treat_as_reject) - int treat_as_reject; - { - ccp_options *go = &ccp_gotoptions[f->unit]; -+ ccp_options *ao = &ccp_allowoptions[f->unit]; -+ ccp_options *wo = &ccp_wantoptions[f->unit]; - ccp_options no; /* options we've seen already */ - ccp_options try; /* options to ask for next time */ - -@@ -908,28 +1089,100 @@ ccp_nakci(f, p, len, treat_as_reject) - try = *go; - - #ifdef MPPE -- if (go->mppe && len >= CILEN_MPPE -- && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { -- no.mppe = 1; -- /* -- * Peer wants us to use a different strength or other setting. -- * Fail if we aren't willing to use his suggestion. -- */ -- MPPE_CI_TO_OPTS(&p[2], try.mppe); -- if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) { -- error("Refusing MPPE stateful mode offered by peer"); -- try.mppe = 0; -- } else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) { -- /* Peer must have set options we didn't request (suggest) */ -- try.mppe = 0; -+ if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) && -+ len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { -+ -+ if (go->mppc) { -+ no.mppc = 1; -+ if (!(p[5] & MPPE_MPPC)) -+ try.mppc = 0; - } - -- if (!try.mppe) { -- error("MPPE required but peer negotiation failed"); -- lcp_close(f->unit, "MPPE required but peer negotiation failed"); -+ if (go->mppe) -+ no.mppe = 1; -+ if (go->mppe_40) -+ no.mppe_40 = 1; -+ if (go->mppe_56) -+ no.mppe_56 = 1; -+ if (go->mppe_128) -+ no.mppe_128 = 1; -+ if (go->mppe_stateless) -+ no.mppe_stateless = 1; -+ -+ if (ao->mppe_40) { -+ if ((p[5] & MPPE_40BIT)) -+ try.mppe_40 = 1; -+ else -+ try.mppe_40 = (p[5] == 0) ? 1 : 0; - } -+ if (ao->mppe_56) { -+ if ((p[5] & MPPE_56BIT)) -+ try.mppe_56 = 1; -+ else -+ try.mppe_56 = (p[5] == 0) ? 1 : 0; -+ } -+ if (ao->mppe_128) { -+ if ((p[5] & MPPE_128BIT)) -+ try.mppe_128 = 1; -+ else -+ try.mppe_128 = (p[5] == 0) ? 1 : 0; -+ } -+ -+ if (ao->mppe_stateless) { -+ if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless) -+ try.mppe_stateless = 1; -+ else -+ try.mppe_stateless = 0; -+ } -+ -+ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) { -+ try.mppe = try.mppe_stateless = 0; -+ if (wo->mppe) { -+ /* we require encryption, but peer doesn't support it -+ so we close connection */ -+ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = -+ wo->mppe_56 = wo->mppe_128 = 0; -+ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " -+ "key length"); -+ } -+ } -+ if (wo->mppe && (wo->mppe_40 != try.mppe_40) && -+ (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) { -+ /* cannot negotiate key length */ -+ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = -+ wo->mppe_56 = wo->mppe_128 = 0; -+ lcp_close(f->unit, "Cannot negotiate MPPE key length"); -+ } -+ if (try.mppe_40 && try.mppe_56 && try.mppe_128) -+ try.mppe_40 = try.mppe_56 = 0; -+ else -+ if (try.mppe_56 && try.mppe_128) -+ try.mppe_56 = 0; -+ else -+ if (try.mppe_40 && try.mppe_128) -+ try.mppe_40 = 0; -+ else -+ if (try.mppe_40 && try.mppe_56) -+ try.mppe_40 = 0; -+ -+ p += CILEN_MPPE; -+ len -= CILEN_MPPE; - } - #endif /* MPPE */ -+ -+ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { -+ no.lzs = 1; -+ if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ && -+ p[4] != LZS_MODE_EXT)) -+ try.lzs = 0; -+ else { -+ try.lzs_mode = p[4]; -+ try.lzs_hists = (p[2] << 8) | p[3]; -+ } -+ p += CILEN_LZS; -+ len -= CILEN_LZS; -+ } -+ - if (go->deflate && len >= CILEN_DEFLATE - && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) - && p[1] == CILEN_DEFLATE) { -@@ -1002,14 +1255,50 @@ ccp_rejci(f, p, len) - return -1; - - #ifdef MPPE -- if (go->mppe && len >= CILEN_MPPE -+ if ((go->mppe || go->mppc) && len >= CILEN_MPPE - && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { -- error("MPPE required but peer refused"); -- lcp_close(f->unit, "MPPE required but peer refused"); -+ ccp_options *wo = &ccp_wantoptions[f->unit]; -+ if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) || -+ p[3] != 0 || -+ p[4] != 0 || -+ p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | -+ (go->mppe_56 ? MPPE_56BIT : 0) | -+ (go->mppe_128 ? MPPE_128BIT : 0) | -+ (go->mppc ? MPPE_MPPC : 0))) -+ return 0; -+ if (go->mppc) -+ try.mppc = 0; -+ if (go->mppe) { -+ try.mppe = 0; -+ if (go->mppe_40) -+ try.mppe_40 = 0; -+ if (go->mppe_56) -+ try.mppe_56 = 0; -+ if (go->mppe_128) -+ try.mppe_128 = 0; -+ if (go->mppe_stateless) -+ try.mppe_stateless = 0; -+ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) -+ try.mppe = try.mppe_stateless = 0; -+ if (wo->mppe) { /* we want MPPE but cannot negotiate key length */ -+ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = -+ wo->mppe_56 = wo->mppe_128 = 0; -+ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " -+ "key length"); -+ } -+ } - p += CILEN_MPPE; - len -= CILEN_MPPE; - } --#endif -+#endif /* MPPE */ -+ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { -+ if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) -+ || p[4] != go->lzs_mode) -+ return 0; -+ try.lzs = 0; -+ p += CILEN_LZS; -+ len -= CILEN_LZS; -+ } - if (go->deflate_correct && len >= CILEN_DEFLATE - && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) { - if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size) -@@ -1073,14 +1362,15 @@ ccp_reqci(f, p, lenp, dont_nak) - int dont_nak; - { - int ret, newret, res; -- u_char *p0, *retp; -+ u_char *p0, *retp, p2, p5; - int len, clen, type, nb; - ccp_options *ho = &ccp_hisoptions[f->unit]; - ccp_options *ao = &ccp_allowoptions[f->unit]; -+ ccp_options *wo = &ccp_wantoptions[f->unit]; - #ifdef MPPE -- bool rej_for_ci_mppe = 1; /* Are we rejecting based on a bad/missing */ -- /* CI_MPPE, or due to other options? */ --#endif -+ u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; -+/* int mtu; */ -+#endif /* MPPE */ - - ret = CONFACK; - retp = p0 = p; -@@ -1103,106 +1393,307 @@ ccp_reqci(f, p, lenp, dont_nak) - switch (type) { - #ifdef MPPE - case CI_MPPE: -- if (!ao->mppe || clen != CILEN_MPPE) { -+ if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) { - newret = CONFREJ; - break; - } -- MPPE_CI_TO_OPTS(&p[2], ho->mppe); - -- /* Nak if anything unsupported or unknown are set. */ -- if (ho->mppe & MPPE_OPT_UNSUPPORTED) { -- newret = CONFNAK; -- ho->mppe &= ~MPPE_OPT_UNSUPPORTED; -- } -- if (ho->mppe & MPPE_OPT_UNKNOWN) { -+ p2 = p[2]; -+ p5 = p[5]; -+ /* not sure what they want, tell 'em what we got */ -+ if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 || -+ (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT | -+ MPPE_MPPC)) != 0 || p[5] == 0) || -+ (p[2] == 0 && p[3] == 0 && p[4] == 0 && p[5] == 0)) { - newret = CONFNAK; -- ho->mppe &= ~MPPE_OPT_UNKNOWN; -+ p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0); -+ p[3] = 0; -+ p[4] = 0; -+ p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) | -+ (wo->mppe_56 ? MPPE_56BIT : 0) | -+ (wo->mppe_128 ? MPPE_128BIT : 0) | -+ (wo->mppc ? MPPE_MPPC : 0); -+ break; - } - -- /* Check state opt */ -- if (ho->mppe & MPPE_OPT_STATEFUL) { -- /* -- * We can Nak and request stateless, but it's a -- * lot easier to just assume the peer will request -- * it if he can do it; stateful mode is bad over -- * the Internet -- which is where we expect MPPE. -- */ -- if (refuse_mppe_stateful) { -- error("Refusing MPPE stateful mode offered by peer"); -+ if ((p[5] & MPPE_MPPC)) { -+ if (ao->mppc) { -+ ho->mppc = 1; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ opt_buf[2] = opt_buf[3] = opt_buf[4] = 0; -+ opt_buf[5] = MPPE_MPPC; -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) { -+ ho->mppc = 0; -+ p[5] &= ~MPPE_MPPC; -+ newret = CONFNAK; -+ } -+ } else { - newret = CONFREJ; -- break; -+ if (wo->mppe || ao->mppe) { -+ p[5] &= ~MPPE_MPPC; -+ newret = CONFNAK; -+ } - } - } - -- /* Find out which of {S,L} are set. */ -- if ((ho->mppe & MPPE_OPT_128) -- && (ho->mppe & MPPE_OPT_40)) { -- /* Both are set, negotiate the strongest. */ -+ if (ao->mppe) -+ ho->mppe = 1; -+ -+ if ((p[2] & MPPE_STATELESS)) { -+ if (ao->mppe_stateless) { -+ if (wo->mppe_stateless) -+ ho->mppe_stateless = 1; -+ else { -+ newret = CONFNAK; -+ if (!dont_nak) -+ p[2] &= ~MPPE_STATELESS; -+ } -+ } else { -+ newret = CONFNAK; -+ if (!dont_nak) -+ p[2] &= ~MPPE_STATELESS; -+ } -+ } else { -+ if (wo->mppe_stateless && !dont_nak) { -+ wo->mppe_stateless = 0; -+ newret = CONFNAK; -+ p[2] |= MPPE_STATELESS; -+ } -+ } -+ -+ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) { - newret = CONFNAK; -- if (ao->mppe & MPPE_OPT_128) -- ho->mppe &= ~MPPE_OPT_40; -- else if (ao->mppe & MPPE_OPT_40) -- ho->mppe &= ~MPPE_OPT_128; -- else { -- newret = CONFREJ; -- break; -+ if (ao->mppe_128) { -+ ho->mppe_128 = 1; -+ p[5] &= ~(MPPE_40BIT|MPPE_56BIT); -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_128 = 0; -+ p[5] |= (MPPE_40BIT|MPPE_56BIT); -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_56_40; -+ } -+ goto check_mppe; - } -- } else if (ho->mppe & MPPE_OPT_128) { -- if (!(ao->mppe & MPPE_OPT_128)) { -- newret = CONFREJ; -- break; -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_56_40; -+ } -+ if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) { -+ newret = CONFNAK; -+ if (ao->mppe_128) { -+ ho->mppe_128 = 1; -+ p[5] &= ~MPPE_56BIT; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_128 = 0; -+ p[5] |= MPPE_56BIT; -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_56; -+ } -+ goto check_mppe; - } -- } else if (ho->mppe & MPPE_OPT_40) { -- if (!(ao->mppe & MPPE_OPT_40)) { -- newret = CONFREJ; -- break; -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_56; -+ } -+ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) { -+ newret = CONFNAK; -+ if (ao->mppe_128) { -+ ho->mppe_128 = 1; -+ p[5] &= ~MPPE_40BIT; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_128 = 0; -+ p[5] |= MPPE_40BIT; -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_40; -+ } -+ goto check_mppe; -+ } -+ p[5] &= ~MPPE_128BIT; -+ goto check_mppe_40; -+ } -+ if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) { -+ if (ao->mppe_128) { -+ ho->mppe_128 = 1; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_128 = 0; -+ p[5] &= ~MPPE_128BIT; -+ newret = CONFNAK; -+ } -+ goto check_mppe; -+ } -+ p[5] &= ~MPPE_128BIT; -+ newret = CONFNAK; -+ goto check_mppe; -+ } -+ check_mppe_56_40: -+ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) { -+ newret = CONFNAK; -+ if (ao->mppe_56) { -+ ho->mppe_56 = 1; -+ p[5] &= ~MPPE_40BIT; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_56 = 0; -+ p[5] |= MPPE_40BIT; -+ p[5] &= ~MPPE_56BIT; -+ newret = CONFNAK; -+ goto check_mppe_40; -+ } -+ goto check_mppe; -+ } -+ p[5] &= ~MPPE_56BIT; -+ goto check_mppe_40; -+ } -+ check_mppe_56: -+ if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) { -+ if (ao->mppe_56) { -+ ho->mppe_56 = 1; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_56 = 0; -+ p[5] &= ~MPPE_56BIT; -+ newret = CONFNAK; -+ } -+ goto check_mppe; -+ } -+ p[5] &= ~MPPE_56BIT; -+ newret = CONFNAK; -+ goto check_mppe; -+ } -+ check_mppe_40: -+ if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) { -+ if (ao->mppe_40) { -+ ho->mppe_40 = 1; -+ BCOPY(p, opt_buf, CILEN_MPPE); -+ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -+ MPPE_MAX_KEY_LEN); -+ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + -+ MPPE_MAX_KEY_LEN, 1) <= 0) { -+ ho->mppe_40 = 0; -+ p[5] &= ~MPPE_40BIT; -+ newret = CONFNAK; -+ } -+ goto check_mppe; -+ } -+ p[5] &= ~MPPE_40BIT; -+ } -+ -+ check_mppe: -+ if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) { -+ if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) { -+ newret = CONFNAK; -+ p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0); -+ p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) | -+ (wo->mppe_56 ? MPPE_56BIT : 0) | -+ (wo->mppe_128 ? MPPE_128BIT : 0) | -+ (wo->mppc ? MPPE_MPPC : 0); -+ } else { -+ ho->mppe = ho->mppe_stateless = 0; - } - } else { -- /* Neither are set. */ -- /* We cannot accept this. */ -+ /* MPPE is not compatible with other compression types */ -+ if (wo->mppe) { -+ ao->bsd_compress = 0; -+ ao->predictor_1 = 0; -+ ao->predictor_2 = 0; -+ ao->deflate = 0; -+ ao->lzs = 0; -+ } -+ } -+ if ((!ho->mppc || !ao->mppc) && !ho->mppe) { -+ p[2] = p2; -+ p[5] = p5; - newret = CONFNAK; - /* Give the peer our idea of what can be used, - so it can choose and confirm */ - ho->mppe = ao->mppe; - } - -- /* rebuild the opts */ -- MPPE_OPTS_TO_CI(ho->mppe, &p[2]); -- if (newret == CONFACK) { -- u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; -- int mtu; -- -- BCOPY(p, opt_buf, CILEN_MPPE); -- BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], -- MPPE_MAX_KEY_LEN); -- if (ccp_test(f->unit, opt_buf, -- CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) { -- /* This shouldn't happen, we've already tested it! */ -- error("MPPE required, but kernel has no support."); -- lcp_close(f->unit, "MPPE required but not available"); -- newret = CONFREJ; -- break; -- } -- /* -- * We need to decrease the interface MTU by MPPE_PAD -- * because MPPE frames **grow**. The kernel [must] -- * allocate MPPE_PAD extra bytes in xmit buffers. -- */ -- mtu = netif_get_mtu(f->unit); -- if (mtu) -- netif_set_mtu(f->unit, mtu - MPPE_PAD); -- else -- newret = CONFREJ; -- } -+ /* -+ * I have commented the code below because according to RFC1547 -+ * MTU is only information for higher level protocols about -+ * "the maximum allowable length for a packet (q.v.) transmitted -+ * over a point-to-point link without incurring network layer -+ * fragmentation." Of course a PPP implementation should be able -+ * to handle overhead added by MPPE - in our case apropriate code -+ * is located in drivers/net/ppp_generic.c in the kernel sources. -+ * -+ * According to RFC1661: -+ * - when negotiated MRU is less than 1500 octets, a PPP -+ * implementation must still be able to receive at least 1500 -+ * octets, -+ * - when PFC is negotiated, a PPP implementation is still -+ * required to receive frames with uncompressed protocol field. -+ * -+ * So why not to handle MPPE overhead without changing MTU value? -+ * I am sure that RFC3078, unfortunately silently, assumes that. -+ */ - - /* -- * We have accepted MPPE or are willing to negotiate -- * MPPE parameters. A CONFREJ is due to subsequent -- * (non-MPPE) processing. -+ * We need to decrease the interface MTU by MPPE_PAD -+ * because MPPE frames **grow**. The kernel [must] -+ * allocate MPPE_PAD extra bytes in xmit buffers. - */ -- rej_for_ci_mppe = 0; -+/* -+ mtu = netif_get_mtu(f->unit); -+ if (mtu) { -+ netif_set_mtu(f->unit, mtu - MPPE_PAD); -+ } else { -+ newret = CONFREJ; -+ if (ccp_wantoptions[f->unit].mppe) { -+ error("Cannot adjust MTU needed by MPPE."); -+ lcp_close(f->unit, "Cannot adjust MTU needed by MPPE."); -+ } -+ } -+*/ - break; - #endif /* MPPE */ -+ -+ case CI_LZS: -+ if (!ao->lzs || clen != CILEN_LZS) { -+ newret = CONFREJ; -+ break; -+ } -+ -+ ho->lzs = 1; -+ ho->lzs_hists = (p[2] << 8) | p[3]; -+ ho->lzs_mode = p[4]; -+ if ((ho->lzs_hists != ao->lzs_hists) || -+ (ho->lzs_mode != ao->lzs_mode)) { -+ newret = CONFNAK; -+ if (!dont_nak) { -+ p[2] = ao->lzs_hists >> 8; -+ p[3] = ao->lzs_hists & 0xff; -+ p[4] = ao->lzs_mode; -+ } else -+ break; -+ } -+ -+ if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) { -+ newret = CONFREJ; -+ } -+ break; -+ - case CI_DEFLATE: - case CI_DEFLATE_DRAFT: - if (!ao->deflate || clen != CILEN_DEFLATE -@@ -1344,12 +1835,6 @@ ccp_reqci(f, p, lenp, dont_nak) - else - *lenp = retp - p0; - } --#ifdef MPPE -- if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) { -- error("MPPE required but peer negotiation failed"); -- lcp_close(f->unit, "MPPE required but peer negotiation failed"); -- } --#endif - return ret; - } - -@@ -1371,24 +1856,35 @@ method_name(opt, opt2) - char *p = result; - char *q = result + sizeof(result); /* 1 past result */ - -- slprintf(p, q - p, "MPPE "); -- p += 5; -- if (opt->mppe & MPPE_OPT_128) { -- slprintf(p, q - p, "128-bit "); -- p += 8; -- } -- if (opt->mppe & MPPE_OPT_40) { -- slprintf(p, q - p, "40-bit "); -- p += 7; -- } -- if (opt->mppe & MPPE_OPT_STATEFUL) -- slprintf(p, q - p, "stateful"); -- else -- slprintf(p, q - p, "stateless"); -- -+ if (opt->mppe) { -+ if (opt->mppc) { -+ slprintf(p, q - p, "MPPC/MPPE "); -+ p += 10; -+ } else { -+ slprintf(p, q - p, "MPPE "); -+ p += 5; -+ } -+ if (opt->mppe_128) { -+ slprintf(p, q - p, "128-bit "); -+ p += 8; -+ } else if (opt->mppe_56) { -+ slprintf(p, q - p, "56-bit "); -+ p += 7; -+ } else if (opt->mppe_40) { -+ slprintf(p, q - p, "40-bit "); -+ p += 7; -+ } -+ if (opt->mppe_stateless) -+ slprintf(p, q - p, "stateless"); -+ else -+ slprintf(p, q - p, "stateful"); -+ } else if (opt->mppc) -+ slprintf(p, q - p, "MPPC"); - break; - } --#endif -+#endif /* MPPE */ -+ case CI_LZS: -+ return "Stac LZS"; - case CI_DEFLATE: - case CI_DEFLATE_DRAFT: - if (opt2 != NULL && opt2->deflate_size != opt->deflate_size) -@@ -1444,12 +1940,12 @@ ccp_up(f) - } else if (ANY_COMPRESS(*ho)) - notice("%s transmit compression enabled", method_name(ho, NULL)); - #ifdef MPPE -- if (go->mppe) { -+ if (go->mppe || go->mppc) { - BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN); - BZERO(mppe_send_key, MPPE_MAX_KEY_LEN); - continue_networks(f->unit); /* Bring up IP et al */ - } --#endif -+#endif /* MPPE */ - } - - /* -@@ -1472,7 +1968,7 @@ ccp_down(f) - lcp_close(f->unit, "MPPE disabled"); - } - } --#endif -+#endif /* MPPE */ - } - - /* -@@ -1532,24 +2028,28 @@ ccp_printpkt(p, plen, printer, arg) - #ifdef MPPE - case CI_MPPE: - if (optlen >= CILEN_MPPE) { -- u_char mppe_opts; -- -- MPPE_CI_TO_OPTS(&p[2], mppe_opts); -- printer(arg, "mppe %s %s %s %s %s %s%s", -- (p[2] & MPPE_H_BIT)? "+H": "-H", -- (p[5] & MPPE_M_BIT)? "+M": "-M", -- (p[5] & MPPE_S_BIT)? "+S": "-S", -- (p[5] & MPPE_L_BIT)? "+L": "-L", -+ printer(arg, "mppe %s %s %s %s %s %s", -+ (p[2] & MPPE_STATELESS)? "+H": "-H", -+ (p[5] & MPPE_56BIT)? "+M": "-M", -+ (p[5] & MPPE_128BIT)? "+S": "-S", -+ (p[5] & MPPE_40BIT)? "+L": "-L", - (p[5] & MPPE_D_BIT)? "+D": "-D", -- (p[5] & MPPE_C_BIT)? "+C": "-C", -- (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": ""); -- if (mppe_opts & MPPE_OPT_UNKNOWN) -+ (p[5] & MPPE_MPPC)? "+C": "-C"); -+ if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT | -+ MPPE_D_BIT | MPPE_MPPC)) || -+ (p[2] & ~MPPE_STATELESS)) - printer(arg, " (%.2x %.2x %.2x %.2x)", - p[2], p[3], p[4], p[5]); - p += CILEN_MPPE; - } - break; --#endif -+#endif /* MPPE */ -+ case CI_LZS: -+ if (optlen >= CILEN_LZS) { -+ printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]); -+ p += CILEN_LZS; -+ } -+ break; - case CI_DEFLATE: - case CI_DEFLATE_DRAFT: - if (optlen >= CILEN_DEFLATE) { -@@ -1635,6 +2135,7 @@ ccp_datainput(unit, pkt, len) - error("Lost compression sync: disabling compression"); - ccp_close(unit, "Lost compression sync"); - #ifdef MPPE -+ /* My module dosn't need this. J.D., 2003-07-06 */ - /* - * If we were doing MPPE, we must also take the link down. - */ -@@ -1642,9 +2143,18 @@ ccp_datainput(unit, pkt, len) - error("Too many MPPE errors, closing LCP"); - lcp_close(unit, "Too many MPPE errors"); - } --#endif -+#endif /* MPPE */ - } else { - /* -+ * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ -+ * and don't wait for CCP_RESETACK -+ */ -+ if ((ccp_gotoptions[f->unit].method == CI_LZS) || -+ (ccp_gotoptions[f->unit].method == CI_MPPE)) { -+ fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0); -+ return; -+ } -+ /* - * Send a reset-request to reset the peer's compressor. - * We don't do that if we are still waiting for an - * acknowledgement to a previous reset-request. -@@ -1675,4 +2185,3 @@ ccp_rack_timeout(arg) - } else - ccp_localstate[f->unit] &= ~RACK_PENDING; - } -- diff --git a/package/ppp/patches/patch-pppd_ccp_h b/package/ppp/patches/patch-pppd_ccp_h deleted file mode 100644 index fe2c3875f..000000000 --- a/package/ppp/patches/patch-pppd_ccp_h +++ /dev/null @@ -1,20 +0,0 @@ ---- ppp-2.4.4.orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100 -+++ ppp-2.4.4/pppd/ccp.h 2009-06-05 19:12:00.000000000 +0200 -@@ -37,9 +37,17 @@ typedef struct ccp_options { - bool predictor_2; /* do Predictor-2? */ - bool deflate_correct; /* use correct code for deflate? */ - bool deflate_draft; /* use draft RFC code for deflate? */ -+ bool lzs; /* do Stac LZS? */ -+ bool mppc; /* do MPPC? */ - bool mppe; /* do MPPE? */ -+ bool mppe_40; /* allow 40 bit encryption? */ -+ bool mppe_56; /* allow 56 bit encryption? */ -+ bool mppe_128; /* allow 128 bit encryption? */ -+ bool mppe_stateless; /* allow stateless encryption */ - u_short bsd_bits; /* # bits/code for BSD Compress */ - u_short deflate_size; /* lg(window size) for Deflate */ -+ u_short lzs_mode; /* LZS check mode */ -+ u_short lzs_hists; /* number of LZS histories */ - short method; /* code for chosen compression method */ - } ccp_options; - diff --git a/package/ppp/patches/patch-pppd_chap_ms_c b/package/ppp/patches/patch-pppd_chap_ms_c deleted file mode 100644 index b829221d4..000000000 --- a/package/ppp/patches/patch-pppd_chap_ms_c +++ /dev/null @@ -1,22 +0,0 @@ ---- ppp-2.4.5.orig/pppd/chap_ms.c 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/chap_ms.c 2011-01-16 15:51:05.000000000 +0100 -@@ -898,13 +898,17 @@ set_mppe_enc_types(int policy, int types - /* - * Disable undesirable encryption types. Note that we don't ENABLE - * any encryption types, to avoid overriding manual configuration. -+ * -+ * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548) - */ - switch(types) { - case MPPE_ENC_TYPES_RC4_40: -- ccp_wantoptions[0].mppe &= ~MPPE_OPT_128; /* disable 128-bit */ -+ ccp_wantoptions[0].mppe_128 = 0; /* disable 128-bit */ -+ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ - break; - case MPPE_ENC_TYPES_RC4_128: -- ccp_wantoptions[0].mppe &= ~MPPE_OPT_40; /* disable 40-bit */ -+ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ -+ ccp_wantoptions[0].mppe_40 = 0; /* disable 40-bit */ - break; - default: - break; diff --git a/package/ppp/patches/patch-pppd_plugins_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_Makefile_linux index 9f78f3d19..8351654c7 100644 --- a/package/ppp/patches/patch-pppd_plugins_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_Makefile_linux @@ -1,29 +1,47 @@ --- ppp-2.4.5.orig/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/Makefile.linux 2011-01-16 17:14:34.000000000 +0100 -@@ -1,13 +1,8 @@ ++++ ppp-2.4.5/pppd/plugins/Makefile.linux 2011-01-21 21:29:58.118658260 +0100 +@@ -1,13 +1,13 @@ -#CC = gcc -COPTS = -O2 -g -CFLAGS = $(COPTS) -I.. -I../../include -fPIC -LDFLAGS = -shared -INSTALL = install -+include ../../makedefs.linux ++# ++# makefile for pppd/plugins ++# ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) -DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++include ../../Makedefs.com ++ +CPPFLAGS += -I.. -I../../include -+CFLAGS += -fPIC ++CFLAGS += -fPIC +LDFLAGS += -shared SUBDIRS := rp-pppoe pppoatm pppol2tp # Uncomment the next line to include the radius authentication plugin -@@ -23,7 +18,7 @@ all: $(PLUGINS) +@@ -23,12 +23,10 @@ all: $(PLUGINS) for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done %.so: %.c - $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -+ $(CC) -o $@ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $^ +- +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) + install: $(PLUGINS) +- $(INSTALL) -d $(LIBDIR) ++ $(INSTALL) -d -m 755 $(LIBDIR) + $(INSTALL) $? $(LIBDIR) + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done +@@ -37,5 +35,4 @@ clean: + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done + + depend: +- $(CPP) -M $(CFLAGS) *.c >.depend +- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done ++ $(CPP) -M $(CPPFLAGS) *.c >.depend diff --git a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux index e7fb3f5e7..32a86eaf7 100644 --- a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux @@ -1,36 +1,60 @@ --- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2011-01-16 21:12:55.000000000 +0100 -@@ -1,13 +1,10 @@ ++++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2011-01-21 21:29:58.177408277 +0100 +@@ -1,15 +1,16 @@ -#CC = gcc -COPTS = -O2 -g -CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC -LDFLAGS = -shared -INSTALL = install -+include ../../../makedefs.linux ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -#*********************************************************************** -+CPPFLAGS += -I../.. -I../../../include -+CFLAGS += -fPIC -+LDFLAGS += -shared ++include ../../../Makedefs.com -DESTDIR = $(INSTROOT)@DESTDIR@ -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++CPPFLAGS += -I../.. -I../../../include ++ifeq (,$(filter -fPIC,$(CFLAGS))) ++CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) ++LDFLAGS += -shared ++endif + +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +#*********************************************************************** - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + PLUGIN := pppoatm.so + PLUGIN_OBJS := pppoatm.o +@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o + #HAVE_LIBATM=yes + + ifdef HAVE_LIBATM +-LIBS := -latm ++LIBS += -latm + else +-CFLAGS += -I. ++CPPFLAGS += -I. + PLUGIN_OBJS += text2qos.o text2atm.o misc.o ans.o +-LIBS := -lresolv ++LIBS += -lresolv + endif -@@ -33,7 +30,7 @@ endif + #********* all: $(PLUGIN) $(PLUGIN): $(PLUGIN_OBJS) - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - install: all +-install: all ++install: $(PLUGIN) $(INSTALL) -d -m 755 $(LIBDIR) -@@ -43,4 +40,4 @@ clean: - rm -f *.o *.so +- $(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 4550 $(PLUGIN) $(LIBDIR) - %.o: %.c + clean: + rm -f *.o *.so +- +-%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux index 4c46c5971..481f1e41c 100644 --- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux @@ -1,41 +1,45 @@ --- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-16 21:32:19.000000000 +0100 -@@ -1,13 +1,10 @@ ++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-21 21:30:05.208658673 +0100 +@@ -1,29 +1,27 @@ -#CC = gcc -COPTS = -O2 -g -CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC -LDFLAGS = -shared -INSTALL = install -+include ../../../makedefs.linux ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -#*********************************************************************** -+CPPFLAGS += -I. -I../.. -I../../../include -+#CFLAGS += -fPIC -+#LDFLAGS += -shared ++include ../../../Makedefs.com -DESTDIR = @DESTDIR@ -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++CPPFLAGS += -I. -I../.. -I../../../include ++ifeq (,$(filter -fPIC,$(CFLAGS))) ++CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) ++LDFLAGS += -shared ++endif + +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +#*********************************************************************** - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + PLUGINS := pppol2tp.so openl2tp.so -@@ -16,7 +13,11 @@ PLUGINS := pppol2tp.so openl2tp.so all: $(PLUGINS) %.so: %.o - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+ echo $(LDFLAGS) -+ -+%.o: %.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< - install: all +-install: all ++install: $(PLUGINS) $(INSTALL) -d -m 755 $(LIBDIR) -@@ -25,5 +26,4 @@ install: all +- $(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR) + clean: rm -f *.o *.so - +- -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< -+.PHONY: clean diff --git a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux index d01aeb86c..4c7123243 100644 --- a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux @@ -1,58 +1,94 @@ --- ppp-2.4.5.orig/pppd/plugins/radius/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2011-01-16 21:35:47.000000000 +0100 -@@ -1,18 +1,14 @@ ++++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2011-01-21 21:29:58.278658282 +0100 +@@ -1,18 +1,20 @@ # Makefile for RADIUS plugin - # - # Copyright 2002 Roaring Penguin Software Inc. -# + # Copyright 2002 Roaring Penguin Software Inc. + # -DESTDIR = $(INSTROOT)@DESTDIR@ -MANDIR = $(DESTDIR)/share/man/man8 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) -+include ../../../makedefs.linux - --VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -+CPPFLAGS+=-I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON +- + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -INSTALL = install -+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++include ../../../Makedefs.com - PLUGIN=radius.so radattr.so radrealms.so +-PLUGIN=radius.so radattr.so radrealms.so -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++CPPFLAGS += -I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON ++ifeq (,$(filter -fPIC,$(CFLAGS))) ++CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) ++LDFLAGS += -shared ++endif ++ ++PLUGINS = radius.so radattr.so radrealms.so # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. -@@ -36,25 +32,26 @@ all: $(PLUGIN) +@@ -23,43 +25,40 @@ MPPE=y + MAXOCTETS=y + + ifdef CHAPMS +-CFLAGS += -DCHAPMS=1 ++CPPFLAGS += -DCHAPMS=1 + ifdef MPPE +-CFLAGS += -DMPPE=1 ++CPPFLAGS += -DMPPE=1 + endif + endif + ifdef MAXOCTETS +-CFLAGS += -DMAXOCTETS=1 ++CPPFLAGS += -DMAXOCTETS=1 + endif + +-all: $(PLUGIN) ++CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ ++ clientid.o sendserver.o lock.o util.o md5.o - install: all - $(INSTALL) -d -m 755 $(LIBDIR) +-install: all +- $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) - $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) - $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) - $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) +- $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) +- $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) ++all: $(PLUGINS) radius.so: radius.o libradiusclient.a - $(CC) -o radius.so -shared radius.o libradiusclient.a -+ $(CC) $(LDFLAGS) -o radius.so radius.o libradiusclient.a ++ $(CC) $(LDFLAGS) -o $@ $^ radattr.so: radattr.o - $(CC) -o radattr.so -shared radattr.o -+ $(CC) $(LDFLAGS) -o radattr.so radattr.o ++ $(CC) $(LDFLAGS) -o $@ $^ radrealms.so: radrealms.o - $(CC) -o radrealms.so -shared radrealms.o -+ $(CC) $(LDFLAGS) -o radrealms.so radrealms.o ++ $(CC) $(LDFLAGS) -o $@ $^ - CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ - clientid.o sendserver.o lock.o util.o md5.o -+ +-CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ +- clientid.o sendserver.o lock.o util.o md5.o libradiusclient.a: $(CLIENTOBJS) - $(AR) rv $@ $? -+ $(TARGET_AR) rcsv $@ $? ++ $(AR) $(ARFLAGS) $@ $? + +-clean: +- rm -f *.o *.so *.a ++install: $(PLUGINS) ++ $(INSTALL) -d -m 755 $(LIBDIR) ++ $(INSTALL) -d -m 755 $(MANDIR) ++ $(INSTALL) $(STRIP) -c -m 755 radius.so $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 755 radattr.so $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 755 radrealms.so $(LIBDIR) ++ $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) ++ $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) - clean: +-distclean: ++clean: rm -f *.o *.so *.a +- +-dist-clean: distclean diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux index 09d845f6a..844525b54 100644 --- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux @@ -1,50 +1,51 @@ --- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-16 21:38:08.000000000 +0100 -@@ -1,6 +1,3 @@ ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-21 21:29:58.318658312 +0100 +@@ -1,6 +1,4 @@ -# Generated automatically from Makefile.in by configure. --#*********************************************************************** + #*********************************************************************** -# # Makefile # # Makefile for Roaring Penguin's Linux PPPoE plugin. -@@ -13,52 +10,50 @@ - # +@@ -14,51 +12,35 @@ # $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $ #*********************************************************************** -- + -DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin -LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION) - -PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -- ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + -INSTALL = install -+include ../../../makedefs.linux ++include ../../../Makedefs.com # Version is set ONLY IN THE MAKEFILE! Don't delete this! RP_VERSION=3.8p -COPTS=-O2 -g -CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' -+CPPFLAGS += -I../../.. -I../../../include '-DRP_VERSION="$(RP_VERSION)"' ++CPPFLAGS += -I../../../include -I../../.. ++CPPFLAGS += '-DRP_VERSION="$(RP_VERSION)"' ++ifeq (,$(filter -fPIC,$(CFLAGS))) +CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) +LDFLAGS += -shared -+ -+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++endif + all: rp-pppoe.so pppoe-discovery pppoe-discovery: pppoe-discovery.o debug.o - $(CC) -o pppoe-discovery pppoe-discovery.o debug.o -+ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o - - pppoe-discovery.o: pppoe-discovery.c +- +-pppoe-discovery.o: pppoe-discovery.c - $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ - - debug.o: debug.c +- +-debug.o: debug.c - $(CC) $(CFLAGS) -c -o debug.o debug.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ rp-pppoe.so: plugin.o discovery.o if.o common.o - $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o @@ -53,28 +54,23 @@ install: all $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 4550 rp-pppoe.so $(LIBDIR) $(INSTALL) -d -m 755 $(BINDIR) - $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) -+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) ++ $(INSTALL) $(STRIP) -c -m 555 pppoe-discovery $(BINDIR) clean: rm -f *.o *.so pppoe-discovery - - plugin.o: plugin.c +- +-plugin.o: plugin.c - $(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o plugin.o plugin.c - - discovery.o: discovery.c +- +-discovery.o: discovery.c - $(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o discovery.o discovery.c - - if.o: if.c +- +-if.o: if.c - $(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o if.o if.c - - common.o: common.c +- +-common.o: common.c - $(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c - -+.PHONY: clean +- diff --git a/package/ppp/patches/patch-pppd_sys-linux_c b/package/ppp/patches/patch-pppd_sys-linux_c deleted file mode 100644 index 94c9e7a2e..000000000 --- a/package/ppp/patches/patch-pppd_sys-linux_c +++ /dev/null @@ -1,16 +0,0 @@ ---- ppp-2.4.4.orig/pppd/sys-linux.c 2005-08-27 00:44:35.000000000 +0200 -+++ ppp-2.4.4/pppd/sys-linux.c 2009-06-05 19:12:00.000000000 +0200 -@@ -453,6 +453,13 @@ int generic_establish_ppp (int fd) - if (new_style_driver) { - int flags; - -+ /* if a ppp_fd is already open, close it first */ -+ if(ppp_fd > 0) { -+ close(ppp_fd); -+ remove_fd(ppp_fd); -+ ppp_fd = -1; -+ } -+ - /* Open an instance of /dev/ppp and connect the channel to it */ - if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) { - error("Couldn't get channel number: %m"); diff --git a/package/ppp/patches/patch-pppdump_Makefile_linux b/package/ppp/patches/patch-pppdump_Makefile_linux index 796548ab7..3c44233bf 100644 --- a/package/ppp/patches/patch-pppdump_Makefile_linux +++ b/package/ppp/patches/patch-pppdump_Makefile_linux @@ -1,33 +1,40 @@ --- ppp-2.4.5.orig/pppdump/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppdump/Makefile.linux 2011-01-16 16:58:39.000000000 +0100 -@@ -1,21 +1,19 @@ ++++ ppp-2.4.5/pppdump/Makefile.linux 2011-01-21 21:29:58.380124461 +0100 +@@ -1,21 +1,24 @@ -DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 -+include ../makedefs.linux ++# ++# pppdump makefile ++# $id$ ++# -CFLAGS= -O -I../include/net -+CPPFLAGS+= -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o +-OBJS = pppdump.o bsd-comp.o deflate.o zlib.o ++include ../Makedefs.com -INSTALL= install -- - all: pppdump ++CPPFLAGS += -I../include/net - pppdump: $(OBJS) +-all: pppdump ++PROG = pppdump ++OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + +-pppdump: $(OBJS) - $(CC) -o pppdump $(OBJS) -- ++all: $(PROG) + -clean: - rm -f pppdump $(OBJS) *~ -+ $(CC) $(LDFLAGS) -o pppdump $(OBJS) ++$(PROG): $(OBJS) install: - mkdir -p $(BINDIR) $(MANDIR) +- mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) ++ $(INSTALL) -d -m 755 $(BINDIR) ++ $(INSTALL) -d -m 755 $(MANDIR) ++ $(INSTALL) $(STRIP) -c $(PROG) $(BINDIR) $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) + +clean: -+ rm -f pppdump $(OBJS) *~ -+ -+.PHONY: clean ++ rm -f $(PROG) $(OBJS) *~ diff --git a/package/ppp/patches/patch-pppstats_Makefile_linux b/package/ppp/patches/patch-pppstats_Makefile_linux index 81dfd920b..d08bab07a 100644 --- a/package/ppp/patches/patch-pppstats_Makefile_linux +++ b/package/ppp/patches/patch-pppstats_Makefile_linux @@ -1,48 +1,50 @@ --- ppp-2.4.5.orig/pppstats/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppstats/Makefile.linux 2011-01-16 17:11:22.000000000 +0100 -@@ -1,36 +1,27 @@ - # ++++ ppp-2.4.5/pppstats/Makefile.linux 2011-01-21 21:29:58.437408223 +0100 +@@ -2,35 +2,26 @@ # pppstats makefile # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $ --# + # -DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 -+include ../makedefs.linux -+ -+CPPFLAGS += -I../include - PPPSTATSRCS = pppstats.c - PPPSTATOBJS = pppstats.o +-PPPSTATSRCS = pppstats.c +-PPPSTATOBJS = pppstats.o ++include ../Makedefs.com -#CC = gcc -COPTS = -O -COMPILE_FLAGS = -I../include -LIBS = -- ++CPPFLAGS += -I../include + -INSTALL= install -- ++PROG = pppstats ++OBJS = pppstats.o ++SRCS = pppstats.c + -CFLAGS = $(COPTS) $(COMPILE_FLAGS) -- - all: pppstats ++all: $(PROG) + +-all: pppstats ++$(PROG): $(OBJS) -+pppstats: $(PPPSTATSRCS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDLAGS) -o pppstats pppstats.c $(LIBS) -+ - install: pppstats - -mkdir -p $(MANDIR) +-install: pppstats +- -mkdir -p $(MANDIR) - $(INSTALL) -s -c pppstats $(BINDIR) -+ $(INSTALL) -c pppstats $(BINDIR) ++install: $(PROG) ++ $(INSTALL) -d -m 755 $(MANDIR) $(BINDIR) ++ $(INSTALL) $(STRIP) -c $(PROG) $(BINDIR) $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) -pppstats: $(PPPSTATSRCS) - $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) - clean: - rm -f pppstats *~ #* core +- rm -f pppstats *~ #* core ++ rm -f $(PROG) $(OBJS) *~ #* core depend: - cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend +- cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend -# makedepend $(CFLAGS) $(PPPSTATSRCS) -+ -+.PHONY: clean ++ $(CPP) -M $(CPPFLAGS) $(CFLAGS) $(SRCS) >.depend diff --git a/package/ppp/src/linux/Makedefs.gcc b/package/ppp/src/linux/Makedefs.gcc new file mode 100644 index 000000000..618eabcc9 --- /dev/null +++ b/package/ppp/src/linux/Makedefs.gcc @@ -0,0 +1,21 @@ +CPPFLAGS ?= +CFLAGS ?= -O2 -pipe +LDFLAGS ?= +LIBS ?= +ARFLAGS ?= rv + +INSTALL ?= install +STRIP ?= -s + +DESTDIR ?= $(INSTROOT)@DESTDIR@ +BINDIR = $(DESTDIR)/sbin +MANDIR = $(DESTDIR)/share/man/man8 +LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) +INCDIR = $(DESTDIR)/include +ETCDIR = $(DESTDIR)@SYSCONF@/ppp + +%.d: %.c + @set -e; rm -f $@; \ + $(CC) -M $(CPPFLAGS) $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ diff --git a/package/ppp/src/makedefs.linux b/package/ppp/src/makedefs.linux deleted file mode 100644 index 061efabc6..000000000 --- a/package/ppp/src/makedefs.linux +++ /dev/null @@ -1,14 +0,0 @@ -CC ?= gcc -CPPFLAGS ?= -CFLAGS ?= -O -pipe -LDFLAGS ?= -LIBS ?= - -INSTALL ?= install - -# Default installation locations -DESTDIR = $(INSTROOT)/usr -BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 -INCDIR = $(DESTDIR)/include -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) |