From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 18 Aug 2019 15:46:49 +0000 (+0200)
Subject: - updated to 2.4.41, patch merged from PLD
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=643b40ba6fb202f1a137be81b0b78a0305a68873;p=packages%2Fapache.git

- updated to 2.4.41, patch merged from PLD
---

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index a0ff92e..07aba85 100644
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,26 +1,18 @@
-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;
-         char *path = apr_pstrdup(p, fname);
-@@ -1562,8 +1563,13 @@
+--- 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, ".")
-+            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);
+     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)) {
diff --git a/apache.spec b/apache.spec
index 358feb0..b0b5ded 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,12 +35,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.4.39
-Release:	2
+Version:	2.4.41
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	930e217ba2d71e708a3f1521ecae7ec0
+# Source0-md5:	dfc674f8f454e3bc2d4ccd73ad3b5f1e
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig