[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.7-13-g3e1001ab0

[git at osgeo.org]

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-3.1 has been updated
       via  3e1001ab01b8f8f9d8b5d1f73b68fbee67c4dea6 (commit)
       via  c423ef45d09d26a2303c077b303a0d5368ebda7d (commit)
      from  d939bbf43e6b854f9fa379f47e7e0134cb68ab5e (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 3e1001ab01b8f8f9d8b5d1f73b68fbee67c4dea6
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Oct 29 11:39:08 2022 +0200

    Encode dependency of raster unpackaged sql on create_unpackage.pl

diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index f3df77875..dddc6fcc1 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -78,8 +78,8 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
 sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
 	echo "-- Nothing to do here" > $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile sql
-	cat $^ | $(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis_raster > $@
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
+	cat sql/$(EXTENSION)--$(EXTVERSION).sql | $(PERL) @top_srcdir@/utils/create_unpackaged.pl $(EXTENSION) > $@
 	# Upgrade after packaging
 	cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql >> $@
 

commit c423ef45d09d26a2303c077b303a0d5368ebda7d
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Oct 29 12:01:57 2022 +0200

    Fix handling of multiline SQL defn in unpackaged script creation

diff --git a/utils/create_unpackaged.pl b/utils/create_unpackaged.pl
index b82d3b989..a50725158 100755
--- a/utils/create_unpackaged.pl
+++ b/utils/create_unpackaged.pl
@@ -147,7 +147,7 @@ sub add_if_not_exists
 	# in objects
 	die "Invalid characters in object definition: $obj" if $obj =~ /'/;
 
-	$obj =~ m/([^ ]*) (.*)/;
+	$obj =~ m/([^ ]*) (.*)/s; # can be multiline
 	my $type = $1;
 	my $sig = $2;
 

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

Summary of changes:
 extensions/postgis_raster/Makefile.in | 4 ++--
 utils/create_unpackaged.pl            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS