From eeff44363350896ad4bfa111a0c097665dfa6af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= Date: Thu, 16 Jun 2022 18:11:29 +0200 Subject: [PATCH] Fix bug in patched magic file for core files recognition --- httpd-2.4.53-icons.patch => httpd-2.4.54-icons.patch | 5 ++--- httpd.spec | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) rename httpd-2.4.53-icons.patch => httpd-2.4.54-icons.patch (93%) 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.spec b/httpd.spec index 80492b2..1c6b205 100644 --- a/httpd.spec +++ b/httpd.spec @@ -24,7 +24,7 @@ Summary: Apache HTTP Server Name: httpd 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 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc @@ -86,7 +86,7 @@ Patch23: httpd-2.4.53-export.patch Patch24: httpd-2.4.43-corelimit.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 @@ -836,7 +836,7 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog -* Thu Jun 09 2022 Luboš Uhliarik - 2.4.54-1 +* Thu Jun 09 2022 Luboš Uhliarik - 2.4.54-2 - new version 2.4.54 * Mon May 16 2022 Joe Orton - 2.4.53-7