=== Applying patches on top of PostgreSQL commit ID 67d318e70402b0eb450c7e20c0378b88e5a6df1d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Apr 14 22:01:29 UTC 2026
On branch cf/6283
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Add-configure-time-selection-of-strong-random-num.patch ===
Applying: Add configure-time selection of strong random number source.
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	doc/src/sgml/config.sgml
M	doc/src/sgml/installation.sgml
M	meson.build
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/include/pg_config.h.in
Falling back to patching base and 3-way merge...
Auto-merging src/include/pg_config.h.in
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging meson.build
Auto-merging doc/src/sgml/installation.sgml
Auto-merging doc/src/sgml/config.sgml
Auto-merging configure.ac
Auto-merging configure
=== using 'git am' to apply patch ./v3-0002-Support-getrandom-as-random-source-where-availabl.patch ===
Applying: Support getrandom() as random source where available.
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	meson.build
M	src/include/pg_config.h.in
Falling back to patching base and 3-way merge...
Auto-merging src/include/pg_config.h.in
Auto-merging meson.build
Auto-merging 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 Support getrandom() as random source where available.
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 ./v3-0002-Support-getrandom-as-random-source-where-availabl.patch ===
patching file configure
Hunk #1 FAILED at 15576.
Hunk #2 succeeded at 18785 (offset 326 lines).
Hunk #3 succeeded at 18817 (offset 326 lines).
1 out of 3 hunks FAILED -- saving rejects to file configure.rej
patching file configure.ac
Hunk #1 succeeded at 1858 (offset 77 lines).
Hunk #2 succeeded at 2416 (offset 96 lines).
Hunk #3 succeeded at 2427 (offset 96 lines).
patching file meson.build
Hunk #1 succeeded at 3237 (offset 326 lines).
patching file src/include/pg_config.h.in
Hunk #1 succeeded at 183 (offset 4 lines).
patching file src/port/pg_strong_random.c
Unstaged changes after reset:
M	configure
M	configure.ac
M	meson.build
M	src/include/pg_config.h.in
M	src/port/pg_strong_random.c
Removing configure.rej
=== using 'git apply' to apply patch ./v3-0002-Support-getrandom-as-random-source-where-availabl.patch ===
Applied patch to 'configure' with conflicts.
Applied patch to 'configure.ac' cleanly.
Applied patch to 'meson.build' cleanly.
Applied patch to 'src/include/pg_config.h.in' cleanly.
Applied patch to 'src/port/pg_strong_random.c' cleanly.
U configure
diff --cc configure
index 8767193edd1,91135999d9d..00000000000
--- a/configure
+++ b/configure
@@@ -15891,7 -15576,7 +15891,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 explicit_memset getauxval getifaddrs getpeerucred inet_pton kqueue localeconv_l mbstowcs_l memset_explicit 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 getrandom inet_pton kqueue localeconv_l mbstowcs_l posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast 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"