Merge pull request opnsense#2080 from fraenki/haproxy_226

net/haproxy: release 2.26
ZephireNZ · Dec 17, 2020 · b5cf466 · b5cf466
2 parents 3e8deda + 8e2e0e7
commit b5cf466
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		2.25
+PLUGIN_VERSION=		2.26
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy20
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
@@ -6,6 +6,11 @@ very high loads while needing persistence or Layer7 processing.
 Plugin Changelog
 ================
 
+2.26
+
+Fixed:
+* preserve sort order of default SSL bind options
+
 2.25
 
 Added:

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml
@@ -91,6 +91,7 @@
         <type>select_multiple</type>
         <style>tokenize</style>
         <allownew>true</allownew>
+        <sortable>true</sortable>
         <help><![CDATA[Used to enforce or disable certain SSL options.]]></help>
     </field>
     <field>

diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -130,6 +130,7 @@
                 <ssl_bindOptions type="OptionField">
                     <Required>N</Required>
                     <default>no-sslv3,no-tlsv10,no-tls-tickets</default>
+                    <Sorted>Y</Sorted>
                     <Multiple>Y</Multiple>
                     <OptionValues>
                         <no-sslv3>no-sslv3</no-sslv3>
-Original file line number
+Diff line change
@@ Expand Up @@
     Plugin Changelog
     ================
+.26
+    Fixed:
+    * preserve sort order of default SSL bind options
 .25
     Added:
@@ Expand Down @@