- updated for 2.0.48

Changed files:
    apache-configdir_skip_backups.patch -> 1.4

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index 558f6b33ddad6c113be97e52bcb02aed65681b5d..ecc4084c9c5885e2b9a6c3ca03a4a1cf5781eec8 100644 (file)
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,5 +1,6 @@
---- 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
+diff -Nru httpd-2.0.48.orig/server/config.c httpd-2.0.48/server/config.c
+--- httpd-2.0.48.orig/server/config.c  2003-10-14 05:43:18.000000000 +0200
++++ httpd-2.0.48/server/config.c       2003-10-28 10:09:44.618490512 +0100
 @@ -1458,6 +1458,7 @@
          apr_dir_t *dirp;
          apr_finfo_t dirent;
@@ -8,19 +9,18 @@
          apr_array_header_t *candidates = NULL;
          fnames *fnew;
          apr_status_t rv;
-@@ -1505,9 +1506,15 @@
+@@ -1478,8 +1479,14 @@
  
          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)) {
++              && (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);