[SCM] PostGIS branch stable-3.4 updated. 3.4.6-74-gdd9cdb99e

[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.4 has been updated
       via  dd9cdb99e92b435441c0eea419a2d980a366168b (commit)
       via  d6c2080a00db8b27348afbaeb2a48bc920e6540b (commit)
       via  c68b42044475a5edf6b3e9d4710339d098facb90 (commit)
       via  e47beeb971e343098d5f9276574da0fbb747afd7 (commit)
      from  d1196f6043de1e608864739e915cc876a44b1ee5 (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 dd9cdb99e92b435441c0eea419a2d980a366168b
Merge: d1196f604 d6c2080a0
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date:   Sun Jul 19 06:01:03 2026 -0700

    Merge pull request 'utils: compare upgrade versions numerically' (!440) from Komzpa/postgis:ci/semver-numeric-3.4-20260719T1138Z into stable-3.4
    
    Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/440


commit d6c2080a00db8b27348afbaeb2a48bc920e6540b
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sun Jul 19 16:29:37 2026 +0400

    ci: use pg_ctl_options for start timeout

diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index 0b90f98fa..b224b6f32 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -7,7 +7,7 @@ variables:
     - export PGPORT=$$(grep ^port /etc/postgresql/$${PGVER}/main/postgresql.conf | awk '{print $$3}')
     # The test image can need crash recovery after clone-local startup. Under
     # multi-workflow I/O load, Debian's default 60-second pg_ctl wait is short.
-    - printf '%s\n' '-t 300' > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
+    - printf '%s\n' "pg_ctl_options = '-t 300'" > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
     - export SRCDIR=$${CI_WORKSPACE}
     - export RUNTESTFLAGS="-v
       --after-create-db-script $${SRCDIR}/regress/hooks/standard-conforming-strings-off.sql"

commit c68b42044475a5edf6b3e9d4710339d098facb90
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sun Jul 19 16:03:27 2026 +0400

    ci: extend PostgreSQL start timeout

diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index e6bf5ad09..0b90f98fa 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -5,6 +5,9 @@ variables:
   steps-env: &steps-env
     - export PATH=/usr/lib/postgresql/$${PGVER}/bin:$${PATH}
     - export PGPORT=$$(grep ^port /etc/postgresql/$${PGVER}/main/postgresql.conf | awk '{print $$3}')
+    # The test image can need crash recovery after clone-local startup. Under
+    # multi-workflow I/O load, Debian's default 60-second pg_ctl wait is short.
+    - printf '%s\n' '-t 300' > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
     - export SRCDIR=$${CI_WORKSPACE}
     - export RUNTESTFLAGS="-v
       --after-create-db-script $${SRCDIR}/regress/hooks/standard-conforming-strings-off.sql"

commit e47beeb971e343098d5f9276574da0fbb747afd7
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sun Jul 19 03:55:09 2026 +0400

    utils: compare upgrade versions numerically

diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index d16533f40..1ad78384f 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -65,6 +65,16 @@ semver_compare()
       echo 1; return;
     fi
     V2=`echo "$V2" | cut -d. -sf2-`
+    v1_numeric=`echo "$v1" | sed 's/[^0-9].*//'`
+    v2_numeric=`echo "$v2" | sed 's/[^0-9].*//'`
+    if test -n "$v1_numeric" && test -n "$v2_numeric"; then
+      if [ "$v1_numeric" -lt "$v2_numeric" ]; then
+        echo -1; return;
+      fi
+      if [ "$v1_numeric" -gt "$v2_numeric" ]; then
+        echo 1; return;
+      fi
+    fi
     # echo "v: $v1 - $v2" >&2
     if expr "$v1" '<' "$v2" > /dev/null; then
       echo -1; return;
@@ -286,6 +296,21 @@ check_all_upgrades_selftest()
     exit 1
   fi
   grep -q '^FAIL: self-test downgrade gave some other error:' ${test_tmp}/other.out
+
+  if test "`semver_compare 3.2.7 3.2.11dev`" != "-1"; then
+    echo "FAIL: expected 3.2.7 to compare older than 3.2.11dev" >&2
+    exit 1
+  fi
+
+  if test "`semver_compare 3.2.11dev 3.2.7`" != "1"; then
+    echo "FAIL: expected 3.2.11dev to compare newer than 3.2.7" >&2
+    exit 1
+  fi
+
+  if test "`semver_compare 3.2.11dev 3.2.11dev`" != "0"; then
+    echo "FAIL: expected identical dev versions to compare equal" >&2
+    exit 1
+  fi
 }
 
 if test "${SELFTEST}" = 1; then

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

Summary of changes:
 .woodpecker/regress.yml     |  3 +++
 utils/check_all_upgrades.sh | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)


hooks/post-receive
-- 
PostGIS