From 8b1f9a0eb30e48e024f18daf5f59b26a12b0bd12 Mon Sep 17 00:00:00 2001
From: reporter4u <roberto.dalzilio@consulenti.csi.it>
Date: Mon, 11 Jul 2022 10:44:53 +0200
Subject: [PATCH] - FIX Issue #55: /etc/httpd/conf/magic broken since version
 2.4.54-1 - UPDATE httpd-2.4.43-selinux.patch from FC'

---
 httpd-2.4.53-icons.patch => httpd-2.4.54-icons.patch   |  5 ++---
 ...-2.4.43-selinux.patch => httpd-2.4.54-selinux.patch | 10 +++++-----
 httpd24u.spec                                          | 10 +++++++---
 3 files changed, 14 insertions(+), 11 deletions(-)
 rename httpd-2.4.53-icons.patch => httpd-2.4.54-icons.patch (93%)
 rename httpd-2.4.43-selinux.patch => httpd-2.4.54-selinux.patch (89%)

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 cd125b3..efc0c4d 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 89%
rename from httpd-2.4.43-selinux.patch
rename to httpd-2.4.54-selinux.patch
index ea668b8..3868b3b 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 <unistd.h>
 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 <unistd.h>
  #endif
  
@@ -29,7 +29,7 @@ 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) 1<<30) /* 1GB */
-@@ -5015,6 +5019,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+@@ -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/httpd24u.spec b/httpd24u.spec
index 40f689e..3489295 100644
--- a/httpd24u.spec
+++ b/httpd24u.spec
@@ -25,7 +25,7 @@
 Summary: Apache HTTP Server
 Name: httpd24u
 Version: 2.4.54
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source2: httpd.logrotate
@@ -75,9 +75,9 @@ Patch19: httpd-2.4.53-detect-systemd.patch
 # Features/functional changes
 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
 Patch41: httpd-2.4.43-r1861793+.patch
@@ -827,6 +827,10 @@ exit $rv
 
 
 %changelog
+* Mon Jul 11 2022 Reporter4u <reporter4u@gmail.com> - 2.4.54-2
+- Update patch httpd-2.4.54-icons.patch from FC
+- Update patch httpd-2.4.54-selinux.patch from FC
+
 * Thu Jun 09 2022 Reporter4u <reporter4u@gmail.com> - 2.4.54-1
 - Latest upstream