[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-297-g76cba50ee

[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, master has been updated
       via  76cba50ee2fc29fd2feafc7b54fd6b3b67b10f34 (commit)
       via  13a5f579c19c041516969f87b32d0291dc81303f (commit)
      from  1fd7fd8c655754209e98be6c156601e7e06220a8 (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 76cba50ee2fc29fd2feafc7b54fd6b3b67b10f34
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 8bac04f67..1d061f114 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 13a5f579c19c041516969f87b32d0291dc81303f
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