<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b7e08715ffb24b84868d90267cd8d88a20028e3">https://github.com/macports/macports-ports/commit/6b7e08715ffb24b84868d90267cd8d88a20028e3</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 6b7e08715ff postgresql95: Bugfix, Make PostgreSQL work with newer libxml2
</span>6b7e08715ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b7e08715ffb24b84868d90267cd8d88a20028e3
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Nov 24 09:40:58 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> postgresql95: Bugfix, Make PostgreSQL work with newer libxml2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch
</span><span style='display:block; white-space:pre;color:#404040;'> * https://lists.macports.org/pipermail/macports-dev/2024-November/045952.html
</span>---
databases/postgresql95/Portfile | 5 ++++-
databases/postgresql95/files/patch-xml_c.diff | 31 +++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql95/Portfile b/databases/postgresql95/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 336e47dbcb0..47e0d2649f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,6 @@ PortGroup deprecated 1.0
</span>
# Final release was on 2021-02-08
deprecated.upstream_support no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-known_fail yes
</span>
#remember to update the -doc and -server as well
name postgresql95
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +37,10 @@ use_bzip2 yes
</span> # do not build man or html files (use postgresqlXY-doc instead)
patchfiles-append patch-no_doc.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -NaurdwB ./postgresql95-orig ./postgresql95-new | sed -E -e 's/\.\/postgresql95-(orig|new)/\./g' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-xml_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-xml_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt
depends_build port:bison
depends_run port:postgresql_select-95
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql95/files/patch-xml_c.diff b/databases/postgresql95/files/patch-xml_c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8c1264a1f61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql95/files/patch-xml_c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -NaurdwB ./src/backend/utils/adt/xml.c ./src/backend/utils/adt/xml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/backend/utils/adt/xml.c 2024-11-23 14:50:40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/backend/utils/adt/xml.c 2024-11-23 14:57:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +117,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlParserCtxtPtr ctxt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void xml_errorHandler(void *data, const xmlError *error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void xml_errorHandler(void *data, xmlErrorPtr error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void xml_ereport_by_code(int level, int sqlcode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *msg, int errcode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void chopStringInfoNewlines(StringInfo str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1655,8 +1660,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Error handler for libxml errors and warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-xml_errorHandler(void *data, xmlErrorPtr error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void xml_errorHandler(void *data, const xmlError *error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void xml_errorHandler(void *data, xmlErrorPtr error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;
</span></pre><pre style='margin:0'>
</pre>