Merge pull request #1060 from doktornotor/patch-7

9 files changed, 53 insertions, 33 deletions

diff --git a/config/ipguard/ipguard.inc b/config/ipguard/ipguard.inc
index 53284c96..68e08e9f 100644
--- a/config/ipguard/ipguard.inc
+++ b/config/ipguard/ipguard.inc
@@ -41,7 +41,11 @@ function ipguard_custom_php_write_config() {
 	global $g, $config;
 
 	/* Detect boot process and do nothing */
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index e9656afd..2282d4e3 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -139,12 +139,14 @@ function sync_package_lcdproc_screens() {
 }
 
 function sync_package_lcdproc() {
-	global $g;
-	global $config;
-	global $input_errors;
+	global $g, $config, $input_errors;
 
 	# Detect boot process
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 71b06932..a864b965 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -492,8 +492,7 @@ EOD;
 	}
 
 	function sync_package_nut() {
-		global $config;
-		global $input_errors;
+		global $g, $config, $input_errors;
 
 		stop_service("nut");
 
@@ -509,10 +508,12 @@ EOD;
 			$return = sync_package_nut_snmp();
 		}
 
-		if ((!platform_booting()) && (nut_config('monitor'))) {
-			/* only start if enabled and system is not booting */
-			/* this prevents service from starting / stopping / starting on boot */
-
+		/* only start if enabled and system is not booting */
+		/* this prevents service from starting / stopping / starting on boot */
+		if ((function_exists("platform_booting")) && (!platform_booting()) && (nut_config('monitor'))) {
+			log_error("[nut] INFO: Starting service");
+			start_service("nut");
+		} elseif ((!($g['booting'])) && (nut_config('monitor'))) {
 			log_error("[nut] INFO: Starting service");
 			start_service("nut");
 		} elseif (!$return && file_exists(NUT_RCFILE)) {
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc
index 446b5f82..85410560 100644
--- a/config/sarg/sarg.inc
+++ b/config/sarg/sarg.inc
@@ -192,7 +192,11 @@ function sync_package_sarg() {
 	global $config, $g, $sarg_proxy;
 
 	// detect boot process
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 27bff27b..5a0946bb 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -543,10 +543,15 @@ function squid_validate_auth($post, &$input_errors) {
 }
 
 function squid_install_cron($should_install) {
-	global $config;
-	if (platform_booting()) {
+	global $g, $config;
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
+
 	parse_config(true);
 
 	if (is_array($config['installedpackages']['squidcache'])) {
diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index c7c19291..9c3a8bb9 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -62,7 +62,11 @@ function sshdcond_custom_php_write_config() {
 	global $g, $config, $pkg_interface;
 
 	/* Detect boot process, do nothing during boot. */
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 6dcaf09b..082b29e5 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -606,7 +606,7 @@
 		<config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
 		<depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi>
-		<version>0.6.5</version>
+		<version>0.6.6</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<port_category>www</port_category>
@@ -633,7 +633,7 @@
 		<config_file>https://packages.pfsense.org/packages/config/ipguard/ipguard.xml</config_file>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,49917.msg263664.html#msg263664</pkginfolink>
 		<depends_on_package_pbi>ipguard-1.04_2-##ARCH##.pbi</depends_on_package_pbi>
-		<version>0.1.1</version>
+		<version>0.1.2</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<configurationfile>ipguard.xml</configurationfile>
@@ -814,7 +814,7 @@
 		<descr>Network UPS Tools.</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.0.9</version>
+		<version>2.1.0</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -1025,7 +1025,7 @@
 		<descr>High performance web proxy cache.</descr>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1096,7 +1096,7 @@
 		<descr>LCD display driver - development version.</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>Utility</category>
-		<version>0.9.13</version>
+		<version>0.9.14</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<maintainer>michele@nt2.it</maintainer>
@@ -1336,7 +1336,7 @@
 			]]>
 		</descr>
 		<category>Enhancements</category>
-		<version>1.0.4</version>
+		<version>1.0.5</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b847ea20..5c39a7f6 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -675,7 +675,7 @@
 		<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
 		<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
 		<depends_on_package_pbi>sarg-2.3.6_2-i386.pbi</depends_on_package_pbi>
-		<version>2.3.6_2 pkg v.0.6.3</version>
+		<version>2.3.6_2 pkg v.0.6.6</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<configurationfile>sarg.xml</configurationfile>
@@ -696,7 +696,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>ipguard-1.04.tbz</depends_on_package>
 		<depends_on_package_pbi>ipguard-1.04-i386.pbi</depends_on_package_pbi>
-		<version>1.0.4 pkg v.0.1</version>
+		<version>1.0.4 pkg v.0.1.2</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>ipguard.xml</configurationfile>
@@ -916,7 +916,7 @@
 		<descr>Network UPS Tools</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.6.5_1 pkg 2.0.4</version>
+		<version>2.6.5_1 pkg 2.1.0</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -1130,7 +1130,7 @@
 		<descr>High performance web proxy cache.</descr>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>2.7.9 pkg v.4.3.4</version>
+		<version>2.7.9 pkg v.4.3.9</version>
 		<status>Stable</status>
 		<required_version>2</required_version>
 		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1232,7 +1232,7 @@
 		<descr>LCD display driver - Development version</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>Utility</category>
-		<version>lcdproc-0.5.6 pkg v. 0.9.11</version>
+		<version>lcdproc-0.5.6 pkg v. 0.9.14</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>michele@nt2.it</maintainer>
@@ -1563,7 +1563,7 @@
 		<descr><![CDATA[Allows to define SSH overrides for users,groups,hosts and addresses using Match in a convenient way.<br />
 				This package acts as an access list frontend for ssh connections]]></descr>
 		<category>Enhancements</category>
-		<version>1.0.1</version>
+		<version>1.0.5</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 6bafb7f4..7e2dbeb6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -662,7 +662,7 @@
 		<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
 		<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
 		<depends_on_package_pbi>sarg-2.3.6_2-amd64.pbi</depends_on_package_pbi>
-		<version>2.3.6_2 pkg v.0.6.3</version>
+		<version>2.3.6_2 pkg v.0.6.6</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<configurationfile>sarg.xml</configurationfile>
@@ -683,7 +683,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
  		<depends_on_package>ipguard-1.04.tbz</depends_on_package>
 		<depends_on_package_pbi>ipguard-1.04-amd64.pbi</depends_on_package_pbi>
-		<version>1.0.4 pkg v.0.1</version>
+		<version>1.0.4 pkg v.0.1.2</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>ipguard.xml</configurationfile>
@@ -903,7 +903,7 @@
 		<descr>Network UPS Tools</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.6.5_1 pkg 2.0.4</version>
+		<version>2.6.5_1 pkg 2.1.0</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -1117,7 +1117,7 @@
 		<descr>High performance web proxy cache.</descr>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>2.7.9 pkg v.4.3.4</version>
+		<version>2.7.9 pkg v.4.3.9</version>
 		<status>Stable</status>
 		<required_version>2</required_version>
 		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1219,7 +1219,7 @@
 		<descr>LCD display driver - Development version</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>Utility</category>
-		<version>lcdproc-0.5.6 pkg v. 0.9.11</version>
+		<version>lcdproc-0.5.6 pkg v. 0.9.14</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>michele@nt2.it</maintainer>
@@ -1550,7 +1550,7 @@
 		<descr><![CDATA[Allows to define SSH overrides for users,groups,hosts and addresses using Match in a convenient way.<br />
 				This package acts as an access list frontend for ssh connections]]></descr>
 		<category>Enhancements</category>
-		<version>1.0.1</version>
+		<version>1.0.5</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file>