swconfig: fix vlan/port configs being applied to all switches

[openwrt.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 4107ef6..eed5943 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2010 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp

-PKG_VERSION:=2.4.4
-PKG_RELEASE:=11
+PKG_VERSION:=2.4.5
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

-PKG_MD5SUM:=183800762e266132218b204dfb428d29
+PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

 
 PKG_BUILD_DEPENDS:=libpcap
 
 
 PKG_BUILD_DEPENDS:=libpcap
 


@@ -33,16 +35,33 @@ define Package/ppp
 $(call Package/ppp/Default)
   DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon
 $(call Package/ppp/Default)
   DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon

-  MENU:=1
+  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
 
 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
 $(call Package/ppp/Default)
 define Package/ppp-mod-pppoa
 $(call Package/ppp/Default)

-  DEPENDS:=ppp +linux-atm +kmod-pppoa
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +linux-atm +kmod-pppoa

   TITLE:=PPPoA plugin
 endef
 
   TITLE:=PPPoA plugin
 endef
 


@@ -52,7 +71,7 @@ endef
 
 define Package/ppp-mod-pppoe
 $(call Package/ppp/Default)
 
 define Package/ppp-mod-pppoe
 $(call Package/ppp/Default)

-  DEPENDS:=ppp +kmod-pppoe
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppoe

   TITLE:=PPPoE plugin
 endef
 
   TITLE:=PPPoE plugin
 endef
 


@@ -62,7 +81,7 @@ endef
 
 define Package/ppp-mod-radius
 $(call Package/ppp/Default)
 
 define Package/ppp-mod-radius
 $(call Package/ppp/Default)

-  DEPENDS:=ppp
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=RADIUS plugin
 endef
 
   TITLE:=RADIUS plugin
 endef
 


@@ -71,9 +90,14 @@ This package contains a RADIUS (Remote Authentication Dial-In User Service)
 plugin for ppp.
 endef
 
 plugin for ppp.
 endef
 

+define Package/ppp-mod-radius/conffiles
+/etc/ppp/radius.conf
+/etc/ppp/radius/
+endef
+

 define Package/chat
 $(call Package/ppp/Default)
 define Package/chat
 $(call Package/ppp/Default)

-  DEPENDS:=ppp
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Establish conversation with a modem
 endef
 
   TITLE:=Establish conversation with a modem
 endef
 


@@ -84,7 +108,7 @@ endef
 
 define Package/pppdump
 $(call Package/ppp/Default)
 
 define Package/pppdump
 $(call Package/ppp/Default)

-  DEPENDS:=ppp
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Read PPP record file
 endef
 
   TITLE:=Read PPP record file
 endef
 


@@ -94,7 +118,7 @@ endef
 
 define Package/pppstats
 $(call Package/ppp/Default)
 
 define Package/pppstats
 $(call Package/ppp/Default)

-  DEPENDS:=ppp
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)

   TITLE:=Report PPP statistics
 endef
 
   TITLE:=Report PPP statistics
 endef
 


@@ -120,6 +144,13 @@ MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
                PRECOMPILED_FILTER=1 \
                STAGING_DIR="$(STAGING_DIR)"
 
                PRECOMPILED_FILTER=1 \
                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/
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/


@@ -143,7 +174,8 @@ define Package/ppp/install
        $(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
        ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
 endef
        $(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_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \
 define Package/ppp-mod-pppoa/install
        $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \


@@ -191,6 +223,7 @@ define Package/pppstats/install
 endef
 
 $(eval $(call BuildPackage,ppp))
 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))
 $(eval $(call BuildPackage,ppp-mod-pppoa))
 $(eval $(call BuildPackage,ppp-mod-pppoe))
 $(eval $(call BuildPackage,ppp-mod-radius))