-#
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
-PKG_VERSION:=2.4.3
-PKG_RELEASE:=7
-PKG_BUILDDEP:=libpcap linux-atm
+PKG_VERSION:=2.4.4
+PKG_RELEASE:=17
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
-PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
-PKG_CAT:=zcat
+PKG_MD5SUM:=183800762e266132218b204dfb428d29
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libpcap
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
+define Package/ppp/Default
+ SECTION:=net
+ CATEGORY:=Network
+ MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+ URL:=http://ppp.samba.org/
+endef
+
define Package/ppp
-SECTION:=net
-CATEGORY:=Network
-MENU:=1
-DEFAULT:=y
-TITLE:=PPP daemon
-DESCRIPTION:=PPP (Point-to-Point Protocol) daemon
-URL:=http://ppp.samba.org/
+$(call Package/ppp/Default)
+ DEPENDS:=+kmod-ppp
+ TITLE:=PPP daemon
+ VARIANT:=default
+endef
+
+define Package/ppp-multilink
+$(call Package/ppp/Default)
+ DEPENDS:=+kmod-ppp
+ TITLE:=PPP daemon (with multilink support)
+ VARIANT:=multilink
+endef
+
+define Package/ppp/description
+This package contains the PPP (Point-to-Point Protocol) daemon.
+endef
+
+define Package/ppp/conffiles
+/etc/ppp/chap-secrets
+/etc/ppp/filter
+/etc/ppp/ip-down
+/etc/ppp/ip-up
+/etc/ppp/ipv6-down
+/etc/ppp/ipv6-up
+/etc/ppp/options
endef
define Package/ppp-mod-pppoa
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp +linux-atm
-TITLE:=PPPoA plugin
-DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +linux-atm +kmod-pppoa
+ TITLE:=PPPoA plugin
+endef
+
+define Package/ppp-mod-pppoa/description
+This package contains a PPPoA (PPP over ATM) plugin for ppp.
endef
define Package/ppp-mod-pppoe
-SECTION:=net
-CATEGORY:=Network
-DEFAULT:=y
-DEPENDS:=ppp
-TITLE:=PPPoE plugin
-DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppoe
+ TITLE:=PPPoE plugin
+endef
+
+define Package/ppp-mod-pppoe/description
+This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
endef
define Package/ppp-mod-radius
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=RADIUS plugin
-DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+ TITLE:=RADIUS plugin
+endef
+
+define Package/ppp-mod-radius/description
+This package contains a RADIUS (Remote Authentication Dial-In User Service)
+plugin for ppp.
+endef
+
+define Package/ppp-mod-radius/conffiles
+/etc/ppp/radius.conf
+/etc/ppp/radius/
endef
define Package/chat
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Establish conversation with a modem
-DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem)
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+ TITLE:=Establish conversation with a modem
+endef
+
+define Package/chat/description
+This package contains an utility to establish conversation with other PPP servers
+(via a modem).
endef
define Package/pppdump
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Read PPP record file
-DESCRIPTION:=Utility to read PPP record file
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+ TITLE:=Read PPP record file
+endef
+
+define Package/pppdump/description
+This package contains an utility to read PPP record file.
endef
define Package/pppstats
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Report PPP statistics
-DESCRIPTION:=Utility to report PPP statistics
-endef
-
-define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
- mkdir -p $(PKG_INSTALL_DIR)/usr
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CC=$(TARGET_CC) \
- COPTS="$(TARGET_CFLAGS)" \
+$(call Package/ppp/Default)
+ DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+ TITLE:=Report PPP statistics
+endef
+
+define Package/pppstats/description
+This package contains an utility to report PPP statistics.
+endef
+
+
+define Build/Configure
+$(call Build/Configure/Default,, \
+ UNAME_S="Linux" \
+ UNAME_R="$(LINUX_VERSION)" \
+ UNAME_M="$(ARCH)" \
+)
+ mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
+ cp \
+ $(LINUX_DIR)/include/linux/compiler.h \
+ $(LINUX_DIR)/include/linux/atm*.h \
+ $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
+endef
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+MAKE_VARS += LDFLAGS="-Wl,--gc-sections"
+
+MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
PRECOMPILED_FILTER=1 \
- STAGING_DIR="$(STAGING_DIR)" \
- DESTDIR="$(PKG_INSTALL_DIR)/usr" \
- all install
+ STAGING_DIR="$(STAGING_DIR)"
+
+ifeq ($(BUILD_VARIANT),multilink)
+ MAKE_FLAGS += HAVE_MULTILINK=y
+else
+ MAKE_FLAGS += HAVE_MULTILINK=
+endif
+
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/
endef
define Package/ppp/install
- install -d -m0755 $(1)/etc/ppp
- install -m0600 ./files/etc/ppp/chap-secrets $(1)/etc/ppp/
- install -m0644 ./files/etc/ppp/filter $(1)/etc/ppp/
- install -m0755 ./files/etc/ppp/ip-up $(1)/etc/ppp/
- install -d -m0755 $(1)/etc/ppp/ip-up.d
- install -m0755 ./files/etc/ppp/ip-down $(1)/etc/ppp/
- install -d -m0755 $(1)/etc/ppp/ip-down.d
- install -m0644 ./files/etc/ppp/options $(1)/etc/ppp/
- ln -sf /tmp/resolv.conf $(1)/etc/ppp/resolv.conf
- install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
- install -d -m0755 $(1)/usr/sbin
- install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/
-endef
-
+ $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/lib/network
+ $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/network/
+ $(INSTALL_DIR) $(1)/etc/ppp
+ $(INSTALL_CONF) ./files/etc/ppp/chap-secrets $(1)/etc/ppp/
+ $(INSTALL_DATA) ./files/etc/ppp/filter $(1)/etc/ppp/
+ $(INSTALL_BIN) ./files/etc/ppp/ip-up $(1)/etc/ppp/
+ $(INSTALL_DIR) $(1)/etc/ppp/ip-up.d
+ $(INSTALL_BIN) ./files/etc/ppp/ip-down $(1)/etc/ppp/
+ $(INSTALL_DIR) $(1)/etc/ppp/ip-down.d
+ $(INSTALL_BIN) ./files/etc/ppp/ipv6-up $(1)/etc/ppp/
+ $(INSTALL_BIN) ./files/etc/ppp/ipv6-down $(1)/etc/ppp/
+ $(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
+ ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
+endef
+Package/ppp-multilink/install=$(Package/ppp/install)
+
define Package/ppp-mod-pppoa/install
- install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
- install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \
+ $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \
$(1)/usr/lib/pppd/$(PKG_VERSION)/
- install -d -m0755 $(1)/sbin
- install -m0755 ./files/ifup.pppoa $(1)/sbin/
+ $(INSTALL_DIR) $(1)/lib/network
+ $(INSTALL_BIN) ./files/pppoa.sh $(1)/lib/network/
+ $(INSTALL_DIR) $(1)/etc/hotplug.d/atm
+ $(INSTALL_DATA) ./files/etc/hotplug.d/atm/20-atm-modem $(1)/etc/hotplug.d/atm/
endef
define Package/ppp-mod-pppoe/install
- install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
- install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
+ $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
$(1)/usr/lib/pppd/$(PKG_VERSION)/
- install -d -m0755 $(1)/sbin
- install -m0755 ./files/ifup.pppoe $(1)/sbin/
+ $(INSTALL_DIR) $(1)/lib/network
+ $(INSTALL_BIN) ./files/pppoe.sh $(1)/lib/network/
endef
define Package/ppp-mod-radius/install
- install -d -m0755 $(1)/etc/ppp
- install -m644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
- install -d -m0755 $(1)/etc/ppp/radius
- install -m644 ./files/etc/ppp/radius/dictionary* \
+ $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/radius.so \
+ $(1)/usr/lib/pppd/$(PKG_VERSION)/
+ $(INSTALL_DIR) $(1)/etc/ppp
+ $(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/
+ $(INSTALL_DIR) $(1)/etc/ppp/radius
+ $(INSTALL_DATA) ./files/etc/ppp/radius/dictionary* \
$(1)/etc/ppp/radius/
- install -m600 ./files/etc/ppp/radius/servers \
+ $(INSTALL_CONF) ./files/etc/ppp/radius/servers \
$(1)/etc/ppp/radius/
- install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
- install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \
- $(1)/usr/lib/pppd/$(PKG_VERSION)/
endef
define Package/chat/install
- install -d -m0755 $(1)/usr/sbin
- install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/chat $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/
endef
define Package/pppdump/install
- install -d -m0755 $(1)/usr/sbin
- install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppdump $(1)/usr/sbin/
endef
define Package/pppstats/install
- install -d -m0755 $(1)/usr/sbin
- install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppstats $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,ppp))
+$(eval $(call BuildPackage,ppp-multilink))
$(eval $(call BuildPackage,ppp-mod-pppoa))
$(eval $(call BuildPackage,ppp-mod-pppoe))
$(eval $(call BuildPackage,ppp-mod-radius))
projects / openwrt.git / blobdiff