- apache: prefer curl due to wget2 issues, and dont use -L for wget2

Resolves: RHEL-40720

RHEL-40720-prefer-curl-dont-use-L-for-wget2.patch

@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 1/2] apache/http-mon.sh: dont use -L for wget2 as it's not
  implemented yet
 
 ---
@@ -30,3 +30,31 @@ index ce13ccd39a..ddd79c1f92 100644
  	auth=""
  	cl_opts="$WGETOPTS $test_httpclient_opts"
  	[ x != "x$test_user" ] &&
+
+From b2ca07d84f023623eed6d81edb26eb3dd597e7e3 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 26 Jun 2024 16:05:24 +0200
+Subject: [PATCH 2/2] apache/http-mon.sh: prefer curl due to new wget2 issues,
+ including not being able to resolve hostnames from /etc/hosts
+
+---
+ heartbeat/http-mon.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/heartbeat/http-mon.sh b/heartbeat/http-mon.sh
+index ddd79c1f92..44ca8968e1 100644
+--- a/heartbeat/http-mon.sh
++++ b/heartbeat/http-mon.sh
+@@ -79,10 +79,10 @@ findhttpclient() {
+ 	# prefer wget (for historical reasons)
+ 	if [ "x$CLIENT" != x ] && which "$CLIENT" >/dev/null 2>&1; then
+ 		echo "$CLIENT"
+-	elif which wget >/dev/null 2>&1; then
+-		echo "wget"
+ 	elif which curl >/dev/null 2>&1; then
+ 		echo "curl"
++	elif which wget >/dev/null 2>&1; then
++		echo "wget"
+ 	else
+ 		return 1
+ 	fi

resource-agents.spec

@@ -45,13 +45,13 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.13.0
-Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	6%{?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
+Patch2: 	RHEL-40720-prefer-curl-dont-use-L-for-wget2.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -516,8 +516,8 @@ 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
+* Thu Jun 27 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.13.0-6
+- apache: prefer curl due to wget2 issues, and dont use -L for wget2
 
   Resolves: RHEL-40720