commit cbb1fbc70622cecb5d274ec1fdd43e6c41517783
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Thu Feb 2 20:22:05 2023 +0100
Up to 2.4.21
haproxy.spec | 10 ++++------
openssl.patch | 18 ------------------
2 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/haproxy.spec b/haproxy.spec
index 9fa01fc..fc9716b 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -10,12 +10,12 @@
Summary: haproxy - high-performance TCP/HTTP load balancer
Summary(pl.UTF-8): haproxy - wysoko wydajny load balancer TCP/HTTP
Name: haproxy
-Version: 2.4.7
-Release: 2
+Version: 2.4.21
+Release: 1
License: GPL v2
Group: Networking/Daemons
Source0:
http://www.haproxy.org/download/2.4/src/%{name}-%{version}.tar.gz
-# Source0-md5: 67d28ee9a39973bf17a38563d39ea81e
+# Source0-md5: c6cd9bc875c068e5ead2a7afbdabccc9
Source1:
https://github.com/makinacorpus/haproxy-1.5/raw/master/debian/halog.1
# Source1-md5: df4631f3cbc59893a2cd5e4364c9e755
Source2:
https://github.com/janeczku/haproxy-acme-validation-plugin/raw/master/acme-http01-webroot.lua
@@ -23,7 +23,6 @@ Source2:
https://github.com/janeczku/haproxy-acme-validation-plugin/raw/master/a
Source3: %{name}.cfg
Source4: %{name}-ft.vim
Source5: %{name}.init
-Patch0: openssl.patch
URL: http://www.haproxy.org/
%{?with_lua:BuildRequires: lua53-devel}
%{?with_ssl:BuildRequires: openssl-devel}
@@ -98,7 +97,6 @@ haproxy.
%prep
%setup -q
-%patch0 -p1
cp -p %{SOURCE2} .
mv examples/errorfiles .
@@ -180,7 +178,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc CHANGELOG README README ROADMAP examples/* doc/* tests
+%doc CHANGELOG README ROADMAP examples/* doc/* tests
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/haproxy.cfg
%attr(754,root,root) /etc/rc.d/init.d/%{name}
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index e0a04da..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- haproxy-2.4.7/src/ssl_sock.c~ 2021-10-04 14:56:33.000000000 +0200
-+++ haproxy-2.4.7/src/ssl_sock.c 2021-10-25 23:49:26.805909724 +0200
-@@ -2270,13 +2270,13 @@
- : 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/haproxy.git/commitdiff/cbb1fbc70622cecb5d274ec1fdd43e6c41517783
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
