diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml index 5faf67ac..3776d0ce 100644 --- a/.appveyor/packages.yml +++ b/.appveyor/packages.yml @@ -24,8 +24,8 @@ environment: WORKFLOW: packages - OPENSSL_VERSION: "1_1_1l" - POSTGRES_VERSION: "14_1" + OPENSSL_VERSION: "1_1_1q" + POSTGRES_VERSION: "14_4" PSYCOPG2_TESTDB: psycopg2_test PSYCOPG2_TESTDB_USER: postgres diff --git a/.appveyor/tests.yml b/.appveyor/tests.yml index 21ed9ee5..67d3d61c 100644 --- a/.appveyor/tests.yml +++ b/.appveyor/tests.yml @@ -19,8 +19,8 @@ environment: WORKFLOW: tests - OPENSSL_VERSION: "1_1_1l" - POSTGRES_VERSION: "14_1" + OPENSSL_VERSION: "1_1_1q" + POSTGRES_VERSION: "14_4" PSYCOPG2_TESTDB: psycopg2_test PSYCOPG2_TESTDB_USER: postgres diff --git a/.gitignore b/.gitignore index b921662e..e466e152 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ MANIFEST *.sw[po] *.egg-info/ dist/* -build/* +/build env env? .idea diff --git a/NEWS b/NEWS index c14250ea..75b5e8a5 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ What's new in psycopg 2.9.4 (unreleased) - Handle correctly composite types with names or in schemas requiring escape. - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 15. +- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 14.4 Current release diff --git a/scripts/build/appveyor.cache_rebuild b/scripts/build/appveyor.cache_rebuild index 68535798..fd9a424a 100644 --- a/scripts/build/appveyor.cache_rebuild +++ b/scripts/build/appveyor.cache_rebuild @@ -8,11 +8,8 @@ To invalidate the cache, update this file and check it into git. Currently used modules built in the cache: -OpenSSL - Version: 1.1.1l - -PostgreSQL - Version: 14.1 +- OPENSSL_VERSION: 1.1.1q +- POSTGRES_VERSION: 14.4 NOTE: to zap the cache manually you can also use: diff --git a/scripts/build/build_libpq.sh b/scripts/build/build_libpq.sh index 3d297ada..938b5249 100755 --- a/scripts/build/build_libpq.sh +++ b/scripts/build/build_libpq.sh @@ -5,10 +5,14 @@ set -euo pipefail set -x -openssl_version="1.1.1l" +# Last release: https://www.postgresql.org/ftp/source/ +postgres_version="14.4" +# last release: https://www.openssl.org/source/ +openssl_version="1.1.1q" +# last release: https://openldap.org/software/download/ ldap_version="2.4.59" -sasl_version="2.1.27" -postgres_version="14.1" +# last release: https://github.com/cyrusimap/cyrus-sasl/releases +sasl_version="2.1.28" yum install -y zlib-devel krb5-devel pam-devel