KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add ppp-mod-pppol2tp subpackage to ppp

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

SVN-Revision: 31564
This commit is contained in:
Gabor Juhos 2012-05-03 09:38:58 +00:00
parent b0449ccf04
commit 97697c332f
4 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
package/ppp/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_VERSION:=2.4.5 PKG_VERSION:=2.4.5
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
@ -95,6 +95,16 @@ define Package/ppp-mod-radius/conffiles
/etc/ppp/radius/ /etc/ppp/radius/
endef endef
define Package/ppp-mod-pppol2tp
$(call Package/ppp/Default)
DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppol2tp
TITLE:=PPPoL2TP plugin
endef
define Package/ppp-mod-pppol2tp/description
This package contains a PPPoL2TP (PPP over L2TP) plugin for ppp.
endef
define Package/chat define Package/chat
$(call Package/ppp/Default) $(call Package/ppp/Default)
DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
@ -220,6 +230,12 @@ define Package/ppp-mod-radius/install
$(1)/etc/ppp/radius/ $(1)/etc/ppp/radius/
endef 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)/
endef
define Package/chat/install define Package/chat/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/
@ -240,6 +256,7 @@ $(eval $(call BuildPackage,ppp-multilink))
$(eval $(call BuildPackage,ppp-mod-pppoa)) $(eval $(call BuildPackage,ppp-mod-pppoa))
$(eval $(call BuildPackage,ppp-mod-pppoe)) $(eval $(call BuildPackage,ppp-mod-pppoe))
$(eval $(call BuildPackage,ppp-mod-radius)) $(eval $(call BuildPackage,ppp-mod-radius))
$(eval $(call BuildPackage,ppp-mod-pppol2tp))
$(eval $(call BuildPackage,chat)) $(eval $(call BuildPackage,chat))
$(eval $(call BuildPackage,pppdump)) $(eval $(call BuildPackage,pppdump))
$(eval $(call BuildPackage,pppstats)) $(eval $(call BuildPackage,pppstats))

2
package/ppp/files.old/etc/ppp/ip-down
View file

@ -10,7 +10,7 @@ export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
[ -z "$PPP_IPPARAM" ] || { [ -z "$PPP_IPPARAM" ] || {
case "$PPP_IFACE" in case "$PPP_IFACE" in
# only handle uci managed interfaces here, others are done by generic hotplug # only handle uci managed interfaces here, others are done by generic hotplug
3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) 3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*|l2tp-*)
env -i ACTION="ifdown" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface" env -i ACTION="ifdown" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
uci_revert_state network "$PPP_IPPARAM" uci_revert_state network "$PPP_IPPARAM"
;; ;;

2
package/ppp/files.old/etc/ppp/ip-up
View file

@ -23,7 +23,7 @@ export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
[ -z "$PPP_IPPARAM" ] || { [ -z "$PPP_IPPARAM" ] || {
case "$PPP_IFACE" in case "$PPP_IFACE" in
# only handle uci managed interfaces here, others are done by generic hotplug # only handle uci managed interfaces here, others are done by generic hotplug
3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) 3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*|l2tp-*)
env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface" env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
;; ;;
esac esac

16
package/ppp/patches/400-simplify_kernel_checks.patch
View file

@ -126,3 +126,19 @@
add_options(Options); add_options(Options);
info("RP-PPPoE plugin version %s compiled against pppd %s", info("RP-PPPoE plugin version %s compiled against pppd %s",
--- a/pppd/plugins/pppol2tp/pppol2tp.c 2010-11-15 12:12:43.000000000 +0000
+++ b/pppd/plugins/pppol2tp/pppol2tp.c 2012-04-24 15:53:58.806260309 +0100
@@ -488,12 +488,7 @@ static void pppol2tp_check_options(void)
void plugin_init(void)
{
-#if defined(__linux__)
- extern int new_style_driver; /* From sys-linux.c */
- if (!ppp_available() && !new_style_driver)
- fatal("Kernel doesn't support ppp_generic - "
- "needed for PPPoL2TP");
-#else
+#if !defined(__linux__)
fatal("No PPPoL2TP support on this OS");
#endif
add_options(pppol2tp_options);