<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/311d396250fbb532827d898330dd83324cc86706">https://github.com/macports/macports-ports/commit/311d396250fbb532827d898330dd83324cc86706</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 311d396250f apache2: update to 2.4.59
</span>311d396250f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 311d396250fbb532827d898330dd83324cc86706
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Thu Apr 4 09:31:12 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    apache2: update to 2.4.59
</span>---
 www/apache2/Portfile                 |  9 ++++-----
 www/apache2/files/libxml2-2.12.patch | 16 ----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache2/Portfile b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3321435fe9..c916e3c1a85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem          1.0
</span> PortGroup           apache2 1.0
 
 name                apache2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.4.58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.4.59
</span> revision            0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  0d12a1750b92fbae503f19e6644b3edf0f6a29ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    7485817
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  44342c09deb54e33b1c8b635b1d7a1025d75f80a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    7503198
</span> 
 categories          www
 maintainers         {ryandesign @ryandesign} {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,6 @@ patch.pre_args      -p1
</span> patchfiles          patch-build-rules.mk.in.diff \
                     patch-config.layout.diff \
                     patch-support-apxs.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    libxml2-2.12.patch \
</span>                     patch-ssl_engine_init.c.diff
 
 post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache2/files/libxml2-2.12.patch b/www/apache2/files/libxml2-2.12.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ac23d14f2f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache2/files/libxml2-2.12.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with libxml2 2.12.x:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: unknown type name 'xmlChar'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/modules/filters/mod_xml2enc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/modules/filters/mod_xml2enc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     /* to sniff, first we look for BOM */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                              ctx->bytes); 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if (HAVE_ENCODING(ctx->xml2enc)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
</span></pre><pre style='margin:0'>

</pre>