diff --git a/vsftpd-2.0.1-server_args.patch b/vsftpd-2.0.1-server_args.patch new file mode 100644 index 0000000..670f2df --- /dev/null +++ b/vsftpd-2.0.1-server_args.patch @@ -0,0 +1,11 @@ +--- vsftpd-2.0.1/xinetd.d/vsftpd.server_args 2001-10-11 21:40:17.000000000 +0200 ++++ vsftpd-2.0.1/xinetd.d/vsftpd 2004-10-01 14:52:28.171052120 +0200 +@@ -9,7 +9,7 @@ + wait = no + user = root + server = /usr/local/sbin/vsftpd +-# server_args = ++ server_args = /etc/vsftpd/vsftpd.conf + # log_on_success += DURATION USERID + # log_on_failure += USERID + nice = 10 diff --git a/vsftpd.spec b/vsftpd.spec index 5bb4346..f6523ff 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.1 -Release: 4 +Release: 5 License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -20,6 +20,7 @@ Patch4: vsftpd-1.5.1-libs.patch Patch5: vsftpd-2.0.1-signal.patch Patch6: vsftpd-1.2.1-conffile.patch Patch7: vsftpd-2.0.1-build_ssl.patch +Patch8: vsftpd-2.0.1-server_args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} BuildPrereq: tcp_wrappers @@ -53,6 +54,7 @@ cp %{SOURCE1} . %patch5 -p1 -b .signal %patch6 -p1 %patch7 -p1 -b .build_ssl +%patch8 -p1 -b .server_args %build %ifarch s390x @@ -110,6 +112,9 @@ fi /var/ftp %changelog +* Fri Oct 01 2004 Radek Vokal 2.0.1-5 +- vsftpd under xinetd reads its config file (#134314) + * Thu Sep 16 2004 Radek Vokal 2.0.1-4 - spec file changed, ftp dir change commented (#130119) - added doc files (#113056) diff --git a/vsftpd.xinetd b/vsftpd.xinetd index 9807b70..9b22b5b 100644 --- a/vsftpd.xinetd +++ b/vsftpd.xinetd @@ -7,6 +7,7 @@ service ftp wait = no user = root server = /usr/sbin/vsftpd + server_args = /etc/vsftpd/vsftpd.conf nice = 10 disable = yes flags = IPv4