From 5a9394761a76843883ab7b09d15c336324e2be13 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Fri, 05 Apr 2024 16:14:27 +0200
Subject: [PATCH] apache-24: update to 2.4.59
---
/dev/null | 12 ------------
components/web/apache24/Makefile | 5 ++---
components/web/apache24/manifests/sample-manifest.p5m | 2 +-
components/web/apache24/pkg5 | 2 +-
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/components/web/apache24/Makefile b/components/web/apache24/Makefile
index 7c9f2bd..9afebb0 100644
--- a/components/web/apache24/Makefile
+++ b/components/web/apache24/Makefile
@@ -29,13 +29,12 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= apache2
-COMPONENT_VERSION= 2.4.58
-COMPONENT_REVISION= 1
+COMPONENT_VERSION= 2.4.59
COMPONENT_PROJECT_URL= https://httpd.apache.org/
COMPONENT_SRC_NAME= httpd
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:503a7da4a4a27fd496037998b17078dc9fe004db32c657c96cce8356b8aa2eb6
+COMPONENT_ARCHIVE_HASH= sha256:e4ec4ce12c6c8f5a794dc2263d126cb1d6ef667f034c4678ec945d61286e8b0f
COMPONENT_ARCHIVE_URL= https://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
CONFIGURE_DEFAULT_DIRS= no
diff --git a/components/web/apache24/manifests/sample-manifest.p5m b/components/web/apache24/manifests/sample-manifest.p5m
index 7e507f1..df945df 100644
--- a/components/web/apache24/manifests/sample-manifest.p5m
+++ b/components/web/apache24/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/web/apache24/patches/xmlChar.patch b/components/web/apache24/patches/xmlChar.patch
deleted file mode 100644
index cacdaa4..0000000
--- a/components/web/apache24/patches/xmlChar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# see https://github.com/apache/httpd/pull/393
---- modules/filters/mod_xml2enc.c 2020-02-21 01:33:40.000000000 +0100
-+++ modules/filters/mod_xml2enc.c.new 2023-11-29 19:31:15.134240536 +0100
-@@ -209,7 +209,7 @@
-
- /* to sniff, first we look for BOM */
- if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
-- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
-+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
- ctx->bytes);
- if (HAVE_ENCODING(ctx->xml2enc)) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
diff --git a/components/web/apache24/pkg5 b/components/web/apache24/pkg5
index de8c912..462d88b 100644
--- a/components/web/apache24/pkg5
+++ b/components/web/apache24/pkg5
@@ -25,4 +25,4 @@
"web/server/apache-24/documentation"
],
"name": "apache2"
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3