[vsftpd] added patch from BZ#450853#c23

[Jiri Skala]

commit 88b3ba36e9a30a28d8856ba005c416281191d327
Author: Jiri Skala <jskala at redhat.com>
Date:   Mon Nov 28 08:31:47 2011 +0100

    added patch from BZ#450853#c23

 vsftpd-2.3.4-listen_ipv6.patch |   37 +++++++++++++++++++++++++++++++++++++
 vsftpd-2.3.4-noexclusive.patch |   13 -------------
 vsftpd.spec                    |    9 ++++++---
 3 files changed, 43 insertions(+), 16 deletions(-)
---
diff --git a/vsftpd-2.3.4-listen_ipv6.patch b/vsftpd-2.3.4-listen_ipv6.patch
new file mode 100644
index 0000000..5fe4de7
--- /dev/null
+++ b/vsftpd-2.3.4-listen_ipv6.patch
@@ -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
diff --git a/vsftpd.spec b/vsftpd.spec
index 0f600b6..525d0ec 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -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 at redhat.com> - 2.3.4-7
+- added patch from BZ#450853#c23
+
 * Tue Nov 15 2011 Jiri Skala <jskala at redhat.com> - 2.3.4-6
 - fixes #753365 - multiple issues with vsftpd's systemd unit
 - removes exclusivity between listen and listen_ipv6 BZ#450853