From ac2e1d899bf44441b1b8270bba27bec2c37aefb3969c1dbe4725452ed476485e Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 2 May 2017 12:29:24 +0000 Subject: [PATCH] Accepting request 492473 from home:kukuk:branches:network - Adjust to new system user/group RPMs OBS-URL: https://build.opensuse.org/request/show/492473 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=108 --- vsftpd.changes | 5 +++++ vsftpd.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index 28e1b0b..f58600c 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 2 14:20:06 CEST 2017 - kukuk@suse.de + +- Adjust to new system user/group RPMs + ------------------------------------------------------------------- Mon Sep 19 11:39:04 UTC 2016 - psimons@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index 8149213..8b5e5c2 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -1,7 +1,7 @@ # # spec file for package vsftpd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -75,6 +75,9 @@ BuildRequires: openssl-devel BuildRequires: pam-devel Requires: logrotate Requires(pre): shadow +%if 0%{?suse_version} >= 1330 +Requires(pre): group(nobody) +%endif Provides: ftp-server BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with_systemd} @@ -150,7 +153,7 @@ install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %pre -getent passwd ftpsecure >/dev/null || useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure +getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure %if %{with_systemd} %service_add_pre %{name}.service %{name}@.service %{name}.socket %endif