[WIP] Validate haproxy28-2.8.18

[lihongan]

Rebase latest https://pkgs.devel.redhat.com/cgit/rpms/haproxy/commit/?h=rhaos-4.22-rhel-9
and rebuid the rpm

brew build: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=69881815

$ git show 059e87db963fce0f6dd6265964829126b83e3055
commit 059e87db963fce0f6dd6265964829126b83e3055 (HEAD -> rhaos-4.22-rhel-9)
Author: Hongan Li <hongli@redhat.com>
Date:   Wed Jan 21 09:55:16 2026 +0800

    NE-2210: Bump to haproxy 2.8.18
    
      - Resolves https://issues.redhat.com/browse/NE-2210
      - Bump to 2.8.18
      - Update release to 1.rhaos4.22
      - Carry fix for OCPBUGS-60885 (https://github.com/haproxy/haproxy/issues/3124)
      - Fix obsolete patch syntax (%patch0 -> %patch -P0)

diff --git a/.gitignore b/.gitignore
index 58118d1..40b6e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /haproxy-2.6.13.tar.gz
 /haproxy-2.8.5.tar.gz
 /haproxy-2.8.10.tar.gz
+/haproxy-2.8.18.tar.gz
diff --git a/haproxy.spec b/haproxy.spec
index 5ae4c96..ffff0d2 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -21,8 +21,8 @@
 %define real_name haproxy28
 
 Name:           haproxy
-Version:        2.8.10
-Release:        2.rhaos4.21%{?dist}
+Version:        2.8.18
+Release:        1.rhaos4.22%{?dist}
 Summary:        Do not ship, install or use this, use %{real_name} subpackage instead
 
 License:        GPLv2+
@@ -30,7 +30,7 @@ License:        GPLv2+
 URL:            http://www.haproxy.org/
 Source0:        http://www.haproxy.org/download/2.8/src/haproxy-%{version}.tar.gz
 
-# Backport of the following upstream commits into 2.8.10:
+# Backport of the following upstream commits into 2.8.18:
 # - http://git.haproxy.org/?p=haproxy.git;a=commit;h=7ea80cc5b66e9a9e8e5618532f1c6deb93385761
 # - http://git.haproxy.org/?p=haproxy.git;a=commit;h=1afaa7b59d6c407d68683b821f3142654a37b17e
 # To fix https://issues.redhat.com/browse/OCPBUGS-60885.
@@ -71,7 +71,7 @@ availability environments. Indeed, it can:
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
 
 %build
 regparm_opts=
@@ -118,6 +118,10 @@ fi
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Jan 21 2026 Hongan Li <hongli@redhat.com> - 2.8.18-1.rhaos4.22
+- Bump to 2.8.18
+- Carry fix for https://github.com/haproxy/haproxy/issues/3124
+
 * Mon Jan 19 2026 Andrey Lebedev <alebedev@redhat.com> - 2.8.10-2.rhaos4.21
 - Update release version to 2.8.10-2 to fix RPM selection for OCP 4.21.
 
diff --git a/sources b/sources
index 501fe14..ee2caae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (haproxy-2.8.10.tar.gz) = 0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2
+SHA512 (haproxy-2.8.18.tar.gz) = 9bb4598b4197927ac46285c4dffe54d90177b0929e0ff8db1966f294f5e6b300bf33044b0b4925bbba565068bc722ea19f984e1b6b4850f02897691343bd841c

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign bentito for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[lihongan]

/retest

[lihongan]

/retest

[openshift-ci]

@lihongan: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/images	64b07b0	link	true	/test images
ci/prow/e2e-agnostic	64b07b0	link	true	/test e2e-agnostic
ci/prow/e2e-aws-serial-1of2	64b07b0	link	true	/test e2e-aws-serial-1of2
ci/prow/e2e-aws-serial-2of2	64b07b0	link	true	/test e2e-aws-serial-2of2
ci/prow/e2e-upgrade	64b07b0	link	true	/test e2e-upgrade

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.