From 3e2258c0d7aa288071555b206b3f64ae10d72b1fee36583d56192b049e4f43eb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Jan 2021 20:48:58 +0000 Subject: [PATCH] Accepting request 863310 from Base:System - system-user-tss.conf: Remove group entry, not needed and did contain syntax errors - remove duplicate group entry: - system-user-tftp.conf - system-user-uuidd.conf - system-user-uucp.conf - system-user-uucp.conf - system-user-ftp.conf - system-user-games.conf - system-user-news.conf (forwarded request 863309 from kukuk) OBS-URL: https://build.opensuse.org/request/show/863310 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/system-users?expand=0&rev=21 --- system-user-ftp.conf | 1 - system-user-games.conf | 1 - system-user-mail.conf | 1 - system-user-news.conf | 1 - system-user-ntp.conf | 2 ++ system-user-tftp.conf | 1 - system-user-tss.conf | 1 - system-user-uucp.conf | 1 - system-user-uuidd.conf | 1 - system-users.changes | 20 ++++++++++++++++++++ system-users.spec | 20 +++++++++++++++++++- 11 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 system-user-ntp.conf diff --git a/system-user-ftp.conf b/system-user-ftp.conf index 538d169..4cbc2bd 100644 --- a/system-user-ftp.conf +++ b/system-user-ftp.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] u ftp - "FTP Account" /srv/ftp -g ftp - diff --git a/system-user-games.conf b/system-user-games.conf index 7810be0..75f3fe9 100644 --- a/system-user-games.conf +++ b/system-user-games.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] -g games - u games - "Games account" /var/games diff --git a/system-user-mail.conf b/system-user-mail.conf index 6d94b5c..39f4a58 100644 --- a/system-user-mail.conf +++ b/system-user-mail.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] u mail - "Mailer daemon" /var/spool/clientmqueue -g mail - diff --git a/system-user-news.conf b/system-user-news.conf index 8defcf2..51c6a32 100644 --- a/system-user-news.conf +++ b/system-user-news.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] -g news - u news - "News system" /etc/news diff --git a/system-user-ntp.conf b/system-user-ntp.conf new file mode 100644 index 0000000..043d097 --- /dev/null +++ b/system-user-ntp.conf @@ -0,0 +1,2 @@ +# Type Name ID GECOS [HOME] +u ntp - "NTP account" /var/lib/ntp diff --git a/system-user-tftp.conf b/system-user-tftp.conf index d45b7eb..b20ec7e 100644 --- a/system-user-tftp.conf +++ b/system-user-tftp.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] -g tftp - u tftp - "TFTP Account" /srv/tftpboot diff --git a/system-user-tss.conf b/system-user-tss.conf index 196ad1b..df2729e 100644 --- a/system-user-tss.conf +++ b/system-user-tss.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] -g tss 98 "TPM device access" u tss 98 "TSS daemon" /var/lib/tpm diff --git a/system-user-uucp.conf b/system-user-uucp.conf index 3bdf51d..4974dc9 100644 --- a/system-user-uucp.conf +++ b/system-user-uucp.conf @@ -1,4 +1,3 @@ # Type Name ID GECOS [HOME] -g uucp - u uucp - "Unix-to-Unix CoPy system" /etc/uucp m uucp lock diff --git a/system-user-uuidd.conf b/system-user-uuidd.conf index d7efe01..57bb1d5 100644 --- a/system-user-uuidd.conf +++ b/system-user-uuidd.conf @@ -1,3 +1,2 @@ # Type Name ID GECOS [HOME] -g uuidd - u uuidd - "User for uuidd" /var/run/uuidd diff --git a/system-users.changes b/system-users.changes index 69b58a2..20b7664 100644 --- a/system-users.changes +++ b/system-users.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Jan 14 16:30:39 UTC 2021 - Thorsten Kukuk + +- system-user-tss.conf: Remove group entry, not needed and did + contain syntax errors +- remove duplicate group entry: + - system-user-tftp.conf + - system-user-uuidd.conf + - system-user-uucp.conf + - system-user-uucp.conf + - system-user-ftp.conf + - system-user-games.conf + - system-user-news.conf + +------------------------------------------------------------------- +Fri Jan 8 14:23:45 UTC 2021 - Martin Hauke + +- Add system-user-ntp subpackage with ntp user and group and + /var/lib/ntp as home directory + ------------------------------------------------------------------- Sun Dec 27 20:31:35 UTC 2020 - Arjen de Korte diff --git a/system-users.spec b/system-users.spec index 9d94f61..22d956e 100644 --- a/system-users.spec +++ b/system-users.spec @@ -1,7 +1,7 @@ # # spec file for package system-users # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,7 @@ Source21: system-group-kvm.conf Source22: system-user-qemu.conf Source23: system-group-libvirt.conf Source24: system-user-vscan.conf +Source25: system-user-ntp.conf BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildArch: noarch @@ -242,6 +243,14 @@ Group: System/Fhs %description -n system-user-vscan This package provides the system user 'vscan'. +%package -n system-user-ntp +Summary: System user ntp and group +Group: System/Fhs +%{sysusers_requires} + +%description -n system-user-ntp +This package provides the system user and group 'ntp'. + %prep %setup -q -c -T @@ -268,12 +277,14 @@ This package provides the system user 'vscan'. %sysusers_generate_pre %{SOURCE22} qemu %sysusers_generate_pre %{SOURCE23} libvirt %sysusers_generate_pre %{SOURCE24} vscan +%sysusers_generate_pre %{SOURCE25} ntp %install mkdir -p %{buildroot}%{_sysusersdir} mkdir -p %{buildroot}%{_sysconfdir}/uucp mkdir -p %{buildroot}%{_sysconfdir}/news mkdir -p %{buildroot}%{_localstatedir}/games +mkdir -p %{buildroot}%{_localstatedir}/lib/ntp mkdir -p %{buildroot}%{_localstatedir}/lib/wwwrun mkdir -p %{buildroot}%{_localstatedir}/spool/amavis mkdir -p %{buildroot}%{_localstatedir}/spool/clientmqueue @@ -305,6 +316,7 @@ install -m 644 %{SOURCE21} %{buildroot}%{_sysusersdir}/system-group-kvm.conf install -m 644 %{SOURCE22} %{buildroot}%{_sysusersdir}/system-user-qemu.conf install -m 644 %{SOURCE23} %{buildroot}%{_sysusersdir}/system-group-libvirt.conf install -m 644 %{SOURCE24} %{buildroot}%{_sysusersdir}/system-user-vscan.conf +install -m 644 %{SOURCE25} %{buildroot}%{_sysusersdir}/system-user-ntp.conf %pre -n system-user-uucp -f uucp.pre %pre -n system-user-games -f games.pre @@ -331,6 +343,7 @@ test -x /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||: %pre -n system-user-qemu -f qemu.pre %pre -n system-group-libvirt -f libvirt.pre %pre -n system-user-vscan -f vscan.pre +%pre -n system-user-ntp -f ntp.pre %files -n system-user-uucp %defattr(-,root,root) @@ -431,4 +444,9 @@ test -x /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||: %dir %attr(0750,vscan,vscan) %{_localstatedir}/spool/amavis %{_sysusersdir}/system-user-vscan.conf +%files -n system-user-ntp +%defattr(-,root,root) +%dir %attr(0750,ntp,ntp) %{_localstatedir}/lib/ntp +%{_sysusersdir}/system-user-ntp.conf + %changelog