=== Applying patches on top of PostgreSQL commit ID 5761d991c98471b7dab3147b71f9caf00a6f8ce4 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 6 14:09:20 UTC 2025 On branch cf/5301 nothing to commit, working tree clean === using 'git am' to apply patch ./v16-0001-Control-ctype-behavior-internally-with-a-method-.patch === Applying: Control ctype behavior internally with a method table. Using index info to reconstruct a base tree... M src/backend/regex/regc_pg_locale.c M src/backend/utils/adt/like.c M src/backend/utils/adt/like_support.c M src/backend/utils/adt/pg_locale.c M src/backend/utils/adt/pg_locale_builtin.c M src/backend/utils/adt/pg_locale_icu.c M src/backend/utils/adt/pg_locale_libc.c M src/include/utils/pg_locale.h 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/include/utils/pg_locale.h Auto-merging src/backend/utils/adt/pg_locale_libc.c Auto-merging src/backend/utils/adt/pg_locale_icu.c Auto-merging src/backend/utils/adt/pg_locale_builtin.c Auto-merging src/backend/utils/adt/pg_locale.c No changes -- Patch already applied. === using 'git am' to apply patch ./v16-0002-Remove-provider-field-from-pg_locale_t.patch === Applying: Remove provider field from pg_locale_t. Using index info to reconstruct a base tree... M src/backend/utils/adt/pg_locale_builtin.c M src/backend/utils/adt/pg_locale_icu.c M src/backend/utils/adt/pg_locale_libc.c M src/include/utils/pg_locale.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/pg_locale.h Auto-merging src/backend/utils/adt/pg_locale_libc.c Auto-merging src/backend/utils/adt/pg_locale_builtin.c No changes -- Patch already applied. === using 'git am' to apply patch ./v16-0003-Make-provider-data-in-pg_locale_t-an-opaque-poin.patch === Applying: Make provider data in pg_locale_t an opaque pointer. Using index info to reconstruct a base tree... M src/backend/utils/adt/pg_locale_builtin.c M src/backend/utils/adt/pg_locale_libc.c M src/include/utils/pg_locale.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/pg_locale.h Auto-merging src/backend/utils/adt/pg_locale_libc.c CONFLICT (content): Merge conflict in src/backend/utils/adt/pg_locale_libc.c Auto-merging src/backend/utils/adt/pg_locale_builtin.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 Make provider data in pg_locale_t an opaque pointer. 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/backend/utils/adt/pg_locale_builtin.c M src/backend/utils/adt/pg_locale_icu.c M src/backend/utils/adt/pg_locale_libc.c M src/include/utils/pg_locale.h === using patch(1) to apply patch ./v16-0003-Make-provider-data-in-pg_locale_t-an-opaque-poin.patch === patching file src/backend/utils/adt/pg_locale_builtin.c Hunk #1 succeeded at 25 (offset -1 lines). Hunk #2 succeeded at 77 (offset -1 lines). Hunk #3 succeeded at 108 (offset -1 lines). Hunk #4 succeeded at 147 (offset -1 lines). Hunk #5 succeeded at 181 (offset -1 lines). Hunk #6 succeeded at 236 (offset -1 lines). Hunk #7 succeeded at 270 (offset -1 lines). patching file src/backend/utils/adt/pg_locale_icu.c patching file src/backend/utils/adt/pg_locale_libc.c Hunk #11 succeeded at 515 with fuzz 1. Hunk #19 succeeded at 700 with fuzz 1. Hunk #28 FAILED at 1234. Hunk #29 FAILED at 1294. 2 out of 29 hunks FAILED -- saving rejects to file src/backend/utils/adt/pg_locale_libc.c.rej patching file src/include/utils/pg_locale.h Hunk #1 succeeded at 154 (offset 3 lines). Unstaged changes after reset: M src/backend/utils/adt/pg_locale_builtin.c M src/backend/utils/adt/pg_locale_icu.c M src/backend/utils/adt/pg_locale_libc.c M src/include/utils/pg_locale.h Removing src/backend/utils/adt/pg_locale_libc.c.rej === using 'git apply' to apply patch ./v16-0003-Make-provider-data-in-pg_locale_t-an-opaque-poin.patch === Applied patch to 'src/backend/utils/adt/pg_locale_builtin.c' cleanly. Applied patch to 'src/backend/utils/adt/pg_locale_icu.c' cleanly. Applied patch to 'src/backend/utils/adt/pg_locale_libc.c' with conflicts. Applied patch to 'src/include/utils/pg_locale.h' cleanly. U src/backend/utils/adt/pg_locale_libc.c diff --cc src/backend/utils/adt/pg_locale_libc.c index 8d88b53c375,41fd657ace6..00000000000 --- a/src/backend/utils/adt/pg_locale_libc.c +++ b/src/backend/utils/adt/pg_locale_libc.c @@@ -457,10 -512,10 +512,10 @@@ strlower_libc_mb(char *dest, size_t des /* Output workspace cannot have more codes than input bytes */ workspace = (wchar_t *) palloc((srclen + 1) * sizeof(wchar_t)); - char2wchar(workspace, srclen + 1, src, srclen, locale); + char2wchar(workspace, srclen + 1, src, srclen, loc); for (curr_char = 0; workspace[curr_char] != 0; curr_char++) - workspace[curr_char] = towlower_l(workspace[curr_char], loc); + workspace[curr_char] = towlower_l(workspace[curr_char], libc->lt); /* * Make result large enough; case change might change number of bytes @@@ -640,10 -697,10 +697,10 @@@ strupper_libc_mb(char *dest, size_t des /* Output workspace cannot have more codes than input bytes */ workspace = (wchar_t *) palloc((srclen + 1) * sizeof(wchar_t)); - char2wchar(workspace, srclen + 1, src, srclen, locale); + char2wchar(workspace, srclen + 1, src, srclen, loc); for (curr_char = 0; workspace[curr_char] != 0; curr_char++) - workspace[curr_char] = towupper_l(workspace[curr_char], loc); + workspace[curr_char] = towupper_l(workspace[curr_char], libc->lt); /* * Make result large enough; case change might change number of bytes @@@ -1167,8 -1234,10 +1234,14 @@@ wchar2char(char *to, const wchar_t *fro } else { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + /* Use wcstombs_l for nondefault locales */ ++<<<<<<< ours + result = wcstombs_l(to, from, tolen, loc); ++======= + result = wcstombs_l(to, from, tolen, libc->lt); ++>>>>>>> theirs } return result; @@@ -1227,8 -1296,10 +1300,14 @@@ char2wchar(wchar_t *to, size_t tolen, c } else { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + /* Use mbstowcs_l for nondefault locales */ ++<<<<<<< ours + result = mbstowcs_l(to, str, tolen, loc); ++======= + result = mbstowcs_l(to, str, tolen, libc->lt); ++>>>>>>> theirs } pfree(str);