From 69f7328ab47bca9aba8c312e51de2f700f650d57 Mon Sep 17 00:00:00 2001 From: baiguo Date: Fri, 10 May 2024 09:45:47 +0800 Subject: [PATCH] Fix error:unknown type name xmlChar --- ...-Fix-error-unknown-type-name-xmlChar.patch | 24 +++++++++++++++++++ httpd.spec | 9 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-error-unknown-type-name-xmlChar.patch diff --git a/backport-Fix-error-unknown-type-name-xmlChar.patch b/backport-Fix-error-unknown-type-name-xmlChar.patch new file mode 100644 index 0000000..8a9ac70 --- /dev/null +++ b/backport-Fix-error-unknown-type-name-xmlChar.patch @@ -0,0 +1,24 @@ +From c986490db166933b140257aca2695a3a02675dfd Mon Sep 17 00:00:00 2001 +From: zhaixiaojuan +Date: Fri, 10 May 2024 09:39:27 +0800 +Subject: [PATCH] Fix error:unknown type name xmlChar + +--- + modules/filters/mod_xml2enc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c +index 4f9a897..0b8f1f2 100644 +--- a/modules/filters/mod_xml2enc.c ++++ b/modules/filters/mod_xml2enc.c +@@ -36,6 +36,7 @@ + + /* libxml2 */ + #include ++#include + + #if defined(__clang__) + #pragma clang diagnostic pop +-- +2.27.0 + diff --git a/httpd.spec b/httpd.spec index 61ed127..fad46e0 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.58 -Release: 2 +Release: 3 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -76,6 +76,7 @@ Patch22: backport-CVE-2024-24795-let-httpd-handle-CL-TE-for-non-http-ha Patch23: backport-CVE-2023-38709-header-validation-after-content.patch Patch24: backport-CVE-2024-27316-bail-after-too-many-failed-reads.patch Patch25: backport-remove-dependency-on-xmlstring-header.patch +Patch26: backport-Fix-error-unknown-type-name-xmlChar.patch BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel @@ -512,6 +513,12 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Fri May 10 2024 baiguo - 2.4.58-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix error unknown type name 'xmlChar' + * Mon May 06 2024 chengyechun - 2.4.58-2 - Type:CVE - ID:CVE-2024-24795,CVE-2023-38709,CVE-2024-27316 -- Gitee