=== Applying patches on top of PostgreSQL commit ID d374280e1837adc1f8218bb0d69ffbae5d808fc6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jul 17 20:13:26 UTC 2026 On branch cf/5495 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Revert-non-text-pg_dumpall.patch === Applying: Revert non-text output formats for pg_dumpall Using index info to reconstruct a base tree... M doc/src/sgml/ref/pg_dumpall.sgml M doc/src/sgml/ref/pg_restore.sgml M src/bin/pg_dump/meson.build M src/bin/pg_dump/parallel.c M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_backup_tar.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_dump/pg_restore.c M src/bin/pg_dump/t/001_basic.pl M src/bin/pg_dump/t/005_pg_dump_filterfile.pl A src/bin/pg_dump/t/007_pg_dumpall.pl M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/bin/pg_dump/pg_dumpall.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dumpall.c Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_tar.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/parallel.c Auto-merging doc/src/sgml/ref/pg_dumpall.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Revert non-text output formats for pg_dumpall 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-Revert-non-text-pg_dumpall.patch === patching file doc/src/sgml/ref/pg_dumpall.sgml Hunk #1 FAILED at 16. Hunk #2 FAILED at 36. Hunk #3 succeeded at 57 with fuzz 1 (offset -16 lines). Hunk #4 FAILED at 153. Hunk #5 FAILED at 1035. Hunk #6 FAILED at 1063. 5 out of 6 hunks FAILED -- saving rejects to file doc/src/sgml/ref/pg_dumpall.sgml.rej patching file doc/src/sgml/ref/pg_restore.sgml Hunk #1 FAILED at 18. Hunk #2 FAILED at 39. Hunk #3 FAILED at 54. Hunk #4 FAILED at 152. Hunk #5 FAILED at 180. Hunk #6 FAILED at 282. Hunk #7 FAILED at 641. Hunk #8 FAILED at 751. Hunk #9 FAILED at 800. Hunk #10 FAILED at 1240. 10 out of 10 hunks FAILED -- saving rejects to file doc/src/sgml/ref/pg_restore.sgml.rej patching file src/bin/pg_dump/meson.build Hunk #1 FAILED at 103. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/meson.build.rej patching file src/bin/pg_dump/parallel.c Hunk #1 FAILED at 333. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/parallel.c.rej patching file src/bin/pg_dump/pg_backup.h Hunk #1 FAILED at 313. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_backup.h.rej patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 FAILED at 87. Hunk #2 FAILED at 340. Hunk #3 FAILED at 464. Hunk #4 FAILED at 767. Hunk #5 FAILED at 1335. Hunk #6 FAILED at 1710. Hunk #7 FAILED at 1738. Hunk #8 FAILED at 2414. Hunk #9 FAILED at 3050. Hunk #10 FAILED at 3095. Hunk #11 FAILED at 3132. Hunk #12 FAILED at 3915. 12 out of 12 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_archiver.c.rej patching file src/bin/pg_dump/pg_backup_archiver.h Hunk #1 FAILED at 394. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_archiver.h.rej patching file src/bin/pg_dump/pg_backup_tar.c Hunk #1 FAILED at 826. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_tar.c.rej patching file src/bin/pg_dump/pg_dump.c Hunk #1 FAILED at 1279. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dumpall.c Hunk #1 FAILED at 1. Hunk #2 FAILED at 34. Hunk #3 FAILED at 76. Hunk #4 FAILED at 136. Hunk #5 FAILED at 165. Hunk #6 FAILED at 215. Hunk #7 FAILED at 265. Hunk #8 FAILED at 295. Hunk #9 FAILED at 323. Hunk #10 FAILED at 338. Hunk #11 FAILED at 421. Hunk #12 FAILED at 549. Hunk #13 succeeded at 612 with fuzz 2 (offset -7 lines). Hunk #14 FAILED at 669. Hunk #15 FAILED at 792. Hunk #16 FAILED at 833. Hunk #17 FAILED at 881. Hunk #18 FAILED at 983. Hunk #19 FAILED at 1031. Hunk #20 FAILED at 1104. Hunk #21 FAILED at 1123. Hunk #22 FAILED at 1201. Hunk #23 FAILED at 1255. Hunk #24 FAILED at 1263. Hunk #25 FAILED at 1282. Hunk #26 FAILED at 1345. Hunk #27 FAILED at 1492. Hunk #28 FAILED at 1515. Hunk #29 FAILED at 1540. Hunk #30 FAILED at 1571. Hunk #31 FAILED at 1596. Hunk #32 FAILED at 1636. Hunk #33 FAILED at 1680. Hunk #34 FAILED at 1698. Hunk #35 FAILED at 1717. Hunk #36 FAILED at 1761. Hunk #37 FAILED at 1844. Hunk #38 FAILED at 1860. Hunk #39 FAILED at 1908. Hunk #40 FAILED at 1923. Hunk #41 FAILED at 2003. Hunk #42 FAILED at 2019. Hunk #43 FAILED at 2084. Hunk #44 FAILED at 2102. Hunk #45 FAILED at 2144. Hunk #46 FAILED at 2157. Hunk #47 FAILED at 2166. Hunk #48 FAILED at 2269. Hunk #49 FAILED at 2410. 48 out of 49 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dumpall.c.rej patching file src/bin/pg_dump/pg_restore.c Hunk #1 FAILED at 2. Hunk #2 FAILED at 41. Hunk #3 FAILED at 58. Hunk #4 FAILED at 107. Hunk #5 FAILED at 117. Hunk #6 FAILED at 165. Hunk #7 FAILED at 201. Hunk #8 FAILED at 225. Hunk #9 FAILED at 262. Hunk #10 FAILED at 352. Hunk #11 FAILED at 382. Hunk #12 FAILED at 409. Hunk #13 FAILED at 515. Hunk #14 FAILED at 703. Hunk #15 FAILED at 731. Hunk #16 FAILED at 763. Hunk #17 FAILED at 780. Hunk #18 FAILED at 788. Hunk #19 FAILED at 817. Hunk #20 FAILED at 923. 20 out of 20 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_restore.c.rej patching file src/bin/pg_dump/t/001_basic.pl Hunk #1 FAILED at 87. Hunk #2 FAILED at 205. Hunk #3 FAILED at 251. 3 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/t/001_basic.pl.rej patching file src/bin/pg_dump/t/005_pg_dump_filterfile.pl Hunk #1 FAILED at 570. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/t/005_pg_dump_filterfile.pl.rej The next patch would delete the file src/bin/pg_dump/t/007_pg_dumpall.pl, which does not exist! Skipping patch. 1 out of 1 hunk ignored patching file src/tools/pgindent/typedefs.list Hunk #1 FAILED at 648. 1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej Unstaged changes after reset: M doc/src/sgml/ref/pg_dumpall.sgml M src/bin/pg_dump/pg_dumpall.c Removing doc/src/sgml/ref/pg_dumpall.sgml.rej Removing doc/src/sgml/ref/pg_restore.sgml.rej Removing src/bin/pg_dump/meson.build.rej Removing src/bin/pg_dump/parallel.c.rej Removing src/bin/pg_dump/pg_backup.h.rej Removing src/bin/pg_dump/pg_backup_archiver.c.rej Removing src/bin/pg_dump/pg_backup_archiver.h.rej Removing src/bin/pg_dump/pg_backup_tar.c.rej Removing src/bin/pg_dump/pg_dump.c.rej Removing src/bin/pg_dump/pg_dumpall.c.rej Removing src/bin/pg_dump/pg_restore.c.rej Removing src/bin/pg_dump/t/001_basic.pl.rej Removing src/bin/pg_dump/t/005_pg_dump_filterfile.pl.rej Removing src/tools/pgindent/typedefs.list.rej === using 'git apply' to apply patch ./0001-Revert-non-text-pg_dumpall.patch === Applied patch to 'doc/src/sgml/ref/pg_dumpall.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_restore.sgml' cleanly. Applied patch to 'src/bin/pg_dump/meson.build' cleanly. Applied patch to 'src/bin/pg_dump/parallel.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_tar.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dumpall.c' with conflicts. Applied patch to 'src/bin/pg_dump/pg_restore.c' cleanly. Applied patch to 'src/bin/pg_dump/t/001_basic.pl' cleanly. Applied patch to 'src/bin/pg_dump/t/005_pg_dump_filterfile.pl' cleanly. error: src/bin/pg_dump/t/007_pg_dumpall.pl: does not exist in index Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.