X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fppp%2FMakefile;h=d21d1e043858bc91e4b47874cd15371b2db4bc01;hp=9a4640bf1c2293df8552c70b8cff946487830050;hb=6b7eeb74dbf8b491b6426820bfa230fca60047dc;hpb=73875c1215016a9b24024b932d41fa5ba6aabb2b diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 9a4640bf1c..d21d1e0438 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,15 +9,19 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_VERSION:=2.4.5 -PKG_RELEASE:=9 +PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ -PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57 -PKG_MAINTAINER:=Felix Fietkau +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/paulusmack/ppp +PKG_SOURCE_DATE:=2019-05-25 +PKG_SOURCE_VERSION:=8e77984ac5d7acbe68b2b2f590abd17564c9730d +PKG_MIRROR_HASH:=7e7e74f0261db2c45770d79c6114e768382e85bfeb3f5a83179f270d6c15006d +PKG_MAINTAINER:=Felix Fietkau +PKG_LICENSE:=BSD-4-Clause +PKG_CPE_ID:=cpe:/a:samba:ppp -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_RELEASE_VERSION:=2.4.7 +PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE) PKG_BUILD_DEPENDS:=libpcap @@ -29,8 +33,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ppp/Default SECTION:=net CATEGORY:=Network - MAINTAINER:=Jo-Philipp Wich - URL:=http://ppp.samba.org/ + URL:=https://ppp.samba.org/ endef define Package/ppp @@ -117,9 +120,19 @@ define Package/ppp-mod-pptp/description This package contains a PPtP plugin for ppp. endef -define Package/chat +define Package/ppp-mod-passwordfd $(call Package/ppp/Default) DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) + TITLE:=pap/chap secret from filedescriptor +endef + +define Package/ppp-mod-passwordfd/description +This package allows to pass the PAP/CHAP secret from a filedescriptor. +Eliminates the need for a secrets file. +endef + +define Package/chat +$(call Package/ppp/Default) TITLE:=Establish conversation with a modem endef @@ -148,6 +161,17 @@ define Package/pppstats/description This package contains an utility to report PPP statistics. endef +define Package/pppoe-discovery +$(call Package/ppp/Default) + DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +ppp-mod-pppoe + TITLE:=Perform a PPPoE-discovery process +endef + +define Package/pppoe-discovery/description +This tool performs the same discovery process as pppoe, but does +not initiate a session. Can be useful to debug pppoe. +endef + define Build/Configure $(call Build/Configure/Default,, \ @@ -156,12 +180,20 @@ $(call Build/Configure/Default,, \ UNAME_M="$(ARCH)" \ ) mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux - cp \ + $(CP) \ $(LINUX_DIR)/include/linux/compiler.h \ $(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \ $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/ + + # Kernel 4.14.9+ only, ignore the exit status of cp in case the file + # doesn't exits + -$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \ + $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/ endef +TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto +TARGET_LDFLAGS += -Wl,--gc-sections -flto -fuse-linker-plugin + MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \ PRECOMPILED_FILTER=1 \ STAGING_DIR="$(STAGING_DIR)" @@ -172,6 +204,9 @@ else MAKE_FLAGS += HAVE_MULTILINK= endif +ifdef CONFIG_USE_MUSL + MAKE_FLAGS += USE_LIBUTIL= +endif define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -182,37 +217,38 @@ define Package/ppp/script_install endef define Package/ppp/install - $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/ $(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_DATA) ./files/etc/ppp/options $(1)/etc/ppp/ - ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf + $(LN) /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf $(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_BIN) ./files/ppp.sh $(1)/lib/netifd/proto/ $(INSTALL_BIN) ./files/lib/netifd/ppp-up $(1)/lib/netifd/ + $(INSTALL_BIN) ./files/lib/netifd/ppp6-up $(1)/lib/netifd/ $(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/ 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 \ - $(1)/usr/lib/pppd/$(PKG_VERSION)/ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppoatm.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ endef define Package/ppp-mod-pppoe/install - $(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_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/rp-pppoe.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ endef define Package/ppp-mod-radius/install - $(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)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/radius.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/ $(INSTALL_DIR) $(1)/etc/ppp/radius @@ -223,19 +259,25 @@ define Package/ppp-mod-radius/install endef define Package/ppp-mod-pppol2tp/install - $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppol2tp.so \ - $(1)/usr/lib/pppd/$(PKG_VERSION)/ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pppol2tp.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ endef define Package/ppp-mod-pptp/install - $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pptp.so \ - $(1)/usr/lib/pppd/$(PKG_VERSION)/ + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/pptp.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ $(INSTALL_DIR) $(1)/etc/ppp $(INSTALL_DATA) ./files/etc/ppp/options.pptp $(1)/etc/ppp/ endef +define Package/ppp-mod-passwordfd/install + $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_RELEASE_VERSION)/passwordfd.so \ + $(1)/usr/lib/pppd/$(PKG_RELEASE_VERSION)/ +endef + define Package/chat/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/ @@ -251,6 +293,11 @@ define Package/pppstats/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppstats $(1)/usr/sbin/ endef +define Package/pppoe-discovery/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppoe-discovery $(1)/usr/sbin/ +endef + $(eval $(call BuildPackage,ppp)) $(eval $(call BuildPackage,ppp-multilink)) $(eval $(call BuildPackage,ppp-mod-pppoa)) @@ -258,6 +305,8 @@ $(eval $(call BuildPackage,ppp-mod-pppoe)) $(eval $(call BuildPackage,ppp-mod-radius)) $(eval $(call BuildPackage,ppp-mod-pppol2tp)) $(eval $(call BuildPackage,ppp-mod-pptp)) +$(eval $(call BuildPackage,ppp-mod-passwordfd)) $(eval $(call BuildPackage,chat)) $(eval $(call BuildPackage,pppdump)) $(eval $(call BuildPackage,pppstats)) +$(eval $(call BuildPackage,pppoe-discovery))