=== Applying patches on top of PostgreSQL commit ID 361499538c9d3640e1ed5522e08fdf81b08e76ae ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 11 02:33:24 UTC 2025
On branch cf/5802
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Moving-Perl-functions-Range-index-to-a-common-mod.patch ===
Applying: Moving Perl functions (Range index) to a common module.
=== using 'git am' to apply patch ./v1-0002-big-Improve-the-performance-of-Unicode-Normalization-.patch ===
Applying: Improve the performance of Unicode Normalization Forms.
=== using 'git am' to apply patch ./v1-0002-small-Improve-the-performance-of-Unicode-Normalization-.patch ===
Applying: Improve the performance of Unicode Normalization Forms.
Using index info to reconstruct a base tree...
M	src/common/unicode/generate-unicode_norm_table.pl
M	src/common/unicode_norm.c
A	src/include/common/unicode_norm_hashfunc.h
M	src/include/common/unicode_norm_table.h
M	src/tools/pgindent/exclude_file_patterns
Falling back to patching base and 3-way merge...
Auto-merging src/include/common/unicode_norm_table.h
CONFLICT (content): Merge conflict in src/include/common/unicode_norm_table.h
Auto-merging src/common/unicode/generate-unicode_norm_table.pl
CONFLICT (content): Merge conflict in src/common/unicode/generate-unicode_norm_table.pl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve the performance of Unicode Normalization Forms.
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/common/unicode/generate-unicode_norm_table.pl
M	src/include/common/unicode_norm_table.h
=== using patch(1) to apply patch ./v1-0002-small-Improve-the-performance-of-Unicode-Normalization-.patch ===
patching file src/common/unicode/generate-unicode_norm_table.pl
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 64.
Hunk #3 FAILED at 103.
Hunk #4 FAILED at 120.
Hunk #5 FAILED at 215.
Hunk #6 FAILED at 240.
Hunk #7 FAILED at 260.
7 out of 7 hunks FAILED -- saving rejects to file src/common/unicode/generate-unicode_norm_table.pl.rej
patching file src/common/unicode_norm.c
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 46.
Hunk #3 FAILED at 71.
Hunk #4 FAILED at 145.
Hunk #5 FAILED at 245.
5 out of 5 hunks FAILED -- saving rejects to file src/common/unicode_norm.c.rej
The next patch would delete the file src/include/common/unicode_norm_hashfunc.h,
which does not exist!  Skipping patch.
1 out of 1 hunk ignored
patching file src/include/common/unicode_norm_table.h
Hunk #1 FAILED at 18.
Hunk #2 FAILED at 35.
2 out of 2 hunks FAILED -- saving rejects to file src/include/common/unicode_norm_table.h.rej
patching file src/tools/pgindent/exclude_file_patterns
Hunk #1 FAILED at 33.
1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/exclude_file_patterns.rej
Removing src/common/unicode/generate-unicode_norm_table.pl.rej
Removing src/common/unicode_norm.c.rej
Removing src/include/common/unicode_norm_table.h.rej
Removing src/tools/pgindent/exclude_file_patterns.rej
=== using 'git apply' to apply patch ./v1-0002-small-Improve-the-performance-of-Unicode-Normalization-.patch ===
Applied patch to 'src/common/unicode/generate-unicode_norm_table.pl' with conflicts.
Applied patch to 'src/common/unicode_norm.c' cleanly.
error: src/include/common/unicode_norm_hashfunc.h: does not exist in index
Applied patch to 'src/include/common/unicode_norm_table.h' with conflicts.
Applied patch to 'src/tools/pgindent/exclude_file_patterns' cleanly.