=== Applying patches on top of PostgreSQL commit ID 665cafe8a4bd23b4f14194b0671d3ef09dc55864 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Feb 21 12:39:28 UTC 2025 On branch cf/4736 nothing to commit, working tree clean === applying patch ./v17-0001-libpq-Add-PQfullProtocolVersion-to-exports.txt.patch Applied patch to 'src/interfaces/libpq/exports.txt' with conflicts. U src/interfaces/libpq/exports.txt diff --cc src/interfaces/libpq/exports.txt index 9b789cbec0,467f2718de..0000000000 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@@ -206,6 -206,4 +206,10 @@@ PQsocketPoll 20 PQsetChunkedRowsMode 204 PQgetCurrentTimeUSec 205 PQservice 206 ++<<<<<<< ours +PQsetAuthDataHook 207 +PQgetAuthDataHook 208 +PQdefaultAuthDataHook 209 ++======= + PQfullProtocolVersion 207 ++>>>>>>> theirs