[postgis-tickets] [SCM] PostGIS branch stable-3.3 updated. 3.3.3-5-gffd855ba8

[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.3 has been updated
       via  ffd855ba878d2c9459bc7ae487c8cc398925e905 (commit)
       via  12fa7be3abb4895ef2b55caee927a96510762331 (commit)
       via  2355e8e4f6330e267b1c509ce7d0ae7cdf17a5a4 (commit)
      from  a230dbc02753a4e96376f08ebfdb56a347a01e30 (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 ffd855ba878d2c9459bc7ae487c8cc398925e905
Author: Regina Obe <lr at pcorp.us>
Date:   Mon May 29 16:02:32 2023 -0400

    Add 3.3.3 to upgrade paths

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index e9630aa3f..086354e73 100644
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -87,4 +87,5 @@ UPGRADEABLE_VERSIONS = \
 	3.2.5 \
 	3.3.0 \
 	3.3.1 \
-	3.3.2
+	3.3.2 \
+	3.3.3

commit 12fa7be3abb4895ef2b55caee927a96510762331
Merge: 2355e8e4f a230dbc02
Author: Regina Obe <lr at pcorp.us>
Date:   Mon May 29 16:01:25 2023 -0400

    Merge branch 'stable-3.3' of git.osgeo.org:postgis/postgis into stable-3.3


commit 2355e8e4f6330e267b1c509ce7d0ae7cdf17a5a4
Author: Regina Obe <lr at pcorp.us>
Date:   Mon May 29 15:43:56 2023 -0400

    Update versions of windows packages, and ship projsync.exe

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 2740016c1..fed194481 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -10,7 +10,7 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
-	export JSON_VER=0.12
+	export JSON_VER=0.16
 	export PROJSO=libproj-19.dll
 fi;
 
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 58cefe218..f23534dbd 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -18,13 +18,13 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export PROJ_VER=7.2.1
 	export SFCGAL_VER=1.4.1
 	export CGAL_VER=5.3
-	export ICON_VER=1.16
-	export ZLIB_VER=1.2.11
+	export ICON_VER=1.17
+	export ZLIB_VER=1.2.13
   export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
-	export JSON_VER=0.12
+	export JSON_VER=0.16
 	export PROJSO=libproj-19.dll
-	export CURL_VER=7.73
+	export CURL_VER=8.0.1
 fi;
 
 export PROTOBUF_VER=3.2.0
@@ -39,20 +39,20 @@ fi;
 echo "ICON_VER ${ICON_VER}"
 
 if  [[ "${CURL_VER}" == '' ]] ; then
-  export CURL_VER=7.73
+  export CURL_VER=8.0.1
 fi;
 
 echo "CURL_VER ${CURL_VER}"
 
 #set to something even if override is on but not set
 if  [[ "${ZLIB_VER}" == '' ]] ; then
-  export ZLIB_VER=1.2.11
+  export ZLIB_VER=1.2.13
 fi;
 
 
 #set to something even if override is on but not set
 if  [[ "${LIBXML_VER}" == '' ]] ; then
-  export LIBXML_VER=2.9.9
+  export LIBXML_VER=2.9.14
 fi;
 
 #set to something even if override is on but not set
@@ -166,6 +166,10 @@ cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
 # new proj >= 8 folder prefixed with proj
 cp ${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
 cp ${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
+#start shipping the projsync
+cp ${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/projsync.exe $outdir/bin
+
+
 cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
 
 cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 2853dd95b..a12277eba 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -10,30 +10,30 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
-	export JSON_VER=0.12
+	export JSON_VER=0.1
 	export PROJSO=libproj-19.dll
 fi;
 
 export PROTOBUF_VER=3.2.0
 export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.12
+export JSON_VER=0.16
 export PCRE_VER=8.33
 
 if  [[ "${ICON_VER}" == '' ]] ; then
-  export ICON_VER=1.16
+  export ICON_VER=1.17
 fi;
 
 echo "ICON_VER ${ICON_VER}"
 
 #set to something even if override is on but not set
 if  [[ "${ZLIB_VER}" == '' ]] ; then
-  export ZLIB_VER=1.2.11
+  export ZLIB_VER=1.2.13
 fi;
 
 
 #set to something even if override is on but not set
 if  [[ "${LIBXML_VER}" == '' ]] ; then
-  export LIBXML_VER=2.9.9
+  export LIBXML_VER=2.9.14
 fi;
 
 #set to something even if override is on but not set

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

Summary of changes:
 ci/winnie/build_postgis.sh         |  2 +-
 ci/winnie/package_postgis.sh       | 18 +++++++++++-------
 ci/winnie/regress_postgis.sh       | 10 +++++-----
 extensions/upgradeable_versions.mk |  3 ++-
 4 files changed, 19 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
PostGIS