[rpms/haproxy] main: - Upgrade to 3.4.0 (#2324436)

[rpms/haproxy] main: - Upgrade to 3.4.0 (#2324436)

[Robert Scheck]

            A new commit has been pushed.

            Repo   : rpms/haproxy
            Branch : main
            Commit : 079233dec1608e7cabe8359cd708d72c6bc21caa
            Author : Robert Scheck <robert@fedoraproject.org>
            Date   : 2026-06-04T02:56:18+02:00
            Stats  : +25/-58 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/haproxy/c/079233dec1608e7cabe8359cd708d72c6bc21caa?branch=main

            Log:
            - 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

---
diff --git a/haproxy-3.0.17-lua-5.5.patch b/haproxy-3.0.17-lua-5.5.patch
deleted file mode 100644
index f94c2ed..0000000
--- a/haproxy-3.0.17-lua-5.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 96544e0..03c1aa0 100644
--- a/haproxy.logrotate
+++ b/haproxy.logrotate
@@ -1,12 +1,11 @@
 /var/log/haproxy.log {
-    daily
-    rotate 10
-    missingok
-    notifempty
-    compress
-    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
+	daily
+	rotate 10
+	missingok
+	compress
+	notifempty
+	postrotate
+		systemctl try-reload-or-restart rsyslog.service syslog-ng.service
+	endscript
+	sharedscripts
 }

diff --git a/haproxy.spec b/haproxy.spec
index 494c284..9adf0c8 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -2,8 +2,8 @@
 
 Summary:        Reliable, high-performance TCP/HTTP load-balancing reverse proxy
 Name:           haproxy
-Version:        3.0.23
-Release:        2%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://www.haproxy.org/
 Source0:        https://www.haproxy.org/download/%(b=%{version}; echo ${b%.*})/src/%{name}-%{version}.tar.gz
@@ -13,12 +13,11 @@ 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:  gcc
+BuildRequires:  %{__cc}
 BuildRequires:  libxcrypt-devel
 BuildRequires:  lua-devel
 BuildRequires:  make
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel >= 3.5.1
 BuildRequires:  pcre2-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
@@ -49,13 +48,13 @@ availability environments. Indeed, it can:
   EXTRAVERSION="-%{release}" \
   USE_PCRE2=1 \
   USE_OPENSSL=1 \
+  USE_QUIC=1 \
   USE_LUA=1 \
   USE_PROMEX=1 \
-  CC=gcc \
+  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
@@ -70,19 +69,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}
@@ -98,7 +92,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/
@@ -110,12 +104,17 @@ 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}/
 
 %changelog
+* 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 1761e58..da277e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (haproxy-3.0.23.tar.gz) = d75d30069026f5f6270d3600d4699dc69b189cd8db3fd0e100c13068bc509c3232f3f10c54246a0ef132901ed9093a06105cc62bd30b448a7c2304b569120e01
+SHA512 (haproxy-3.4.0.tar.gz) = 982dd97c9d148179e12cdac0e9675960c665f64a9cfb02eb974de9844ef7edfc1d0b99a3a1b3b8e9b145b475fbb9bfe764548486445f66805fc26cf619815310