[vsftpd/f15/master] update to latest upstream 2.3.4 fixes #681935 - CVE-2011-0762 vsftpd: remote DoS via crafted glob pa

[Jiri Skala]

commit e288a3ad088f8ab29f7591bcfaa4246b58657bc6
Author: Jiri Skala <jskala at skalniknb.(none)>
Date:   Thu Mar 3 21:04:51 2011 +0100

    update to latest upstream 2.3.4
    fixes #681935 - CVE-2011-0762 vsftpd: remote DoS via crafted glob pattern

 .gitignore                |    1 +
 sources                   |    2 +-
 vsftpd-2.1.0-filter.patch |    2 +-
 vsftpd.spec               |    8 ++++++--
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 060a059..a25fec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 vsftpd-2.2.2.tar.gz
 vsftpd-2.3.2.tar.gz
+/vsftpd-2.3.4.tar.gz
diff --git a/sources b/sources
index c2d3f66..1725ccc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bad7b117d737a738738836041edc00db  vsftpd-2.3.2.tar.gz
+2ea5d19978710527bb7444d93b67767a  vsftpd-2.3.4.tar.gz
diff --git a/vsftpd-2.1.0-filter.patch b/vsftpd-2.1.0-filter.patch
index fe049fa..26b6489 100644
--- a/vsftpd-2.1.0-filter.patch
+++ b/vsftpd-2.1.0-filter.patch
@@ -32,7 +32,7 @@ diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c
 +  } else
 +    str_copy(&name_remain_str, p_filename_str);
 +  
-   while (!str_isempty(&filter_remain_str))
+   while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
    {
      static struct mystr s_match_needed_str;
 diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c
diff --git a/vsftpd.spec b/vsftpd.spec
index 32dba1f..4017896 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,8 +1,8 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
 Name: vsftpd
-Version: 2.3.2
-Release: 2%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -142,6 +142,10 @@ fi
 
 
 %changelog
+* 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
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild