From 9d901b9f352f6d7102c636547aa8af206e6d8fc2 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 6 Nov 2015 09:35:46 +0100
Subject: Fix XMLRPC sync with CARP/HA

The config option used has not existed since pfSense 2.1 (config version 084).
---
 config/haproxy-legacy/haproxy.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/haproxy-legacy/haproxy.inc b/config/haproxy-legacy/haproxy.inc
index 55b86882..9b19bbd4 100644
--- a/config/haproxy-legacy/haproxy.inc
+++ b/config/haproxy-legacy/haproxy.inc
@@ -345,8 +345,8 @@ function haproxy_sync_on_changes() {
 					}
 				break;
 			case "auto":
-					if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])){
-						$system_carp=$config['installedpackages']['carpsettings']['config'][0];
+					if (is_array($config['hasync'])) {
+						$system_carp = $config['hasync'];
 						$rs[0]['ipaddress']=$system_carp['synchronizetoip'];
 						$rs[0]['username']=$system_carp['username'];
 						$rs[0]['password']=$system_carp['password'];
-- 
cgit v1.2.3


From 9d9a02e8ca0964e8299fc88c7cca723a33906e2e Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 6 Nov 2015 09:37:36 +0100
Subject: Bump haproxy-legacy package version

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d4032e66..e4af90d2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -149,7 +149,7 @@
 				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.1.2</version>
+		<version>1.4.24 pkg v 1.1.3</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file>
-- 
cgit v1.2.3


From 7868154b3dd25b6d58bfc2a6520dea3f09ef1901 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 6 Nov 2015 09:38:44 +0100
Subject: Bump haproxy-legacy package version

---
 pkg_config.8.xml.amd64 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 76bff1ec..26973405 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -136,9 +136,9 @@
 				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.1.2</version>
+		<version>1.4.24 pkg v 1.1.3</version>
 		<status>Release</status>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-- 
cgit v1.2.3


From cf180efeba6f94433eadfc1365f96eeb9ce4878a Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 6 Nov 2015 09:39:33 +0100
Subject: Bump haproxy-legacy package version

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e4af90d2..a6bd3328 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -151,7 +151,7 @@
 		<category>Services</category>
 		<version>1.4.24 pkg v 1.1.3</version>
 		<status>Release</status>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-- 
cgit v1.2.3