=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jan 31 20:30:32 UTC 2025 On branch cf/4736 nothing to commit, working tree clean === applying patch ./v16-0001-libpq-Add-PQfullProtocolVersion-to-exports.txt.patch Applied patch to 'src/interfaces/libpq/exports.txt' cleanly. [cf/4736 3a60f895a7] libpq: Add PQfullProtocolVersion to exports.txt Author: Jelte Fennema-Nio Date: Mon Dec 23 16:49:10 2024 +0100 1 file changed, 1 insertion(+) === applying patch ./v16-0002-libpq-Trace-NegotiateProtocolVersion-correctly.patch Applied patch to 'src/interfaces/libpq/fe-trace.c' cleanly. [cf/4736 bc4652d6a8] libpq: Trace NegotiateProtocolVersion correctly Author: Jelte Fennema-Nio Date: Wed Jun 5 11:40:04 2024 +0200 1 file changed, 7 insertions(+), 1 deletion(-) === applying patch ./v16-0003-libpq-Handle-NegotiateProtocolVersion-message-di.patch /work/patches/./v16-0003-libpq-Handle-NegotiateProtocolVersion-message-di.patch:86: trailing whitespace. Applied patch to 'src/interfaces/libpq/fe-connect.c' cleanly. Applied patch to 'src/interfaces/libpq/fe-protocol3.c' cleanly. warning: 1 line adds whitespace errors. [cf/4736 3c8d1f3db0] libpq: Handle NegotiateProtocolVersion message differently Author: Jelte Fennema-Nio Date: Wed Aug 14 18:25:16 2024 +0200 2 files changed, 43 insertions(+), 28 deletions(-) === applying patch ./v16-0004-libpq-Add-min-max_protocol_version-connection-op.patch Applied patch to 'doc/src/sgml/libpq.sgml' cleanly. Applied patch to 'src/interfaces/libpq/fe-connect.c' with conflicts. Applied patch to 'src/interfaces/libpq/libpq-int.h' with conflicts. U src/interfaces/libpq/fe-connect.c U src/interfaces/libpq/libpq-int.h diff --cc src/interfaces/libpq/fe-connect.c index cd35b63ad3,d0844a0339..0000000000 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@@ -367,11 -366,15 +367,23 @@@ static const internalPQconninfoOption P "Load-Balance-Hosts", "", 8, /* sizeof("disable") = 8 */ offsetof(struct pg_conn, load_balance_hosts)}, ++<<<<<<< ours + {"scram_client_key", NULL, NULL, NULL, "SCRAM-Client-Key", "D", SCRAM_MAX_KEY_LEN * 2, + offsetof(struct pg_conn, scram_client_key)}, + + {"scram_server_key", NULL, NULL, NULL, "SCRAM-Server-Key", "D", SCRAM_MAX_KEY_LEN * 2, + offsetof(struct pg_conn, scram_server_key)}, ++======= + {"min_protocol_version", "PGMINPROTOCOLVERSION", + NULL, NULL, + "Min-Protocol-Version", "", 6, /* sizeof("latest") = 6 */ + offsetof(struct pg_conn, min_protocol_version)}, + + {"max_protocol_version", "PGMAXPROTOCOLVERSION", + NULL, NULL, + "Max-Protocol-Version", "", 6, /* sizeof("latest") = 6 */ + offsetof(struct pg_conn, max_protocol_version)}, ++>>>>>>> theirs /* Terminating entry --- MUST BE LAST */ {NULL, NULL, NULL, NULL, diff --cc src/interfaces/libpq/libpq-int.h index e0d5b5fe0b,46b8376f2e..0000000000 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@@ -430,8 -428,8 +430,13 @@@ struct pg_con char *target_session_attrs; /* desired session properties */ char *require_auth; /* name of the expected auth method */ char *load_balance_hosts; /* load balance over hosts */ ++<<<<<<< ours + char *scram_client_key; /* base64-encoded SCRAM client key */ + char *scram_server_key; /* base64-encoded SCRAM server key */ ++======= + char *min_protocol_version; /* minimum used protocol version */ + char *max_protocol_version; /* maximum used protocol version */ ++>>>>>>> theirs bool cancelRequest; /* true if this connection is used to send a * cancel request, instead of being a normal @@@ -524,10 -520,8 +529,15 @@@ AddrInfo *addr; /* the array of addresses for the currently * tried host */ bool send_appname; /* okay to send application_name? */ ++<<<<<<< ours + size_t scram_client_key_len; + void *scram_client_key_binary; /* binary SCRAM client key */ + size_t scram_server_key_len; + void *scram_server_key_binary; /* binary SCRAM server key */ ++======= + ProtocolVersion min_pversion; /* protocol version to request */ + ProtocolVersion max_pversion; /* protocol version to request */ ++>>>>>>> theirs /* Miscellaneous stuff */ int be_pid; /* PID of backend --- needed for cancels */