X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-connectivity%2Fvsftpd%2Fvsftpd%2F06-greedy.patch;fp=meta-openvuplus%2Frecipes-connectivity%2Fvsftpd%2Fvsftpd%2F06-greedy.patch;h=0000000000000000000000000000000000000000;hp=ff73c9c28560b0c03852c8e3d685061ec9d0d8ad;hb=57dadb52843e9a4e6ae22c1299a2958c4fdbee5a;hpb=dd149942b9463ed3eafff01859224051c3cc2af9

diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/06-greedy.patch b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/06-greedy.patch
deleted file mode 100644
index ff73c9c..0000000
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/06-greedy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Martin Nagy <mnagy@redhat.com>
-Description: Fix file listing issue with wildcard (Bugzilla: #392181).
-
-diff -Naurp vsftpd.orig/ls.c vsftpd/ls.c
---- vsftpd.orig/ls.c	2009-10-02 14:15:18.000000000 +0200
-+++ vsftpd/ls.c	2009-10-18 11:48:29.000000000 +0200
-@@ -281,6 +281,25 @@ vsf_filename_passes_filter(const struct 
-       {
-         goto out;
-       }
-+      if (!must_match_at_current_pos)
-+      {
-+        struct mystr scan_fwd = INIT_MYSTR;
-+
-+        str_mid_to_end(&name_remain_str, &scan_fwd,
-+                        indexx + str_getlen(&s_match_needed_str));
-+        /* We're allowed to be greedy, test if it match further along
-+         * keep advancing indexx while we can still match.
-+         */
-+        while( (locate_result = str_locate_str(&scan_fwd, &s_match_needed_str)),
-+            locate_result.found )
-+        {
-+          indexx += locate_result.index + str_getlen(&s_match_needed_str);
-+          str_mid_to_end(&scan_fwd, &temp_str,
-+                         locate_result.index + str_getlen(&s_match_needed_str));
-+          str_copy(&scan_fwd, &temp_str);
-+        }
-+       str_free(&scan_fwd);
-+      }
-       /* Chop matched string out of remainder */
-       str_mid_to_end(&name_remain_str, &temp_str,
-                      indexx + str_getlen(&s_match_needed_str));