From 46e3438a0b608c12b68a78e07167a52bae4322de Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 1 Oct 2016 11:07:10 +0200
Subject: [PATCH] net/*: no longer necessary to pull plugins.inc

Plugins were tied into the firewall rules, which makes it
vital to be loaded and for plugins to work at all.  The
dependency is implicit so it can be safely removed without
changing the plugin revision/version.
---
 net/l2tp/src/www/vpn_l2tp.php            | 1 -
 net/l2tp/src/www/vpn_l2tp_log.inc        | 1 -
 net/l2tp/src/www/vpn_l2tp_users.php      | 1 -
 net/l2tp/src/www/vpn_l2tp_users_edit.php | 1 -
 net/pppoe/src/www/vpn_pppoe.php          | 1 -
 net/pppoe/src/www/vpn_pppoe_edit.php     | 1 -
 net/pppoe/src/www/vpn_pppoe_log.inc      | 1 -
 net/pptp/src/www/vpn_pptp.php            | 1 -
 net/pptp/src/www/vpn_pptp_log.inc        | 1 -
 net/pptp/src/www/vpn_pptp_users.php      | 1 -
 net/pptp/src/www/vpn_pptp_users_edit.php | 1 -
 11 files changed, 11 deletions(-)

diff --git a/net/l2tp/src/www/vpn_l2tp.php b/net/l2tp/src/www/vpn_l2tp.php
index f10ae27d6..05ffd0802 100644
--- a/net/l2tp/src/www/vpn_l2tp.php
+++ b/net/l2tp/src/www/vpn_l2tp.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("plugins.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
 if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) {
diff --git a/net/l2tp/src/www/vpn_l2tp_log.inc b/net/l2tp/src/www/vpn_l2tp_log.inc
index 116e32d7b..7fba93a2d 100644
--- a/net/l2tp/src/www/vpn_l2tp_log.inc
+++ b/net/l2tp/src/www/vpn_l2tp_log.inc
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once('services.inc');
-require_once('plugins.inc');
 require_once("interfaces.inc");
 
 if (empty($config['syslog']['nentries'])) {
diff --git a/net/l2tp/src/www/vpn_l2tp_users.php b/net/l2tp/src/www/vpn_l2tp_users.php
index bfbbaba3f..2862ebac2 100644
--- a/net/l2tp/src/www/vpn_l2tp_users.php
+++ b/net/l2tp/src/www/vpn_l2tp_users.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("plugins.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
 if (!isset($config['l2tp']['user'])) {
diff --git a/net/l2tp/src/www/vpn_l2tp_users_edit.php b/net/l2tp/src/www/vpn_l2tp_users_edit.php
index 5332981e4..783dcd214 100644
--- a/net/l2tp/src/www/vpn_l2tp_users_edit.php
+++ b/net/l2tp/src/www/vpn_l2tp_users_edit.php
@@ -46,7 +46,6 @@ function l2tp_users_sort()
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("plugins.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
 if (empty($config['l2tp']['user']) || !is_array($config['l2tp']['user'])) {
diff --git a/net/pppoe/src/www/vpn_pppoe.php b/net/pppoe/src/www/vpn_pppoe.php
index d570449dc..2add77a8e 100644
--- a/net/pppoe/src/www/vpn_pppoe.php
+++ b/net/pppoe/src/www/vpn_pppoe.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("plugins.inc.d/if_pppoe.inc");
 require_once("interfaces.inc");
 
diff --git a/net/pppoe/src/www/vpn_pppoe_edit.php b/net/pppoe/src/www/vpn_pppoe_edit.php
index b41e5fc58..28a79dfc5 100644
--- a/net/pppoe/src/www/vpn_pppoe_edit.php
+++ b/net/pppoe/src/www/vpn_pppoe_edit.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 function vpn_pppoe_get_id()
 {
diff --git a/net/pppoe/src/www/vpn_pppoe_log.inc b/net/pppoe/src/www/vpn_pppoe_log.inc
index 116e32d7b..7fba93a2d 100644
--- a/net/pppoe/src/www/vpn_pppoe_log.inc
+++ b/net/pppoe/src/www/vpn_pppoe_log.inc
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once('services.inc');
-require_once('plugins.inc');
 require_once("interfaces.inc");
 
 if (empty($config['syslog']['nentries'])) {
diff --git a/net/pptp/src/www/vpn_pptp.php b/net/pptp/src/www/vpn_pptp.php
index 6ced725fe..2ceba4c6e 100644
--- a/net/pptp/src/www/vpn_pptp.php
+++ b/net/pptp/src/www/vpn_pptp.php
@@ -32,7 +32,6 @@ require_once('interfaces.inc');
 require_once('filter.inc');
 require_once('services.inc');
 require_once("system.inc");
-require_once("plugins.inc");
 require_once('plugins.inc.d/if_pptp.inc');
 
 if (!is_array($config['pptpd']['radius'])) {
diff --git a/net/pptp/src/www/vpn_pptp_log.inc b/net/pptp/src/www/vpn_pptp_log.inc
index 116e32d7b..7fba93a2d 100644
--- a/net/pptp/src/www/vpn_pptp_log.inc
+++ b/net/pptp/src/www/vpn_pptp_log.inc
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once('services.inc');
-require_once('plugins.inc');
 require_once("interfaces.inc");
 
 if (empty($config['syslog']['nentries'])) {
diff --git a/net/pptp/src/www/vpn_pptp_users.php b/net/pptp/src/www/vpn_pptp_users.php
index dc3fea601..d9b0534ee 100644
--- a/net/pptp/src/www/vpn_pptp_users.php
+++ b/net/pptp/src/www/vpn_pptp_users.php
@@ -30,7 +30,6 @@
 require_once('guiconfig.inc');
 require_once('services.inc');
 require_once("system.inc");
-require_once("plugins.inc");
 require_once('plugins.inc.d/if_pptp.inc');
 
 if (!is_array($config['pptpd']['user'])) {
diff --git a/net/pptp/src/www/vpn_pptp_users_edit.php b/net/pptp/src/www/vpn_pptp_users_edit.php
index c9d0a6308..ed43125af 100644
--- a/net/pptp/src/www/vpn_pptp_users_edit.php
+++ b/net/pptp/src/www/vpn_pptp_users_edit.php
@@ -46,7 +46,6 @@ function pptpd_users_sort()
 require_once('guiconfig.inc');
 require_once('services.inc');
 require_once("system.inc");
-require_once("plugins.inc");
 require_once('plugins.inc.d/if_pptp.inc');
 
 if (!is_array($config['pptpd']['user'])) {