public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Robert Scheck <robert@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/haproxy] f43: Really synchronize with f44
Date: Fri, 26 Jun 2026 13:48:05 GMT	[thread overview]
Message-ID: <178248168553.1.5252979274612445073.rpms-haproxy-2c4fbfa6f42b@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/haproxy
Branch : f43
Commit : 2c4fbfa6f42b24371296a9d23969954d02789212
Author : Robert Scheck <robert@fedoraproject.org>
Date   : 2026-06-26T15:47:49+02:00
Stats  : +11/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/haproxy/c/2c4fbfa6f42b24371296a9d23969954d02789212?branch=f43

Log:
Really synchronize with f44

---
diff --git a/haproxy.spec b/haproxy.spec
index c1fe9ff..146be55 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -18,7 +18,7 @@ BuildRequires:  %{__cc}
 BuildRequires:  libxcrypt-devel
 BuildRequires:  lua-devel
 BuildRequires:  make
-BuildRequires:  openssl-devel >= 3.5.2
+BuildRequires:  openssl-devel
 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,14 +71,19 @@ 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/ and examples/ for %%doc inclusion
+# Prepare doc/ for %%doc inclusion
 mv -f doc/{gpl,lgpl}.txt .
-rm -f doc/{gpl,lgpl}.txt doc/%{name}.1 examples/%{name}.init
+rm -f doc/{gpl,lgpl}.txt doc/%{name}.1
 
 %pre
 %sysusers_create_compat %{SOURCE5}
@@ -94,7 +99,7 @@ rm -f doc/{gpl,lgpl}.txt doc/%{name}.1 examples/%{name}.init
 
 %files
 %license LICENSE gpl.txt lgpl.txt
-%doc CHANGELOG README.md doc/* examples/
+%doc CHANGELOG README doc/* examples/
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.cfg
 %dir %{_sysconfdir}/%{name}/conf.d/
@@ -107,6 +112,7 @@ rm -f doc/{gpl,lgpl}.txt doc/%{name}.1 examples/%{name}.init
 %{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_sysusersdir}/%{name}.conf
+%{_datadir}/%{name}/
 %{_mandir}/man1/halog.1*
 %{_mandir}/man1/%{name}.1*
 %dir %{_localstatedir}/lib/%{name}/

                 reply	other threads:[~2026-06-26 13:48 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178248168553.1.5252979274612445073.rpms-haproxy-2c4fbfa6f42b@fedoraproject.org \
    --to=robert@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox