ath: fix world regulatory domain fix-up so that all regulatory rules are processed

[openwrt.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b90fa4f..4c5cac3 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -6,10 +6,11 @@
 #
 
 include $(TOPDIR)/rules.mk
 #
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4

-PKG_RELEASE:=5
+PKG_RELEASE:=16

 
 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/


@@ -20,11 +21,11 @@ PKG_BUILD_DEPENDS:=libpcap
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 define Package/ppp/Default
   SECTION:=net
   CATEGORY:=Network
 
 define Package/ppp/Default
   SECTION:=net
   CATEGORY:=Network

+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>

   URL:=http://ppp.samba.org/
 endef
 
   URL:=http://ppp.samba.org/
 endef
 


@@ -39,6 +40,16 @@ define Package/ppp/description
 This package contains the PPP (Point-to-Point Protocol) daemon.
 endef
 
 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)
   DEPENDS:=ppp +linux-atm +kmod-pppoa
 define Package/ppp-mod-pppoa
 $(call Package/ppp/Default)
   DEPENDS:=ppp +linux-atm +kmod-pppoa


@@ -70,6 +81,11 @@ 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)
   DEPENDS:=ppp
 define Package/chat
 $(call Package/ppp/Default)
   DEPENDS:=ppp


@@ -108,6 +124,11 @@ $(call Build/Configure/Default,, \
        UNAME_R="$(LINUX_VERSION)" \
        UNAME_M="$(ARCH)" \
 )
        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
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
 endef
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \


@@ -135,15 +156,17 @@ define Package/ppp/install
        $(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/
        $(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.auto $(1)/etc/ppp/resolv.conf
+       ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf

 endef
 endef

-       
+

 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 \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
        $(INSTALL_DIR) $(1)/lib/network
        $(INSTALL_BIN) ./files/pppoa.sh $(1)/lib/network/
 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 \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
        $(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
 endef
 
 define Package/ppp-mod-pppoe/install