From 7f1e1a18cb3c49e465c90d3ff4f0903848fc7b9817575f6c89a99bc3096cca8d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 30 Apr 2008 10:01:41 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/vsftpd?expand=0&rev=7

---
 vsftpd-2.0.4-conf.diff |  6 +++---
 vsftpd.changes         |  6 ++++++
 vsftpd.spec            | 10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/vsftpd-2.0.4-conf.diff b/vsftpd-2.0.4-conf.diff
index 082d4e0..8fea490 100644
--- a/vsftpd-2.0.4-conf.diff
+++ b/vsftpd-2.0.4-conf.diff
@@ -27,7 +27,7 @@
 +# It is recommended that you define on your system a unique user which the
 +# ftp server can use as a totally isolated and unprivileged user.
 +#
-+#nopriv_user=ftpsecure
++nopriv_user=ftpsecure
 +#
 +# You may fully customise the login banner string:
 +#
@@ -46,12 +46,12 @@
 +#deny_email_enable=YES
 +#
 +# (default follows)
-+#
+ #
 +#banned_email_file=/etc/vsftpd.banned_emails
 +#
 +# If  enabled,  all  user  and  group  information in
 +# directory listings will be displayed as "ftp".
- #
++#
 +#hide_ids=YES
 +
 +# Local FTP user Settings
diff --git a/vsftpd.changes b/vsftpd.changes
index e2737cd..c691c24 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 30 11:58:17 CEST 2008 - hvogel@suse.de
+
+- Make the unpriv bits run as ftpsecure and not as nobody
+  [bnc#384776]
+
 -------------------------------------------------------------------
 Tue Apr  1 16:23:57 CEST 2008 - mkoenig@suse.de
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 526c746..57047a0 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -19,7 +19,7 @@ BuildRequires:  libcap
 BuildRequires:  libcap-devel
 %endif
 Version:        2.0.6
-Release:        8
+Release:        15
 Summary:        Very Secure FTP Daemon - Written from Scratch
 License:        GPL v2 or later
 Group:          Productivity/Networking/Ftp/Servers
@@ -42,7 +42,7 @@ Patch7:         %name-2.0.5-enable-debuginfo.patch
 Patch8:         %name-2.0.5-utf8-log-names.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
-PreReq:         %insserv_prereq
+PreReq:         %insserv_prereq /usr/sbin/useradd
 
 %description
 Vsftpd is an FTP server, or dæmon. The "vs" stands for Very Secure.
@@ -95,6 +95,9 @@ install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
 install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
+%pre
+/usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
+
 %preun
 %stop_on_removal %name
 
@@ -124,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 %changelog
+* Wed Apr 30 2008 hvogel@suse.de
+- Make the unpriv bits run as ftpsecure and not as nobody
+  [bnc#384776]
 * Tue Apr 01 2008 mkoenig@suse.de
 - remove dir /usr/share/omc/svcinfo.d as it is provided now
   by filesystem