From 651f7caa3ef4af53361277b1b4c91801a3a798fa Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 13 Dec 2016 10:19:56 +0100 Subject: [PATCH] net: provide stubs for missing netgraph glue --- net/l2tp/Makefile | 2 +- net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc | 8 ++++++++ net/pppoe/Makefile | 2 +- net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc | 9 +++++++++ net/pptp/Makefile | 2 +- net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc | 9 +++++++++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile index 807a597ec..f41483549 100644 --- a/net/l2tp/Makefile +++ b/net/l2tp/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= l2tp -PLUGIN_VERSION= 1.4 +PLUGIN_VERSION= 1.5 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= L2TP server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc index 08fec9c88..3ade627be 100644 --- a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc +++ b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc @@ -32,6 +32,7 @@ /* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */ require_once 'util.inc'; + if (!function_exists('url_safe')) { function url_safe($format, $args = array()) { @@ -47,6 +48,13 @@ if (!function_exists('url_safe')) { return vsprintf($format, $args); } } + +require_once 'interfaces.lib.inc'; + +if (!function_exists('legacy_netgraph_attach')) { + function legacy_netgraph_attach($if) { return; } +} + /* END remove this in 17.1 */ function if_l2tp_configure() diff --git a/net/pppoe/Makefile b/net/pppoe/Makefile index eaa167100..cd8173cca 100644 --- a/net/pppoe/Makefile +++ b/net/pppoe/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= pppoe -PLUGIN_VERSION= 1.4 +PLUGIN_VERSION= 1.5 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= PPPoE server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc index f78f313d8..d07d22a9e 100644 --- a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc +++ b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc @@ -31,7 +31,9 @@ */ /* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */ + require_once 'util.inc'; + if (!function_exists('url_safe')) { function url_safe($format, $args = array()) { @@ -47,6 +49,13 @@ if (!function_exists('url_safe')) { return vsprintf($format, $args); } } + +require_once 'interfaces.lib.inc'; + +if (!function_exists('legacy_netgraph_attach')) { + function legacy_netgraph_attach($if) { return; } +} + /* END remove this in 17.1 */ function if_pppoe_configure() diff --git a/net/pptp/Makefile b/net/pptp/Makefile index dfb959ceb..2365e877f 100644 --- a/net/pptp/Makefile +++ b/net/pptp/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= pptp -PLUGIN_VERSION= 1.4 +PLUGIN_VERSION= 1.5 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= PPTP server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc index 535908b78..72a6db2ae 100644 --- a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc +++ b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc @@ -31,7 +31,9 @@ */ /* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */ + require_once 'util.inc'; + if (!function_exists('url_safe')) { function url_safe($format, $args = array()) { @@ -47,6 +49,13 @@ if (!function_exists('url_safe')) { return vsprintf($format, $args); } } + +require_once 'interfaces.lib.inc'; + +if (!function_exists('legacy_netgraph_attach')) { + function legacy_netgraph_attach($if) { return; } +} + /* END remove this in 17.1 */ function if_pptp_configure()