[vsftpd/f15] removes exclusivity between listen and listen_ipv6 BZ#450853

[Jiri Skala]

commit fafd5d042c845f69cd331108e325ce742520a3f2
Author: Jiri Skala <jskala at redhat.com>
Date:   Tue Nov 15 15:20:44 2011 +0100

    removes exclusivity between listen and listen_ipv6 BZ#450853

 vsftpd-2.2.2-v6only.patch      |   44 ----------------------------------------
 vsftpd-2.3.4-noexclusive.patch |   13 +++++++++++
 vsftpd.spec                    |    9 +++++--
 3 files changed, 19 insertions(+), 47 deletions(-)
---
diff --git a/vsftpd-2.3.4-noexclusive.patch b/vsftpd-2.3.4-noexclusive.patch
new file mode 100644
index 0000000..4a088d3
--- /dev/null
+++ b/vsftpd-2.3.4-noexclusive.patch
@@ -0,0 +1,13 @@
+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
diff --git a/vsftpd.spec b/vsftpd.spec
index 4017896..3eeab57 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -51,7 +51,7 @@ Patch13: vsftpd-2.2.0-openssl.patch
 Patch14: vsftpd-2.2.0-wildchar.patch
 
 Patch16: vsftpd-2.2.2-clone.patch
-Patch17: vsftpd-2.2.2-v6only.patch
+Patch17: vsftpd-2.3.4-noexclusive.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -77,7 +77,7 @@ cp %{SOURCE1} .
 %patch13 -p1 -b .openssl
 %patch14 -p1 -b .wildchar
 %patch16 -p1 -b .clone
-%patch17 -p1 -b .v6only
+%patch17 -p1 -b .noexclusive
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Tue Nov 15 2011 Jiri Skala <jskala at redhat.com> - 2.3.4-2
+- removes exclusivity between listen and listen_ipv6 BZ#450853
+
 * Thu Mar 03 2011 Jiri Skala <jskala at redhat.com> - 2.3.4-1
 - update to latest upstream 2.3.4
 - fixes #681935 - CVE-2011-0762 vsftpd: remote DoS via crafted glob pattern