rpms/vsftpd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

added patch from BZ#450853#c23

Browse Source
This commit is contained in:
Jiri Skala 2011-11-28 08:31:47 +01:00
parent ce6a54f810
commit 88b3ba36e9
3 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vsftpd-2.3.4-listen_ipv6.patch Normal file
View File

@ -0,0 +1,37 @@
--- vsftpd-2.3.4/vsftpd.conf~ 2011-11-21 13:15:03.888357116 +0000
+++ vsftpd-2.3.4/vsftpd.conf 2011-11-21 13:17:43.676136602 +0000
@@ -108,12 +108,16 @@ xferlog_std_format=YES
# When "listen" directive is enabled, vsftpd runs in standalone mode and
# listens on IPv4 sockets. This directive cannot be used in conjunction
# with the listen_ipv6 directive.
-listen=YES
+#listen=YES
#
-# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
-# sockets, you must run two copies of vsftpd with two configuration files.
+# This directive enables listening on IPv6 sockets. By default, listening
+# on the IPv6 "any" address (::) will accept connections from both IPv6
+# and IPv4 clients. It is not necessary to listen on *both* IPv4 and IPv6
+# sockets. If you want that (perhaps because you want to listen on specific
+# addresses) then you must run two copies of vsftpd with two configuration
+# files.
# Make sure, that one of the listen options is commented !!
-#listen_ipv6=YES
+listen_ipv6=YES
pam_service_name=vsftpd
userlist_enable=YES
--- vsftpd-2.3.4/vsftpd.conf.5~ 2011-11-21 13:15:03.905357305 +0000
+++ vsftpd-2.3.4/vsftpd.conf.5 2011-11-21 13:18:31.771672385 +0000
@@ -281,8 +281,9 @@ Default: NO
.TP
.B listen_ipv6
Like the listen parameter, except vsftpd will listen on an IPv6 socket instead
-of an IPv4 one. This parameter and the listen parameter are mutually
-exclusive.
+of an IPv4 one. Note that a socket listening on the IPv6 "any" address (::)
+will accept both IPv6 and IPv4 connections by default. This parameter and the
+listen parameter are mutually exclusive.
Default: NO
.TP

13
vsftpd-2.3.4-noexclusive.patch
View File

@ -1,13 +0,0 @@
diff -up vsftpd-2.3.4/vsftpd.conf.5.noexclusive vsftpd-2.3.4/vsftpd.conf.5
--- vsftpd-2.3.4/vsftpd.conf.5.noexclusive 2011-11-15 12:56:01.777161200 +0100
+++ vsftpd-2.3.4/vsftpd.conf.5 2011-11-15 12:59:22.037565778 +0100
@@ -284,8 +284,7 @@ Default: NO
.TP
.B listen_ipv6
Like the listen parameter, except vsftpd will listen on an IPv6 socket instead
-of an IPv4 one. This parameter and the listen parameter are mutually
-exclusive.
+of an IPv4 one.
Default: NO
.TP

9
vsftpd.spec
View File

@ -2,7 +2,7 @@
Name: vsftpd
Version: 2.3.4
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons
@ -54,7 +54,7 @@ Patch16: vsftpd-2.2.2-clone.patch
Patch18: vsftpd-2.3.4-tout.patch
Patch19: vsftpd-2.3.4-sd.patch
Patch20: vsftpd-2.3.4-sqb.patch
Patch21: vsftpd-2.3.4-noexclusive.patch
Patch21: vsftpd-2.3.4-listen_ipv6.patch
%description
vsftpd is a Very Secure FTP daemon. It was written completely from
@ -92,7 +92,7 @@ cp %{SOURCE1} .
%patch18 -p1 -b .tout
%patch19 -p1 -b .sd
%patch20 -p1 -b .sqb
%patch21 -p1 -b .noexclusive
%patch21 -p1 -b .listen_ipv6
%build
%ifarch s390x sparcv9 sparc64
@ -167,6 +167,9 @@ fi
%{_sysconfdir}/rc.d/init.d/vsftpd
%changelog
* Mon Nov 28 2011 Jiri Skala <jskala@redhat.com> - 2.3.4-7
- added patch from BZ#450853#c23
* Tue Nov 15 2011 Jiri Skala <jskala@redhat.com> - 2.3.4-6
- fixes #753365 - multiple issues with vsftpd's systemd unit
- removes exclusivity between listen and listen_ipv6 BZ#450853