[rpms/exim] rawhide: Merge #23 `fix(sysusers): create exim user on CentOS/RHEL systems lacking native sysusers`

[rpms/exim] rawhide: Merge #23 `fix(sysusers): create exim user on CentOS/RHEL systems lacking native sysusers`

[@ 2026-07-20 8:18 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/exim
Branch : rawhide
Commit : fff06fcee2e3f292cd4b33fd5101380474bcbf06
Author : Jaroslav Škarvada <jskarvad@fedoraproject.org>
Date   : 2026-07-20T08:18:08+00:00
Stats  : +12/-7 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/exim/c/fff06fcee2e3f292cd4b33fd5101380474bcbf06?branch=rawhide

Log:
Merge #23 `fix(sysusers): create exim user on CentOS/RHEL systems lacking native sysusers`

---
diff --git a/exim.spec b/exim.spec
index 976abb5..dfd4901 100644
--- a/exim.spec
+++ b/exim.spec
@@ -21,6 +21,7 @@ Provides: MTA smtpd smtpdaemon server(smtp)
 Requires(post): %{_sbindir}/restorecon %{_sbindir}/alternatives systemd
 Requires(preun): %{_sbindir}/alternatives systemd
 Requires(postun): %{_sbindir}/alternatives systemd
+%{?sysusers_requires_compat}
 %if %{with clamav}
 BuildRequires: clamd
 %endif
@@ -41,6 +42,7 @@ Source23: trusted-configs
 Source24: exim.service
 Source25: exim-gen-cert
 Source26: clamd.exim.service
+Source30: exim.sysusers.conf
 
 Patch: exim-4.99-config.patch
 Patch: exim-4.94-libdir.patch
@@ -81,6 +83,7 @@ BuildRequires: libSM-devel
 BuildRequires: libICE-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
+BuildRequires: systemd-rpm-macros
 BuildRequires: systemd-units
 BuildRequires: libgsasl-devel
 # Workaround for NIS removal from glibc, bug 1534920
@@ -201,11 +204,7 @@ for f in $(ls -dp cve-* | grep -v '/\|\(\.txt\)$'); do
 done
 popd
 
-# Create a sysusers.d config file
-cat >exim.sysusers.conf <<EOF
-u exim 93 - %{_var}/spool/exim -
-m exim mail
-EOF
+# exim.sysusers.conf is now a static Source file (Source30)
 
 %build
 # https://bugs.exim.org/show_bug.cgi?id=3135
@@ -341,12 +340,13 @@ install -m755 %{SOURCE22} $RPM_BUILD_ROOT/%_sysconfdir/cron.daily/greylist-tidy.
 install -m644 %{SOURCE23} $RPM_BUILD_ROOT/%_sysconfdir/exim/trusted-configs
 touch $RPM_BUILD_ROOT/%_var/spool/exim/db/greylist.db
 
-install -m0644 -D exim.sysusers.conf %{buildroot}%{_sysusersdir}/exim.conf
+install -m0644 -D %{SOURCE30} %{buildroot}%{_sysusersdir}/exim.conf
 
 %check
 build-`scripts/os-type`-`scripts/arch-type`/exim -C src/configure.default -bV
 
 %pre
+%sysusers_create_compat %{SOURCE30}
 # Copy TLS certs from old location to new -- don't move them, because the
 # config file may be modified and may be pointing to the old location.
 if [ ! -f /etc/pki/tls/certs/exim.pem -a -f %{_datadir}/ssl/certs/exim.pem ] ; then

diff --git a/exim.sysusers.conf b/exim.sysusers.conf
new file mode 100644
index 0000000..97fe307
--- /dev/null
+++ b/exim.sysusers.conf
@@ -0,0 +1,2 @@
+u exim 93 - /var/spool/exim -
+m exim mail

diff --git a/exim.spec b/exim.spec
index f1075df..dfd4901 100644
--- a/exim.spec
+++ b/exim.spec
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
 License: GPL-2.0-or-later
 Url: https://www.exim.org/
@@ -512,6 +512,9 @@ fi
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.99.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 4.99.4-2
 - Rebuilt for openssl 4.0