=== 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 02:48:23 UTC 2026 On branch cf/6483 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-use-the-malloc-macros-for-in-pg_dump-code.patch === Applying: use the malloc macros for in pg_dump code Using index info to reconstruct a base tree... M src/bin/pg_dump/compress_gzip.c M src/bin/pg_dump/compress_io.c M src/bin/pg_dump/compress_lz4.c M src/bin/pg_dump/compress_none.c M src/bin/pg_dump/compress_zstd.c M src/bin/pg_dump/connectdb.c M src/bin/pg_dump/dumputils.c M src/bin/pg_dump/parallel.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_custom.c M src/bin/pg_dump/pg_backup_directory.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump_sort.c M src/bin/pg_dump/pg_dumpall.c Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_dump/compress_gzip.c CONFLICT (content): Merge conflict in src/bin/pg_dump/compress_gzip.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 use the malloc macros for in pg_dump code 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 src/bin/pg_dump/compress_gzip.c === using patch(1) to apply patch ./v3-0001-use-the-malloc-macros-for-in-pg_dump-code.patch === patching file src/bin/pg_dump/compress_gzip.c Hunk #1 FAILED at 57. Hunk #2 FAILED at 178. 2 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_dump/compress_gzip.c.rej patching file src/bin/pg_dump/compress_io.c Hunk #1 FAILED at 125. Hunk #2 FAILED at 195. 2 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_dump/compress_io.c.rej patching file src/bin/pg_dump/compress_lz4.c Hunk #1 FAILED at 305. Hunk #2 FAILED at 754. 2 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_dump/compress_lz4.c.rej patching file src/bin/pg_dump/compress_none.c Hunk #1 FAILED at 124. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/compress_none.c.rej patching file src/bin/pg_dump/compress_zstd.c Hunk #1 FAILED at 219. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/compress_zstd.c.rej patching file src/bin/pg_dump/connectdb.c Hunk #1 FAILED at 89. Hunk #2 FAILED at 105. 2 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_dump/connectdb.c.rej patching file src/bin/pg_dump/dumputils.c Hunk #1 FAILED at 160. Hunk #2 FAILED at 176. Hunk #3 FAILED at 774. 3 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/dumputils.c.rej patching file src/bin/pg_dump/parallel.c Hunk #1 FAILED at 469. Hunk #2 FAILED at 903. Hunk #3 FAILED at 913. Hunk #4 FAILED at 969. 4 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_dump/parallel.c.rej patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 FAILED at 134. Hunk #2 FAILED at 1107. Hunk #3 FAILED at 1244. Hunk #4 FAILED at 1272. Hunk #5 FAILED at 1575. Hunk #6 FAILED at 1990. Hunk #7 FAILED at 2385. Hunk #8 FAILED at 2422. Hunk #9 FAILED at 2509. Hunk #10 FAILED at 2720. Hunk #11 FAILED at 2817. Hunk #12 FAILED at 2827. Hunk #13 FAILED at 2836. Hunk #14 FAILED at 4882. Hunk #15 FAILED at 4925. Hunk #16 FAILED at 5040. Hunk #17 FAILED at 5058. Hunk #18 FAILED at 5148. 18 out of 18 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_archiver.c.rej patching file src/bin/pg_dump/pg_backup_custom.c Hunk #1 FAILED at 136. Hunk #2 FAILED at 199. Hunk #3 FAILED at 240. Hunk #4 FAILED at 893. 4 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_custom.c.rej patching file src/bin/pg_dump/pg_backup_directory.c Hunk #1 FAILED at 140. Hunk #2 FAILED at 200. Hunk #3 FAILED at 252. Hunk #4 FAILED at 769. 4 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_directory.c.rej patching file src/bin/pg_dump/pg_dump.c Hunk #1 FAILED at 1541. Hunk #2 FAILED at 2569. Hunk #3 FAILED at 3070. Hunk #4 FAILED at 4087. Hunk #5 FAILED at 4310. Hunk #6 FAILED at 4366. Hunk #7 FAILED at 4608. Hunk #8 FAILED at 4787. Hunk #9 FAILED at 4886. Hunk #10 FAILED at 5263. Hunk #11 FAILED at 5357. Hunk #12 FAILED at 5837. Hunk #13 FAILED at 6019. Hunk #14 FAILED at 6151. Hunk #15 FAILED at 6250. Hunk #16 FAILED at 6336. Hunk #17 FAILED at 6399. Hunk #18 FAILED at 6471. Hunk #19 FAILED at 6535. Hunk #20 FAILED at 6608. Hunk #21 FAILED at 6670. Hunk #22 FAILED at 6735. Hunk #23 FAILED at 6853. Hunk #24 FAILED at 6886. Hunk #25 FAILED at 7044. Hunk #26 FAILED at 7079. Hunk #27 FAILED at 7121. Hunk #28 FAILED at 7413. Hunk #29 FAILED at 7745. Hunk #30 FAILED at 8057. Hunk #31 FAILED at 8123. Hunk #32 FAILED at 8161. Hunk #33 FAILED at 8252. Hunk #34 FAILED at 8363. Hunk #35 FAILED at 8524. Hunk #36 FAILED at 8612. Hunk #37 FAILED at 8818. Hunk #38 FAILED at 8915. Hunk #39 FAILED at 8989. Hunk #40 FAILED at 9081. Hunk #41 FAILED at 9180. Hunk #42 FAILED at 9518. Hunk #43 FAILED at 9624. Hunk #44 FAILED at 9760. Hunk #45 FAILED at 9859. Hunk #46 FAILED at 10187. Hunk #47 FAILED at 10254. Hunk #48 FAILED at 10318. Hunk #49 FAILED at 10377. Hunk #50 FAILED at 10449. Hunk #51 FAILED at 10532. Hunk #52 FAILED at 10630. Hunk #53 FAILED at 10729. Hunk #54 FAILED at 11606. Hunk #55 FAILED at 13683. Hunk #56 FAILED at 16810. Hunk #57 FAILED at 19178. Hunk #58 FAILED at 19256. Hunk #59 FAILED at 20360. Hunk #60 FAILED at 20534. Hunk #61 FAILED at 20542. Hunk #62 FAILED at 20577. 62 out of 62 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dump_sort.c Hunk #1 FAILED at 572. Hunk #2 FAILED at 651. Hunk #3 FAILED at 787. 3 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump_sort.c.rej patching file src/bin/pg_dump/pg_dumpall.c Hunk #1 FAILED at 1140. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_dumpall.c.rej Removing src/bin/pg_dump/compress_gzip.c.rej Removing src/bin/pg_dump/compress_io.c.rej Removing src/bin/pg_dump/compress_lz4.c.rej Removing src/bin/pg_dump/compress_none.c.rej Removing src/bin/pg_dump/compress_zstd.c.rej Removing src/bin/pg_dump/connectdb.c.rej Removing src/bin/pg_dump/dumputils.c.rej Removing src/bin/pg_dump/parallel.c.rej Removing src/bin/pg_dump/pg_backup_archiver.c.rej Removing src/bin/pg_dump/pg_backup_custom.c.rej Removing src/bin/pg_dump/pg_backup_directory.c.rej Removing src/bin/pg_dump/pg_dump.c.rej Removing src/bin/pg_dump/pg_dump_sort.c.rej Removing src/bin/pg_dump/pg_dumpall.c.rej === using 'git apply' to apply patch ./v3-0001-use-the-malloc-macros-for-in-pg_dump-code.patch === Applied patch to 'src/bin/pg_dump/compress_gzip.c' with conflicts. Applied patch to 'src/bin/pg_dump/compress_io.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_lz4.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_none.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_zstd.c' cleanly. Applied patch to 'src/bin/pg_dump/connectdb.c' cleanly. Applied patch to 'src/bin/pg_dump/dumputils.c' cleanly. Applied patch to 'src/bin/pg_dump/parallel.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_custom.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_directory.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump_sort.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly. U src/bin/pg_dump/compress_gzip.c diff --cc src/bin/pg_dump/compress_gzip.c index c9ce8a53aaa,c9e51691b76..00000000000 --- a/src/bin/pg_dump/compress_gzip.c +++ b/src/bin/pg_dump/compress_gzip.c @@@ -58,7 -58,7 +58,11 @@@ DeflateCompressorInit(CompressorState * z_streamp zp; gzipcs = pg_malloc0_object(GzipCompressorState); ++<<<<<<< ours + zp = gzipcs->zp = pg_malloc_object(z_stream); ++======= + zp = gzipcs->zp = (z_streamp) pg_malloc_object(z_stream); ++>>>>>>> theirs zp->zalloc = Z_NULL; zp->zfree = Z_NULL; zp->opaque = Z_NULL; @@@ -178,7 -178,7 +182,11 @@@ ReadDataFromArchiveGzip(ArchiveHandle * char *buf; size_t buflen; ++<<<<<<< ours + zp = pg_malloc_object(z_stream); ++======= + zp = (z_streamp) pg_malloc_object(z_stream); ++>>>>>>> theirs zp->zalloc = Z_NULL; zp->zfree = Z_NULL; zp->opaque = Z_NULL;