<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/84d75e16614d580cd4f83618d7be664627992867">https://github.com/macports/macports-ports/commit/84d75e16614d580cd4f83618d7be664627992867</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84d75e16614d580cd4f83618d7be664627992867
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sun Feb 4 11:08:13 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> postgresql12, postgresql12-server, postgresql12-doc: update to 12.18
</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/postgresql12-doc/Portfile | 8 +-
databases/postgresql12-server/Portfile | 2 +-
databases/postgresql12/Portfile | 22 ++-
databases/postgresql12/files/patch-openssl32.diff | 190 ----------------------
4 files changed, 19 insertions(+), 203 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql12-doc/Portfile b/databases/postgresql12-doc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41f064d7faf..fb7a759e76d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql12-doc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql12-doc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name postgresql12-doc
conflicts postgresql96-doc postgresql10-doc postgresql11-doc \
postgresql13-doc postgresql14-doc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 12.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 12.18
</span> revision 0
categories databases
platforms any
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ master_sites postgresql:source/v${version}
</span> distname postgresql-${version}
set rname postgresql12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ddb48d89e9d4e27529b42bb9c826cf94ed841928 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 93e8e1b23981d5f03c6c5763f77b28184c1ce4db7194fa466e2edb65d9c1c5f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21181616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8128836266e50ea501f909ffa218fe3342b04cdd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4f9919725d941ce9868e07fe1ed1d3a86748599b483386547583928b74c3918a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21208935
</span>
use_bzip2 yes
dist_subdir ${rname}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql12-server/Portfile b/databases/postgresql12-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2a10858832..d25d5ce0cd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql12-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql12-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name postgresql12-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 12.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 12.18
</span> categories databases
platforms {darwin any}
maintainers {jwa @jyrkiwahlstedt}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql12/Portfile b/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06d40db5a57..5ad2b0f71cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup muniversal 1.0
</span>
#remember to update the -doc and -server as well
name postgresql12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 12.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 12.18
</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;'>@@ -28,15 +28,14 @@ master_sites http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org
</span> postgresql:source/v${version}/
distname postgresql-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ddb48d89e9d4e27529b42bb9c826cf94ed841928 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 93e8e1b23981d5f03c6c5763f77b28184c1ce4db7194fa466e2edb65d9c1c5f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21181616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8128836266e50ea501f909ffa218fe3342b04cdd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4f9919725d941ce9868e07fe1ed1d3a86748599b483386547583928b74c3918a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21208935
</span>
use_bzip2 yes
# do not build man or html files (use postgresqlXY-doc instead)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-no_doc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openssl32.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no_doc.diff
</span>
depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt path:lib/pkgconfig/icu-uc.pc:icu path:lib/libgssapi_krb5.dylib:kerberos5
depends_build port:bison port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +43,14 @@ depends_run port:postgresql_select
</span>
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}
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;'>@@ -96,6 +100,8 @@ livecheck.url ${homepage}/ftp/source/
</span>
post-destroot {
ln -s ${libdir}/bin/psql ${destroot}${prefix}/bin/psql12
<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}/psql12
</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/postgresql12/files/patch-openssl32.diff b/databases/postgresql12/files/patch-openssl32.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ac87edcd69..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql12/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,190 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0acbe32e1a24e23aa36a7fbcce3a002ee22b10ed 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.in | 2 +-
</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/include/pg_config.h.win32 | 3 ---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/interfaces/libpq/fe-secure-openssl.c | 11 ++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/msvc/Solution.pm | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7 files changed, 9 insertions(+), 24 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 cce104aebb..346ea8e2c1 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;'>-@@ -12641,7 +12641,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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_func in OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data
</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.in configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3c93e7a944..2c15b20049 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1290,7 +1290,7 @@ if test "$with_openssl" = yes ; 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])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data])
</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 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 b0a1f7258a..34f8f9e71e 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;'>-@@ -699,11 +699,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;'>-@@ -713,7 +708,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;'>-@@ -733,7 +728,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;'>-@@ -809,7 +804,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 457a8713cc..1e9d21c3e4 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;'>-@@ -96,9 +96,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the <atomic.h> header file. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_ATOMIC_H
</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/include/pg_config.h.win32 src/include/pg_config.h.win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 42fd7067f1..37accc560b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/include/pg_config.h.win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/include/pg_config.h.win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,9 +75,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `ASN1_STRING_get0_data' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* #undef HAVE_ASN1_STRING_GET0_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_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 5948a37983..2e91587b7c 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;'>-@@ -1491,11 +1491,8 @@ 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;'>-+/* protected by ssl_config_mutex */
</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;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,7 +1500,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;'>-@@ -1533,7 +1530,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;'>-@@ -1624,7 +1621,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/tools/msvc/Solution.pm src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 20ce233af4..a7e5fdbda9 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;'>-@@ -273,7 +273,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;'>- print $o "#define HAVE_ASN1_STRING_GET0_DATA 1\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print $o "#define HAVE_BIO_GET_DATA 1\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print $o "#define HAVE_BIO_METH_NEW 1\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print $o "#define HAVE_OPENSSL_INIT_SSL 1\n";
</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;'>-2.42.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>