From eafa9e9f5b52c239e0fe58aaa7c518db9def5a34 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2016 11:52:06 +0000
Subject: import vsftpd-3.0.2-11.el7_2


---

diff --git a/SOURCES/vsftpd-2.0.5-fix_qm.patch b/SOURCES/vsftpd-2.0.5-fix_qm.patch
new file mode 100644
index 0000000..00f7358
--- /dev/null
+++ b/SOURCES/vsftpd-2.0.5-fix_qm.patch
@@ -0,0 +1,13 @@
+diff -up vsftpd-2.0.5/ls.c.fix_qm vsftpd-2.0.5/ls.c
+--- vsftpd-2.0.5/ls.c.fix_qm	2012-03-02 12:59:01.303249397 +0100
++++ vsftpd-2.0.5/ls.c	2012-03-02 13:00:03.792145117 +0100
+@@ -454,7 +454,8 @@ vsf_filename_passes_filter(const struct
+         must_match_at_current_pos = 0;
+       }
+     } while (locate_result.found &&
+-             str_getlen(&name_remain_str) > 0 && last_token != '*');
++             str_getlen(&name_remain_str) > 0 &&
++             last_token != '*' && last_token != '?');
+   }
+   /* Any incoming string left means no match unless we ended on the correct
+    * type of wildcard.
diff --git a/SPECS/vsftpd.spec b/SPECS/vsftpd.spec
index f67f290..38e983e 100644
--- a/SPECS/vsftpd.spec
+++ b/SPECS/vsftpd.spec
@@ -3,7 +3,7 @@
 
 Name: vsftpd
 Version: 3.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -65,6 +65,7 @@ Patch27: vsftpd-3.0.2-mrate.patch
 Patch28: vsftpd-3.0.2-wnohang.patch
 Patch29: vsftpd-3.0.2-dh.patch
 Patch30: vsftpd-3.0.2-ecdh.patch
+Patch31: vsftpd-2.0.5-fix_qm.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -110,6 +111,7 @@ cp %{SOURCE1} .
 %patch28 -p1 -b .wnohang
 %patch29 -p1 -b .dh
 %patch30 -p1 -b .ecdh
+%patch31 -p1 -b .fix_qm
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -180,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/vsftpd
 
 %changelog
+* Tue Feb 23 2016 Pavel Šimerda <psimerda@redhat.com> - 3.0.2-11
+- Resolves: #1166741 - Wildcard ? does not work correctly in vsftpd-3.0.2-9.el7
+
 * Mon Aug 03 2015 Martin Osvald <mosvald@rehat.com> - 3.0.2-10
 - Resolves: #1058704 - vsftpd does not support DHE cipher suites
 - Resolves: #1058712 - vsftpd does not support ECDHE cipher suites