From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 22 Sep 2023 21:31:46 +0000 (+0200)
Subject: chore: upgrade libpq, OpenSSL versions
X-Git-Tag: pool-3.1.8~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be33c6389a42e939835abc3df8c6176ebf4bec6;p=thirdparty%2Fpsycopg.git

chore: upgrade libpq, OpenSSL versions
---

diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml
index cea42ff96..042b72d9e 100644
--- a/.github/workflows/packages-bin.yml
+++ b/.github/workflows/packages-bin.yml
@@ -121,10 +121,12 @@ jobs:
           CIBW_TEST_COMMAND: >-
             pytest {project}/tests -m 'not slow and not flakey' --color yes
           CIBW_ENVIRONMENT: >-
+            PG_VERSION=16
             PSYCOPG_IMPL=binary
             PSYCOPG_TEST_DSN='dbname=postgres'
-            PSYCOPG_TEST_WANT_LIBPQ_BUILD=">= 14"
-            PSYCOPG_TEST_WANT_LIBPQ_IMPORT=">= 14"
+            PATH="/usr/local/opt/postgresql@${PG_VERSION}/bin:$PATH"
+            PSYCOPG_TEST_WANT_LIBPQ_BUILD=">= $PG_VERSION"
+            PSYCOPG_TEST_WANT_LIBPQ_IMPORT=">= $PG_VERSION"
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/tools/build/build_libpq.sh b/tools/build/build_libpq.sh
index 783963530..1fd734340 100755
--- a/tools/build/build_libpq.sh
+++ b/tools/build/build_libpq.sh
@@ -9,7 +9,7 @@ set -x
 
 # Latest release: https://www.postgresql.org/ftp/source/
 # IMPORTANT! Change the cache key in packages.yml when upgrading libraries
-postgres_version="${LIBPQ_VERSION:-15.0}"
+postgres_version="${LIBPQ_VERSION:-16.0}"
 
 # Latest release: https://www.openssl.org/source/
 openssl_version="${OPENSSL_VERSION:-1.1.1r}"
@@ -157,7 +157,8 @@ if [ ! -d "${postgres_dir}" ]; then
     # export LD_LIBRARY_PATH="${LIBPQ_BUILD_PREFIX}/lib"
 
     ./configure --prefix=${LIBPQ_BUILD_PREFIX} --sysconfdir=/etc/postgresql-common \
-        --without-readline --with-gssapi --with-openssl --with-pam --with-ldap \
+        --without-readline --without-icu \
+        --with-gssapi --with-openssl --with-pam --with-ldap \
         CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib
     make -C src/interfaces/libpq
     make -C src/bin/pg_config
diff --git a/tools/build/build_macos_arm64.sh b/tools/build/build_macos_arm64.sh
index f8c2fd75e..33dff3c4a 100755
--- a/tools/build/build_macos_arm64.sh
+++ b/tools/build/build_macos_arm64.sh
@@ -11,7 +11,7 @@ set -euo pipefail
 set -x
 
 python_versions="3.8.10 3.9.13 3.10.5 3.11.0"
-pg_version=15
+pg_version=16
 
 # Move to the root of the project
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/tools/build/wheel_macos_before_all.sh b/tools/build/wheel_macos_before_all.sh
index 0ddf4263b..d2ba619eb 100755
--- a/tools/build/wheel_macos_before_all.sh
+++ b/tools/build/wheel_macos_before_all.sh
@@ -2,13 +2,15 @@
 
 # Configure the environment needed to build wheel packages on Mac OS.
 # This script is designed to be used by cibuildwheel as CIBW_BEFORE_ALL_MACOS
+#
+# The PG_VERSION env var must be set to a Postgres major version (e.g. 16).
 
 set -euo pipefail
 set -x
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-brew install gnu-sed postgresql@15
+brew install gnu-sed postgresql@${PG_VERSION}
 
 # Start the database for testing
 brew services start postgresql