=== Applying patches on top of PostgreSQL commit ID 9d8cdcbe0c8aee743e29079bdb2e4b5eeae4c70e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jun  9 14:06:25 UTC 2026
On branch cf/5570
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Bump-postmaster-soft-open-file-limit-RLIMIT_NOFI.patch ===
Applying: Bump postmaster soft open file limit (RLIMIT_NOFILE) when necessary
Using index info to reconstruct a base tree...
M	meson.build
M	src/backend/storage/file/fd.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/storage/file/fd.c
CONFLICT (content): Merge conflict in src/backend/storage/file/fd.c
Auto-merging meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump postmaster soft open file limit (RLIMIT_NOFILE) when necessary
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 ./v10-0001-Bump-postmaster-soft-open-file-limit-RLIMIT_NOFI.patch ===
patching file meson.build
Hunk #1 succeeded at 3221 (offset 118 lines).
patching file src/backend/access/transam/xlogarchive.c
patching file src/backend/archive/shell_archive.c
patching file src/backend/storage/file/fd.c
Hunk #9 FAILED at 3144.
1 out of 11 hunks FAILED -- saving rejects to file src/backend/storage/file/fd.c.rej
patching file src/bin/initdb/t/001_initdb.pl
patching file src/include/pg_config.h.in
patching file src/include/storage/fd.h
Unstaged changes after reset:
M	meson.build
M	src/backend/access/transam/xlogarchive.c
M	src/backend/archive/shell_archive.c
M	src/backend/storage/file/fd.c
M	src/bin/initdb/t/001_initdb.pl
M	src/include/pg_config.h.in
M	src/include/storage/fd.h
Removing src/backend/storage/file/fd.c.rej
=== using 'git apply' to apply patch ./v10-0001-Bump-postmaster-soft-open-file-limit-RLIMIT_NOFI.patch ===
Applied patch to 'meson.build' cleanly.
Applied patch to 'src/backend/access/transam/xlogarchive.c' cleanly.
Applied patch to 'src/backend/archive/shell_archive.c' cleanly.
Applied patch to 'src/backend/storage/file/fd.c' with conflicts.
Applied patch to 'src/bin/initdb/t/001_initdb.pl' cleanly.
Applied patch to 'src/include/pg_config.h.in' cleanly.
Applied patch to 'src/include/storage/fd.h' cleanly.
U src/backend/storage/file/fd.c
diff --cc src/backend/storage/file/fd.c
index 4cf4717f764,21696fad0f6..00000000000
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@@ -2747,13 -3144,11 +3144,21 @@@ OpenPipeStream(const char *command, con
  	ReleaseLruFiles();
  
  TryAgain:
++<<<<<<< ours
 +	fflush(NULL);
 +	pqsignal(SIGPIPE, PG_SIG_DFL);
++=======
+ 
++>>>>>>> theirs
  	errno = 0;
- 	file = popen(command, mode);
+ 	file = pg_popen(command, mode, &child_pid);
  	save_errno = errno;
++<<<<<<< ours
 +	pqsignal(SIGPIPE, PG_SIG_IGN);
 +	errno = save_errno;
++=======
+ 	pqsignal(SIGPIPE, SIG_IGN);
++>>>>>>> theirs
  	if (file != NULL)
  	{
  		AllocateDesc *desc = &allocatedDescs[numAllocatedDescs];