[packages/haproxy] - up to 2.4.7

[baggins]

commit 36a26d1175790f73fdda3c42c9500d2dc79519ef
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 25 23:57:36 2021 +0200

    - up to 2.4.7

 haproxy.spec  | 28 ++++++++++++++++++----------
 openssl.patch | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)
---
diff --git a/haproxy.spec b/haproxy.spec
index 5585bb7..a7e47ff 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:	1.8.30
+Version:	2.4.7
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.haproxy.org/download/1.8/src/%{name}-%{version}.tar.gz
-# Source0-md5:	4ce216de30d16217a3510b974b91580c
+Source0:	http://www.haproxy.org/download/2.4/src/%{name}-%{version}.tar.gz
+# Source0-md5:	67d28ee9a39973bf17a38563d39ea81e
 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,6 +23,7 @@ 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}
@@ -97,9 +98,9 @@ haproxy.
 
 %prep
 %setup -q
+%patch0 -p1
 
 cp -p %{SOURCE2} .
-mv examples/haproxy.vim .
 mv examples/errorfiles .
 mv doc/gpl.txt .
 
@@ -110,7 +111,7 @@ regparm_opts="USE_REGPARM=1"
 %endif
 
 %{__make} $regparm_opts \
-	TARGET="linux2628" \
+	TARGET="linux-glibc" \
 	CPU="generic" \
 	%{?with_lua:USE_LUA=1 LUA_LIB_NAME=lua5.3 LUA_INC=%{_includedir}/lua5.3} \
 	%{?with_ssl:USE_OPENSSL=1} \
@@ -120,11 +121,15 @@ regparm_opts="USE_REGPARM=1"
 	ADDINC="%{rpmcflags}" \
 	ADDLIB="%{rpmldflags}"
 
-%{__make} -C contrib/halog halog \
+%{__make} admin/halog/halog \
 	CC="%{__cc}" \
 	OPTIMIZE="%{optflags}"
 
-%{__make} -C contrib/iprange iprange \
+%{__make} admin/iprange/iprange \
+	CC="%{__cc}" \
+	OPTIMIZE="%{optflags}"
+
+%{__make} admin/iprange/ip6range \
 	CC="%{__cc}" \
 	OPTIMIZE="%{optflags}"
 
@@ -138,12 +143,14 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name}/lua,/etc/r
 	PREFIX=%{_prefix} \
 	DESTDIR=$RPM_BUILD_ROOT \
 
-install -p contrib/halog/halog $RPM_BUILD_ROOT%{_sbindir}/halog
-install -p contrib/iprange/iprange $RPM_BUILD_ROOT%{_sbindir}/iprange
+install -p admin/halog/halog $RPM_BUILD_ROOT%{_sbindir}/halog
+install -p admin/iprange/iprange $RPM_BUILD_ROOT%{_sbindir}/iprange
+install -p admin/iprange/iprange $RPM_BUILD_ROOT%{_sbindir}/ip6range
+
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/haproxy.cfg
-cp -p haproxy.vim $RPM_BUILD_ROOT%{_vimdatadir}/syntax
+cp -p admin/syntax-highlight/haproxy.vim $RPM_BUILD_ROOT%{_vimdatadir}/syntax
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_vimdatadir}/ftdetect/haproxy.vim
 cp -a errorfiles $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -p acme-http01-webroot.lua $RPM_BUILD_ROOT%{_datadir}/%{name}/lua
@@ -180,6 +187,7 @@ fi
 %attr(755,root,root) %{_sbindir}/halog
 %attr(755,root,root) %{_sbindir}/haproxy
 %attr(755,root,root) %{_sbindir}/iprange
+%attr(755,root,root) %{_sbindir}/ip6range
 %{_mandir}/man1/halog.1*
 %{_mandir}/man1/haproxy.1*
 %{_datadir}/%{name}
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..e0a04da
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,18 @@
+--- 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/36a26d1175790f73fdda3c42c9500d2dc79519ef