=== Applying patches on top of PostgreSQL commit ID 32e4508db27d1fa3dc07404ad69d43ed97870f15 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jul 17 13:40:26 UTC 2026
On branch cf/6864
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-libpq-oauth-Warn-when-PGOAUTHDEBUG-trace-may-expose-.patch ===
Applying: libpq-oauth: Warn when PGOAUTHDEBUG trace may expose secrets
Using index info to reconstruct a base tree...
M	src/interfaces/libpq-oauth/oauth-curl.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq-oauth/oauth-curl.c
CONFLICT (content): Merge conflict in src/interfaces/libpq-oauth/oauth-curl.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 libpq-oauth: Warn when PGOAUTHDEBUG trace may expose secrets
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".
=== using patch(1) to apply patch ./0001-libpq-oauth-Warn-when-PGOAUTHDEBUG-trace-may-expose-.patch ===
patching file src/interfaces/libpq-oauth/oauth-curl.c
Hunk #1 succeeded at 3056 (offset 15 lines).
Hunk #2 FAILED at 3101.
1 out of 2 hunks FAILED -- saving rejects to file src/interfaces/libpq-oauth/oauth-curl.c.rej
Unstaged changes after reset:
M	src/interfaces/libpq-oauth/oauth-curl.c
Removing src/interfaces/libpq-oauth/oauth-curl.c.rej
=== using 'git apply' to apply patch ./0001-libpq-oauth-Warn-when-PGOAUTHDEBUG-trace-may-expose-.patch ===
Applied patch to 'src/interfaces/libpq-oauth/oauth-curl.c' with conflicts.
U src/interfaces/libpq-oauth/oauth-curl.c
diff --cc src/interfaces/libpq-oauth/oauth-curl.c
index ba5815eb249,62fb4d87489..00000000000
--- a/src/interfaces/libpq-oauth/oauth-curl.c
+++ b/src/interfaces/libpq-oauth/oauth-curl.c
@@@ -3112,7 -3098,13 +3117,17 @@@ pg_start_oauthbearer(PGconn *conn, PGoa
  	 * Now finish filling in the actx.
  	 */
  
++<<<<<<< ours
 +	actx->debug_flags = debug_flags;
++=======
+ 	/* Parse debug flags from the environment. */
+ 	actx->debug_flags = oauth_parse_debug_flags();
+ 
+ 	if (actx->debug_flags & OAUTHDEBUG_UNSAFE_TRACE)
+ 		fprintf(stderr,
+ 				libpq_gettext("WARNING: PGOAUTHDEBUG trace is enabled. HTTP traffic (including secrets) will be logged.\n"));
+ 
++>>>>>>> theirs
  	initPQExpBuffer(&actx->work_data);
  	initPQExpBuffer(&actx->errbuf);