From f360a48670266f97c620fd225c153c8f6be3be4a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:29:25 +0100 Subject: filer - add bunch of missing includes --- config/filer/filer.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/filer/filer.inc b/config/filer/filer.inc index 63cdb302..ac7fba43 100644 --- a/config/filer/filer.inc +++ b/config/filer/filer.inc @@ -30,6 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. */ /* ========================================================================== */ +require_once("config.inc"); +require_once("globals.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); + function filer_text_area_decode($text) { return preg_replace('/\r\n/', "\n", base64_decode($text)); } -- cgit v1.2.3 From d6fc255fd1fd47a345750aa747ae99cc897aed27 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:32:43 +0100 Subject: sshdcond - add bunch of missing includes --- config/sshdcond/sshdcond.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc index 7c1be614..d814d0dc 100644 --- a/config/sshdcond/sshdcond.inc +++ b/config/sshdcond/sshdcond.inc @@ -30,7 +30,11 @@ */ require_once("config.inc"); +require_once("globals.inc"); +require_once("notices.inc"); require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); function restart_sshd() { mwexec_bg("/etc/sshd"); -- cgit v1.2.3 From b306b13185c09883d6f636fbba6ad7d2e97eff1f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:34:19 +0100 Subject: ipguard - add bunch of missing includes --- config/ipguard/ipguard.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/ipguard/ipguard.inc b/config/ipguard/ipguard.inc index d51e4fe2..35ab9e68 100644 --- a/config/ipguard/ipguard.inc +++ b/config/ipguard/ipguard.inc @@ -28,7 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. */ require_once("config.inc"); +require_once("globals.inc"); +require_once("notices.inc"); require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); function ipguard_custom_php_deinstall_command() { unlink_if_exists("/usr/local/etc/rc.d/ipguard.sh"); -- cgit v1.2.3 From 2036efe8abf986abbfc2899be65eb09f84e0cbe3 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:40:46 +0100 Subject: checkmk-agent - add bunch of missing includes --- config/checkmk-agent/checkmk.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/checkmk-agent/checkmk.inc b/config/checkmk-agent/checkmk.inc index 1ab92400..fb97e678 100644 --- a/config/checkmk-agent/checkmk.inc +++ b/config/checkmk-agent/checkmk.inc @@ -28,8 +28,13 @@ POSSIBILITY OF SUCH DAMAGE. */ require_once("filter.inc"); +require_once("globals.inc"); +require_once("interfaces.inc"); +require_once("notices.inc"); require_once("pfsense-utils.inc"); require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); define('ETC_SERVICES', '/etc/services'); -- cgit v1.2.3 From ad85e8838bee6ff09774571d98287ecd568cce32 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:44:25 +0100 Subject: haproxy-devel - add bunch of missing includes --- config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc index 699dffd1..6d0f1523 100644 --- a/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc +++ b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc @@ -32,6 +32,8 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("notices.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); function xmlrpc_sync_execute($syncinfo) { // name that is logged if something fails during syncing -- cgit v1.2.3 From 0d81209c36e1343c8f15b846c4ca4fe186f745f9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:46:26 +0100 Subject: haproxy1_5 - add bunch of missing includes --- config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc b/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc index 699dffd1..ae5f9897 100644 --- a/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc +++ b/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc @@ -32,6 +32,9 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); function xmlrpc_sync_execute($syncinfo) { // name that is logged if something fails during syncing -- cgit v1.2.3 From 46dad160aee24e653d58b9008a83bce1dc85a859 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:54:22 +0100 Subject: varnish3 - add bunch of missing includes --- config/varnish3/varnish.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/varnish3/varnish.inc b/config/varnish3/varnish.inc index 5df8052b..662b8dee 100644 --- a/config/varnish3/varnish.inc +++ b/config/varnish3/varnish.inc @@ -32,6 +32,12 @@ POSSIBILITY OF SUCH DAMAGE. */ /* ========================================================================== */ +require_once("globals.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); + $shortcut_section = "varnish"; $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -- cgit v1.2.3 From 0b844e14da0668a1292cd18379ddf211d0bf3e83 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 20:59:01 +0100 Subject: sarg - add bunch of missing includes --- config/sarg/sarg.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 561f7c61..d67d11dc 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -28,6 +28,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +require_once("config.inc"); +require_once("globals.inc"); +require_once("notices.inc"); +require_once("services.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); + $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pf_version == "2.1" || $pf_version == "2.2") { // Function to get squidGuard directory -- cgit v1.2.3 From ae3efcf7e1f73726728514d28fb30794c69a2f3c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:03:49 +0100 Subject: apache_mod_security-dev - add bunch of missing includes --- config/apache_mod_security-dev/apache_mod_security.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc index 4ec13bd0..564b57da 100644 --- a/config/apache_mod_security-dev/apache_mod_security.inc +++ b/config/apache_mod_security-dev/apache_mod_security.inc @@ -29,7 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +require_once("config.inc"); +require_once("globals.inc"); +require_once("notices.inc"); require_once("service-utils.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); $shortcut_section = "apache"; // Check to find out on which system the package is running -- cgit v1.2.3 From eb157ea60b4589aaf0231df9f6003318ca250349 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:08:03 +0100 Subject: bind - add bunch of missing includes --- config/bind/bind.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/bind/bind.inc b/config/bind/bind.inc index 39c12e13..1c83231b 100644 --- a/config/bind/bind.inc +++ b/config/bind/bind.inc @@ -39,6 +39,9 @@ require_once("service-utils.inc"); if (!function_exists("filter_configure")) { require_once("filter.inc"); } +require_once("notices.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pf_version == "2.1" || $pf_version == "2.2") { -- cgit v1.2.3 From 82123132b069476d6dd6ecc084550c0f655a9b0c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:13:35 +0100 Subject: mailscanner - add bunch of missing includes --- config/mailscanner/mailscanner.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc index 62905091..6907f7ca 100644 --- a/config/mailscanner/mailscanner.inc +++ b/config/mailscanner/mailscanner.inc @@ -28,9 +28,13 @@ */ $shortcut_section = "mailscanner"; -require_once("util.inc"); +require_once("config.inc"); require_once("globals.inc"); -#require("guiconfig.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") { -- cgit v1.2.3 From 9e5599604d6b07dba5a79ae52e91e24d844a9066 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:21:20 +0100 Subject: postfix - add bunch of missing includes --- config/postfix/postfix.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index 9db7e5a1..20683f49 100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -29,10 +29,16 @@ POSSIBILITY OF SUCH DAMAGE. */ $shortcut_section = "postfix"; -require_once("util.inc"); +require_once("config.inc"); require_once("functions.inc"); -require_once("pkg-utils.inc"); require_once("globals.inc"); +require_once("interfaces.inc"); +require_once("notices.inc"); +require_once("pkg-utils.inc"); +require_once("services.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if ($pfs_version == "2.1" || $pfs_version == "2.2") { -- cgit v1.2.3 From d10d37d0491f2b8815585054f4ee79477a1ea1a1 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:23:00 +0100 Subject: postfix - add bunch of missing includes --- config/postfix/postfix.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/postfix/postfix.php b/config/postfix/postfix.php index 4c444ab8..f6a31fe7 100644 --- a/config/postfix/postfix.php +++ b/config/postfix/postfix.php @@ -31,6 +31,8 @@ require_once("/etc/inc/util.inc"); require_once("/etc/inc/functions.inc"); require_once("/etc/inc/pkg-utils.inc"); require_once("/etc/inc/globals.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); require_once("/usr/local/pkg/postfix.inc"); $uname = posix_uname(); -- cgit v1.2.3 From a380eb1272a37978591681bc917ee29e22a6291c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:30:58 +0100 Subject: suricata - add bunch of missing includes --- config/suricata/suricata.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc index bd7a181b..423e01ec 100644 --- a/config/suricata/suricata.inc +++ b/config/suricata/suricata.inc @@ -39,11 +39,16 @@ */ require_once("pfsense-utils.inc"); require_once("config.inc"); +require_once("globals.inc"); require_once("functions.inc"); require_once("services.inc"); require_once("service-utils.inc"); require_once("pkg-utils.inc"); require_once("filter.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); require("/usr/local/pkg/suricata/suricata_defs.inc"); global $g, $config; -- cgit v1.2.3 From e83693902488ff490f44dca1a66f9c518e966425 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:34:06 +0100 Subject: squidGuard-devel - add bunch of missing includes --- config/squidGuard-devel/squidguard.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/squidGuard-devel/squidguard.inc b/config/squidGuard-devel/squidguard.inc index c9d51b8d..a4fd9ff3 100644 --- a/config/squidGuard-devel/squidguard.inc +++ b/config/squidGuard-devel/squidguard.inc @@ -29,13 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('globals.inc'); require_once('config.inc'); -require_once('util.inc'); +require_once('filter.inc'); +require_once('globals.inc'); +require_once("notices.inc"); require_once('pfsense-utils.inc'); require_once('pkg-utils.inc'); -require_once('filter.inc'); require_once('service-utils.inc'); +require_once('util.inc'); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); require_once('squidguard_configurator.inc'); # ------------------------------------------------------------------------------ -- cgit v1.2.3 From bef28c7ada61b602b595873fa481065f1f438f2a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:36:38 +0100 Subject: squidGuard - add bunch of missing includes --- config/squidGuard/squidguard.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index 65e1ef50..9bffd746 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -29,13 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('globals.inc'); require_once('config.inc'); -require_once('util.inc'); +require_once('filter.inc'); +require_once('globals.inc'); +require_once("notices.inc"); require_once('pfsense-utils.inc'); require_once('pkg-utils.inc'); -require_once('filter.inc'); require_once('service-utils.inc'); +require_once('util.inc'); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); require_once('squidguard_configurator.inc'); # ------------------------------------------------------------------------------ -- cgit v1.2.3 From 3b9d4db7710d42bff33eca4bbbc7a8e4324392d9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:39:21 +0100 Subject: snort - add bunch of missing includes --- config/snort/snort.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 5cdd5a00..692bae29 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -33,10 +33,15 @@ require_once("pfsense-utils.inc"); require_once("config.inc"); +require_once("globals.inc"); require_once("functions.inc"); require_once("service-utils.inc"); require_once("pkg-utils.inc"); require_once("filter.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); require("/usr/local/pkg/snort/snort_defs.inc"); // Snort GUI needs some extra PHP memory space to manipulate large rules arrays -- cgit v1.2.3 From c276536a917e05fd3397b459e830d748f5454e14 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:44:04 +0100 Subject: dansguardian - add bunch of missing includes --- config/dansguardian/dansguardian.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index c915d579..a819473e 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -27,10 +27,12 @@ POSSIBILITY OF SUCH DAMAGE. */ - -require_once("util.inc"); +require_once("config.inc"); require_once("globals.inc"); -#require("guiconfig.inc"); +require_once("notices.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version > 2.0) -- cgit v1.2.3 From 0eecca6356380d1ee1875d9fdc0de6fccb007449 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:49:33 +0100 Subject: squid3 - add bunch of missing includes --- config/squid3/34/squid.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index b7eb9889..aab4d134 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -31,12 +31,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('globals.inc'); require_once('config.inc'); -require_once('util.inc'); +require_once('globals.inc'); +require_once('notices.inc'); require_once('pfsense-utils.inc'); require_once('pkg-utils.inc'); +require_once('services.inc'); require_once('service-utils.inc'); +require_once('util.inc'); +require_once('xmlrpc.inc'); +require_once('xmlrpc_client.inc'); if (!function_exists("filter_configure")) { require_once("filter.inc"); -- cgit v1.2.3 From f3cced98add11ea9ea713854a190f88449aa9f5d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:55:14 +0100 Subject: squid3 - add bunch of missing includes --- config/squid3/34/squid_antivirus.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/squid3/34/squid_antivirus.inc b/config/squid3/34/squid_antivirus.inc index fe8406e7..82768f4b 100644 --- a/config/squid3/34/squid_antivirus.inc +++ b/config/squid3/34/squid_antivirus.inc @@ -27,8 +27,11 @@ POSSIBILITY OF SUCH DAMAGE. */ /* Functions for Squid C-ICAP/ClamAV integration */ -require_once('globals.inc'); require_once('config.inc'); +require_once('globals.inc'); +require_once('services.inc'); +require_once('service-utils.inc'); +require_once('util.inc'); /* This file is currently only being included in squid.inc and not used separately */ // require_once('squid.inc'); -- cgit v1.2.3 From 674eb5a7a9cdafbd7c7436eb64c74a3bfddc49d0 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 21:57:16 +0100 Subject: squid3 - remove unused include --- config/squid3/34/squid_js.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/squid3/34/squid_js.inc b/config/squid3/34/squid_js.inc index e1eb2e4e..59b75e60 100644 --- a/config/squid3/34/squid_js.inc +++ b/config/squid3/34/squid_js.inc @@ -29,7 +29,6 @@ /* * Squid javascript helpers for GUI fields status manipulation */ -require_once('globals.inc'); require_once('config.inc'); /* -- cgit v1.2.3 From 75857f248f72050da5f87602d6398bbdfc4d5562 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 22:04:24 +0100 Subject: squid3 - add missing include --- config/squid3/34/squid_reverse.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/config/squid3/34/squid_reverse.inc b/config/squid3/34/squid_reverse.inc index 483069e4..b302c8b1 100755 --- a/config/squid3/34/squid_reverse.inc +++ b/config/squid3/34/squid_reverse.inc @@ -30,6 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ require_once('certs.inc'); +require_once('util.inc'); /* This file is currently only being included in squid.inc and not used separately */ // require_once('squid.inc'); -- cgit v1.2.3 From 6cd60ccf3ec022371f846b6f082d9dad853286b9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 22:10:21 +0100 Subject: freeradius2 - add bunch of missing includes --- config/freeradius2/freeradius.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index f23e6c38..0ac591b6 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -28,14 +28,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('config.inc'); -require_once('service-utils.inc'); -require_once("util.inc"); +require_once("config.inc"); +require_once("filter.inc"); require_once("functions.inc"); -require_once("pkg-utils.inc"); require_once("globals.inc"); -require_once("filter.inc"); +require_once("notices.inc"); +require_once("pkg-utils.inc"); require_once("services.inc"); +require_once("service-utils.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); // Check pfSense version $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -- cgit v1.2.3 From 6a740784628c9d78259e5de79e00fdeae0a470b5 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 22:21:45 +0100 Subject: tinydns - add bunch of missing includes --- config/tinydns/tinydns.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc index 5e61fc05..14ff2e50 100644 --- a/config/tinydns/tinydns.inc +++ b/config/tinydns/tinydns.inc @@ -28,11 +28,18 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -if(!function_exists("filter_configure")) +require_once("globals.inc"); +if (!function_exists("filter_configure")) { require_once("filter.inc"); - -if(!function_exists("get_real_wan_interface")) +} +if (!function_exists("get_real_wan_interface")) { require_once("interfaces.inc"); +} +require_once("notices.inc"); +require_once("service-utils.inc"); +require_once("util.inc"); +require_once("xmlrpc.inc"); +require_once("xmlrpc_client.inc"); function tinydns_validate() { global $input_errors, $config; -- cgit v1.2.3 From e080c894cb873ce951866e433b59a003901052d8 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 23 Nov 2015 23:07:17 +0100 Subject: pfblockerng - add bunch of missing includes --- config/pfblockerng/pfblockerng.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 7ddbb565..69e010d3 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -42,6 +42,8 @@ require_once('pfsense-utils.inc'); require_once('globals.inc'); require_once('services.inc'); require_once('service-utils.inc'); +require_once('xmlrpc.inc'); +require_once('xmlrpc_client.inc'); require_once('/usr/local/pkg/pfblockerng/pfblockerng_extra.inc'); // 'include functions' not yet merged into pfSense global $g, $config, $pfb; @@ -4774,4 +4776,4 @@ function pfblockerng_do_xmlrpc_sync($sync_to_ip, $port, $protocol, $username, $p } return $success; } -?> \ No newline at end of file +?> -- cgit v1.2.3 From 6e9ca2a8ed5dac121236b2c895505465f7c1de40 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 26 Nov 2015 13:44:28 +0100 Subject: Add explicit includes to a bunch of packages and bump the package versions --- pkg_config.10.xml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 4dd76ed7..37346ccc 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -61,7 +61,7 @@ The most widely used name server software. http://www.isc.org/downloads/BIND/ Services - 0.4.1 + 0.4.2 RC 2.2 https://packages.pfsense.org/packages/config/bind/bind.xml @@ -82,7 +82,7 @@ Utility https://doc.pfsense.org/index.php/Filer_package https://packages.pfsense.org/packages/config/filer/filer.xml - 0.60.6 + 0.60.7 BETA 2.2 bscholer@cshl.edu @@ -144,7 +144,7 @@ http://haproxy.1wt.eu/ Services - 0.32 + 0.33 RELEASE 2.2 https://packages.pfsense.org/packages/config/haproxy1_5/haproxy.xml @@ -172,7 +172,7 @@ http://haproxy.1wt.eu/ Services - 0.33 + 0.34 RELEASE 2.2 https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml @@ -201,7 +201,7 @@ ]]> Security - 0.45 + 0.46 ALPHA 2.2 https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_virtualhost.xml @@ -408,7 +408,7 @@ security_barnyard2_UNSET_FORCE=ODBC PGSQL PRELUDE;security_barnyard2_SET_FORCE=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;security_snort_SET_FORCE=BARNYARD PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;security_snort_UNSET_FORCE=PULLEDPORK FILEINSPECT HA https://packages.pfsense.org/packages/config/snort/snort.xml - 3.2.9 + 3.2.9.1 2.2 RELEASE /snort.xml @@ -488,7 +488,7 @@ https://forum.pfsense.org/index.php/topic,40622.0.html https://packages.pfsense.org/packages/config/postfix/postfix.xml postfix-2.11.3_2-##ARCH##.pbi - 2.4.5 + 2.4.6 RELEASE 2.2 postfix.xml @@ -515,7 +515,7 @@ https://packages.pfsense.org/packages/config/dansguardian/dansguardian.xml https://forum.pfsense.org/index.php/topic,43786.0.html dansguardian-2.12.0.3_2-##ARCH##.pbi - 0.1.13 + 0.1.14 BETA 2.2 dansguardian.xml @@ -541,7 +541,7 @@ https://packages.pfsense.org/packages/config/mailscanner/mailscanner.xml https://forum.pfsense.org/index.php/topic,43687.0.html mailscanner-4.84.6-##ARCH##.pbi - 0.2.12 + 0.2.13 BETA 2.2 mailscanner.xml @@ -633,7 +633,7 @@ https://packages.pfsense.org/packages/config/sarg/sarg.xml https://forum.pfsense.org/index.php/topic,47765.0.html sarg-2.3.9-##ARCH##.pbi - 0.6.7 + 0.6.8 RELEASE 2.2 www @@ -660,7 +660,7 @@ https://packages.pfsense.org/packages/config/ipguard/ipguard.xml https://forum.pfsense.org/index.php/topic,49917.msg263664.html#msg263664 ipguard-1.04_2-##ARCH##.pbi - 0.1.3 + 0.1.4 BETA 2.2 ipguard.xml @@ -684,7 +684,7 @@ http://varnish-cache.org https://doc.pfsense.org/index.php/Varnish_package Services - 0.2.4 + 0.2.3 RC 2.2 https://packages.pfsense.org/packages/config/varnish3/varnish_backends.xml @@ -728,7 +728,7 @@ pfSense version of TinyDNS which features failover host support. http://cr.yp.to/djbdns.html Services - 1.0.6.24 + 1.0.6.25 BETA https://doc.pfsense.org/index.php/Tinydns_package 2.2 @@ -939,7 +939,7 @@ https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package Services - 1.6.18 + 1.6.19 RC 2.2 nachtfalkeaw@web.de @@ -1182,7 +1182,7 @@ http://www.squidGuard.org/ dv_serg@mail.ru Network Management - 1.9.17 + 1.9.18 BETA 2.2 squidguard-1.4_7-##ARCH##.pbi @@ -1207,7 +1207,7 @@ http://www.squidGuard.org/ gugabsd@mundounix.com.br Network Management - 1.5.9 + 1.5.10 BETA 2.2 squidguard-devel-1.5_1-##ARCH##.pbi @@ -1375,7 +1375,7 @@ sysutils/muse https://packages.pfsense.org/packages/config/checkmk-agent/checkmk.xml - 0.1.5 + 0.1.6 RC 2.2 marcellocoutinho@gmail.com @@ -1390,7 +1390,7 @@ ]]> System - 1.0.6 + 1.0.7 BETA 2.2 https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml @@ -1763,7 +1763,7 @@ http://suricata-ids.org/ High Performance Network IDS, IPS and Security Monitoring engine by OISF. Security - 2.1.9 + 2.1.9.1 Stable 2.2 https://packages.pfsense.org/packages/config/suricata/suricata.xml -- cgit v1.2.3