From a713be09744c5bb0419e466b45af3b89240ba17e Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 17 Jun 2025 15:18:14 +0200
Subject: [PATCH 1/3] net/haproxy: rename input field + improve help text, refs
 #4650

---
 net/haproxy/pkg-descr                                       | 6 ++++++
 .../app/controllers/OPNsense/HAProxy/forms/dialogAction.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index daac185c3..13a4f948b 100644
--- a/net/haproxy/pkg-descr
+++ b/net/haproxy/pkg-descr
@@ -6,6 +6,12 @@ very high loads while needing persistence or Layer7 processing.
 Plugin Changelog
 ================
 
+4.6
+
+Changed:
+* improve help text for "http-request redirect" rules (#4650)
+* rename "http-request redirect" input field (#4650)
+
 4.5
 
 Changed:
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
index e0e5e345d..0386b9f1a 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
@@ -87,9 +87,9 @@
     </field>
     <field>
         <id>action.http_request_redirect</id>
-        <label>HTTP Redirect</label>
+        <label>Redirect Command</label>
         <type>text</type>
-        <help><![CDATA[Use HAProxy's redirect function to return a HTTP redirection. See <a href="http://docs.haproxy.org/3.0/configuration.html#redirect">HAProxy's documentation</a> for further details and examples.]]></help>
+        <help><![CDATA[Use HAProxy's redirect function to return a HTTP redirection. A full redirect command is required, e.g. "location https://www.example.net/" or "scheme https code 301". See <a href="http://docs.haproxy.org/3.0/configuration.html#redirect">HAProxy's documentation</a> for further details and examples.]]></help>
     </field>
     <field>
         <label>Parameters</label>

From 61ecefd7322d02540f0e88cf11926813f26221f8 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 17 Jun 2025 15:20:33 +0200
Subject: [PATCH 2/3] net/haproxy: switch to net/haproxy30 port, refs #4758

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

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index e629b6ca0..875210115 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,7 +1,7 @@
 PLUGIN_NAME=		haproxy
 PLUGIN_VERSION=		4.5
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
-PLUGIN_DEPENDS=		haproxy py${PLUGIN_PYTHON}-haproxy-cli
+PLUGIN_DEPENDS=		haproxy30 py${PLUGIN_PYTHON}-haproxy-cli
 PLUGIN_MAINTAINER=	opnsense@moov.de
 
 .include "../../Mk/plugins.mk"

From a56c6fd856f81afe78ce6d0cb6ec211723594b6b Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 17 Jun 2025 15:20:52 +0200
Subject: [PATCH 3/3] net/haproxy: bump version

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

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 875210115..c478e619d 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		4.5
+PLUGIN_VERSION=		4.6
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy30 py${PLUGIN_PYTHON}-haproxy-cli
 PLUGIN_MAINTAINER=	opnsense@moov.de