=== Applying patches on top of PostgreSQL commit ID 144ad723a4484927266a316d1c9550d56745ff67 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Jul 5 14:07:19 UTC 2025 On branch cf/4984 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Serverside-SNI-support-for-libpq.patch === Applying: Serverside SNI support for libpq Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M doc/src/sgml/runtime.sgml M src/backend/Makefile M src/backend/libpq/be-secure-openssl.c M src/backend/libpq/be-secure.c M src/backend/utils/misc/guc.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/bin/initdb/initdb.c M src/include/libpq/libpq-be.h M src/include/utils/guc.h M src/test/ssl/meson.build 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/test/ssl/meson.build Auto-merging src/include/utils/guc.h Auto-merging src/include/libpq/libpq-be.h Auto-merging src/bin/initdb/initdb.c Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/misc/guc.c Auto-merging src/backend/libpq/be-secure.c Auto-merging src/backend/libpq/be-secure-openssl.c Auto-merging src/backend/Makefile Auto-merging doc/src/sgml/runtime.sgml Auto-merging doc/src/sgml/config.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Serverside SNI support for libpq 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 doc/src/sgml/config.sgml M doc/src/sgml/runtime.sgml M src/backend/Makefile M src/backend/libpq/be-secure-common.c M src/backend/libpq/be-secure-openssl.c M src/backend/libpq/be-secure.c M src/backend/libpq/meson.build M src/backend/utils/misc/guc.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/bin/initdb/initdb.c M src/include/libpq/hba.h M src/include/libpq/libpq-be.h M src/include/libpq/libpq.h M src/include/utils/guc.h M src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c M src/test/ssl/meson.build M src/tools/pgindent/typedefs.list Removing src/backend/libpq/pg_hosts.conf.sample Removing src/test/ssl/t/004_sni.pl === using patch(1) to apply patch ./v6-0001-Serverside-SNI-support-for-libpq.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 1694 (offset 16 lines). patching file doc/src/sgml/runtime.sgml Hunk #1 succeeded at 2445 (offset 1 line). Hunk #2 succeeded at 2578 (offset 1 line). patching file src/backend/Makefile Hunk #1 succeeded at 187 (offset 1 line). patching file src/backend/libpq/be-secure-common.c patching file src/backend/libpq/be-secure-openssl.c patching file src/backend/libpq/be-secure.c patching file src/backend/libpq/meson.build patching file src/backend/libpq/pg_hosts.conf.sample patching file src/backend/utils/misc/guc.c patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 491 (offset 15 lines). Hunk #2 succeeded at 562 (offset 15 lines). Hunk #3 succeeded at 4719 (offset 87 lines). Hunk #4 succeeded at 5405 (offset 109 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #2 succeeded at 123 with fuzz 2 (offset 1 line). patching file src/bin/initdb/initdb.c Hunk #1 succeeded at 177 (offset 1 line). Hunk #2 succeeded at 1531 (offset -12 lines). Hunk #3 succeeded at 2803 (offset -11 lines). Hunk #4 succeeded at 2819 (offset -11 lines). Hunk #5 succeeded at 2833 (offset -11 lines). patching file src/include/libpq/hba.h patching file src/include/libpq/libpq-be.h Hunk #1 succeeded at 320 (offset -3 lines). Hunk #2 succeeded at 333 (offset -3 lines). patching file src/include/libpq/libpq.h patching file src/include/utils/guc.h patching file src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c patching file src/test/ssl/meson.build patching file src/test/ssl/t/004_sni.pl patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 1205 (offset 37 lines). [cf/4984 38458ca90c9] Serverside SNI support for libpq Author: Daniel Gustafsson Date: Thu Feb 27 14:03:31 2025 +0100 20 files changed, 937 insertions(+), 50 deletions(-) create mode 100644 src/backend/libpq/pg_hosts.conf.sample create mode 100644 src/test/ssl/t/004_sni.pl