=== Applying patches on top of PostgreSQL commit ID 55a780e9476a753354a6db887e92125c7886ca6d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jul  8 02:47:19 UTC 2025
On branch cf/5396
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Add-option-to-check-all-addrs-for-target_session.patch ===
Applying: Add option to check all addrs for target_session.
Using index info to reconstruct a base tree...
M	doc/src/sgml/libpq.sgml
M	src/interfaces/libpq/fe-connect.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-connect.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-connect.c
Auto-merging doc/src/sgml/libpq.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 Add option to check all addrs for target_session.
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/libpq.sgml
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/libpq-int.h
Removing src/interfaces/libpq/t/007_target_session_attr_dns.pl
Removing src/interfaces/libpq/t/008_load_balance_dns_check_all_addrs.pl
=== using patch(1) to apply patch ./v6-0001-Add-option-to-check-all-addrs-for-target_session.patch ===
patching file doc/src/sgml/libpq.sgml
patching file src/interfaces/libpq/fe-connect.c
Hunk #2 succeeded at 4434 (offset -4 lines).
Hunk #3 succeeded at 4489 (offset -4 lines).
Hunk #4 FAILED at 5123.
1 out of 4 hunks FAILED -- saving rejects to file src/interfaces/libpq/fe-connect.c.rej
patching file src/interfaces/libpq/libpq-int.h
patching file src/interfaces/libpq/t/007_target_session_attr_dns.pl
patching file src/interfaces/libpq/t/008_load_balance_dns_check_all_addrs.pl
Unstaged changes after reset:
M	doc/src/sgml/libpq.sgml
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/libpq-int.h
Removing src/interfaces/libpq/fe-connect.c.rej
Removing src/interfaces/libpq/t/007_target_session_attr_dns.pl
Removing src/interfaces/libpq/t/008_load_balance_dns_check_all_addrs.pl
=== using 'git apply' to apply patch ./v6-0001-Add-option-to-check-all-addrs-for-target_session.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' cleanly.
Falling back to direct application...
Falling back to direct application...
U src/interfaces/libpq/fe-connect.c
diff --cc src/interfaces/libpq/fe-connect.c
index 51a9c416584,54ed809ee7c..00000000000
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@@ -5110,18 -5123,7 +5114,22 @@@ freePGconn(PGconn *conn
  	free(conn->oauth_client_id);
  	free(conn->oauth_client_secret);
  	free(conn->oauth_scope);
++<<<<<<< ours
 +	/* Note that conn->Pfdebug is not ours to close or free */
 +	free(conn->events);
 +	pqReleaseConnHosts(conn);
 +	free(conn->connip);
 +	release_conn_addrinfo(conn);
 +	free(conn->scram_client_key_binary);
 +	free(conn->scram_server_key_binary);
 +	/* if this is a cancel connection, be_cancel_key may still be allocated */
 +	free(conn->be_cancel_key);
 +	free(conn->inBuffer);
 +	free(conn->outBuffer);
 +	free(conn->rowBuf);
++=======
+ 	free(conn->check_all_addrs);
++>>>>>>> theirs
  	termPQExpBuffer(&conn->errorMessage);
  	termPQExpBuffer(&conn->workBuffer);