From 182a51a33f197a1b03e60a8a2f41b6a86ce4027b Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 6 Oct 2022 03:14:06 +0100
Subject: chore: upgrade packaged libpq version and dependencies

appveyor.cache_rebuild reformatted for greppability.
---
 .appveyor/packages.yml               |  4 ++--
 .appveyor/tests.yml                  |  4 ++--
 .gitignore                           |  2 +-
 NEWS                                 |  1 +
 scripts/build/appveyor.cache_rebuild |  7 ++-----
 scripts/build/build_libpq.sh         | 10 +++++++---
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml
index 5faf67a..3776d0c 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 21ed9ee..67d3d61 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 b921662..e466e15 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 c14250e..75b5e8a 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 6853579..fd9a424 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 3d297ad..938b524 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
 
-- 
cgit v1.2.1