- Add comment about listen variables for xinetd configuration.

Fixes bnc#872221.
- Add default configuration as arg to xinetd started vsftpd.
- Updated patch:
  * vsftpd-2.0.4-xinetd.diff

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

vsftpd-2.0.4-xinetd.diff

@@ -1,6 +1,7 @@
---- xinetd.d/vsftpd.orig
-+++ xinetd.d/vsftpd
-@@ -1,18 +1,23 @@
+diff -urN vsftpd-3.0.2.old/xinetd.d/vsftpd vsftpd-3.0.2/xinetd.d/vsftpd
+--- vsftpd-3.0.2.old/xinetd.d/vsftpd	2014-05-26 14:38:40.717042497 +0200
++++ vsftpd-3.0.2/xinetd.d/vsftpd	2014-05-26 14:41:23.753049249 +0200
+@@ -1,18 +1,26 @@
 -# default: on
 +# default: off
  # description:
@@ -10,6 +11,9 @@
 +#
 +# NOTE: This file contains the configuration for xinetd to start vsftpd.
 +#       the configuration file for vsftp itself is in /etc/vsftpd.conf
++#
++# NOTE: Remember to set both listen and listen_ipv6 to NO in /etc/vsftpd.conf
++#       in order to have working xinetd connection.
 +#
  service ftp
  {
@@ -24,7 +28,7 @@
 -        nice                    = 10
 -        disable                 = no
 +        server                  = /usr/sbin/vsftpd
-+#        server_args             =
++        server_args             = /etc/vsftpd.conf
 +#        log_on_success          += DURATION USERID
 +#        log_on_failure          += USERID
 +#        nice                    = 10

vsftpd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon May 26 12:42:21 UTC 2014 - tchvatal@suse.com
+
+- Add comment about listen variables for xinetd configuration.
+  Fixes bnc#872221.
+- Add default configuration as arg to xinetd started vsftpd.
+- Updated patch:
+  * vsftpd-2.0.4-xinetd.diff
+
 -------------------------------------------------------------------
 Thu Apr 10 12:56:03 UTC 2014 - tchvatal@suse.com
 

vsftpd.spec

@@ -88,7 +88,7 @@ tests.
 %gpg_verify %{S:1000}
 %setup -q
 %patch1
-%patch3
+%patch3 -p1
 %patch4
 %patch5
 %patch6