aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2015-11-03 23:21:48 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2015-11-03 23:21:48 +0100
commitd529f5eda199344e285f111d12d0115720677e1c (patch)
tree87b143d886eac02dbb64ad6ea485da24acad844c
parent4c6e336f529df7900be3d7739e76b03e7bf804f7 (diff)
downloadpfsense-packages-d529f5eda199344e285f111d12d0115720677e1c.tar.gz
pfsense-packages-d529f5eda199344e285f111d12d0115720677e1c.tar.bz2
pfsense-packages-d529f5eda199344e285f111d12d0115720677e1c.zip
haproxy-devel, update package to use 1.6.2 binaries
-rw-r--r--config/haproxy-devel/haproxy.xml2
-rw-r--r--config/haproxy-devel/pkg/haproxy.inc6
-rw-r--r--pkg_config.10.xml4
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 11 insertions, 5 deletions
diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml
index 784e0034..19b6b577 100644
--- a/config/haproxy-devel/haproxy.xml
+++ b/config/haproxy-devel/haproxy.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>haproxy</name>
- <version>0.32</version>
+ <version>0.33</version>
<title>HAProxy</title>
<aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect>
<include_file>/usr/local/pkg/haproxy.inc</include_file>
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index 638ece28..714b041c 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -1460,6 +1460,12 @@ function haproxy_writeconf($configpath) {
$a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['item'];
$a_resolvers = &$config['installedpackages']['haproxy']['dns_resolvers']['item'];
$a_files = &$config['installedpackages']['haproxy']['files']['item'];
+ if (!is_array($a_mailers)) {
+ $a_mailers = array();
+ }
+ if (!is_array($a_resolvers)) {
+ $a_resolvers = array();
+ }
$fd = fopen($configfile, "w");
if (is_array($a_global)) {
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 3fa52bb8..c5c67095 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -171,7 +171,7 @@
</descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>0.32</version>
+ <version>0.33</version>
<status>Release</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -179,7 +179,7 @@
<run_depends>sbin/haproxy:net/haproxy</run_depends>
<port_category>net</port_category>
<conflicts>haproxy</conflicts>
- <depends_on_package_pbi>haproxy-devel-1.6-dev4-##ARCH##.pbi</depends_on_package_pbi>
+ <depends_on_package_pbi>haproxy-1.6.2-##ARCH##.pbi</depends_on_package_pbi>
<build_pbi>
<ports_before>security/openssl lang/lua53</ports_before>
<custom_name>haproxy</custom_name>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 5a41698d..f8285354 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -190,7 +190,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.32</version>
+ <version>1.5.3 pkg v 0.33</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index f5322dbb..2f6e6e36 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -177,7 +177,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.32</version>
+ <version>1.5.3 pkg v 0.33</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>