Merge remote-tracking branch 'upstream/master'

2 files changed, 25 insertions, 19 deletions

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 7d000547..76ba4f83 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -132,25 +132,27 @@
 	<package>
 		<name>haproxy</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
-		<descr><![CDATA[The Reliable, High Performance HTTP Load Balancer<br />
-				This package implements HTTP balance features from Haproxy.]]></descr>
+		<descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br />
+				This package implements both TCP and HTTP balance features from Haproxy.<br />
+				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.23 pkg v 1.2</version>
+		<version>1.4.24 pkg v 1.2</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>haproxy-1.4.23.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-1.4.23-i386.pbi</depends_on_package_pbi>
+		<depends_on_package>haproxy-1.4.24.tbz</depends_on_package>
+		<depends_on_package_pbi>haproxy-1.4.24-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/haproxy</build_port_path>
 	</package>
 	<package>
 		<name>haproxy-full</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
 		<descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br />
-				This package implements both TCP and HTTP balance features from Haproxy.]]></descr>
+				This package implements both TCP and HTTP balance features from Haproxy.<br />
+				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
 		<version>1.4.23 pkg v 1.0</version>
@@ -159,14 +161,15 @@
 		<config_file>http://www.pfsense.com/packages/config/haproxy-legacy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>haproxy-1.4.23.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-1.4.23_2-i386.pbi</depends_on_package_pbi>
+		<depends_on_package>haproxy-1.4.24.tbz</depends_on_package>
+		<depends_on_package_pbi>haproxy-1.4.24-i386.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>haproxy-devel</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
 		<descr><![CDATA[The Reliable, High Performance TCP/HTTP(s) Load Balancer<br />
-				This package implements TCP, HTTP and HTTPS balance features from Haproxy.]]></descr>
+				This package implements TCP, HTTP and HTTPS balance features from Haproxy.<br />
+				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
 		<version>1.5-dev19 pkg v 0.3</version>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 6a49cabb..41090a32 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -119,41 +119,44 @@
 	<package>
 		<name>haproxy</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
-		<descr><![CDATA[The Reliable, High Performance HTTP Load Balancer<br />
-				This package implements HTTP balance features from Haproxy.]]></descr>
+		<descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br />
+				This package implements both TCP and HTTP balance features from Haproxy.<br />
+				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.23 pkg v 1.2</version>
+		<version>1.4.24 pkg v 1.2</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package>haproxy-1.4.23.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-1.4.23-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package>haproxy-1.4.24.tbz</depends_on_package>
+		<depends_on_package_pbi>haproxy-1.4.24-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/haproxy</build_port_path>
 	</package>
 	<package>
 		<name>haproxy-full</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
 		<descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer package<br />
-				This package implements both TCP and HTTP balance features from Haproxy.]]></descr>
+				This package implements both TCP and HTTP balance features from Haproxy.<br />
+				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.23 pkg v 1.0</version>
+		<version>1.4.24 pkg v 1.0</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy-legacy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package>haproxy-1.4.23.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-1.4.23-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package>haproxy-1.4.24.tbz</depends_on_package>
+		<depends_on_package_pbi>haproxy-1.4.24-amd64.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>haproxy-devel</name>
 		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
 		<descr><![CDATA[The Reliable, High Performance TCP/HTTP(s) Load Balancer<br />
-				This package implements TCP, HTTP and HTTPS balance features from Haproxy.]]></descr>
+				This package implements TCP, HTTP and HTTPS balance features from Haproxy.<br />
+				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
 		<version>1.5-dev19 pkg v 0.3</version>