=== Applying patches on top of PostgreSQL commit ID 322bab79744dfb8f7ddb5191b3102cf7986d14a0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Mar 21 13:35:24 UTC 2026 On branch cf/6598 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-contrib-sslinfo-Add-ssl_group_info.patch === Applying: contrib/sslinfo: Add ssl_group_info Using index info to reconstruct a base tree... M configure M configure.ac M meson.build M src/include/pg_config.h.in M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/include/pg_config.h.in Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build Auto-merging configure.ac CONFLICT (content): Merge conflict in configure.ac Auto-merging configure error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 contrib/sslinfo: Add ssl_group_info When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M configure M configure.ac M contrib/sslinfo/Makefile M contrib/sslinfo/meson.build M contrib/sslinfo/sslinfo.c M contrib/sslinfo/sslinfo.control M doc/src/sgml/sslinfo.sgml M meson.build M src/include/pg_config.h.in M src/tools/pgindent/typedefs.list Removing contrib/sslinfo/sslinfo--1.2--1.3.sql === using patch(1) to apply patch ./v5-0001-contrib-sslinfo-Add-ssl_group_info.patch === patching file configure patching file configure.ac Hunk #1 FAILED at 1444. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej patching file contrib/sslinfo/Makefile patching file contrib/sslinfo/meson.build patching file contrib/sslinfo/sslinfo--1.2--1.3.sql patching file contrib/sslinfo/sslinfo.c patching file contrib/sslinfo/sslinfo.control patching file doc/src/sgml/sslinfo.sgml patching file meson.build Hunk #1 FAILED at 1684. Hunk #2 succeeded at 2796 (offset 3 lines). 1 out of 2 hunks FAILED -- saving rejects to file meson.build.rej patching file src/include/pg_config.h.in Hunk #2 succeeded at 389 (offset 3 lines). patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2728 (offset 8 lines). Unstaged changes after reset: M configure M contrib/sslinfo/Makefile M contrib/sslinfo/meson.build M contrib/sslinfo/sslinfo.c M contrib/sslinfo/sslinfo.control M doc/src/sgml/sslinfo.sgml M meson.build M src/include/pg_config.h.in M src/tools/pgindent/typedefs.list Removing configure.ac.rej Removing contrib/sslinfo/sslinfo--1.2--1.3.sql Removing meson.build.rej === using 'git apply' to apply patch ./v5-0001-contrib-sslinfo-Add-ssl_group_info.patch === Applied patch to 'configure' cleanly. Applied patch to 'configure.ac' with conflicts. Applied patch to 'contrib/sslinfo/Makefile' cleanly. Applied patch to 'contrib/sslinfo/meson.build' cleanly. Falling back to direct application... Applied patch to 'contrib/sslinfo/sslinfo.c' cleanly. Applied patch to 'contrib/sslinfo/sslinfo.control' cleanly. Applied patch to 'doc/src/sgml/sslinfo.sgml' cleanly. Applied patch to 'meson.build' with conflicts. Applied patch to 'src/include/pg_config.h.in' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U configure.ac U meson.build diff --cc configure.ac index f8327a7020a,6b3bd8667bc..00000000000 --- a/configure.ac +++ b/configure.ac @@@ -1443,7 -1443,11 +1443,15 @@@ if test "$with_ssl" = openssl ; the # Function introduced in OpenSSL 1.0.2, not in LibreSSL. AC_CHECK_FUNCS([SSL_CTX_set_cert_cb]) # Function introduced in OpenSSL 1.1.1, not in LibreSSL. ++<<<<<<< ours + AC_CHECK_FUNCS([X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback SSL_CTX_set_client_hello_cb]) ++======= + AC_CHECK_FUNCS([X509_get_signature_info SSL_CTX_set_num_tickets SSL_CTX_set_keylog_callback]) + # Functions for groups support, some of them are real functions, some are + # just wrappers around SSL_ctrl. + AC_CHECK_FUNCS([SSL_group_to_name]) + AC_CHECK_DECLS([SSL_get1_groups, SSL_get_negotiated_group], [], [], [#include ]) ++>>>>>>> theirs AC_DEFINE([USE_OPENSSL], 1, [Define to 1 to build with OpenSSL support. (--with-ssl=openssl)]) elif test "$with_ssl" != no ; then AC_MSG_ERROR([--with-ssl must specify openssl]) diff --cc meson.build index 0a181909fab,944db2610b4..00000000000 --- a/meson.build +++ b/meson.build @@@ -1684,7 -1684,9 +1684,13 @@@ if sslopt in ['auto', 'openssl' ['X509_get_signature_info'], ['SSL_CTX_set_num_tickets'], ['SSL_CTX_set_keylog_callback'], ++<<<<<<< ours + ['SSL_CTX_set_client_hello_cb'], ++======= + + # Function for groups support. + ['SSL_group_to_name'], ++>>>>>>> theirs ] are_openssl_funcs_complete = true