=== Applying patches on top of PostgreSQL commit ID 9f03dab4574bd2820eec6902c2ef12b28c706733 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Jul  5 22:08:26 UTC 2026
On branch cf/6980
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-tracing-of-BackendKeyData-and-CancelRequest.patch ===
Applying: Fix tracing of BackendKeyData and CancelRequest
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/fe-trace.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-trace.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-trace.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 Fix tracing of BackendKeyData and CancelRequest
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 ./v1-0001-Fix-tracing-of-BackendKeyData-and-CancelRequest.patch ===
patching file src/interfaces/libpq/fe-trace.c
Hunk #1 FAILED at 452.
Hunk #2 FAILED at 762.
Hunk #3 FAILED at 876.
3 out of 3 hunks FAILED -- saving rejects to file src/interfaces/libpq/fe-trace.c.rej
Removing src/interfaces/libpq/fe-trace.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-tracing-of-BackendKeyData-and-CancelRequest.patch ===
Applied patch to 'src/interfaces/libpq/fe-trace.c' with conflicts.
U src/interfaces/libpq/fe-trace.c
diff --cc src/interfaces/libpq/fe-trace.c
index 2901fa5b451,aa2637e4f1e..00000000000
--- a/src/interfaces/libpq/fe-trace.c
+++ b/src/interfaces/libpq/fe-trace.c
@@@ -452,12 -452,11 +452,20 @@@ pqTraceOutput_CopyOutResponse(FILE *f, 
  }
  
  static void
++<<<<<<< ours
 +pqTraceOutput_BackendKeyData(FILE *f, const char *message, int *cursor, int length,
 +							 bool regress)
 +{
 +	fprintf(f, "BackendKeyData\t");
 +	pqTraceOutputInt32(f, message, cursor, regress);
 +	pqTraceOutputNchar(f, length - *cursor + 1, message, cursor, regress);
++=======
+ pqTraceOutput_BackendKeyData(FILE *f, const char *message, int len, int *cursor, bool regress)
+ {
+ 	fprintf(f, "BackendKeyData\t");
+ 	pqTraceOutputInt32(f, message, cursor, regress);
+ 	pqTraceOutputNchar(f, len, message, cursor, regress);
++>>>>>>> theirs
  }
  
  static void
@@@ -763,8 -762,7 +771,12 @@@ pqTraceOutputMessage(PGconn *conn, cons
  			/* No message content */
  			break;
  		case PqMsg_BackendKeyData:
++<<<<<<< ours
 +			pqTraceOutput_BackendKeyData(conn->Pfdebug, message, &logCursor,
 +										 length, regress);
++=======
+ 			pqTraceOutput_BackendKeyData(conn->Pfdebug, message, conn->be_cancel_key_len, &logCursor, regress);
++>>>>>>> theirs
  			break;
  		case PqMsg_NoData:
  			fprintf(conn->Pfdebug, "NoData");
@@@ -878,8 -876,7 +890,12 @@@ pqTraceOutputNoTypeByteMessage(PGconn *
  		pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
  		pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
  		pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, regress);
++<<<<<<< ours
 +		pqTraceOutputNchar(conn->Pfdebug, length - logCursor, message,
 +						   &logCursor, regress);
++=======
+ 		pqTraceOutputNchar(conn->Pfdebug, conn->be_cancel_key_len, message, &logCursor, regress);
++>>>>>>> theirs
  	}
  	else if (version == NEGOTIATE_SSL_CODE)
  	{