=== Applying patches on top of PostgreSQL commit ID aaf9e95e8764093ab55baf27c35705f406f592f9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 28 06:52:18 UTC 2025
On branch cf/5396
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-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
M	src/interfaces/libpq/libpq-int.h
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/libpq-int.h
CONFLICT (content): Merge conflict in src/interfaces/libpq/libpq-int.h
Auto-merging 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/006_target_session_attr_dns.pl
Removing src/interfaces/libpq/t/007_load_balance_dns_check_all_addrs.pl
=== using patch(1) to apply patch ./v5-0001-Add-option-to-check-all-addrs-for-target_session.patch ===
patching file doc/src/sgml/libpq.sgml
Hunk #1 succeeded at 2555 (offset 72 lines).
patching file src/interfaces/libpq/fe-connect.c
Hunk #1 succeeded at 383 (offset 10 lines).
Hunk #2 succeeded at 4432 (offset 66 lines).
Hunk #3 succeeded at 4487 (offset 66 lines).
Hunk #4 succeeded at 5117 (offset 66 lines).
patching file src/interfaces/libpq/libpq-int.h
Hunk #1 FAILED at 432.
1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/libpq/libpq-int.h.rej
patching file src/interfaces/libpq/t/006_target_session_attr_dns.pl
patching file src/interfaces/libpq/t/007_load_balance_dns_check_all_addrs.pl
Unstaged changes after reset:
M	doc/src/sgml/libpq.sgml
M	src/interfaces/libpq/fe-connect.c
Removing src/interfaces/libpq/libpq-int.h.rej
Removing src/interfaces/libpq/t/006_target_session_attr_dns.pl
Removing src/interfaces/libpq/t/007_load_balance_dns_check_all_addrs.pl
=== using 'git apply' to apply patch ./v5-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' cleanly.
Applied patch to 'src/interfaces/libpq/libpq-int.h' with conflicts.
Falling back to direct application...
Falling back to direct application...
U src/interfaces/libpq/libpq-int.h
diff --cc src/interfaces/libpq/libpq-int.h
index 9369c217fb5,27f162c1c29..00000000000
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@@ -426,7 -432,7 +426,11 @@@ struct pg_con
  	char	   *load_balance_hosts; /* load balance over hosts */
  	char	   *scram_client_key;	/* base64-encoded SCRAM client key */
  	char	   *scram_server_key;	/* base64-encoded SCRAM server key */
++<<<<<<< ours
 +	char	   *sslkeylogfile;	/* where should the client write ssl keylogs */
++=======
+ 	char       *check_all_addrs;  /* whether to check all ips within a host or terminate on failure */
++>>>>>>> theirs
  
  	bool		cancelRequest;	/* true if this connection is used to send a
  								 * cancel request, instead of being a normal