From 70f0422fc388d6a879511d70f7b01c4d88c18efe Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Mar 07 2023 10:37:27 +0000
Subject: Bump to 2.2.29


Latest upstream release in 2.2 LTS branch.

---

diff --git a/.haproxy.metadata b/.haproxy.metadata
index 3d2a7e7..c92340d 100644
--- a/.haproxy.metadata
+++ b/.haproxy.metadata
@@ -1 +1 @@
-c1b6c1d4d5de55bcad874a0a7a02a94db5638b1f SOURCES/haproxy-1.8.23.tar.gz
+f439f6e0666a34bb984270d7e88e7479a2a300c5 SOURCES/haproxy-2.2.29.tar.gz
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
index 430cef9..97f073f 100644
--- a/SPECS/haproxy.spec
+++ b/SPECS/haproxy.spec
@@ -7,8 +7,8 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        2.2.3
-Release:        2%{?dist}
+Version:        2.2.29
+Release:        1%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 License:        GPLv2+
@@ -21,8 +21,6 @@ Source3:        %{name}.logrotate
 Source4:        %{name}.sysconfig
 Source5:        halog.1
 
-Patch0:		0001-BUILD-threads-workaround-for-late-loading-of-libgcc_s.patch
-
 BuildRequires:  gcc
 BuildRequires:  lua-devel
 BuildRequires:  pcre2-devel
@@ -50,7 +48,6 @@ availability environments. Indeed, it can:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 regparm_opts=
@@ -135,7 +132,35 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
-* Thu Sep 16 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.3-2
+* Tue Mar 07 2023 Alfredo Moralejo <amoralej@redhat.com> -2.2.29-1
+- Update to 2.2.29
+
+* Mon Mar 14 2022 Alfredo Moralejo <amoralej@redhat.com> -2.2.21-1
+- Update to 2.2.21
+
+* Thu Sep 09 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.17-1
+- Update to 2.2.17
+- Fix request smuggling attack or response splitting (CVE-2021-40346, #2002411)
+
+* Wed Aug 18 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.16-1
+- Update to 2.2.16
+- Fix domain parts in :scheme and :path fields (CVE-2021-39240, #1995105)
+- Fix spaces in the :method field (CVE-2021-39241, #1995109)
+- Fix mismatch between :authority and Host fields (CVE-2021-39242, #1995113)
+
+* Tue Apr 06 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.13-1
+- Update to 2.2.13
+
+* Tue Feb 16 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.9-1
+- Update to 2.2.9
+
+* Mon Dec 14 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.6-1
+- Update to 2.2.6
+
+* Thu Oct 01 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.4-1
+- Update to 2.2.4 (#1883742)
+    
+* Thu Sep 17 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.3-2
 - Fix build for late loading of libgcc_s
 
 * Mon Sep 14 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.3-1