=== Applying patches on top of PostgreSQL commit ID 12eee85e511ff8854ac61e8caad8cec218b20513 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 18 19:07:22 UTC 2025
On branch cf/5756
nothing to commit, working tree clean
=== using 'git am' to apply patch ./memset_s_fix.patch ===
Patch format detection failed.
=== using patch(1) to apply patch ./memset_s_fix.patch ===
patching file configure
Hunk #1 FAILED at 15616.
Hunk #2 succeeded at 16205 with fuzz 1 (offset 13 lines).
1 out of 2 hunks FAILED -- saving rejects to file configure.rej
patching file configure.ac
Hunk #1 FAILED at 1792.
Hunk #2 FAILED at 1838.
2 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej
patching file meson.build
Hunk #1 FAILED at 2654.
Hunk #2 FAILED at 2667.
Hunk #3 FAILED at 2880.
3 out of 3 hunks FAILED -- saving rejects to file meson.build.rej
patching file src/include/pg_config.h.in
Hunk #1 succeeded at 95 with fuzz 2 (offset 4 lines).
Hunk #2 FAILED at 295.
1 out of 2 hunks FAILED -- saving rejects to file src/include/pg_config.h.in.rej
patching file src/port/explicit_bzero.c
Hunk #1 FAILED at 12.
1 out of 1 hunk FAILED -- saving rejects to file src/port/explicit_bzero.c.rej
Unstaged changes after reset:
M	configure
M	src/include/pg_config.h.in
Removing configure.ac.rej
Removing configure.rej
Removing meson.build.rej
Removing src/include/pg_config.h.in.rej
Removing src/port/explicit_bzero.c.rej
=== using 'git apply' to apply patch ./memset_s_fix.patch ===
Applied patch to 'configure' cleanly.
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/explicit_bzero.c' with conflicts.
U src/port/explicit_bzero.c
diff --cc src/port/explicit_bzero.c
index 53766e86e94,358a692f357..00000000000
--- a/src/port/explicit_bzero.c
+++ b/src/port/explicit_bzero.c
@@@ -12,7 -12,7 +12,11 @@@
   *-------------------------------------------------------------------------
   */
  
++<<<<<<< ours
 +#define __STDC_WANT_LIB_EXT1__ 1	/* needed to access memset_s() */
++=======
+ #define __STDC_WANT_LIB_EXT1__ 1		/* needed to access memset_s() */
++>>>>>>> theirs
  
  #include "c.h"