[SCM] PostGIS branch stable-2.5 updated. 2.5.10-2-g0418cc0dd

git at osgeo.org git at osgeo.org
Wed Feb 14 13:09:04 PST 2024


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-2.5 has been updated
       via  0418cc0ddfda973ba10aa8cc981b07f25a464bdb (commit)
       via  4982b385be81de20846d2e1e4b5d8d3f954b5c6c (commit)
      from  83ac76a8baad28b54cfcc764e3cfb0b6bd3b3897 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0418cc0ddfda973ba10aa8cc981b07f25a464bdb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Feb 14 13:08:06 2024 -0800

    Prepare for 2.5.11 release

diff --git a/NEWS b/NEWS
index 5a24db573..8ed351b9c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 
+PostGIS 2.5.11
+2024/02/14
+This Valentines Day release addresses an error in the last release
+which did not include the full repair patch.
+
+
 PostGIS 2.5.10
 2024/02/06
 This emergency release addresses a behaviour change in RHEL libxml2
diff --git a/README.postgis b/README.postgis
index 7382df1f8..d46916aa6 100644
--- a/README.postgis
+++ b/README.postgis
@@ -1,8 +1,8 @@
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 2.5.10
-:Date: 2024-02-06
+:Version: 2.5.11
+:Date: 2024-02-14
 :Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties
diff --git a/Version.config b/Version.config
index 7c7bedd54..19b178795 100644
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=10
+POSTGIS_MICRO_VERSION=11
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

commit 4982b385be81de20846d2e1e4b5d8d3f954b5c6c
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Feb 14 13:00:24 2024 -0800

    Fix partial commit of libxml fix patch.
    Harmonize regression to new behaviour for
    name space in xml fragment.

diff --git a/postgis/lwgeom_in_gml.c b/postgis/lwgeom_in_gml.c
index a79a4c7bf..3b1f26140 100644
--- a/postgis/lwgeom_in_gml.c
+++ b/postgis/lwgeom_in_gml.c
@@ -1843,7 +1843,7 @@ static LWGEOM* lwgeom_from_gml(const char* xml)
 
 	/* Begin to Parse XML doc */
 	xmlInitParser();
-        xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, XML_PARSE_SAX1);
+	xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, 0);
 	if (!xmldoc || (xmlroot = xmlDocGetRootElement(xmldoc)) == NULL)
 	{
 		xmlFreeDoc(xmldoc);
diff --git a/postgis/lwgeom_in_kml.c b/postgis/lwgeom_in_kml.c
index aa05c78bd..a55da00d3 100644
--- a/postgis/lwgeom_in_kml.c
+++ b/postgis/lwgeom_in_kml.c
@@ -115,7 +115,6 @@ Datum geom_from_kml(PG_FUNCTION_ARGS)
 	/* Begin to Parse XML doc */
 	xmlInitParser();
 	xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, 0);
-	// xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, XML_PARSE_SAX1);
 	if (!xmldoc || (xmlroot = xmlDocGetRootElement(xmldoc)) == NULL)
 	{
 		xmlFreeDoc(xmldoc);
diff --git a/regress/in_gml_expected b/regress/in_gml_expected
index 5e0ff9a41..f279ba6e7 100644
--- a/regress/in_gml_expected
+++ b/regress/in_gml_expected
@@ -224,7 +224,7 @@ ns_6|POINT(1 2)
 ns_7|SRID=4326;POINT(1 2)
 ns_8|SRID=4326;POINT(1 2)
 ns_9|SRID=4326;POINT(1 2)
-ns_10|SRID=4326;POINT(1 2)
+ns_10|POINT(1 2)
 ns_11|POINT(1 2)
 ERROR:  invalid GML representation
 ns_13|SRID=4326;POINT(1 2)

-----------------------------------------------------------------------

Summary of changes:
 NEWS                    | 6 ++++++
 README.postgis          | 4 ++--
 Version.config          | 2 +-
 postgis/lwgeom_in_gml.c | 2 +-
 postgis/lwgeom_in_kml.c | 1 -
 regress/in_gml_expected | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list