diff --git a/httpd-2.4.43-r1861269.patch b/httpd-2.4.43-r1861269.patch deleted file mode 100644 index 9bff242154d19481bce95f892494da2484d5536e..0000000000000000000000000000000000000000 --- a/httpd-2.4.43-r1861269.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c -index b53f3f8..979489c 100644 ---- a/modules/ssl/ssl_engine_config.c -+++ b/modules/ssl/ssl_engine_config.c -@@ -812,8 +812,14 @@ const char *ssl_cmd_SSLCipherSuite(cmd_parms *cmd, - static const char *ssl_cmd_check_file(cmd_parms *parms, - const char **file) - { -- const char *filepath = ap_server_root_relative(parms->pool, *file); -+ const char *filepath; - -+ /* If only dumping the config, don't verify the paths */ -+ if (ap_state_query(AP_SQ_RUN_MODE) == AP_SQ_RM_CONFIG_DUMP) { -+ return NULL; -+ } -+ -+ filepath = ap_server_root_relative(parms->pool, *file); - if (!filepath) { - return apr_pstrcat(parms->pool, parms->cmd->name, - ": Invalid file path ", *file, NULL); diff --git a/httpd-2.4.54.tar.bz2 b/httpd-2.4.55.tar.bz2 similarity index 49% rename from httpd-2.4.54.tar.bz2 rename to httpd-2.4.55.tar.bz2 index 2b51803797c9abad1a9b46cbd7a36ff6eb41366e..c4b735ccdb6cbe4301f7feb79cd3a6173918c607 100644 Binary files a/httpd-2.4.54.tar.bz2 and b/httpd-2.4.55.tar.bz2 differ diff --git a/httpd.spec b/httpd.spec index 42741f97bd04867c672f87bfcd79cbe9debfdfe7..fe4412c4b04a1d2c3ae432a58bf6ac63bd8af6d4 100644 --- a/httpd.spec +++ b/httpd.spec @@ -14,7 +14,7 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.4.54 +Version: 2.4.55 Release: %{anolis_release}%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -78,7 +78,6 @@ Patch30: httpd-2.4.43-cachehardmax.patch Patch34: httpd-2.4.43-socket-activation.patch Patch38: httpd-2.4.43-sslciphdefault.patch Patch39: httpd-2.4.43-sslprotdefault.patch -Patch40: httpd-2.4.43-r1861269.patch Patch41: httpd-2.4.43-r1861793+.patch Patch42: httpd-2.4.48-r1828172+.patch Patch45: httpd-2.4.43-logjournal.patch @@ -800,6 +799,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Jan 18 2023 Funda Wang - 2.4.55-1 +- New version 2.4.55 + * Wed Aug 31 2022 mgb01105731 - 2.4.54-1 - update httpd to 2.4.54