[rpms/haproxy] f43: Fix accidential merge from rawhide instead of f44

[rpms/haproxy] f43: Fix accidential merge from rawhide instead of f44

[Robert Scheck]

A new commit has been pushed.

Repo   : rpms/haproxy
Branch : f43
Commit : 51d85f874699b9c0e9a8e028328f8538bd074dee
Author : Robert Scheck <robert@fedoraproject.org>
Date   : 2026-06-26T14:32:19+02:00
Stats  : +52/-34 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/haproxy/c/51d85f874699b9c0e9a8e028328f8538bd074dee?branch=f43

Log:
Fix accidential merge from rawhide instead of f44

---
diff --git a/haproxy-3.0.17-lua-5.5.patch b/haproxy-3.0.17-lua-5.5.patch
new file mode 100644
index 0000000..f94c2ed
--- /dev/null
+++ b/haproxy-3.0.17-lua-5.5.patch
@@ -0,0 +1,31 @@
+From 1c0f781994a89b5cbd7b4b893c23e6d2b75b1764 Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Fri, 2 Jan 2026 14:38:10 +0000
+Subject: [PATCH] MINOR: hlua: Add support for lua 5.5
+
+Lua 5.5 adds an extra argument to lua_newstate(). Since there are
+already a few other ifdefs in hlua.c checking for the Lua version,
+and there's a single call place, let's do the same here. This should
+be safe for backporting if needed.
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ src/hlua.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/hlua.c b/src/hlua.c
+index 5109d3c04b33..bb73b377c571 100644
+--- a/src/hlua.c
++++ b/src/hlua.c
+@@ -14027,7 +14027,11 @@ lua_State *hlua_init_state(int thread_num)
+ 	struct prepend_path *pp;
+ 
+ 	/* Init main lua stack. */
++#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 505
++	L = lua_newstate(hlua_alloc, &hlua_global_allocator, luaL_makeseed(0));
++#else
+ 	L = lua_newstate(hlua_alloc, &hlua_global_allocator);
++#endif
+ 
+ 	if (!L) {
+ 		fprintf(stderr,

diff --git a/haproxy.logrotate b/haproxy.logrotate
index 1fcf3cc..a036ec1 100644
--- a/haproxy.logrotate
+++ b/haproxy.logrotate
@@ -1,12 +1,13 @@
 /var/log/haproxy.log /var/log/haproxy/*.log {
-	daily
-	rotate 10
-	missingok
-	compress
-	delaycompress
-	notifempty
-	postrotate
-		systemctl try-reload-or-restart rsyslog.service syslog-ng.service
-	endscript
-	sharedscripts
+    daily
+    rotate 10
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+    postrotate
+        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
 }

diff --git a/haproxy.spec b/haproxy.spec
index 9049f7f..c1fe9ff 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -2,7 +2,7 @@
 
 Summary:        Reliable, high-performance TCP/HTTP load-balancing reverse proxy
 Name:           haproxy
-Version:        3.4.1
+Version:        3.0.24
 Release:        1%{?dist}
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://www.haproxy.org/
@@ -13,6 +13,7 @@ Source3:        %{name}.logrotate
 Source4:        %{name}.sysconfig
 Source5:        %{name}.sysusersd
 Source6:        https://salsa.debian.org/haproxy-team/haproxy/-/raw/c30a7411203b8c4234698e47325d2543359f9d66/debian/halog.1
+Patch0:         https://github.com/haproxy/haproxy/commit/1c0f781994a89b5cbd7b4b893c23e6d2b75b1764.patch#/haproxy-3.0.17-lua-5.5.patch
 BuildRequires:  %{__cc}
 BuildRequires:  libxcrypt-devel
 BuildRequires:  lua-devel
@@ -111,19 +112,10 @@ rm -f doc/{gpl,lgpl}.txt doc/%{name}.1 examples/%{name}.init
 %dir %{_localstatedir}/lib/%{name}/
 
 %changelog
-* Thu Jun 25 2026 Robert Scheck <robert@fedoraproject.org> - 3.4.1-1
-- Upgrade to 3.4.1 (#2492990)
+* Fri Jun 26 2026 Robert Scheck <robert@fedoraproject.org> - 3.0.24-1
+- Upgrade to 3.0.24
 - Add logrotate improvements (thanks to Xose Vazquez Perez)
 
-* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 3.4.0-2
-- Rebuilt for openssl 4.0
-
-* Thu Jun 04 2026 Robert Scheck <robert@fedoraproject.org> - 3.4.0-1
-- Upgrade to 3.4.0 (#2324436)
-- Remove obsolete compile option MAX_SESS_STKCTR (#2368035)
-- Use systemctl in logrotate postrotate script (#2372782)
-- Move example error files from /usr/share/haproxy/ to %%doc
-
 * Mon May 18 2026 Robert Scheck <robert@fedoraproject.org> - 3.0.23-2
 - Revert to permissions 0755 for root:root on /var/lib/haproxy
 

diff --git a/sources b/sources
index c877f08..68104d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (haproxy-3.4.1.tar.gz) = 97deb43a9d52031106f432e07112b9bf9912597f9a9a3d42ca01685c76ff53cd0be5c62c299f959d181b95f4166126af8cb7d05271ed3622d2a30825ab89ebfb
+SHA512 (haproxy-3.0.24.tar.gz) = 7d7ab977264dddd6f9eada2273d6abb568244a09851ce68116ac2cb319c09b03c69b791836d4dd299661b443f0fda61b0d8b8ad8fd3a741f99cfca8d791bc6b9

diff --git a/haproxy.spec b/haproxy.spec
index 146be55..c1fe9ff 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -18,7 +18,7 @@ BuildRequires:  %{__cc}
 BuildRequires:  libxcrypt-devel
 BuildRequires:  lua-devel
 BuildRequires:  make
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel >= 3.5.2
 BuildRequires:  pcre2-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
@@ -50,13 +50,13 @@ availability environments. Indeed, it can:
   EXTRAVERSION="-%{release}" \
   USE_PCRE2=1 \
   USE_OPENSSL=1 \
+  USE_QUIC=1 \
   USE_LUA=1 \
   USE_PROMEX=1 \
   CC=%{__cc} \
   CFLAGS="%{build_cflags}" \
   LDFLAGS="%{build_ldflags}" \
   OPT_CFLAGS="" ARCH_FLAGS="" \
-  DEFINE=-DMAX_SESS_STKCTR=12 \
   EXTRA="admin/halog/halog admin/iprange/iprange admin/iprange/ip6range"
 
 %install
@@ -71,19 +71,14 @@ install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
 install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/halog.1
 mkdir -p %{buildroot}{%{_sysconfdir}/%{name}/conf.d,%{_localstatedir}/lib/%{name}}/
 
-for httpfile in $(find examples/errorfiles/ -type f); do
-  install -D -p -m 0644 ${httpfile} %{buildroot}%{_datadir}/%{name}/${httpfile##*/}
-done
-rm -rf examples/{errorfiles/,haproxy.init}
-
 # Convert from ISO-8859-1 to UTF-8
 iconv -f ISO-8859-1 -t UTF-8 -o doc/internals/connection-scale.txt{.utf8,}
 touch -c -r doc/internals/connection-scale.txt{,.utf8}
 mv -f doc/internals/connection-scale.txt{.utf8,}
 
-# Prepare doc/ for %%doc inclusion
+# Prepare doc/ and examples/ for %%doc inclusion
 mv -f doc/{gpl,lgpl}.txt .
-rm -f doc/{gpl,lgpl}.txt doc/%{name}.1
+rm -f doc/{gpl,lgpl}.txt doc/%{name}.1 examples/%{name}.init
 
 %pre
 %sysusers_create_compat %{SOURCE5}
@@ -99,7 +94,7 @@ rm -f doc/{gpl,lgpl}.txt doc/%{name}.1
 
 %files
 %license LICENSE gpl.txt lgpl.txt
-%doc CHANGELOG README doc/* examples/
+%doc CHANGELOG README.md doc/* examples/
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.cfg
 %dir %{_sysconfdir}/%{name}/conf.d/
@@ -112,7 +107,6 @@ rm -f doc/{gpl,lgpl}.txt doc/%{name}.1
 %{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_sysusersdir}/%{name}.conf
-%{_datadir}/%{name}/
 %{_mandir}/man1/halog.1*
 %{_mandir}/man1/%{name}.1*
 %dir %{_localstatedir}/lib/%{name}/