diff options
| -rw-r--r-- | package/ppp/Config.in | 24 | ||||
| -rw-r--r-- | package/ppp/Makefile | 281 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/chap-secrets (renamed from package/ppp/ipkg/ppp/etc/ppp/chap-secrets) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/options (renamed from package/ppp/ipkg/ppp/etc/ppp/options) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/peers/sample (renamed from package/ppp/ipkg/ppp/etc/ppp/peers/sample) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/radius.conf (renamed from package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/radius/dictionary (renamed from package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/radius/dictionary.asnet (renamed from package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/radius/dictionary.microsoft (renamed from package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft) | 0 | ||||
| -rw-r--r-- | package/ppp/files/etc/ppp/radius/servers (renamed from package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers) | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | package/ppp/files/pppoe.init (renamed from package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/chat.control (renamed from package/ppp/control/chat.control) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp-mod-pppoe.control (renamed from package/ppp/control/ppp-pppoe-plugin.control) | 2 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp-mod-radius.conffiles (renamed from package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp-mod-radius.control (renamed from package/ppp/control/ppp-radius-plugin.control) | 2 | ||||
| -rwxr-xr-x | package/ppp/ipkg/ppp-pppoe-plugin/etc/ppp/ip-up | 2 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options | 2 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp.conffiles (renamed from package/ppp/ipkg/ppp/CONTROL/conffiles) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/ppp.control (renamed from package/ppp/control/ppp.control) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/pppdump.control (renamed from package/ppp/control/pppdump.control) | 0 | ||||
| -rw-r--r-- | package/ppp/ipkg/pppstats.control (renamed from package/ppp/control/pppstats.control) | 0 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-makefile.patch | 53 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-mppe-mppc-1.1.patch (renamed from package/ppp/ppp.patch) | 316 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-no-atm.patch | 12 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-no-strip.patch | 86 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-opt-flags.patch | 26 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-pppoe-iface-name.patch | 12 | ||||
| -rw-r--r-- | package/ppp/patches/ppp-2.4.3-radius-config.patch | 74 |
28 files changed, 412 insertions, 481 deletions
diff --git a/package/ppp/Config.in b/package/ppp/Config.in index 4f1fb3bc78..5254fb5c18 100644 --- a/package/ppp/Config.in +++ b/package/ppp/Config.in @@ -1,39 +1,37 @@ config BR2_PACKAGE_PPP + prompt "ppp - PPP (Point-to-Point Protocol) daemon" tristate - select BR2_PACKAGE_KMOD_PPP - prompt "PPP daemon" default y + select BR2_PACKAGE_KMOD_PPP -config BR2_PACKAGE_PPP_PPPOE +config BR2_PACKAGE_PPP_MOD_PPPOE + prompt "mod-pppoe - PPPoE (PPP over Ethernet) plugin" tristate - prompt "PPP over Ethernet plugin" - select BR2_PACKAGE_KMOD_PPPOE default y depends on BR2_PACKAGE_PPP + select BR2_PACKAGE_KMOD_PPPOE -config BR2_PACKAGE_PPP_RADIUS +config BR2_PACKAGE_PPP_MOD_RADIUS + prompt "mod-radius - RADIUS (Remote Authentication Dial-In User Service) plugin" tristate - prompt "PPP RADIUS plugin" default m depends on BR2_PACKAGE_PPP -config BR2_PACKAGE_PPP_CHAT +config BR2_PACKAGE_CHAT + prompt "chat - an utility to establish conversation with other PPP servers (via a modem)" tristate - prompt "chat utility" default m depends on BR2_PACKAGE_PPP config BR2_PACKAGE_PPPDUMP + prompt "pppdump - an utility to read PPP record file" tristate - prompt "pppdump utility" default m depends on BR2_PACKAGE_PPP config BR2_PACKAGE_PPPSTATS + prompt "pppstats - an utility to report PPP statistics" tristate - prompt "pppstats utility" default m depends on BR2_PACKAGE_PPP - - diff --git a/package/ppp/Makefile b/package/ppp/Makefile index e42a37a76e..1da971582d 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -2,171 +2,124 @@ include $(TOPDIR)/rules.mk -PKG_NAME := ppp -PKG_VERSION := 2.4.3 -PKG_RELEASE := 4 -PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c - -PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/ -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_CAT := zcat -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) - -PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_PPP_PPPOE_PLUGIN := $(PACKAGE_DIR)/ppp-pppoe-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_PPP_RADIUS_PLUGIN := $(PACKAGE_DIR)/ppp-radius-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_PPPSTATS := $(PACKAGE_DIR)/pppstats_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_PPPDUMP := $(PACKAGE_DIR)/pppdump_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - -I_PPP := $(PKG_BUILD_DIR)/ipkg/ppp -I_PPP_PPPOE_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-pppoe-plugin -I_PPP_RADIUS_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-radius-plugin -I_PPPDUMP := $(PKG_BUILD_DIR)/ipkg/pppdump -I_PPPSTATS := $(PKG_BUILD_DIR)/ipkg/pppstats - -TARGETS := $(PKG_PPP) -ifneq ($(BR2_PACKAGE_PPP_PPPOE),) -TARGETS += $(PKG_PPP_PPPOE_PLUGIN) -endif -ifneq ($(BR2_PACKAGE_PPP_RADIUS),) -TARGETS += $(PKG_PPP_RADIUS_PLUGIN) -endif -ifneq ($(BR2_PACKAGE_PPPDUMP),) -TARGETS += $(PKG_PPPDUMP) -endif -ifneq ($(BR2_PACKAGE_PPPSTATS),) -TARGETS += $(PKG_PPPSTATS) -endif - -INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/ppp.list -ifeq ($(BR2_PACKAGE_PPP_PPPOE),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list -endif -ifeq ($(BR2_PACKAGE_PPP_RADIUS),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-radius-plugin.list -endif -ifeq ($(BR2_PACKAGE_PPPDUMP),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppdump.list -endif -ifeq ($(BR2_PACKAGE_PPPSTATS),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppstats.list -endif - -$(DL_DIR)/$(PKG_SOURCE_FILE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) - -$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) - mkdir -p $(TOOL_BUILD_DIR) - $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch - touch $(PKG_BUILD_DIR)/.patched - -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched - (cd $(PKG_BUILD_DIR); \ - rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --infodir=/usr/share/info \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_NLS)) +PKG_NAME:=ppp +PKG_VERSION:=2.4.3 +PKG_RELEASE:=4 +PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c + +PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +define PKG_mod_template + +$$(IPKG_$(1)): + install -d -m0755 $$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION) + install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/$(2).so \ + $$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION)/ + $(RSTRIP) $$(IDIR_$(1)) + $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) + +endef + +$(eval $(call PKG_template,PPP,ppp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,CHAT,chat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PPPDUMP,pppdump,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PPPSTATS,pppstats,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +$(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe)) +$(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius)) + +$(PKG_BUILD_DIR)/.configured: + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + ) touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/pppd/pppd $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR)/usr $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - COPTS="$(TARGET_CFLAGS)" \ - all - -$(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd - mkdir -p $(I_PPP) - cp -af ./ipkg/ppp/* $(I_PPP) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_PPP)/etc/ppp - ln -sf /tmp/resolv.conf $(I_PPP)/etc/ppp/resolv.conf - mkdir -p $(I_PPP)/usr/sbin - cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/ - $(STRIP) $(I_PPP)/usr/sbin/* - mkdir -p $(I_PPP)/usr/lib/pppd - cp $(PKG_BUILD_DIR)/pppd/plugins/*.so $(I_PPP)/usr/lib/pppd/ - $(STRIP) $(I_PPP)/usr/lib/pppd/*.so - mkdir -p $(I_PPP)/$(MODULES_SUBDIR) - cp $(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(I_PPP)/$(MODULES_SUBDIR) - cp $(MODULES_DIR)/kernel/drivers/net/ppp_deflate.o $(I_PPP)/$(MODULES_SUBDIR) - cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR) - find $(I_PPP) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR) + CC=$(TARGET_CC) \ + COPTS="$(TARGET_CFLAGS)" \ + DESTDIR="$(PKG_INSTALL_DIR)/usr" \ + all install + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_PPP): + install -d -m0755 $(IDIR_PPP)/etc/ppp + ln -sf /tmp/resolv.conf $(IDIR_PPP)/etc/ppp/resolv.conf + install -m0600 ./files/etc/ppp/chap-secrets $(IDIR_PPP)/etc/ppp/ + install -m0644 ./files/etc/ppp/options $(IDIR_PPP)/etc/ppp/ + install -d -m0755 $(IDIR_PPP)/etc/ppp/peers + install -m0644 ./files/etc/ppp/peers/sample $(IDIR_PPP)/etc/ppp/peers/ + install -d -m0755 $(IDIR_PPP)/usr/sbin + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/ + install -d -m0755 $(IDIR_PPP)/usr/lib/pppd + $(RSTRIP) $(IDIR_PPP) + $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR) -$(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP) - $(IPKG) install $(PKG_PPP) - -$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - cp -af ./ipkg/ppp-pppoe-plugin/* $(I_PPP_PPPOE_PLUGIN) - mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION) - cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \ - $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION) - $(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so - mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR) - cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR) - find $(I_PPP_PPPOE_PLUGIN) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN) - $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN) - -$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION) - cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \ - $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION) - $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so - find $(I_PPP_RADIUS_PLUGIN) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/ppp-radius-plugin.list: $(PKG_PPP_RADIUS_PLUGIN) - $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN) - -$(PKG_PPPDUMP): $(PKG_PPP) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_PPPDUMP)/usr/sbin - cp -af $(PKG_BUILD_DIR)/pppdump/pppdump $(I_PPPDUMP)/usr/sbin/ - $(STRIP) $(I_PPPDUMP)/usr/sbin/* - find $(I_PPPDUMP) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/pppdump.list: $(PKG_PPPDUMP) - $(IPKG) install $(PKG_PPPDUMP) - -$(PKG_PPPSTATS): $(PKG_PPP) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_PPPSTATS)/usr/sbin - cp -af $(PKG_BUILD_DIR)/pppstats/pppstats $(I_PPPSTATS)/usr/sbin/ - $(STRIP) $(I_PPPSTATS)/usr/sbin/* - find $(I_PPPSTATS) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/pppstats.list: $(PKG_PPPSTATS) - $(IPKG) install $(PKG_PPPSTATS) - -source: $(DL_DIR)/$(PKG_SOURCE_FILE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(TARGETS) -install: $(INSTALL_TARGETS) - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_PPP) $(PKG_PPP_PPPOE_PLUGIN) $(PKG_PPP_RADIUS_PLUGIN) $(PKG_PPPSTATS) $(PKG_PPPDUMP) +$(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe: + install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/etc/init.d + install -m0755 ./files/pppoe.init $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe + +$(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe + +$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf: + + install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp + install -m644 ./files/etc/ppp/radius.conf $(IDIR_PPP_MOD_RADIUS)/etc/ppp/ + install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius + install -m644 ./files/etc/ppp/radius/dictionary* \ + $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius/ + install -m600 ./files/etc/ppp/radius/servers \ + $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius/ + +$(IPKG_PPP_MOD_RADIUS): $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf + +$(IPKG_CHAT): + install -d -m0755 $(IDIR_CHAT)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/ + $(RSTRIP) $(IDIR_CHAT) + $(IPKG_BUILD) $(IDIR_CHAT) $(PACKAGE_DIR) + +$(IPKG_PPPDUMP): + install -d -m0755 $(IDIR_PPPDUMP)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/ + $(RSTRIP) $(IDIR_PPPDUMP) + $(IPKG_BUILD) $(IDIR_PPPDUMP) $(PACKAGE_DIR) + +$(IPKG_PPPSTATS): $(IPKG_PPP) + install -d -m0755 $(IDIR_PPPSTATS)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/ + $(RSTRIP) $(IDIR_PPPSTATS) + $(IPKG_BUILD) $(IDIR_PPPSTATS) $(PACKAGE_DIR) + diff --git a/package/ppp/ipkg/ppp/etc/ppp/chap-secrets b/package/ppp/files/etc/ppp/chap-secrets index 6ab76e49e9..6ab76e49e9 100644 --- a/package/ppp/ipkg/ppp/etc/ppp/chap-secrets +++ b/package/ppp/files/etc/ppp/chap-secrets diff --git a/package/ppp/ipkg/ppp/etc/ppp/options b/package/ppp/files/etc/ppp/options index 4f6f3486ef..4f6f3486ef 100644 --- a/package/ppp/ipkg/ppp/etc/ppp/options +++ b/package/ppp/files/etc/ppp/options diff --git a/package/ppp/ipkg/ppp/etc/ppp/peers/sample b/package/ppp/files/etc/ppp/peers/sample index 492239c6d3..492239c6d3 100644 --- a/package/ppp/ipkg/ppp/etc/ppp/peers/sample +++ b/package/ppp/files/etc/ppp/peers/sample diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf b/package/ppp/files/etc/ppp/radius.conf index 0f24a8c7f7..0f24a8c7f7 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf +++ b/package/ppp/files/etc/ppp/radius.conf diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary b/package/ppp/files/etc/ppp/radius/dictionary index 706d1ce99c..706d1ce99c 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary +++ b/package/ppp/files/etc/ppp/radius/dictionary diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet b/package/ppp/files/etc/ppp/radius/dictionary.asnet index 337d1e1407..337d1e1407 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet +++ b/package/ppp/files/etc/ppp/radius/dictionary.asnet diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft b/package/ppp/files/etc/ppp/radius/dictionary.microsoft index 09fdbba63f..09fdbba63f 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft +++ b/package/ppp/files/etc/ppp/radius/dictionary.microsoft diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers b/package/ppp/files/etc/ppp/radius/servers index 0c5b3b9add..0d4f0691d0 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers +++ b/package/ppp/files/etc/ppp/radius/servers @@ -1 +1,2 @@ +# SERVER SECRET localhost secret diff --git a/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe b/package/ppp/files/pppoe.init index d0cfa261ae..d0cfa261ae 100755..100644 --- a/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe +++ b/package/ppp/files/pppoe.init diff --git a/package/ppp/control/chat.control b/package/ppp/ipkg/chat.control index 88b459f7d3..88b459f7d3 100644 --- a/package/ppp/control/chat.control +++ b/package/ppp/ipkg/chat.control diff --git a/package/ppp/control/ppp-pppoe-plugin.control b/package/ppp/ipkg/ppp-mod-pppoe.control index dd9edb8d19..92e7980253 100644 --- a/package/ppp/control/ppp-pppoe-plugin.control +++ b/package/ppp/ipkg/ppp-mod-pppoe.control @@ -1,4 +1,4 @@ -Package: ppp-pppoe-plugin +Package: ppp-mod-pppoe Priority: optional Section: net Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> diff --git a/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles b/package/ppp/ipkg/ppp-mod-radius.conffiles index 70fe146d22..70fe146d22 100644 --- a/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles +++ b/package/ppp/ipkg/ppp-mod-radius.conffiles diff --git a/package/ppp/control/ppp-radius-plugin.control b/package/ppp/ipkg/ppp-mod-radius.control index 7374e06a00..dce16a21de 100644 --- a/package/ppp/control/ppp-radius-plugin.control +++ b/package/ppp/ipkg/ppp-mod-radius.control @@ -1,4 +1,4 @@ -Package: ppp-radius-plugin +Package: ppp-mod-radius Priority: optional Section: net Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> diff --git a/package/ppp/ipkg/ppp-pppoe-plugin/etc/ppp/ip-up b/package/ppp/ipkg/ppp-pppoe-plugin/etc/ppp/ip-up deleted file mode 100755 index 4c28811637..0000000000 --- a/package/ppp/ipkg/ppp-pppoe-plugin/etc/ppp/ip-up +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/rdate $(/usr/sbin/nvram get ntp_server) diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options deleted file mode 100644 index 1cb1867595..0000000000 --- a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options +++ /dev/null @@ -1,2 +0,0 @@ -plugin radius.so -radius-config-file /etc/ppp/radius.conf diff --git a/package/ppp/ipkg/ppp/CONTROL/conffiles b/package/ppp/ipkg/ppp.conffiles index 8ad17eb436..8ad17eb436 100644 --- a/package/ppp/ipkg/ppp/CONTROL/conffiles +++ b/package/ppp/ipkg/ppp.conffiles diff --git a/package/ppp/control/ppp.control b/package/ppp/ipkg/ppp.control index f7442a696d..f7442a696d 100644 --- a/package/ppp/control/ppp.control +++ b/package/ppp/ipkg/ppp.control diff --git a/package/ppp/control/pppdump.control b/package/ppp/ipkg/pppdump.control index 3078e73669..3078e73669 100644 --- a/package/ppp/control/pppdump.control +++ b/package/ppp/ipkg/pppdump.control diff --git a/package/ppp/control/pppstats.control b/package/ppp/ipkg/pppstats.control index 2439a89de1..2439a89de1 100644 --- a/package/ppp/control/pppstats.control +++ b/package/ppp/ipkg/pppstats.control diff --git a/package/ppp/patches/ppp-2.4.3-makefile.patch b/package/ppp/patches/ppp-2.4.3-makefile.patch new file mode 100644 index 0000000000..5bbf8602d1 --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-makefile.patch @@ -0,0 +1,53 @@ +diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux +--- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 ++++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100 +@@ -48,19 +48,19 @@ + # 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 + # of pppd! +-HAVE_MULTILINK=y ++#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 + +@@ -77,7 +77,7 @@ + + INCLUDE_DIRS= -I../include + +-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP ++COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP + + CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) + +@@ -117,12 +117,12 @@ + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++#ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 +-endif +-ifneq ($(wildcard /usr/lib/libcrypt.*),) ++#endif ++#ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt +-endif ++#endif + + ifdef NEEDDES + ifndef USE_CRYPT diff --git a/package/ppp/ppp.patch b/package/ppp/patches/ppp-2.4.3-mppe-mppc-1.1.patch index cb69791580..7e09f1a792 100644 --- a/package/ppp/ppp.patch +++ b/package/ppp/patches/ppp-2.4.3-mppe-mppc-1.1.patch @@ -1,18 +1,6 @@ -diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux ---- ppp-2.4.3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100 -+++ ppp-2.4.3-3/chat/Makefile.linux 2004-12-05 17:42:43.000000000 +0100 -@@ -25,7 +25,7 @@ - - install: chat - mkdir -p $(BINDIR) -- $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) - - clean: -diff -ruN ppp-2.4.3-orig/include/linux/ppp-comp.h ppp-2.4.3-3/include/linux/ppp-comp.h ---- ppp-2.4.3-orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 -+++ ppp-2.4.3-3/include/linux/ppp-comp.h 2004-12-16 00:50:53.000000000 +0100 +diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-comp.h +--- ppp-2.4.3.orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3/include/linux/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100 @@ -36,7 +36,7 @@ */ @@ -22,19 +10,6 @@ diff -ruN ppp-2.4.3-orig/include/linux/ppp-comp.h ppp-2.4.3-3/include/linux/ppp- * * NOTE TO MAINTAINERS: * If you modify this file at all, please set the above date. -@@ -56,10 +56,10 @@ - */ - - #ifndef DO_BSD_COMPRESS --#define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ -+#define DO_BSD_COMPRESS 0 /* by default, don't include BSD-Compress */ - #endif - #ifndef DO_DEFLATE --#define DO_DEFLATE 1 /* by default, include Deflate */ -+#define DO_DEFLATE 0 /* by default, don't include Deflate */ - #endif - #define DO_PREDICTOR_1 0 - #define DO_PREDICTOR_2 0 @@ -86,7 +86,7 @@ /* Compress a packet */ @@ -87,22 +62,9 @@ diff -ruN ppp-2.4.3-orig/include/linux/ppp-comp.h ppp-2.4.3-3/include/linux/ppp- /* * Definitions for other, as yet unsupported, compression methods. */ -diff -ruN ppp-2.4.3-orig/include/net/ppp-comp.h ppp-2.4.3-3/include/net/ppp-comp.h ---- ppp-2.4.3-orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 -+++ ppp-2.4.3-3/include/net/ppp-comp.h 2004-12-16 00:51:06.000000000 +0100 -@@ -43,10 +43,10 @@ - * various compression methods. - */ - #ifndef DO_BSD_COMPRESS --#define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ -+#define DO_BSD_COMPRESS 0 /* by default, don't include BSD-Compress */ - #endif - #ifndef DO_DEFLATE --#define DO_DEFLATE 1 /* by default, include Deflate */ -+#define DO_DEFLATE 0 /* by default, don't include Deflate */ - #endif - #define DO_PREDICTOR_1 0 - #define DO_PREDICTOR_2 0 +diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h +--- ppp-2.4.3.orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3/include/net/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100 @@ -255,6 +255,33 @@ opts |= MPPE_OPT_UNKNOWN; \ } while (/* CONSTCOND */ 0) @@ -137,80 +99,9 @@ diff -ruN ppp-2.4.3-orig/include/net/ppp-comp.h ppp-2.4.3-3/include/net/ppp-comp /* * Definitions for other, as yet unsupported, compression methods. */ -diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux ---- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 -+++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100 -@@ -48,19 +48,19 @@ - # 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 - # of pppd! --HAVE_MULTILINK=y -+#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 - -@@ -77,7 +77,7 @@ - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP - - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - -@@ -99,7 +99,7 @@ - CFLAGS += -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,12 +117,12 @@ - #LIBS += -lshadow $(LIBS) - endif - --ifneq ($(wildcard /usr/include/crypt.h),) -+#ifneq ($(wildcard /usr/include/crypt.h),) - CFLAGS += -DHAVE_CRYPT_H=1 --endif --ifneq ($(wildcard /usr/lib/libcrypt.*),) -+#endif -+#ifneq ($(wildcard /usr/lib/libcrypt.*),) - LIBS += -lcrypt --endif -+#endif - - ifdef NEEDDES - ifndef USE_CRYPT -@@ -202,7 +202,7 @@ - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -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) -diff -ruN ppp-2.4.3-orig/pppd/ccp.c ppp-2.4.3-3/pppd/ccp.c ---- ppp-2.4.3-orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 -+++ ppp-2.4.3-3/pppd/ccp.c 2004-12-05 17:51:27.000000000 +0100 +diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c +--- ppp-2.4.3.orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 ++++ ppp-2.4.3/pppd/ccp.c 2004-11-21 13:54:09.000000000 +0100 @@ -62,12 +62,10 @@ static char bsd_value[8]; static char deflate_value[8]; @@ -1570,9 +1461,9 @@ diff -ruN ppp-2.4.3-orig/pppd/ccp.c ppp-2.4.3-3/pppd/ccp.c ccp_localstate[f->unit] &= ~RACK_PENDING; } - -diff -ruN ppp-2.4.3-orig/pppd/ccp.h ppp-2.4.3-3/pppd/ccp.h ---- ppp-2.4.3-orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100 -+++ ppp-2.4.3-3/pppd/ccp.h 2004-12-05 17:51:27.000000000 +0100 +diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h +--- ppp-2.4.3.orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100 ++++ ppp-2.4.3/pppd/ccp.h 2004-11-21 13:54:09.000000000 +0100 @@ -37,9 +37,17 @@ bool predictor_2; /* do Predictor-2? */ bool deflate_correct; /* use correct code for deflate? */ @@ -1591,9 +1482,9 @@ diff -ruN ppp-2.4.3-orig/pppd/ccp.h ppp-2.4.3-3/pppd/ccp.h short method; /* code for chosen compression method */ } ccp_options; -diff -ruN ppp-2.4.3-orig/pppd/chap_ms.c ppp-2.4.3-3/pppd/chap_ms.c ---- ppp-2.4.3-orig/pppd/chap_ms.c 2004-11-12 10:57:43.000000000 +0100 -+++ ppp-2.4.3-3/pppd/chap_ms.c 2004-12-05 17:51:27.000000000 +0100 +diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c +--- ppp-2.4.3.orig/pppd/chap_ms.c 2004-11-12 10:57:43.000000000 +0100 ++++ ppp-2.4.3/pppd/chap_ms.c 2004-11-21 13:54:09.000000000 +0100 @@ -895,13 +895,17 @@ /* * Disable undesirable encryption types. Note that we don't ENABLE @@ -1614,148 +1505,9 @@ diff -ruN ppp-2.4.3-orig/pppd/chap_ms.c ppp-2.4.3-3/pppd/chap_ms.c break; default: break; -diff -ruN ppp-2.4.3-orig/pppd/plugins/Makefile.linux ppp-2.4.3-3/pppd/plugins/Makefile.linux ---- ppp-2.4.3-orig/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/Makefile.linux 2004-12-05 17:03:59.000000000 +0100 -@@ -9,7 +9,7 @@ - MANDIR = $(DESTDIR)/share/man/man8 - LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) - --SUBDIRS := rp-pppoe pppoatm radius -+SUBDIRS := rp-pppoe radius - # Uncomment the next line to include the radius authentication plugin - # SUBDIRS += radius - PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so -diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100 -@@ -12,7 +12,8 @@ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+COPTS = -O2 -+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. -@@ -36,9 +37,9 @@ - - 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) - -diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c ---- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/radius/config.c 2004-12-16 04:03:46.000000000 +0100 -@@ -369,31 +369,37 @@ - } - #endif - -+#if 0 - if (rc_conf_int("login_tries") <= 0) - { - error("%s: login_tries <= 0 is illegal", filename); - return (-1); - } -+#endif - if (rc_conf_str("seqfile") == NULL) - { - error("%s: seqfile not specified", filename); - return (-1); - } -+#if 0 - if (rc_conf_int("login_timeout") <= 0) - { - error("%s: login_timeout <= 0 is illegal", filename); - return (-1); - } -+#endif - if (rc_conf_str("mapfile") == NULL) - { - error("%s: mapfile not specified", filename); - return (-1); - } -+#if 0 - if (rc_conf_str("nologin") == NULL) - { - error("%s: nologin not specified", filename); - return (-1); - } -+#endif - - return 0; - } -diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h ---- ppp-2.4.3-orig/pppd/plugins/radius/options.h 2004-11-14 08:26:26.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/radius/options.h 2004-12-16 04:09:16.000000000 +0100 -@@ -31,24 +31,21 @@ - static SERVER acctserver = {0}; - static SERVER authserver = {0}; - --int default_tries = 4; --int default_timeout = 60; -- - static OPTION config_options[] = { - /* internally used options */ - {"config_file", OT_STR, ST_UNDEF, NULL}, - /* General options */ - {"auth_order", OT_AUO, ST_UNDEF, NULL}, --{"login_tries", OT_INT, ST_UNDEF, &default_tries}, --{"login_timeout", OT_INT, ST_UNDEF, &default_timeout}, --{"nologin", OT_STR, ST_UNDEF, "/etc/nologin"}, --{"issue", OT_STR, ST_UNDEF, "/etc/radiusclient/issue"}, -+{"login_tries", OT_INT, ST_UNDEF, NULL}, -+{"login_timeout", OT_INT, ST_UNDEF, NULL}, -+{"nologin", OT_STR, ST_UNDEF, NULL}, -+{"issue", OT_STR, ST_UNDEF, NULL}, - /* RADIUS specific options */ - {"authserver", OT_SRV, ST_UNDEF, &authserver}, - {"acctserver", OT_SRV, ST_UNDEF, &acctserver}, - {"servers", OT_STR, ST_UNDEF, NULL}, - {"dictionary", OT_STR, ST_UNDEF, NULL}, --{"login_radius", OT_STR, ST_UNDEF, "/usr/sbin/login.radius"}, -+{"login_radius", OT_STR, ST_UNDEF, NULL}, - {"seqfile", OT_STR, ST_UNDEF, NULL}, - {"mapfile", OT_STR, ST_UNDEF, NULL}, - {"default_realm", OT_STR, ST_UNDEF, NULL}, -diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux 2004-12-05 17:43:23.000000000 +0100 -@@ -39,9 +39,9 @@ - - 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) -d -m 755 $(BINDIR) -- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) -+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) - - clean: - rm -f *.o *.so -diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c ---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100 -+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c 2004-12-16 01:07:22.000000000 +0100 -@@ -286,7 +286,7 @@ - /* Strip off "nic-" */ - cmd += 4; - } else if (strlen(cmd) < 4 -- || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) -+ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) - && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) { - return 0; - } -diff -ruN ppp-2.4.3-orig/pppd/pppd.8 ppp-2.4.3-3/pppd/pppd.8 ---- ppp-2.4.3-orig/pppd/pppd.8 2004-11-13 13:22:49.000000000 +0100 -+++ ppp-2.4.3-3/pppd/pppd.8 2004-12-05 17:51:27.000000000 +0100 +diff -ruN ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8 +--- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 13:22:49.000000000 +0100 ++++ ppp-2.4.3/pppd/pppd.8 2004-11-21 14:24:47.000000000 +0100 @@ -622,9 +622,29 @@ Enables the use of PPP multilink; this is an alias for the `multilink' option. This option is currently only available under Linux. @@ -1831,35 +1583,3 @@ diff -ruN ppp-2.4.3-orig/pppd/pppd.8 ppp-2.4.3-3/pppd/pppd.8 .TP .B require\-mschap Require the peer to authenticate itself using MS\-CHAP [Microsoft Challenge -diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux ---- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 -+++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100 -@@ -2,7 +2,8 @@ - BINDIR = $(DESTDIR)/sbin - MANDIR = $(DESTDIR)/share/man/man8 - --CFLAGS= -O -I../include/net -+COPTS = -O -+CFLAGS= $(COPTS) -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o - - INSTALL= install -@@ -17,5 +18,5 @@ - - install: - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) -diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux ---- ppp-2.4.3-orig/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100 -+++ ppp-2.4.3-3/pppstats/Makefile.linux 2004-12-05 17:43:38.000000000 +0100 -@@ -22,7 +22,7 @@ - - install: pppstats - -mkdir -p $(MANDIR) -- $(INSTALL) -s -c pppstats $(BINDIR) -+ $(INSTALL) -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) diff --git a/package/ppp/patches/ppp-2.4.3-no-atm.patch b/package/ppp/patches/ppp-2.4.3-no-atm.patch new file mode 100644 index 0000000000..a737cfa23a --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-no-atm.patch @@ -0,0 +1,12 @@ +diff -ruN ppp-2.4.3-orig/pppd/plugins/Makefile.linux ppp-2.4.3-3/pppd/plugins/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/Makefile.linux 2004-12-05 17:03:59.000000000 +0100 +@@ -9,7 +9,7 @@ + MANDIR = $(DESTDIR)/share/man/man8 + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + +-SUBDIRS := rp-pppoe pppoatm radius ++SUBDIRS := rp-pppoe radius + # Uncomment the next line to include the radius authentication plugin + # SUBDIRS += radius + PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so diff --git a/package/ppp/patches/ppp-2.4.3-no-strip.patch b/package/ppp/patches/ppp-2.4.3-no-strip.patch new file mode 100644 index 0000000000..216973cf59 --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-no-strip.patch @@ -0,0 +1,86 @@ +diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux +--- ppp-2.4.3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100 ++++ ppp-2.4.3-3/chat/Makefile.linux 2004-12-05 17:42:43.000000000 +0100 +@@ -25,7 +25,7 @@ + + install: chat + mkdir -p $(BINDIR) +- $(INSTALL) -s -c chat $(BINDIR) ++ $(INSTALL) -c chat $(BINDIR) + $(INSTALL) -c -m 644 chat.8 $(MANDIR) + + clean: +diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux +--- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 ++++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100 +@@ -99,7 +99,7 @@ + CFLAGS += -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 +@@ -202,7 +202,7 @@ + install: pppd + mkdir -p $(BINDIR) $(MANDIR) + $(EXTRAINSTALL) +- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd ++ $(INSTALL) -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) +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100 +@@ -36,9 +37,9 @@ + + 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) + +diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux 2004-12-05 17:43:23.000000000 +0100 +@@ -39,9 +39,9 @@ + + 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) -d -m 755 $(BINDIR) +- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) ++ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) + + clean: + rm -f *.o *.so +diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux +--- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 ++++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100 +@@ -17,5 +18,5 @@ + + install: + mkdir -p $(BINDIR) $(MANDIR) +- $(INSTALL) -s -c pppdump $(BINDIR) ++ $(INSTALL) -c pppdump $(BINDIR) + $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) +diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux +--- ppp-2.4.3-orig/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100 ++++ ppp-2.4.3-3/pppstats/Makefile.linux 2004-12-05 17:43:38.000000000 +0100 +@@ -22,7 +22,7 @@ + + install: pppstats + -mkdir -p $(MANDIR) +- $(INSTALL) -s -c pppstats $(BINDIR) ++ $(INSTALL) -c pppstats $(BINDIR) + $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + + pppstats: $(PPPSTATSRCS) diff --git a/package/ppp/patches/ppp-2.4.3-opt-flags.patch b/package/ppp/patches/ppp-2.4.3-opt-flags.patch new file mode 100644 index 0000000000..200e76b5b5 --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-opt-flags.patch @@ -0,0 +1,26 @@ +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100 +@@ -12,7 +12,8 @@ + INSTALL = install + + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++COPTS = -O2 ++CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux +--- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 ++++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100 +@@ -2,7 +2,8 @@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + +-CFLAGS= -O -I../include/net ++COPTS = -O ++CFLAGS= $(COPTS) -I../include/net + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install diff --git a/package/ppp/patches/ppp-2.4.3-pppoe-iface-name.patch b/package/ppp/patches/ppp-2.4.3-pppoe-iface-name.patch new file mode 100644 index 0000000000..522d5878a4 --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-pppoe-iface-name.patch @@ -0,0 +1,12 @@ +diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c +--- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c 2004-12-16 01:07:22.000000000 +0100 +@@ -286,7 +286,7 @@ + /* Strip off "nic-" */ + cmd += 4; + } else if (strlen(cmd) < 4 +- || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) ++ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) + && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) { + return 0; + } diff --git a/package/ppp/patches/ppp-2.4.3-radius-config.patch b/package/ppp/patches/ppp-2.4.3-radius-config.patch new file mode 100644 index 0000000000..90c02af4c1 --- /dev/null +++ b/package/ppp/patches/ppp-2.4.3-radius-config.patch @@ -0,0 +1,74 @@ +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c +--- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/config.c 2004-12-16 04:03:46.000000000 +0100 +@@ -369,31 +369,37 @@ + } + #endif + ++#if 0 + if (rc_conf_int("login_tries") <= 0) + { + error("%s: login_tries <= 0 is illegal", filename); + return (-1); + } ++#endif + if (rc_conf_str("seqfile") == NULL) + { + error("%s: seqfile not specified", filename); + return (-1); + } ++#if 0 + if (rc_conf_int("login_timeout") <= 0) + { + error("%s: login_timeout <= 0 is illegal", filename); + return (-1); + } ++#endif + if (rc_conf_str("mapfile") == NULL) + { + error("%s: mapfile not specified", filename); + return (-1); + } ++#if 0 + if (rc_conf_str("nologin") == NULL) + { + error("%s: nologin not specified", filename); + return (-1); + } ++#endif + + return 0; + } +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h +--- ppp-2.4.3-orig/pppd/plugins/radius/options.h 2004-11-14 08:26:26.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/options.h 2004-12-16 04:09:16.000000000 +0100 +@@ -31,24 +31,21 @@ + static SERVER acctserver = {0}; + static SERVER authserver = {0}; + +-int default_tries = 4; +-int default_timeout = 60; +- + static OPTION config_options[] = { + /* internally used options */ + {"config_file", OT_STR, ST_UNDEF, NULL}, + /* General options */ + {"auth_order", OT_AUO, ST_UNDEF, NULL}, +-{"login_tries", OT_INT, ST_UNDEF, &default_tries}, +-{"login_timeout", OT_INT, ST_UNDEF, &default_timeout}, +-{"nologin", OT_STR, ST_UNDEF, "/etc/nologin"}, +-{"issue", OT_STR, ST_UNDEF, "/etc/radiusclient/issue"}, ++{"login_tries", OT_INT, ST_UNDEF, NULL}, ++{"login_timeout", OT_INT, ST_UNDEF, NULL}, ++{"nologin", OT_STR, ST_UNDEF, NULL}, ++{"issue", OT_STR, ST_UNDEF, NULL}, + /* RADIUS specific options */ + {"authserver", OT_SRV, ST_UNDEF, &authserver}, + {"acctserver", OT_SRV, ST_UNDEF, &acctserver}, + {"servers", OT_STR, ST_UNDEF, NULL}, + {"dictionary", OT_STR, ST_UNDEF, NULL}, +-{"login_radius", OT_STR, ST_UNDEF, "/usr/sbin/login.radius"}, ++{"login_radius", OT_STR, ST_UNDEF, NULL}, + {"seqfile", OT_STR, ST_UNDEF, NULL}, + {"mapfile", OT_STR, ST_UNDEF, NULL}, + {"default_realm", OT_STR, ST_UNDEF, NULL}, |