aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 16:59:00 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 16:59:00 -0300
commit94552b1db607bd973becb7eb8e0d3e32d9fd4b90 (patch)
treefaef663bc614241f8ba115cd968bed515d811ea9
parent4897bdd7deb318233d34d31ba1ea23b6b77b2215 (diff)
parent7e476a1263bda6c11fbf76b8cbe76598b98571c8 (diff)
downloadpfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.tar.gz
pfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.tar.bz2
pfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.zip
Merge pull request #1059 from doktornotor/patch-6
-rwxr-xr-xconfig/postfix/postfix.inc12
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 12 insertions, 6 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index f40922c6..0629c187 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -231,12 +231,18 @@ function check_cron(){
}
function sync_package_postfix($via_rpc="no") {
- global $config;
+ global $g, $config;
log_error("sync_package_postfix called with via_rpc={$via_rpc}");
# detect boot process
- if (is_array($_POST)){
- if (platform_booting()) {
+ if (is_array($_POST)) {
+ if (function_exists("platform_booting")) {
+ if (!platform_booting()) {
+ unset($boot_process);
+ } else {
+ $boot_process="on";
+ }
+ } elseif (!($g['booting'])) {
unset($boot_process);
} else {
$boot_process="on";
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d29b3959..6dcaf09b 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -467,7 +467,7 @@
<pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file>
<depends_on_package_pbi>postfix-2.11.3_2-##ARCH##.pbi</depends_on_package_pbi>
- <version>2.4.3</version>
+ <version>2.4.4</version>
<status>Release</status>
<required_version>2.2</required_version>
<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 5db18645..b847ea20 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -536,7 +536,7 @@
<depends_on_package>postfix-2.10.2,1.tbz</depends_on_package>
<depends_on_package>perl5-5.16.3_4.tbz</depends_on_package>
<depends_on_package_pbi>postfix-2.10.2-i386.pbi</depends_on_package_pbi>
- <version>2.10.2 pkg v.2.3.9</version>
+ <version>2.10.2 pkg v.2.4.4</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 67b401fd..6bafb7f4 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -523,7 +523,7 @@
<depends_on_package>postfix-2.10.2,1.tbz</depends_on_package>
<depends_on_package>perl5-5.16.3_4.tbz</depends_on_package>
<depends_on_package_pbi>postfix-2.10.2-amd64.pbi</depends_on_package_pbi>
- <version>2.10.2 pkg v.2.3.9</version>
+ <version>2.10.2 pkg v.2.4.4</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>postfix.xml</configurationfile>