From 8ac3c529a188e98e87dbe7c4421a5b92d61638b8 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 25 May 2022 10:58:33 -0500
Subject: [PATCH] Update to 2.5.7 (#2026009)

---
 bz2022031-fix-openssl-build.patch | 45 -------------------------------
 haproxy.spec                      | 10 +++----
 sources                           |  2 +-
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 bz2022031-fix-openssl-build.patch

diff --git a/bz2022031-fix-openssl-build.patch b/bz2022031-fix-openssl-build.patch
deleted file mode 100644
index bac19bd..0000000
--- a/bz2022031-fix-openssl-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f22b032956bc492dcf47b2a909f91a6fb2c6e49b Mon Sep 17 00:00:00 2001
-From: William Lallemand <wlallemand@haproxy.org>
-Date: Wed, 2 Jun 2021 16:09:11 +0200
-Subject: [PATCH] BUILD: fix compilation for OpenSSL-3.0.0-alpha17
-
-Some changes in the OpenSSL syntax API broke this syntax:
-  #if SSL_OP_NO_TLSv1_3
-
-OpenSSL made this change which broke our usage in commit f04bb0bce490de847ed0482b8ec9eabedd173852:
-
--# define SSL_OP_NO_TLSv1_3                               (uint64_t)0x20000000
-+#define SSL_OP_BIT(n)  ((uint64_t)1 << (uint64_t)n)
-+# define SSL_OP_NO_TLSv1_3                               SSL_OP_BIT(29)
-
-Which can't be evaluated by the preprocessor anymore.
-This patch replace the test by an openssl version test.
-
-This fix part of #1276 issue.
----
- src/ssl_sock.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ssl_sock.c b/src/ssl_sock.c
-index f596a831d..27a4c3531 100644
---- a/src/ssl_sock.c
-+++ b/src/ssl_sock.c
-@@ -2217,13 +2217,13 @@ static void ssl_set_TLSv12_func(SSL *ssl, set_context_func c) {
- 		: SSL_set_min_proto_version(ssl, TLS1_2_VERSION);
- }
- static void ctx_set_TLSv13_func(SSL_CTX *ctx, set_context_func c) {
--#if SSL_OP_NO_TLSv1_3
-+#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
- 	c == SET_MAX ? SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION)
- 		: SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
- #endif
- }
- static void ssl_set_TLSv13_func(SSL *ssl, set_context_func c) {
--#if SSL_OP_NO_TLSv1_3
-+#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
- 	c == SET_MAX ? SSL_set_max_proto_version(ssl, TLS1_3_VERSION)
- 		: SSL_set_min_proto_version(ssl, TLS1_3_VERSION);
- #endif
--- 
-2.31.1
-
diff --git a/haproxy.spec b/haproxy.spec
index 98c4a33..00ccfcd 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -7,8 +7,8 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        2.4.8
-Release:        4%{?dist}
+Version:        2.5.7
+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:         bz2022031-fix-openssl-build.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=
@@ -134,6 +131,9 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Wed May 25 2022 Ryan O'Hara <rohara@redhat.com> - 2.5.7-1
+- Update to 2.5.7 (#2026009)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e4dbe2..2788a83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (haproxy-2.4.8.tar.gz) = 8e1d28191a8c26d46989359a213444f30a09e439d32b5ab6cb01a3ca267788fc7677dd14deaa43a7f6c7741cbf6c8fcf6cdd5cf927d23e48f82b9e7723d8a6f9
+SHA512 (haproxy-2.5.7.tar.gz) = cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9