Bump apr dependency to 1.7.0

[packages/apache.git] / apache-configdir_skip_backups.patch

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index 558f6b33ddad6c113be97e52bcb02aed65681b5d..07aba85679d584cc75e18b25ff73b16fc89a6aad 100644 (file)
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,26 +1,18 @@
---- 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 @@
-         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 @@
+--- httpd-2.4.41/server/util.c~        2019-07-22 21:28:14.000000000 +0200
++++ httpd-2.4.41/server/util.c 2019-08-17 10:09:47.225371702 +0200
+@@ -3477,8 +3477,14 @@ AP_DECLARE(const char *)ap_dir_fnmatch(a
  
-         candidates = apr_array_make(p, 1, sizeof(fnames));
-         while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-+              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)) {
+     candidates = apr_array_make(w->ptemp, 1, sizeof(fnames));
+     while (apr_dir_read(&dirent, APR_FINFO_DIRENT | APR_FINFO_TYPE, dirp) == APR_SUCCESS) {
++        size_t slen;
++        slen = strlen(dirent.name);
+         /* strip out '.' and '..' */
+-        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, "..")
+             && (apr_fnmatch(fname, dirent.name,
+                             APR_FNM_PERIOD) == APR_SUCCESS)) {