diff options
| -rw-r--r-- | rules/ppp.in | 109 | ||||
| -rw-r--r-- | rules/ppp.make | 122 |
2 files changed, 138 insertions, 93 deletions
diff --git a/rules/ppp.in b/rules/ppp.in index afe098649..86b251019 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -1,15 +1,18 @@ ## SECTION=networking + menuconfig PPP tristate prompt "ppp " - select LIBC_DL select ROOTFS_VAR_RUN - select LIBPCAP if PPP_FILTER - select LIBPCAP_IPV6 if (PPP_IPV6 && PPP_FILTER) - select OPENSSL if PPP_SRP - select LIBC_RESOLV if PPP_PLUGINS - select LIBC_CRYPT if PPP_NEEDS_CRYPT + select LIBC_DL + select LIBC_RESOLV if PPP_PLUGINS + select LIBC_CRYPT if PPP_NEEDS_CRYPT + select LIBPCAP if PPP_FILTER + select LIBPCAP_IPV6 if PPP_FILTER && PPP_IPV6 + select OPENSSL if PPP_SRP help + Point-to-Point Protocol (PPP) - daemon + Just like SLIP, PPP is a protocol to send datagrams across a serial connection, but addresses a couple of deficiencies of the @@ -28,20 +31,6 @@ config PPP_IPV6 help Enable IPV6 support -config PPP_MS_CHAP - bool - prompt "MS-CHAP" - select PPP_NEEDS_CRYPT - help - support Micro$oft's MS-CHAP authentication protocol - -config PPP_SHADOW - bool - prompt "ppp server: support for shadow passwords" - help - Used when your pppd runs as a dialin server. Not required if it - is intended to run as client only. - config PPP_IPX bool prompt "support IPX protocol" @@ -57,6 +46,12 @@ config PPP_FILTER there is no traffic on the line. This entry provides the filter to specify what counts as traffic and what is to be ignored. +config PPP_SRP + bool "EAP SRP-SHA1 authentication" + depends on BROKEN + help + Enable EAP SRP-SHA1 authentication + config PPP_MULTILINK bool prompt "support multilink" @@ -67,6 +62,45 @@ config PPP_MULTILINK a single virtual PPP link which has the combined bandwidth of the individual links. +config PPP_SHADOW + bool + prompt "ppp server: support for shadow passwords" + help + Used when your pppd runs as a dialin server. Not required if it + is intended to run as client only. + +config PPP_MS_CHAP + bool + prompt "MS-CHAP (Microsoft MS-CHAP authentication protocol)" + select PPP_NEEDS_CRYPT + help + support Micro$oft's MS-CHAP authentication protocol + +config PPP_MPPE + bool + prompt "MPPE (Microsoft Point-to-Point Encryption)" + select PPP_MS_CHAP + help + support Microsoft Point-to-Point Encryption + for more information see: + RFC 3078 (the protocol) + RFC 3079 (deriving initial session keys) + +config PPP_MS_CBCP + bool "CBCP (Microsoft proprietary Callback Control Protocol)" + help + Enable Micro$oft proprietary Callback Control Protocol + + +config PPP_NEEDS_CRYPT + bool + # crypt() calls have slipped into pppd; se we enforce 'y' here until this is fixed upstream + default y + +config PPP_TDB + bool + + menuconfig PPP_PLUGINS bool prompt "support plugins" @@ -106,8 +140,9 @@ config PPP_OE default y prompt "ppp over ethernet" help - Enable this if you are using a DSL modem connected via ethernet to - your host (so called 'PPP over Ethernet'=PPPoE). + + Enable this if you are using a DSL modem connected via + ethernet to your host (so called 'PPP over Ethernet' = PPPoE). config PPP_MINCONN bool @@ -135,21 +170,6 @@ config PPP_WINBIND endif -config PPP_NEEDS_CRYPT - bool - # crypt() calls have slipped into pppd; se we enforce 'y' here until this is fixed upstream - default y - -config PPP_MS_CBCP - bool - help - M$ proprietary Callback Control Protocol - -config PPP_TDB - bool - -config PPP_SRP - bool comment "install options" @@ -174,6 +194,11 @@ config PPP_INST_PPPSTATS The pppstats utility reports PPP-related statistics at regular intervals for a specified PPP interface. +config PPP_INST_PONOFF + bool "install pon/poff" + help + FIXME + config PPP_STARTSCRIPT bool select BUSYBOX_KILL if BUSYBOX @@ -185,11 +210,11 @@ config PPP_STARTSCRIPT Install this script to be able to run this service at system startup config PPP_INST_DEFAULT_CONFIG_FILES - bool - default y - prompt "install /etc/ppp/* configuration files (options,ip-up, etc.)" - help - Install the default ppp configuration files in /etc/ppp. + bool + default y + prompt "install /etc/ppp/* configuration files (options,ip-up, etc.)" + help + Install the default ppp configuration files in /etc/ppp. config PPPD_INTF string diff --git a/rules/ppp.make b/rules/ppp.make index 2b3590f89..98167606b 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -1,9 +1,8 @@ # -*-makefile-*- -# $Id: pppd.make 3876 2006-01-12 20:18:48Z rsc $ # # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for # GYRO net GmbH <info@gyro-net.de>, Hannover, Germany -# Copyright (C) 2008...2009 by Juergen Beisert <juergen@kreuzholzen.de> +# 2008, 2009 by Juergen Beisert <juergen@kreuzholzen.de> # # See CREDITS for details about who has contributed to this project. # @@ -25,7 +24,7 @@ PPP_SUFFIX := tar.gz PPP_URL := ftp://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX) PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX) PPP_DIR := $(BUILDDIR)/$(PPP) - +PPP_LICENSE := BSD,GPLv2 # ---------------------------------------------------------------------------- # Get @@ -40,10 +39,13 @@ $(PPP_SOURCE): # ---------------------------------------------------------------------------- PPP_PATH := PATH=$(CROSS_PATH) -PPP_ENV := $(CROSS_ENV) \ +PPP_ENV := \ TARGET_OS=Linux \ TARGET_OS_VER=$(PTXCONF_KERNEL_VERSION) \ - TARGET_OS_ARCH=$(PTXCONF_KERNEL_ARCH_STRING) + TARGET_OS_ARCH=$(PTXCONF_KERNEL_ARCH_STRING) \ + +PPP_COMPILE_ENV := $(CROSS_ENV) +PPP_MAKE_PAR := NO # # path to where the shared library based plugins get installed @@ -56,13 +58,43 @@ $(STATEDIR)/ppp.prepare: @cd $(PPP_DIR) && $(PPP_PATH) $(PPP_ENV) \ ./configure --prefix=/usr --sysconfdir=/etc -# FIXME: Should also be entries in the menu - @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,MPPE=y) +ifdef PTXCONF_PPP_IPV6 + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) +else + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) +endif -ifdef PTXCONF_PPP_TDB - @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,USE_TDB=y) +ifndef PTXCONF_PPP_IPX + @sed -i \ + -e 's/-DIPX_CHANGE//' \ + -e 's/ipxcp.o//' \ + $(PPP_DIR)/pppd/Makefile +endif + +ifdef PTXCONF_PPP_FILTER + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,FILTER=y) else - @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,USE_TDB=y) + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,FILTER=y) +endif + +ifdef PTXCONF_PPP_SRP + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,USE_SRP=y) +else + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,USE_SRP=y) +endif + +ifndef PTXCONF_PPP_MULTILINK + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_MULTILINK=y) + @sed -i \ + -e 's/-DHAVE_MULTILINK//' \ + -e 's/multilink.o//' \ + $(PPP_DIR)/pppd/Makefile +endif + +ifdef PTXCONF_PPP_SHADOW + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAS_SHADOW=y) +else + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAS_SHADOW=y) endif ifdef PTXCONF_PPP_MS_CHAP @@ -71,10 +103,10 @@ else @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,CHAPMS=y) endif -ifdef PTXCONF_PPP_IPV6 - @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) +ifdef PTXCONF_PPP_MPPE + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,MPPE=y) else - @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,MPPE=y) endif ifdef PTXCONF_PPP_MS_CBCP @@ -83,45 +115,23 @@ else @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,CBCP=y) endif -ifdef PTXCONF_PPP_SHADOW - @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAS_SHADOW=y) -else - @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAS_SHADOW=y) -endif - ifdef PTXCONF_PPP_NEEDS_CRYPT @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,USE_CRYPT=y) else @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,USE_CRYPT=y) endif +ifdef PTXCONF_PPP_TDB + @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,USE_TDB=y) +else + @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,USE_TDB=y) +endif + ifdef PTXCONF_PPP_PLUGINS @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,PLUGIN=y) else @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,PLUGIN=y) endif - -ifndef PTXCONF_PPP_IPX - @perl -p -i -e 's/-DIPX_CHANGE //' $(PPP_DIR)/pppd/Makefile - @perl -p -i -e 's/ipxcp.o //' $(PPP_DIR)/pppd/Makefile -endif - -ifndef PTXCONF_PPP_MULTILINK - @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_MULTILINK=y) - @perl -p -i -e 's/-DHAVE_MULTILINK //' $(PPP_DIR)/pppd/Makefile - @perl -p -i -e 's/multilink.o //' $(PPP_DIR)/pppd/Makefile -endif - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/ppp.compile: - @$(call targetinfo) - cd $(PPP_DIR) && \ - $(PPP_PATH) $(PPP_ENV) $(MAKE) $(PARALLELMFLAGS_BROKEN) @$(call touch) # ---------------------------------------------------------------------------- @@ -144,7 +154,7 @@ $(STATEDIR)/ppp.targetinstall: @$(call install_fixup, ppp,PRIORITY,optional) @$(call install_fixup, ppp,VERSION,$(PPP_VERSION)) @$(call install_fixup, ppp,SECTION,base) - @$(call install_fixup, ppp,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") + @$(call install_fixup, ppp,AUTHOR,"Robert Schwebel (r.schwebel@pengutronix.de)") @$(call install_fixup, ppp,DEPENDS,) @$(call install_fixup, ppp,DESCRIPTION,missing) @@ -156,14 +166,14 @@ ifdef PTXCONF_PPP_INST_CHAT $(PPP_DIR)/chat/chat, /usr/sbin/chat) endif -# # install configuration files (on demand only) ifdef PTXCONF_PPP_INST_DEFAULT_CONFIG_FILES - @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/options, n) - @$(call install_alternative, ppp, 0, 0, 0750, /etc/ppp/ip-up, n) - @$(call install_alternative, ppp, 0, 0, 0750, /etc/ppp/ip-down, n) - @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/options.server, n) - @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/options.ttyS0, n) - @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/pap-secrets, n) + @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/options) + @$(call install_alternative, ppp, 0, 0, 0750, /etc/ppp/ip-up) + @$(call install_alternative, ppp, 0, 0, 0750, /etc/ppp/ip-down) + @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/pap-secrets) + + @$(call install_alternative, ppp, 0, 0, 0600, /etc/ppp/peers/provider) + @$(call install_alternative, ppp, 0, 0, 0600, /etc/chatscripts/provider) endif # # @@ -171,7 +181,7 @@ endif # # ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_PPP_STARTSCRIPT - @$(call install_alternative, ppp, 0, 0, 0755, /etc/init.d/pppd, n) + @$(call install_alternative, ppp, 0, 0, 0755, /etc/init.d/pppd) @$(call install_replace, ppp, /etc/init.d/pppd, \ @PPPD_INTF@, $(PTXCONF_PPPD_INTF)) endif @@ -187,8 +197,14 @@ ifdef PTXCONF_PPP_INST_PPPSTATS $(PPP_DIR)/pppstats/pppstats, /usr/sbin/pppstats) endif +ifdef PTXCONF_PPP_INST_PONOFF + @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/pon) + @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) +endif + ifdef PTXCONF_PPP_PLUGINS @$(call install_copy, ppp, 0, 0, 0755, $(PPP_SHARED_INST_PATH)) +endif ifdef PTXCONF_PPP_OATM @$(call install_copy, ppp, 0, 0, 0644, \ @@ -215,6 +231,11 @@ ifdef PTXCONF_PPP_OE $(PPP_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so, \ $(PPP_SHARED_INST_PATH)/rp-pppoe.so) endif +ifdef PTXCONF_PPP_PLUGIN_RP_PPPOE_DISCOVERY + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/pppd/plugins/rp-pppoe/pppoe-discovery, \ + $(PPP_SHARED_INST_PATH)/pppoe-discovery) +endif ifdef PTXCONF_PPP_MINCONN @$(call install_copy, ppp, 0, 0, 0644, \ $(PPP_DIR)/pppd/plugins/minconn.so, \ @@ -235,7 +256,6 @@ ifdef PTXCONF_PPP_WINBIND $(PPP_DIR)/pppd/plugins/winbind.so, \ $(PPP_SHARED_INST_PATH)/winbind.so) endif -endif @$(call install_finish, ppp) @$(call touch) |