From 8ece4c879795bb31875ce9ce3d3b1e06a86ef6ec Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 21 May 2019 13:57:23 +0200
Subject: [PATCH 1/2] net/haproxy: allow hyphens, closes #1346

---
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
index a5be01a923..33d431a46c 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -336,7 +336,7 @@
                 </enabled>
                 <name type="TextField">
                     <Required>Y</Required>
-                    <mask>/^([0-9a-zA-Z._]){1,255}$/u</mask>
+                    <mask>/^([0-9a-zA-Z._\-]){1,255}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
                 </name>
                 <description type="TextField">
@@ -697,7 +697,7 @@
                 </enabled>
                 <name type="TextField">
                     <Required>Y</Required>
-                    <mask>/^([0-9a-zA-Z._]){1,255}$/u</mask>
+                    <mask>/^([0-9a-zA-Z._\-]){1,255}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
                 </name>
                 <description type="TextField">
@@ -1013,7 +1013,7 @@
                     <Required>Y</Required>
                 </enabled>
                 <name type="TextField">
-                    <mask>/^([0-9a-zA-Z._]){1,255}$/u</mask>
+                    <mask>/^([0-9a-zA-Z._\-]){1,255}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
                     <Required>Y</Required>
                 </name>

From cd07c158f98f4e3f22647fe7f0f0392e2e1c6079 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 21 May 2019 14:01:43 +0200
Subject: [PATCH 2/2] net/haproxy: bump version

---
 net/haproxy/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index f87eadcb9b..04205848ae 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		2.15
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		2.16
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy18
 PLUGIN_MAINTAINER=	opnsense@moov.de