=== Applying patches on top of PostgreSQL commit ID 1aa7cf9eb85972aaf2969306e84f5fc794fbef7f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Apr 27 23:31:22 UTC 2025 On branch cf/5166 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-Tidy-up-locale-thread-safety-in-ECPG-library.patch === Applying: Tidy up locale thread safety in ECPG library. Using index info to reconstruct a base tree... M configure M configure.ac M meson.build M src/include/pg_config.h.in M src/include/port.h M src/interfaces/ecpg/ecpglib/descriptor.c M src/interfaces/ecpg/ecpglib/execute.c M src/interfaces/ecpg/pgtypeslib/numeric.c M src/port/Makefile M src/port/meson.build M src/port/snprintf.c Falling back to patching base and 3-way merge... Auto-merging src/port/snprintf.c Auto-merging src/port/meson.build Auto-merging src/port/Makefile Auto-merging src/interfaces/ecpg/pgtypeslib/numeric.c Auto-merging src/interfaces/ecpg/ecpglib/execute.c Auto-merging src/interfaces/ecpg/ecpglib/descriptor.c Auto-merging src/include/port.h Auto-merging src/include/pg_config.h.in Auto-merging meson.build Auto-merging configure.ac CONFLICT (content): Merge conflict in configure.ac Auto-merging configure CONFLICT (content): Merge conflict in configure error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Tidy up locale thread safety in ECPG library. 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 configure M configure.ac M meson.build M src/include/pg_config.h.in M src/include/port.h M src/include/port/win32_port.h M src/interfaces/ecpg/ecpglib/connect.c M src/interfaces/ecpg/ecpglib/data.c M src/interfaces/ecpg/ecpglib/descriptor.c M src/interfaces/ecpg/ecpglib/ecpglib_extern.h M src/interfaces/ecpg/ecpglib/execute.c M src/interfaces/ecpg/pgtypeslib/dt_common.c M src/interfaces/ecpg/pgtypeslib/interval.c M src/interfaces/ecpg/pgtypeslib/numeric.c M src/port/Makefile M src/port/meson.build M src/port/snprintf.c Removing src/port/locale.c === using patch(1) to apply patch ./v7-0001-Tidy-up-locale-thread-safety-in-ECPG-library.patch === patching file configure Hunk #1 FAILED at 14934. 1 out of 1 hunk FAILED -- saving rejects to file configure.rej patching file configure.ac Hunk #1 FAILED at 1718. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej patching file meson.build Hunk #1 succeeded at 2876 with fuzz 2 (offset 228 lines). patching file src/include/pg_config.h.in Hunk #1 succeeded at 366 (offset 17 lines). Hunk #2 succeeded at 414 (offset 17 lines). patching file src/include/port.h patching file src/include/port/win32_port.h patching file src/interfaces/ecpg/ecpglib/connect.c patching file src/interfaces/ecpg/ecpglib/data.c patching file src/interfaces/ecpg/ecpglib/descriptor.c patching file src/interfaces/ecpg/ecpglib/ecpglib_extern.h patching file src/interfaces/ecpg/ecpglib/execute.c patching file src/interfaces/ecpg/pgtypeslib/dt_common.c patching file src/interfaces/ecpg/pgtypeslib/interval.c patching file src/interfaces/ecpg/pgtypeslib/numeric.c patching file src/port/Makefile patching file src/port/locale.c patching file src/port/meson.build Hunk #1 succeeded at 5 with fuzz 1. patching file src/port/snprintf.c Hunk #2 succeeded at 1247 (offset -3 lines). Hunk #3 succeeded at 1271 (offset -3 lines). Hunk #4 succeeded at 1284 (offset -3 lines). Hunk #5 succeeded at 1411 (offset -3 lines). Unstaged changes after reset: M meson.build M src/include/pg_config.h.in M src/include/port.h M src/include/port/win32_port.h M src/interfaces/ecpg/ecpglib/connect.c M src/interfaces/ecpg/ecpglib/data.c M src/interfaces/ecpg/ecpglib/descriptor.c M src/interfaces/ecpg/ecpglib/ecpglib_extern.h M src/interfaces/ecpg/ecpglib/execute.c M src/interfaces/ecpg/pgtypeslib/dt_common.c M src/interfaces/ecpg/pgtypeslib/interval.c M src/interfaces/ecpg/pgtypeslib/numeric.c M src/port/Makefile M src/port/meson.build M src/port/snprintf.c Removing configure.ac.rej Removing configure.rej Removing src/port/locale.c === using 'git apply' to apply patch ./v7-0001-Tidy-up-locale-thread-safety-in-ECPG-library.patch === Applied patch to 'configure' with conflicts. Applied patch to 'configure.ac' with conflicts. Applied patch to 'meson.build' cleanly. Applied patch to 'src/include/pg_config.h.in' cleanly. Applied patch to 'src/include/port.h' cleanly. Applied patch to 'src/include/port/win32_port.h' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/connect.c' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/data.c' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/descriptor.c' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/ecpglib_extern.h' cleanly. Applied patch to 'src/interfaces/ecpg/ecpglib/execute.c' cleanly. Applied patch to 'src/interfaces/ecpg/pgtypeslib/dt_common.c' cleanly. Applied patch to 'src/interfaces/ecpg/pgtypeslib/interval.c' cleanly. Applied patch to 'src/interfaces/ecpg/pgtypeslib/numeric.c' cleanly. Applied patch to 'src/port/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/port/meson.build' cleanly. Applied patch to 'src/port/snprintf.c' cleanly. U configure U configure.ac diff --cc configure index 0936010718d,017e63598c1..00000000000 --- a/configure +++ b/configure @@@ -15588,7 -14934,7 +15588,11 @@@ f LIBS_including_readline="$LIBS" LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'` ++<<<<<<< ours +for ac_func in backtrace_symbols copyfile copy_file_range elf_aux_info getauxval getifaddrs getpeerucred inet_pton kqueue localeconv_l mbstowcs_l memset_s posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast strsignal syncfs sync_file_range uselocale wcstombs_l ++======= + for ac_func in backtrace_symbols copyfile copy_file_range elf_aux_info getauxval getifaddrs getpeerucred inet_pton kqueue mbstowcs_l memset_s posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast snprintf_l strtod_l strchrnul strsignal syncfs sync_file_range uselocale wcstombs_l ++>>>>>>> theirs do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --cc configure.ac index 2a78cddd825,b06a9cd1080..00000000000 --- a/configure.ac +++ b/configure.ac @@@ -1786,6 -1718,9 +1786,12 @@@ AC_CHECK_FUNCS(m4_normalize( pthread_is_threaded_np setproctitle setproctitle_fast ++<<<<<<< ours ++======= + snprintf_l + strtod_l + strchrnul ++>>>>>>> theirs strsignal syncfs sync_file_range