From 1790f4c2bda8ebaf93637d8049a59cc9a6bbd43f Mon Sep 17 00:00:00 2001 From: Maros Barabas Date: Aug 08 2006 08:09:10 +0000 Subject: Two listen options repaired --- diff --git a/vsftpd-2.0.5-add_ipv6_option.patch b/vsftpd-2.0.5-add_ipv6_option.patch new file mode 100644 index 0000000..a6ad504 --- /dev/null +++ b/vsftpd-2.0.5-add_ipv6_option.patch @@ -0,0 +1,16 @@ +--- vsftpd-2.0.5/vsftpd.conf.old 2006-08-01 13:56:18.000000000 +0200 ++++ vsftpd-2.0.5/vsftpd.conf 2006-08-01 13:59:15.000000000 +0200 +@@ -103,7 +103,11 @@ + + pam_service_name=vsftpd + userlist_enable=YES +-#enable for standalone mode ++# When enabled, vsftpd runs in standalone mode, but listen only to IPv6 sockets. ++# This directive cannot be used in conjunction with the listen directive. ++# Make sure, that one of listen options are commited ++# enable for standalone mode + listen=YES +-listen_ipv6=YES ++#listen_ipv6=YES ++ + tcp_wrappers=YES diff --git a/vsftpd.spec b/vsftpd.spec index 63c8e3c..2d5e849 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 4 +Release: 5 License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -32,6 +32,7 @@ Patch16: vsfptd-2.0.3-user_config.patch Patch17: vsftpd-2.0.3-pam_hostname.patch Patch18: vsftpd-close-std-fds.patch Patch19: vsftpd-2.0.5-default_ipv6.patch +Patch20: vsftpd-2.0.5-add_ipv6_option.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} @@ -78,6 +79,7 @@ cp %{SOURCE1} . %patch17 -p1 -b .old-pam %patch18 -p1 -b .close-fds %patch19 -p1 +%patch20 -p1 %build %ifarch s390x @@ -136,9 +138,11 @@ fi /var/ftp %changelog +* Tue Aug 08 2006 Maros Barabas - 2.0.5-5 +- option to change listening to IPv6 protocol + * Thu Aug 01 2006 Maros Barabas - 2.0.5-4 - listen to IPv4 connections in default conf file -- option to change listening to IPv6 protocol * Mon Jul 17 2006 Radek Vokal - 2.0.5-3 - listen to IPv6 connections in default conf file