=== Applying patches on top of PostgreSQL commit ID 9f4fd119b2cbb9a41ec0c19a8d6ec9b59b92c125 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Feb 15 12:25:27 UTC 2026
On branch cf/6474
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Doc-Mark-RADIUS-deprecated.patch ===
Applying: Doc: Mark RADIUS deprecated.
=== using 'git am' to apply patch ./0002-Drop-RADIUS-support.patch ===
Applying: Drop RADIUS support.
Using index info to reconstruct a base tree...
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Drop RADIUS support.
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/client-auth.sgml
M	src/backend/libpq/auth.c
M	src/backend/libpq/hba.c
M	src/backend/libpq/pg_hba.conf.sample
M	src/backend/utils/adt/hbafuncs.c
M	src/include/libpq/hba.h
M	src/tools/pgindent/typedefs.list
=== using patch(1) to apply patch ./0002-Drop-RADIUS-support.patch ===
patching file doc/src/sgml/client-auth.sgml
patching file src/backend/libpq/auth.c
patching file src/backend/libpq/hba.c
patching file src/backend/libpq/pg_hba.conf.sample
patching file src/backend/utils/adt/hbafuncs.c
patching file src/include/libpq/hba.h
patching file src/tools/pgindent/typedefs.list
Hunk #1 FAILED at 4053.
1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej
Unstaged changes after reset:
M	doc/src/sgml/client-auth.sgml
M	src/backend/libpq/auth.c
M	src/backend/libpq/hba.c
M	src/backend/libpq/pg_hba.conf.sample
M	src/backend/utils/adt/hbafuncs.c
M	src/include/libpq/hba.h
Removing src/tools/pgindent/typedefs.list.rej
=== using 'git apply' to apply patch ./0002-Drop-RADIUS-support.patch ===
Applied patch to 'doc/src/sgml/client-auth.sgml' cleanly.
Applied patch to 'src/backend/libpq/auth.c' cleanly.
Applied patch to 'src/backend/libpq/hba.c' cleanly.
Applied patch to 'src/backend/libpq/pg_hba.conf.sample' cleanly.
Applied patch to 'src/backend/utils/adt/hbafuncs.c' cleanly.
Applied patch to 'src/include/libpq/hba.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' with conflicts.
U src/tools/pgindent/typedefs.list
diff --cc src/tools/pgindent/typedefs.list
index 241945734ec,4bc8a8d6fad..00000000000
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@@ -4062,9 -4053,6 +4062,12 @@@ qc_hash_fun
  qsort_arg_comparator
  qsort_comparator
  query_pathkeys_callback
++<<<<<<< ours
 +radius_attribute
 +radius_packet
 +RadixSortInfo
++=======
++>>>>>>> theirs
  rangeTableEntry_used_context
  rank_context
  rbt_allocfunc