=== Applying patches on top of PostgreSQL commit ID bdaad789c843f57b1fc66c5ede7abaff8a915c3b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug 13 03:20:25 UTC 2026
On branch cf/6909
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Tighten-ACL-check-in-repack_is_permitted_for_rela.patch ===
Applying: Tighten ACL check in repack_is_permitted_for_relation()
Using index info to reconstruct a base tree...
M	src/backend/commands/repack.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/repack.c
CONFLICT (content): Merge conflict in src/backend/commands/repack.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 Tighten ACL check in repack_is_permitted_for_relation()
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-Tighten-ACL-check-in-repack_is_permitted_for_rela.patch ===
patching file src/backend/commands/repack.c
Hunk #1 succeeded at 172 with fuzz 2.
Hunk #2 succeeded at 674 (offset -50 lines).
Hunk #3 succeeded at 2148 (offset -50 lines).
Hunk #4 succeeded at 2185 (offset -50 lines).
Hunk #5 FAILED at 2304.
Hunk #6 succeeded at 2334 (offset 13 lines).
Hunk #7 succeeded at 2356 (offset 13 lines).
1 out of 7 hunks FAILED -- saving rejects to file src/backend/commands/repack.c.rej
Unstaged changes after reset:
M	src/backend/commands/repack.c
Removing src/backend/commands/repack.c.rej
=== using 'git apply' to apply patch ./v1-0001-Tighten-ACL-check-in-repack_is_permitted_for_rela.patch ===
Applied patch to 'src/backend/commands/repack.c' with conflicts.
U src/backend/commands/repack.c
diff --cc src/backend/commands/repack.c
index dde56fb1e8d,b09be65da3b..00000000000
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@@ -169,11 -169,11 +169,11 @@@ static void copy_table_data(Relation Ne
  							MultiXactId *pCutoffMulti);
  static List *get_tables_to_repack(RepackCommand cmd, bool usingindex,
  								  MemoryContext permcxt);
 -static List *get_tables_to_repack_partitioned(RepackCommand cmd,
 -											  Oid relid, bool rel_is_index,
 +static List *get_tables_to_repack_partitioned(RepackStmt *stmt,
 +											  Relation rel,
  											  MemoryContext permcxt);
- static bool repack_is_permitted_for_relation(RepackCommand cmd,
- 											 Oid relid, Oid userid);
+ static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid,
+ 											 Oid userid, bool missing_ok);
  
  static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt);
  static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot,
@@@ -2313,8 -2304,7 +2313,12 @@@ get_tables_to_repack_partitioned(Repack
  		 * leaf partition despite having them on the partitioned table.  Skip
  		 * if so.
  		 */
++<<<<<<< ours
 +		if (!repack_is_permitted_for_relation(stmt->command, table_oid,
 +											  GetUserId()))
++=======
+ 		if (!repack_is_permitted_for_relation(cmd, table_oid, GetUserId(), true))
++>>>>>>> theirs
  			continue;
  
  		/* Use a permanent memory context for the result list */