X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache-configdir_skip_backups.patch;h=a0ff92e1cf322e33c669449e62b9cab931e9425d;hb=b77f3be89fbc13b7aa04dfc574702f5a15971d51;hp=558f6b33ddad6c113be97e52bcb02aed65681b5d;hpb=9d781f9b61ca1b0bf09e2316d09f0b98f99e67f3;p=packages%2Fapache.git

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index 558f6b3..a0ff92e 100644
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,26 +1,26 @@
---- httpd-2.0.42/server/config.c.wiget	Thu Sep 12 22:04:07 2002
-+++ httpd-2.0.42/server/config.c	Wed Sep 25 12:07:10 2002
-@@ -1458,6 +1458,7 @@
+diff -ur httpd-2.2.0.org/server/config.c httpd-2.2.0/server/config.c
+--- httpd-2.2.0.org/server/config.c	2005-11-17 14:39:15.000000000 +0100
++++ httpd-2.2.0/server/config.c	2005-12-21 16:04:35.970963000 +0100
+@@ -1537,6 +1537,7 @@
          apr_dir_t *dirp;
          apr_finfo_t dirent;
          int current;
 +	size_t slen;
          apr_array_header_t *candidates = NULL;
          fnames *fnew;
-         apr_status_t rv;
-@@ -1505,9 +1506,15 @@
+         char *path = apr_pstrdup(p, fname);
+@@ -1562,8 +1563,13 @@
  
          candidates = apr_array_make(p, 1, sizeof(fnames));
          while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-+ 	    	slen = strlen(dirent.name);
++	    slen = strlen(dirent.name);
              /* strip out '.' and '..' */
-             if (strcmp(dirent.name, ".")
-                 && strcmp(dirent.name, "..")
-+				&& (dirent.name)[slen-1] != '~' 
-+				&& (dirent.name)[0] != '.'
-+				&& (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew")) 
-+				&& (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig") 
-+						&& strcmp((dirent.name + slen - 8), ".rpmsave")))
-                 && (!ispatt ||
-                     apr_fnmatch(pattern, dirent.name, 
-                                 FNM_PERIOD) == APR_SUCCESS)) {
+-            if (strcmp(dirent.name, ".")
++            if (strcmp(dirent.name, ".") && (dirent.name)[slen-1] != '~'
++			    && (dirent.name)[0] != '.'
++			    && (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew"))
++			    && (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig")
++					    && strcmp((dirent.name + slen - 8), ".rpmsave")))
+                 && strcmp(dirent.name, "..")) {
+                 fnew = (fnames *) apr_array_push(candidates);
+                 fnew->fname = ap_make_full_path(p, path, dirent.name);