[SCM] PostGIS branch stable-3.3 updated. 3.3.10-130-g3ce1a3653
git at osgeo.org
git at osgeo.org
Sat Aug 15 09:36:38 PDT 2026
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.3 has been updated
via 3ce1a36539ec8db913f226f56288593433c11516 (commit)
via 6746b140c1478b148ca6e1ec152e5bd6c6b3294b (commit)
via cb73987847789a1cd6ea77461745134e94596512 (commit)
via 327a85bfe6669d60e60e38eed4779c69dc76e43e (commit)
from fd53d6f18530e34f9551aadb07ebbf0c70d45002 (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 3ce1a36539ec8db913f226f56288593433c11516
Merge: fd53d6f18 6746b140c
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sat Aug 15 09:36:37 2026 -0700
Merge pull request '[3.3] Fix address_standardizer test-security_bounds build and installcheck failure' (!739) from Komzpa/postgis:fix/addrstd-security-bounds-3.3-20260815 into stable-3.3
[PR 712](https://gitea.osgeo.org/postgis/postgis/pulls/712) extended `REGRESS` to include `test-security_bounds` but did not add the matching `sql/test-security_bounds.sql` prerequisite to the `all:` target, so `installcheck` could not find the generated test file at all ("cannot open .../sql/test-security_bounds.sql: No such file"). Restoring the prerequisite, matching stable-3.4 through stable-3.6, surfaces the same whitespace-only fixture defect fixed in the companion pull requests for the newer branches: real psql pads an aligned-mode single-column header with a trailing space and appends a trailing blank line, and the committed fixture was never actually run against pg_regress before merge. Both are fixed here, and `.editorconfig` gains the same trim-trailing-whitespace protection for `expected/*.out` fixtures that PostGIS's own `*_expected` files already have.
Note: Woodpecker does not run `make -C extensions/address_standardizer installcheck` on any branch, so this failure was only visible on Jenkins Winnie; validated locally on Linux with a clean build (5 of 5 tests pass).
References https://gitea.osgeo.org/postgis/postgis/pulls/712
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/739
commit 6746b140c1478b148ca6e1ec152e5bd6c6b3294b
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sat Aug 15 20:22:23 2026 +0400
Protect PGXS extension regression fixtures from whitespace trimming
.editorconfig's "*_expected" exception to trim_trailing_whitespace only
matches PostGIS's own regress/core/<test>_expected naming convention.
extensions/address_standardizer uses the PGXS pg_regress convention
instead, expected/<test>.out, which the glob does not match, so an
editor honoring .editorconfig silently strips the trailing whitespace
that real psql aligned-mode output requires in these files. That is
what produced the test-security_bounds fixture defect fixed in the
previous commit. Extend the exception to cover expected/*.out at any
depth so future PGXS-style fixtures do not repeat it.
diff --git a/.editorconfig b/.editorconfig
index e8c970e3e..5340c503e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,6 +13,13 @@ insert_final_newline = true
[*_expected]
trim_trailing_whitespace = false
+# PGXS-style extension regression fixtures (extensions/*/expected/*.out)
+# use pg_regress's own naming convention instead of *_expected, and need
+# the same protection: aligned-mode psql output legitimately ends lines
+# in trailing whitespace.
+[**/expected/*.out]
+trim_trailing_whitespace = false
+
# C files want tab indentation
[*.{c,h,h.in}]
indent_style = tab
commit cb73987847789a1cd6ea77461745134e94596512
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sat Aug 15 20:22:12 2026 +0400
Fix test-security_bounds expected output header padding
With the sql/test-security_bounds.sql build prerequisite restored,
installcheck runs the test but still fails: pg_regress reports
"1 of 5 tests failed" for test-security_bounds.
The regression.diffs is whitespace-only. Real, unmodified psql
right-pads a single-column aligned-mode header to the border width
with a trailing space; the data row below it does not need padding
once its width already equals the header width. The
expected/test-security_bounds.out fixture added by GT-712 has that
trailing space missing from both of its "*_ok" headers, and is
missing the trailing blank line pg_regress always appends after the
last statement's output. Every substantive assertion in the file
(the NOTICE and error text, the accept/reject behavior at the
254/255/256/300-byte token boundaries, the malformed rule handling)
is untouched and already matched byte for byte.
This is a fixture authoring defect, not a behavior regression: the
address_standardizer hardening itself works as intended. The
.editorconfig "*_expected" trim-trailing-whitespace exception in this
repository matches PostGIS's regress/core naming convention
(<test>_expected) but not the extensions/*/expected/<test>.out PGXS
convention that address_standardizer uses, so any editor honoring
.editorconfig strips this exact header padding on save; a following
commit closes that gap.
References https://gitea.osgeo.org/postgis/postgis/pulls/712
diff --git a/extensions/address_standardizer/expected/test-security_bounds.out b/extensions/address_standardizer/expected/test-security_bounds.out
index 8bfa88c8e..7261ba068 100644
--- a/extensions/address_standardizer/expected/test-security_bounds.out
+++ b/extensions/address_standardizer/expected/test-security_bounds.out
@@ -65,7 +65,7 @@ BEGIN
END
$scanner_bounds$;
SELECT 'scanner_bounds_ok' AS scanner_bounds_ok;
- scanner_bounds_ok
+ scanner_bounds_ok
-------------------
scanner_bounds_ok
(1 row)
@@ -116,7 +116,8 @@ $$;
NOTICE: load_roles: failed to add rule 1 (7): 1 -1 5 -1 5 0
NOTICE: bad-rule-type: CreateStd: failed to load 't_bad_rule_type' for rules
SELECT 'security_bounds_ok' AS security_bounds_ok;
- security_bounds_ok
+ security_bounds_ok
--------------------
security_bounds_ok
(1 row)
+
commit 327a85bfe6669d60e60e38eed4779c69dc76e43e
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sat Aug 15 20:22:05 2026 +0400
Build sql/test-security_bounds.sql so installcheck can find it
extensions/address_standardizer's REGRESS variable was extended for
test-security_bounds by GT-712, but the Makefile.in "all:" target's
prerequisite list, which drives the "sql/%.sql: %.sql.in" pattern
rule that actually preprocesses each test-*.sql.in into sql/*.sql,
was not updated to match. pg_regress therefore could not find
sql/test-security_bounds.sql at all:
test test-security_bounds ... /bin/sh: 1: cannot open
.../sql/test-security_bounds.sql: No such file
installcheck failed outright (make error 2) rather than running the
test, on both PG15 and a from-clean build. Add the missing
prerequisite alongside the extension's other generated test scripts,
matching stable-3.4/3.5/3.6, which already list it.
References https://gitea.osgeo.org/postgis/postgis/pulls/712
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index d382ef19e..9370861bc 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -50,7 +50,7 @@ DATA_built = \
all: sql/address_standardizer_pre.sql sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql \
sql/$(EXTENSION)_data_us.sql sql/address_standardizer-- at POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us-- at POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql \
-sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
+sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql sql/test-security_bounds.sql
DOCS = README.address_standardizer
PG_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ -DPCRE_VERSION=@PCRE_VERSION@
-----------------------------------------------------------------------
Summary of changes:
.editorconfig | 7 +++++++
extensions/address_standardizer/Makefile.in | 2 +-
extensions/address_standardizer/expected/test-security_bounds.out | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list