Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2025-06-18 17:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.19631 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy" Wed Jun 18 17:58:33 2025 rev:160 rq:1286645 version:3.2.0+git0.e134140d2 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2025-06-04 20:27:33.474508346 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new.19631/haproxy.changes 2025-06-18 17:58:57.323107590 +0200 @@ -1,0 +2,19 @@ +Wed Jun 11 10:50:55 UTC 2025 - Marcus Rueckert <mrueck...@suse.de> + +- modernize spec file with spec-cleaner. some changes (mostly + whitespaces) got reverted for readability + +------------------------------------------------------------------- +Wed Jun 11 10:44:58 UTC 2025 - Marcus Rueckert <mrueck...@suse.de> + +- Add support to build against aws-lc with --with=awslc or in the + project config + + ``` + %define _with_awslc 1 + Macros: + %_with_awslc 1 + :Macros + ``` + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.EziVHU/_old 2025-06-18 17:58:58.131140116 +0200 +++ /var/tmp/diff_new_pack.EziVHU/_new 2025-06-18 17:58:58.135140277 +0200 @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # => notes regarding QUIC in README.SUSE.PACKAGING + +%define pkg_name haproxy +%define pkg_home %{_localstatedir}/lib/%{pkg_name} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim/%(readlink %{_datadir}/vim/current)} + %if 0%{?suse_version} > 1600 %bcond_without quic %else @@ -64,12 +69,45 @@ %bcond_with tmpfiles %endif +%bcond_with awslc + Name: haproxy Version: 3.2.0+git0.e134140d2 Release: 0 # +Summary: The Reliable, High Performance TCP/HTTP Load Balancer +License: GPL-3.0-or-later AND LGPL-2.1-or-later +Group: Productivity/Networking/Web/Proxy +# +URL: https://www.haproxy.org/ +# source URL in _service file +Source: haproxy-%{version}.tar.gz +Source1: %{pkg_name}.init +Source2: usr.sbin.haproxy.apparmor +Source3: local.usr.sbin.haproxy.apparmor +Source4: haproxy.cfg +Source5: haproxy-user.conf +Source6: haproxy-tmpfiles.conf +Source7: README.SUSE +Source8: README.SUSE.PACKAGING +# +Source98: series +Source99: haproxy-rpmlintrc +Patch1: haproxy-1.6.0_config_haproxy_user.patch +Patch2: haproxy-1.6.0-makefile_lib.patch +Patch3: haproxy-1.6.0-sec-options.patch +Patch4: haproxy-service.patch +BuildRequires: libgcrypt-devel +BuildRequires: pcre2-devel +BuildRequires: pkgconfig +BuildRequires: vim +BuildRequires: zlib-devel +Provides: %{name}-doc = %{version} +Obsoletes: %{name}-doc < %{version} +Provides: haproxy-1.5 = %{version} +Obsoletes: haproxy-1.5 < %{version} +# # -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with apparmor} %if 0%{?suse_version} <= 1315 BuildRequires: apparmor-profiles @@ -82,59 +120,28 @@ BuildRequires: apparmor-rpm-macros %endif %endif -BuildRequires: libgcrypt-devel %if %{with lua} BuildRequires: lua-devel >= 5.3 %endif -BuildRequires: pcre2-devel -BuildRequires: zlib-devel +%if %{with awslc} +BuildRequires: aws-lc-devel +%else BuildRequires: openssl-devel -BuildRequires: pkg-config +%endif %if %{with systemd} -BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) %if %{with sysusers} BuildRequires: sysuser-shadow BuildRequires: sysuser-tools %endif %endif -BuildRequires: vim -%define pkg_name haproxy -%define pkg_home /var/lib/%{pkg_name} -# -Url: http://www.haproxy.org/ -# source URL in _service file -Source: haproxy-%{version}.tar.gz -Source1: %{pkg_name}.init -Source2: usr.sbin.haproxy.apparmor -Source3: local.usr.sbin.haproxy.apparmor -Source4: haproxy.cfg -Source5: haproxy-user.conf -Source6: haproxy-tmpfiles.conf -Source7: README.SUSE -Source8: README.SUSE.PACKAGING -Patch1: haproxy-1.6.0_config_haproxy_user.patch -Patch2: haproxy-1.6.0-makefile_lib.patch -Patch3: haproxy-1.6.0-sec-options.patch -Patch4: haproxy-service.patch -# -Source98: series -Source99: haproxy-rpmlintrc -# -Summary: The Reliable, High Performance TCP/HTTP Load Balancer -License: GPL-3.0+ and LGPL-2.1+ -Group: Productivity/Networking/Web/Proxy -Provides: %{name}-doc = %{version} -Obsoletes: %{name}-doc < %{version} -Provides: haproxy-1.5 = %{version} -Obsoletes: haproxy-1.5 < %{version} %if %{with systemd} %{?systemd_ordering} %if %{with sysusers} %sysusers_requires %endif %endif -%{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)} %description HAProxy implements an event-driven, mono-process model which enables support @@ -152,18 +159,22 @@ cp %{SOURCE7} . %build -make %{?_smp_mflags} \ +%make_build \ TARGET=linux-glibc \ CPU="%{_target_cpu}" \ USE_PCRE2=1 \ %if %{with pcre2_jit} USE_PCRE2_JIT=1 \ %endif - %ifarch %ix86 + %ifarch %{ix86} USE_REGPARM=1 \ %endif USE_GETADDRINFO=1 \ +%if %{with awslc} + USE_OPENSSL_AWSLC=1 \ +%else USE_OPENSSL=1 \ +%endif %if %{with lua} USE_LUA=1 \ %endif @@ -185,7 +196,9 @@ USE_PROMEX=1 \ %if %{with quic} USE_QUIC=1 \ +%if %{without awslc} USE_QUIC_OPENSSL_COMPAT=1 \ +%endif %endif %if %{with opentracing} USE_OT=1 \ @@ -195,17 +208,17 @@ %endif DEBUG_CFLAGS="%{optflags}" V=1 %if %{with systemd} -make -C admin/systemd PREFIX="%{_prefix}" +%make_build -C admin/systemd PREFIX="%{_prefix}" %if %{with sysusers} %sysusers_generate_pre %{SOURCE5} haproxy haproxy-user.conf %endif %endif -make admin/halog/halog DEBUG_CFLAGS="%{optflags}" V=1 +%make_build admin/halog/halog DEBUG_CFLAGS="%{optflags}" %install install -D -m 0755 %{pkg_name} %{buildroot}%{_sbindir}/%{pkg_name} install -d -m 0750 %{buildroot}%{_sysconfdir}/%{pkg_name}/ -install -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg +install -m 0640 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg install -D -m 0755 admin/halog/halog %{buildroot}%{_sbindir}/haproxy-halog @@ -221,7 +234,7 @@ install -D -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif %else -install -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} +install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} ln -fs %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} %endif @@ -229,9 +242,9 @@ install -D -m 0644 admin/syntax-highlight/haproxy.vim %{buildroot}%{vim_data_dir}/syntax/%{pkg_name}.vim install -D -m 0644 doc/%{pkg_name}.1 %{buildroot}%{_mandir}/man1/%{pkg_name}.1 %if %{with apparmor} -install -D -m 0644 %{S:2} %{buildroot}/etc/apparmor.d/usr.sbin.haproxy -install -D -m 0644 %{S:3} %{buildroot}/etc/apparmor.d/local/haproxy -install -D -m 0644 %{S:3} %{buildroot}/etc/apparmor.d/local/usr.sbin.haproxy +install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.haproxy +install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/local/haproxy +install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/local/usr.sbin.haproxy %endif rm examples/*init* @@ -247,7 +260,7 @@ %post %if %{with apparmor} && %{with apparmor_reload} -%apparmor_reload /etc/apparmor.d/usr.sbin.haproxy +%apparmor_reload %{_sysconfdir}/apparmor.d/usr.sbin.haproxy %endif %if %{with systemd} %if %{with tmpfiles} @@ -261,19 +274,17 @@ %postun %service_del_postun %{pkg_name}.service - %else - %pre -getent group %{pkg_name} >/dev/null || /usr/sbin/groupadd -r %{pkg_name} +getent group %{pkg_name} >/dev/null || %{_sbindir}/groupadd -r %{pkg_name} getent passwd %{pkg_name} >/dev/null || \ - /usr/sbin/useradd -g %{pkg_name} -s /bin/false -r \ + %{_sbindir}/useradd -g %{pkg_name} -s /bin/false -r \ -c "user for %{pkg_name}" -d %{pkg_home} %{pkg_name} %post %fillup_and_insserv %{pkg_name} %if %{with apparmor} && %{with apparmor_reload} -%apparmor_reload /etc/apparmor.d/usr.sbin.haproxy +%apparmor_reload %{_sysconfdir}/apparmor.d/usr.sbin.haproxy %endif %preun @@ -281,12 +292,10 @@ %postun %restart_on_update %{pkg_name} -%{insserv_cleanup} - +%insserv_cleanup %endif %files -%defattr(-,root,root,-) %license LICENSE %doc README.SUSE CHANGELOG README.md %doc doc/* examples/ @@ -311,17 +320,17 @@ %{_sbindir}/rchaproxy %endif %dir %attr(-,root,haproxy) %{pkg_home} -%{_mandir}/man1/%{pkg_name}.1.gz +%{_mandir}/man1/%{pkg_name}.1%{?ext_man} %dir %{_datadir}/vim %dir %{vim_data_dir} %dir %{vim_data_dir}/syntax %{vim_data_dir}/syntax/%{pkg_name}.vim %if %{with apparmor} %if 0%{?suse_version} == 1110 -%dir /etc/apparmor.d/local/ +%dir %{_sysconfdir}/apparmor.d/local/ %endif -%config(noreplace) /etc/apparmor.d/usr.sbin.haproxy -%config(noreplace) %ghost /etc/apparmor.d/local/haproxy -%config(noreplace) %ghost /etc/apparmor.d/local/usr.sbin.haproxy +%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.haproxy +%config(noreplace) %ghost %{_sysconfdir}/apparmor.d/local/haproxy +%config(noreplace) %ghost %{_sysconfdir}/apparmor.d/local/usr.sbin.haproxy %endif
