diff --git a/httpd-2.4.53-icons.patch b/httpd-2.4.54-icons.patch similarity index 93% rename from httpd-2.4.53-icons.patch rename to httpd-2.4.54-icons.patch index cd125b3dea82291bdfdc1574f3b9af8236579400..efc0c4d5837f764b6fae1693fe5e011f87bbf55d 100644 --- a/httpd-2.4.53-icons.patch +++ b/httpd-2.4.54-icons.patch @@ -28,14 +28,13 @@ index 51b02ed..93a2b87 100644 AddIcon /icons/back.gif .. AddIcon /icons/hand.right.gif README diff --git a/docs/conf/magic b/docs/conf/magic -index bc891d9..6402b59 100644 +index bc891d9..9a41b44 100644 --- a/docs/conf/magic +++ b/docs/conf/magic -@@ -383,3 +383,16 @@ +@@ -383,3 +383,15 @@ 4 string moov video/quicktime 4 string mdat video/quicktime -+AddIconByType /icons/bomb.gif application/x-coredump + +#------------------------------------------------------------------------------ +# application/x-coredump for LE/BE ELF diff --git a/httpd-2.4.43-selinux.patch b/httpd-2.4.54-selinux.patch similarity index 85% rename from httpd-2.4.43-selinux.patch rename to httpd-2.4.54-selinux.patch index 3c3176fe303eee53bea70015aab9bd0098fa66c3..3868b3bdd2532307cc685cfe366f4636f28c44bc 100644 --- a/httpd-2.4.43-selinux.patch +++ b/httpd-2.4.54-selinux.patch @@ -1,8 +1,8 @@ diff --git a/configure.in b/configure.in -index c8f9aa2..cb43246 100644 +index 74015ca..8c0ee10 100644 --- a/configure.in +++ b/configure.in -@@ -484,6 +484,11 @@ getloadavg +@@ -508,6 +508,11 @@ getloadavg dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN @@ -15,10 +15,10 @@ index c8f9aa2..cb43246 100644 [AC_TRY_RUN(#define _GNU_SOURCE #include diff --git a/server/core.c b/server/core.c -index dc0f17a..7ed9527 100644 +index a6fa2fb..cf4cba4 100644 --- a/server/core.c +++ b/server/core.c -@@ -59,6 +59,10 @@ +@@ -65,6 +65,10 @@ #include #endif @@ -28,8 +28,8 @@ index dc0f17a..7ed9527 100644 + /* LimitRequestBody handling */ #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) - #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) -@@ -5015,6 +5019,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte + #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ +@@ -5150,6 +5154,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } #endif diff --git a/httpd-2.4.53.tar.bz2 b/httpd-2.4.54.tar.bz2 similarity index 49% rename from httpd-2.4.53.tar.bz2 rename to httpd-2.4.54.tar.bz2 index e0a1bcf9670b97021b0bd91379a44f88220dbf91..2b51803797c9abad1a9b46cbd7a36ff6eb41366e 100644 Binary files a/httpd-2.4.53.tar.bz2 and b/httpd-2.4.54.tar.bz2 differ diff --git a/httpd.spec b/httpd.spec index ef3ba682082f082bfdd543ab9ee2dba65d08a803..42741f97bd04867c672f87bfcd79cbe9debfdfe7 100644 --- a/httpd.spec +++ b/httpd.spec @@ -14,7 +14,7 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.4.53 +Version: 2.4.54 Release: %{anolis_release}%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -71,9 +71,9 @@ Patch21: httpd-2.4.48-r1842929+.patch Patch22: httpd-2.4.43-mod_systemd.patch Patch23: httpd-2.4.53-export.patch Patch24: httpd-2.4.43-corelimit.patch -Patch25: httpd-2.4.43-selinux.patch +Patch25: httpd-2.4.54-selinux.patch Patch26: httpd-2.4.43-gettid.patch -Patch27: httpd-2.4.53-icons.patch +Patch27: httpd-2.4.54-icons.patch Patch30: httpd-2.4.43-cachehardmax.patch Patch34: httpd-2.4.43-socket-activation.patch Patch38: httpd-2.4.43-sslciphdefault.patch @@ -800,5 +800,8 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Aug 31 2022 mgb01105731 - 2.4.54-1 +- update httpd to 2.4.54 + * Mon May 23 2022 Chunmei Xu - 2.4.53-1 - init from upstream