From a83a71793f22c3fa8022ca62253a828a5db98e2e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 2 Nov 2021 16:23:24 -0400 Subject: [PATCH] import haproxy-2.4.3-1.el9 --- .gitignore | 1 + .haproxy.metadata | 1 + SOURCES/bz1984786-fix-openssl-build.patch | 45 ++ SOURCES/halog.1 | 108 ++++ SOURCES/haproxy.cfg | 90 +++ SOURCES/haproxy.logrotate | 12 + SOURCES/haproxy.service | 18 + SOURCES/haproxy.sysconfig | 4 + SPECS/haproxy.spec | 678 ++++++++++++++++++++++ 9 files changed, 957 insertions(+) create mode 100644 .gitignore create mode 100644 .haproxy.metadata create mode 100644 SOURCES/bz1984786-fix-openssl-build.patch create mode 100644 SOURCES/halog.1 create mode 100644 SOURCES/haproxy.cfg create mode 100644 SOURCES/haproxy.logrotate create mode 100644 SOURCES/haproxy.service create mode 100644 SOURCES/haproxy.sysconfig create mode 100644 SPECS/haproxy.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6bde7b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/haproxy-2.4.3.tar.gz diff --git a/.haproxy.metadata b/.haproxy.metadata new file mode 100644 index 0000000..fcfdee8 --- /dev/null +++ b/.haproxy.metadata @@ -0,0 +1 @@ +af261bfea050ecf8b1bd3d43ae78ccfb945ef64d SOURCES/haproxy-2.4.3.tar.gz diff --git a/SOURCES/bz1984786-fix-openssl-build.patch b/SOURCES/bz1984786-fix-openssl-build.patch new file mode 100644 index 0000000..bac19bd --- /dev/null +++ b/SOURCES/bz1984786-fix-openssl-build.patch @@ -0,0 +1,45 @@ +From f22b032956bc492dcf47b2a909f91a6fb2c6e49b Mon Sep 17 00:00:00 2001 +From: William Lallemand +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/SOURCES/halog.1 b/SOURCES/halog.1 new file mode 100644 index 0000000..39a9711 --- /dev/null +++ b/SOURCES/halog.1 @@ -0,0 +1,108 @@ +.TH HALOG "1" "July 2013" "halog" "User Commands" +.SH NAME +halog \- HAProxy log statistics reporter +.SH SYNOPSIS +.B halog +[\fI-h|--help\fR] +.br +.B halog +[\fIoptions\fR] +Only match response times larger|smaller than