From fe11d6805fd45c287922817233b7643aff2889febe5b74ed9b3a286ddf829f44 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 1 Aug 2019 11:10:56 +0000 Subject: [PATCH 1/2] Accepting request 720027 from home:rmax:branches:Base:System - Add system-user-tftp subpackage with tftp user and group and /srv/tftpboot as home directory [bsc#1143454]. OBS-URL: https://build.opensuse.org/request/show/720027 OBS-URL: https://build.opensuse.org/package/show/Base:System/system-users?expand=0&rev=37 --- system-user-tftp.conf | 3 +++ system-users.changes | 6 ++++++ system-users.spec | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 system-user-tftp.conf diff --git a/system-user-tftp.conf b/system-user-tftp.conf new file mode 100644 index 0000000..d45b7eb --- /dev/null +++ b/system-user-tftp.conf @@ -0,0 +1,3 @@ +# Type Name ID GECOS [HOME] +g tftp - +u tftp - "TFTP Account" /srv/tftpboot diff --git a/system-users.changes b/system-users.changes index 712c64f..55ff206 100644 --- a/system-users.changes +++ b/system-users.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 31 09:55:15 UTC 2019 - Reinhard Max + +- Add system-user-tftp subpackage with tftp user and group and + /srv/tftpboot as home directory [bsc#1143454]. + ------------------------------------------------------------------- Thu Jan 31 13:33:05 UTC 2019 - Michal Suchanek diff --git a/system-users.spec b/system-users.spec index 66e54ef..32f4b64 100644 --- a/system-users.spec +++ b/system-users.spec @@ -39,6 +39,7 @@ Source15: system-user-nobody.conf Source16: system-user-upsd.conf Source17: system-user-uuidd.conf Source18: system-group-s390-tools.conf +Source19: system-user-tftp.conf BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildArch: noarch @@ -197,6 +198,14 @@ Group: System/Fhs %description -n system-user-uuidd This package provides the system account and group 'uuidd'. +%package -n system-user-tftp +Summary: System user and group tftp +Group: System/Fhs +%{sysusers_requires} + +%description -n system-user-tftp +This package provides the system account and group 'tftp'. + %prep %setup -q -c -T @@ -218,6 +227,7 @@ This package provides the system account and group 'uuidd'. %sysusers_generate_pre %{SOURCE16} upsd %sysusers_generate_pre %{SOURCE17} uuidd %sysusers_generate_pre %{SOURCE18} s390-tools +%sysusers_generate_pre %{SOURCE19} tftp %install mkdir -p %{buildroot}%{_sysusersdir} @@ -230,6 +240,7 @@ mkdir -p %{buildroot}%{_localstatedir}/spool/lpd mkdir -p %{buildroot}%{_localstatedir}/run/uuidd mkdir -p %{buildroot}/srv/ftp mkdir -p %{buildroot}%{_localstatedir}/lib/nobody +mkdir -p %{buildroot}/srv/tftpboot install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-uucp.conf install -m 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/system-user-games.conf install -m 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/system-user-bin.conf @@ -247,6 +258,7 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.conf +install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf %pre -n system-user-uucp -f uucp.pre %pre -n system-user-games -f games.pre @@ -268,6 +280,7 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c %pre -n system-user-upsd -f upsd.pre %pre -n system-user-uuidd -f uuidd.pre +%pre -n system-user-tftp -f tftp.pre %files -n system-user-uucp %defattr(-,root,root) @@ -345,4 +358,9 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c %defattr(-,root,root) %{_sysusersdir}/system-user-uuidd.conf +%files -n system-user-tftp +%defattr(-,root,root) +%dir %attr(0755,tftp,tftp) /srv/tftpboot +%{_sysusersdir}/system-user-tftp.conf + %changelog From fc73ebc987f1688cc0493ba7b882d38c8ba682a2d374619e120439e900b68ff0 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 13 Aug 2019 14:17:35 +0000 Subject: [PATCH 2/2] Accepting request 722993 from home:michals - Remove s390 groups again. The s390-tools maintainer wants to add groups in s390-tools manually. OBS-URL: https://build.opensuse.org/request/show/722993 OBS-URL: https://build.opensuse.org/package/show/Base:System/system-users?expand=0&rev=38 --- system-group-s390-tools.conf | 4 ---- system-users.changes | 6 ++++++ system-users.spec | 16 ---------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 system-group-s390-tools.conf diff --git a/system-group-s390-tools.conf b/system-group-s390-tools.conf deleted file mode 100644 index 623f145..0000000 --- a/system-group-s390-tools.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Type Name ID GECOS [HOME] -g cpacfstats - -g ts-shell - -g zkeyadm - diff --git a/system-users.changes b/system-users.changes index 55ff206..00d9986 100644 --- a/system-users.changes +++ b/system-users.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 13 07:07:19 UTC 2019 - Michal Suchanek + +- Remove s390 groups again. The s390-tools maintainer wants to add groups in + s390-tools manually. + ------------------------------------------------------------------- Wed Jul 31 09:55:15 UTC 2019 - Reinhard Max diff --git a/system-users.spec b/system-users.spec index 32f4b64..68dc856 100644 --- a/system-users.spec +++ b/system-users.spec @@ -38,7 +38,6 @@ Source14: system-user-lp.conf Source15: system-user-nobody.conf Source16: system-user-upsd.conf Source17: system-user-uuidd.conf -Source18: system-group-s390-tools.conf Source19: system-user-tftp.conf BuildRequires: sysuser-shadow BuildRequires: sysuser-tools @@ -129,14 +128,6 @@ Group: System/Fhs %description -n system-group-wheel This package provides the system group 'wheel'. -%package -n system-group-s390-tools -Summary: System group 's390-tools' -Group: System/Fhs -%{sysusers_requires} - -%description -n system-group-s390-tools -This package provides the system group 's390-tools' for s390-tools. - %package -n system-user-wwwrun Summary: System user wwwrun and group www Group: System/Fhs @@ -226,7 +217,6 @@ This package provides the system account and group 'tftp'. %sysusers_generate_pre %{SOURCE15} nobody %sysusers_generate_pre %{SOURCE16} upsd %sysusers_generate_pre %{SOURCE17} uuidd -%sysusers_generate_pre %{SOURCE18} s390-tools %sysusers_generate_pre %{SOURCE19} tftp %install @@ -257,7 +247,6 @@ install -m 644 %{SOURCE14} %{buildroot}%{_sysusersdir}/system-user-lp.conf install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf -install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.conf install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf %pre -n system-user-uucp -f uucp.pre @@ -269,7 +258,6 @@ install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf %pre -n system-group-obsolete -f obsolete.pre %pre -n system-group-hardware -f hardware.pre %pre -n system-group-wheel -f wheel.pre -%pre -n system-group-s390-tools -f s390-tools.pre %pre -n system-user-wwwrun -f wwwrun.pre %pre -n system-user-mail -f mail.pre %pre -n system-user-ftp -f ftp.pre @@ -321,10 +309,6 @@ install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf %defattr(-,root,root) %{_sysusersdir}/system-group-wheel.conf -%files -n system-group-s390-tools -%defattr(-,root,root) -%{_sysusersdir}/system-group-s390-tools.conf - %files -n system-user-wwwrun %defattr(-,root,root) %dir %attr(0755,wwwrun,root) %{_localstatedir}/lib/wwwrun