Accepting request 229627 from home:scarabeus_iv

- Move the enabling of timeofday and alarm one level deeper to
  be sure it is whitelisted everytime.
  Also should possibly fix bnc#872215.
- Updated patch:
  * vsftpd-enable-gettimeofday-sec.patch

- Remove forking from service type as it hangs in endless loop.

- Fix warning about dangling symlink on rcvsftpd from rpmlint and
  remove also clean section while at it.

- Add patch to allow gettimeofday and alarm calls with seccomp
  enabled. bnc#870122
- Added patch:
  * vsftpd-enable-gettimeofday-sec.patch

- Specify that the service type is forking

- changed license to SUSE-GPL-2.0-with-openssl-exception
  * suggested by legal team

- add allow_root_squashed_chroot option to enable chroot on nsf
  mounted with squash_root option (fate#311051)
  * vsftpd-root-squashed-chroot.patch

OBS-URL: https://build.opensuse.org/request/show/229627
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=59

vsftpd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vsftpd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@ BuildRequires:  systemd
 Version:        3.0.2
 Release:        0
 Summary:        Very Secure FTP Daemon - Written from Scratch
-License:        GPL-2.0+
+License:        SUSE-GPL-2.0-with-openssl-exception
 Group:          Productivity/Networking/Ftp/Servers
 Url:            https://security.appspot.com/vsftpd.html
 Source0:        https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
@@ -63,9 +63,13 @@ Patch13:        vsftpd-drop-newpid-from-clone.patch
 Patch14:        vsftpd-enable-fcntl-f_setfl.patch
 #PATCH-FIX-OPENSUSE: bnc#812406
 Patch15:        vsftpd-enable-dev-log-sendto.patch
+#PATCH-FEATURE-SUSE: FATE#311051, call chroot with user credentials to enable nsf with squash_root option
+Patch16:        vsftpd-root-squashed-chroot.patch
+#PATCH-FIX-UPSTREAM: bnc#870122
+Patch17:        vsftpd-enable-gettimeofday-sec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
-PreReq:         %insserv_prereq /usr/sbin/useradd
+Requires(pre):  %insserv_prereq /usr/sbin/useradd
 %{?systemd_requires}
 Requires:       logrotate
 
@@ -97,6 +101,8 @@ tests.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 %define seccomp_opts %{nil}
@@ -121,7 +127,7 @@ install -D -m 644 %name.8 $RPM_BUILD_ROOT/%_mandir/man8/%name.8
 install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/%name
 ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/%_prefix/sbin/rc%name
 %else
-ln -sf ../../sbin/service $RPM_BUILD_ROOT/%{_prefix}/sbin/rc%{name}
+ln -sf service $RPM_BUILD_ROOT/%{_prefix}/sbin/rc%{name}
 %endif
 install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
 install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
@@ -165,9 +171,6 @@ fi
 %service_del_postun %{name}.service
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %if 0%{?suse_version} > 1140