- apache: dont use -L for wget2

Resolves: RHEL-40720

RHEL-40720-apache-dont-use-L-for-wget2.patch

@@ -0,0 +1,32 @@
+From 9dc93c146edc904151f7a67aa3e4136b5a5392b5 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 18 Jun 2024 10:42:24 +0200
+Subject: [PATCH] apache/http-mon.sh: dont use -L for wget2 as it's not
+ implemented yet
+
+---
+ heartbeat/http-mon.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/heartbeat/http-mon.sh b/heartbeat/http-mon.sh
+index ce13ccd39a..ddd79c1f92 100644
+--- a/heartbeat/http-mon.sh
++++ b/heartbeat/http-mon.sh
+@@ -21,7 +21,7 @@ if ocf_is_true "$OCF_RESKEY_use_ipv6" || echo "$STATUSURL" | grep -qs "::"; then
+ 	bind_address="::1"
+ 	curl_ipv6_opts="-g"
+ fi
+-WGETOPTS="-O- -q -L --no-proxy --bind-address=$bind_address"
++WGETOPTS="-O- -q --no-proxy --bind-address=$bind_address"
+ CURLOPTS="-o - -Ss -L --interface lo $curl_ipv6_opts"
+ 
+ request_url_header() {
+@@ -58,6 +58,8 @@ curl_func() {
+ 	fi
+ }
+ wget_func() {
++	# -L not implemented in wget2
++	wget -V | grep -q "^GNU Wget2 " || WGETOPTS="$WGETOPTS -L"
+ 	auth=""
+ 	cl_opts="$WGETOPTS $test_httpclient_opts"
+ 	[ x != "x$test_user" ] &&

resource-agents.spec

@@ -45,12 +45,13 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.13.0
-Release:	4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Patch0: 	pgsqlms-ra.patch
 Patch1: 	configure-fix-sanity-check-autoconf-2.72.patch
+Patch2: 	RHEL-40720-apache-dont-use-L-for-wget2.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -202,6 +203,7 @@ exit 1
 %setup -q -n %{upstream_prefix}-%{upstream_version}
 %patch -p1 -P 0
 %patch -p1 -P 1
+%patch -p1 -P 2
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -514,6 +516,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Jun 26 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.13.0-5
+- apache: dont use -L for wget2
+
+  Resolves: RHEL-40720
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.13.0-4.1
 - Bump release for June 2024 mass rebuild