Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mtail for openSUSE:Factory checked
in at 2024-03-01 23:37:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtail (Old)
and /work/SRC/openSUSE:Factory/.mtail.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtail"
Fri Mar 1 23:37:42 2024 rev:6 rq:1153822 version:3.0.0rc51
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtail/mtail.changes 2023-12-07
19:12:50.128637514 +0100
+++ /work/SRC/openSUSE:Factory/.mtail.new.1770/mtail.changes 2024-03-01
23:37:42.478020997 +0100
@@ -1,0 +2,5 @@
+Mon Feb 26 04:33:15 UTC 2024 - Georg Pfuetzenreuter
<mail+...@georg-pfuetzenreuter.net>
+
+- Switch to sysusers
+
+-------------------------------------------------------------------
New:
----
mtail.sysuser
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtail.spec ++++++
--- /var/tmp/diff_new_pack.ti8j9I/_old 2024-03-01 23:37:43.054041825 +0100
+++ /var/tmp/diff_new_pack.ti8j9I/_new 2024-03-01 23:37:43.058041970 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mtail
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,10 +35,13 @@
Source2: %{name}.service
Source3: %{name}.sysconfig
Source4: apparmor-usr.sbin.%{name}
+Source5: %{name}.sysuser
BuildRequires: golang-packaging
+BuildRequires: sysuser-tools
BuildRequires: golang(API) >= 1.17
Requires(post): %fillup_prereq
Requires(pre): shadow
+%sysusers_requires
%if %{with apparmor}
BuildRequires: apparmor-abstractions
BuildRequires: apparmor-rpm-macros
@@ -59,6 +62,7 @@
%else
go build -mod=vendor -buildmode=pie -o mtail cmd/mtail/main.go
%endif
+%sysusers_generate_pre %{SOURCE5} %{name}
%install
# Install the binary
@@ -68,6 +72,8 @@
mkdir -p %{buildroot}%{_unitdir}
install -p -m644 %{SOURCE2} %{buildroot}%{_unitdir}/
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+# Install sysuser configuration
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
# create config directory and create example config files
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
# create sysconfig file
@@ -79,12 +85,7 @@
install -m 0644 %{SOURCE4}
%{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.%{name}
%endif
-%pre
-# creating group and user mtail
-%{_bindir}/getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name}
-%{_bindir}/getent passwd %{name} >/dev/null || \
- %{_sbindir}/useradd -r -g %{name} -d / -s /sbin/nologin \
- -c "%{name} service user" %{name}
+%pre -f %{name}.pre
%service_add_pre %{name}.service
%post
@@ -107,6 +108,7 @@
%{_unitdir}/%{name}.service
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
+%{_sysusersdir}/%{name}.conf
%dir %attr(0750, root, %{name}) %{_sysconfdir}/%{name}
%if %{with apparmor}
%dir %{_sysconfdir}/apparmor.d
++++++ mtail.sysuser ++++++
u mtail - "mtail service user" /var/lib/mtail -
