Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package caddy for openSUSE:Factory checked
in at 2023-09-22 21:50:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caddy (Old)
and /work/SRC/openSUSE:Factory/.caddy.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caddy"
Fri Sep 22 21:50:14 2023 rev:19 rq:1113040 version:2.7.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/caddy/caddy.changes 2023-08-18
19:29:23.587427158 +0200
+++ /work/SRC/openSUSE:Factory/.caddy.new.1770/caddy.changes 2023-09-22
21:50:51.504362606 +0200
@@ -1,0 +2,5 @@
+Thu Sep 21 14:20:37 UTC 2023 - Alexandre Vicenzi <alexandre.vice...@suse.com>
+
+- Switch to sysuser for user setup
+
+-------------------------------------------------------------------
New:
----
caddy.sysusers
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caddy.spec ++++++
--- /var/tmp/diff_new_pack.zpz6Yd/_old 2023-09-22 21:50:53.224425049 +0200
+++ /var/tmp/diff_new_pack.zpz6Yd/_new 2023-09-22 21:50:53.224425049 +0200
@@ -40,10 +40,13 @@
Source4: index.html
Source5: bash-completion
Source6: zsh-completion
+Source7: caddy.sysusers
BuildRequires: golang-packaging
BuildRequires: systemd-rpm-macros
+BuildRequires: sysuser-tools
BuildRequires: golang(API) >= 1.20
%{?systemd_requires}
+%{sysusers_requires}
%{go_provides}
# Make sure that the binary is not getting stripped.
%{go_nostrip}
@@ -68,6 +71,8 @@
go build -v -buildmode=pie -mod=vendor -ldflags "-s -w" -o caddy
cmd/caddy/main.go
+%sysusers_generate_pre %{SOURCE7} %{name} %{name}.conf
+
%install
install -d %{buildroot}/%{_sbindir}
install -D -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
@@ -78,6 +83,7 @@
# service
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+install -Dpm0644 %{SOURCE7} %{buildroot}%{_sysusersdir}/%{name}.conf
# data directory
install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}
@@ -89,9 +95,7 @@
install -D -p -m 0644 %{SOURCE5}
%{buildroot}%{_datadir}/bash-completion/completions/%{name}
install -D -p -m 0644 %{SOURCE6}
%{buildroot}%{_datadir}/zsh/site-functions/_%{name}
-%pre
-getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name}
-getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d
%{_sharedstatedir}/%{name} -s /bin/false -c "Caddy web server" %{name}
+%pre -f %{name}.pre
%service_add_pre %{name}.service
%post
@@ -109,10 +113,9 @@
%doc AUTHORS README.md
%{_bindir}/%{name}
%{_datadir}/%{name}
-
%{_unitdir}/%{name}.service
%{_sbindir}/rc%{name}
-
+%{_sysusersdir}/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/Caddyfile
%attr(0750,%{name},%{name}) %dir %{_sharedstatedir}/%{name}
++++++ caddy.sysusers ++++++
# Type Name ID GECOS [HOME]
u caddy - "Caddy web server" /var/lib/caddy
