<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7a3420d828af96235f0f3904414dbe2b8eae07a1">https://github.com/macports/macports-ports/commit/7a3420d828af96235f0f3904414dbe2b8eae07a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7a3420d828af96235f0f3904414dbe2b8eae07a1
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sun Feb 4 11:08:32 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> postgresql16, postgresql16-server: update to 16.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and misc bug fixes
</span>---
databases/postgresql16-server/Portfile | 4 +-
databases/postgresql16/Portfile | 20 +-
databases/postgresql16/files/patch-openssl32.diff | 226 ----------------------
3 files changed, 15 insertions(+), 235 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql16-server/Portfile b/databases/postgresql16-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6664f9cc6ee..8adbf09a6a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql16-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql16-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name postgresql16-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 16.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories databases
platforms {darwin any}
maintainers {gmail.com:davidgilman1 @dgilman} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql16/Portfile b/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89ce711322c..eaa7a839605 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup muniversal 1.0
</span> PortGroup legacysupport 1.1
name postgresql16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 16.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories databases
maintainers {gmail.com:davidgilman1 @dgilman} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ homepage https://www.postgresql.org/
</span> master_sites postgresql:source/v${version}/
distname postgresql-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7d5c28b9e6c987cb11932fced9b4534309635711 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24605482
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7ad3112cbd1e2d227757eae9050efb371378de7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24711703
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,6 @@ platform darwin powerpc {
</span> patchfiles-append patch-icu.diff \
patch-fix-ppc-asm.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openssl32.diff
</span>
depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib \
port:libxml2 port:libxslt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +58,15 @@ legacysupport.newest_darwin_requires_legacy \
</span> 15
worksrcdir postgresql-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zicpath ${worksrcpath}-${build_arch}/src/timezone/zic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zicpath ${worksrcpath}/src/timezone/zic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> set libdir ${prefix}/lib/${name}
set mandir ${prefix}/share/doc/${name}/man
configure.args PG_SYSROOT=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ZIC=${worksrcpath}/src/timezone/zic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZIC=${zicpath} \
</span> --sysconfdir=${prefix}/etc/${name} \
--bindir=${libdir}/bin \
--libdir=${libdir} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +118,8 @@ livecheck.url ${homepage}/ftp/source/
</span>
post-destroot {
ln -s ${libdir}/bin/psql ${destroot}${prefix}/bin/psql16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # delete buggy symlink - this can be removed 2025/02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${portdbpath}/psql16
</span>
reinplace -E "s#^CFLAGS =#CFLAGS +=#g" \
${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql16/files/patch-openssl32.diff b/databases/postgresql16/files/patch-openssl32.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 96089d6f70f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql16/files/patch-openssl32.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,226 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d35bb1a3eb324c0d1118ad8cbc6253bf968ff589 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 28 Nov 2023 12:34:03 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use BIO_{get,set}_app_data instead of BIO_{get,set}_data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We should have done it this way all along, but we accidentally got
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-away with using the wrong BIO field up until OpenSSL 3.2. There,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the library's BIO routines that we rely on use the "data" field
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for their own purposes, and our conflicting use causes assorted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-weird behaviors up to and including core dumps when SSL connections
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-are attempted. Switch to using the approved field for the purpose,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-i.e. app_data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-While at it, remove our configure probes for BIO_get_data as well
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-as the fallback implementation. BIO_{get,set}_app_data have been
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-there since long before any OpenSSL version that we still support,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-even in the back branches.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also, update src/test/ssl/t/001_ssltests.pl to allow for a minor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-change in an error message spelling that evidently came in with 3.2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tristan Partin and Bo Andreson. Back-patch to all supported branches.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Discussion: https://postgr.es/m/CAN55FZ1eDDYsYaL7mv+oSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ@mail.gmail.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/backend/libpq/be-secure-openssl.c | 11 +++--------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/include/pg_config.h.in | 3 ---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/interfaces/libpq/fe-secure-openssl.c | 10 +++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/test/ssl/t/001_ssltests.pl | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/msvc/Solution.pm | 2 --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8 files changed, 11 insertions(+), 26 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82e45657b2..907c777b9c 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12982,7 +12982,7 @@ done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_func in OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fcea0bcab4..ab32bfdd08 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1385,7 +1385,7 @@ if test "$with_ssl" = openssl ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OpenSSL versions before 1.1.0 required setting callback functions, for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # function was removed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git meson.build meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 51b5285924..96fc2e139a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1278,7 +1278,6 @@ if sslopt in ['auto', 'openssl']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['OPENSSL_init_ssl'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ['BIO_get_data'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['BIO_meth_new'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['ASN1_STRING_get0_data'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['HMAC_CTX_new'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/backend/libpq/be-secure-openssl.c src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e9c86d08df..49dca0cda9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -844,11 +844,6 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to retry; do we need to adopt their logic for that?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BIO_get_data(bio) (bio->ptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BIO_set_data(bio, data) (bio->ptr = data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static BIO_METHOD *my_bio_methods = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -858,7 +853,7 @@ my_sock_read(BIO *h, char *buf, int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (buf != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = secure_raw_read(((Port *) BIO_get_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = secure_raw_read(((Port *) BIO_get_app_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -878,7 +873,7 @@ my_sock_write(BIO *h, const char *buf, int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int res = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = secure_raw_write(((Port *) BIO_get_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = secure_raw_write(((Port *) BIO_get_app_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -954,7 +949,7 @@ my_SSL_set_fd(Port *port, int fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BIO_set_data(bio, port);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BIO_set_app_data(bio, port);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_set_fd(bio, fd, BIO_NOCLOSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSL_set_bio(port->ssl, bio, bio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/include/pg_config.h.in src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6d572c3820..174544630e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,9 +70,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `backtrace_symbols' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_BACKTRACE_SYMBOLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* Define to 1 if you have the `BIO_get_data' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#undef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `BIO_meth_new' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_BIO_METH_NEW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/interfaces/libpq/fe-secure-openssl.c src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 390c888c96..694d32754f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1830,10 +1830,6 @@ PQsslAttribute(PGconn *conn, const char *attribute_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to retry; do we need to adopt their logic for that?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BIO_get_data(bio) (bio->ptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BIO_set_data(bio, data) (bio->ptr = data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static BIO_METHOD *my_bio_methods;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1842,7 +1838,7 @@ my_sock_read(BIO *h, char *buf, int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = pqsecure_raw_read((PGconn *) BIO_get_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = pqsecure_raw_read((PGconn *) BIO_get_app_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1872,7 +1868,7 @@ my_sock_write(BIO *h, const char *buf, int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = pqsecure_raw_write((PGconn *) BIO_get_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = pqsecure_raw_write((PGconn *) BIO_get_app_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1963,7 +1959,7 @@ my_SSL_set_fd(PGconn *conn, int fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BIO_set_data(bio, conn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BIO_set_app_data(bio, conn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSL_set_bio(conn->ssl, bio, bio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO_set_fd(bio, fd, BIO_NOCLOSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/test/ssl/t/001_ssltests.pl src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 76442de063..9bb28fbc83 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -781,7 +781,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . sslkey('client-revoked.key'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "certificate authorization fails with revoked client cert",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # log_like => [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -886,7 +886,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . sslkey('client-revoked.key'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "certificate authorization fails with revoked client cert with server-side CRL directory",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # log_like => [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -899,7 +899,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$common_connstr user=ssltestuser sslcert=ssl/client-revoked-utf8.crt "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . sslkey('client-revoked-utf8.key'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "certificate authorization fails with revoked UTF-8 client cert with server-side CRL directory",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # log_like => [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/tools/msvc/Solution.pm src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b6d31c3583..711fae853f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +225,6 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_ATOMICS => 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_ATOMIC_H => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_BACKTRACE_SYMBOLS => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_BIO_GET_DATA => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_BIO_METH_NEW => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_COMPUTED_GOTO => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_COPYFILE => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,7 +502,6 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $define{HAVE_ASN1_STRING_GET0_DATA} = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $define{HAVE_BIO_GET_DATA} = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $define{HAVE_BIO_METH_NEW} = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $define{HAVE_HMAC_CTX_FREE} = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $define{HAVE_HMAC_CTX_NEW} = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.42.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>