=== Applying patches on top of PostgreSQL commit ID 66ad764c8d517f59577d41ac3dad786729c9e10e === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Apr 14 12:52:27 UTC 2026 On branch cf/6331 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-message-in-pg_terminate_backend-and-pg_cancel_backend.patch === Applying: message in pg_terminate_backend and pg_cancel_backend error: sha1 information is lacking or useless (src/backend/storage/ipc/signalfuncs.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 message in pg_terminate_backend and pg_cancel_backend 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 ./v6-0001-message-in-pg_terminate_backend-and-pg_cancel_backend.patch === patching file src/backend/catalog/system_functions.sql Hunk #1 FAILED at 378. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/catalog/system_functions.sql.rej patching file src/backend/storage/ipc/signalfuncs.c Hunk #1 FAILED at 112. Hunk #2 FAILED at 172. Hunk #3 FAILED at 313. 3 out of 3 hunks FAILED -- saving rejects to file src/backend/storage/ipc/signalfuncs.c.rej patching file src/backend/tcop/postgres.c Hunk #1 FAILED at 3402. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/tcop/postgres.c.rej can't find file to patch at input line 148 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/backend/utils/misc/backend_msg.c b/src/backend/utils/misc/backend_msg.c |index 34d44069056..560aee148be 100644 |--- a/src/backend/utils/misc/backend_msg.c |+++ b/src/backend/utils/misc/backend_msg.c -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored patching file src/include/catalog/pg_proc.dat Hunk #1 FAILED at 6727. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/pg_proc.dat.rej can't find file to patch at input line 249 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/include/utils/backend_msg.h b/src/include/utils/backend_msg.h |index 7e53c59845f..5ccad83af11 100644 |--- a/src/include/utils/backend_msg.h |+++ b/src/include/utils/backend_msg.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Removing src/backend/catalog/system_functions.sql.rej Removing src/backend/storage/ipc/signalfuncs.c.rej Removing src/backend/tcop/postgres.c.rej Removing src/include/catalog/pg_proc.dat.rej === using 'git apply' to apply patch ./v6-0001-message-in-pg_terminate_backend-and-pg_cancel_backend.patch === Applied patch to 'src/backend/catalog/system_functions.sql' with conflicts. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/storage/ipc/signalfuncs.c:112 error: src/backend/storage/ipc/signalfuncs.c: patch does not apply error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/tcop/postgres.c:3402 error: src/backend/tcop/postgres.c: patch does not apply error: src/backend/utils/misc/backend_msg.c: does not exist in index error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/include/catalog/pg_proc.dat:6727 error: src/include/catalog/pg_proc.dat: patch does not apply error: src/include/utils/backend_msg.h: does not exist in index