=== Applying patches on top of PostgreSQL commit ID 7fc2f0423320e02beb8c44b863f1827604c47c75 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Nov 16 13:15:32 UTC 2026 On branch cf/7513 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Drop-support-for-named-POSIX-semaphores-the-sem_o.patch === Applying: Drop support for named POSIX semaphores (the sem_open() kind). Using index info to reconstruct a base tree... M configure M configure.ac M src/backend/port/meson.build M src/backend/port/posix_sema.c M src/include/pg_config.h.in M src/template/darwin Falling back to patching base and 3-way merge... Auto-merging src/backend/port/posix_sema.c CONFLICT (content): Merge conflict in src/backend/port/posix_sema.c Auto-merging configure.ac Auto-merging 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 Drop support for named POSIX semaphores (the sem_open() kind). 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 ./v1-0001-Drop-support-for-named-POSIX-semaphores-the-sem_o.patch === patching file configure Hunk #1 FAILED at 18545. Hunk #2 FAILED at 18665. 2 out of 2 hunks FAILED -- saving rejects to file configure.rej patching file configure.ac Hunk #1 FAILED at 2354. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej patching file src/backend/port/meson.build Hunk #1 FAILED at 5. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/port/meson.build.rej patching file src/backend/port/posix_sema.c Hunk #1 FAILED at 3. Hunk #2 FAILED at 37. Hunk #3 FAILED at 58. Hunk #4 FAILED at 140. Hunk #5 FAILED at 149. Hunk #6 FAILED at 167. Hunk #7 FAILED at 188. Hunk #8 FAILED at 237. Hunk #9 FAILED at 268. 9 out of 9 hunks FAILED -- saving rejects to file src/backend/port/posix_sema.c.rej patching file src/include/pg_config.h.in Hunk #1 FAILED at 723. 1 out of 1 hunk FAILED -- saving rejects to file src/include/pg_config.h.in.rej patching file src/template/darwin Hunk #1 FAILED at 14. 1 out of 1 hunk FAILED -- saving rejects to file src/template/darwin.rej Removing configure.ac.rej Removing configure.rej Removing src/backend/port/meson.build.rej Removing src/backend/port/posix_sema.c.rej Removing src/include/pg_config.h.in.rej Removing src/template/darwin.rej === using 'git apply' to apply patch ./v1-0001-Drop-support-for-named-POSIX-semaphores-the-sem_o.patch === Applied patch to 'configure' cleanly. Applied patch to 'configure.ac' cleanly. Applied patch to 'src/backend/port/meson.build' cleanly. Applied patch to 'src/backend/port/posix_sema.c' with conflicts. Applied patch to 'src/include/pg_config.h.in' cleanly. Applied patch to 'src/template/darwin' cleanly. U src/backend/port/posix_sema.c diff --cc src/backend/port/posix_sema.c index 0490ce21913,e01aa35e77e..00000000000 --- a/src/backend/port/posix_sema.c +++ b/src/backend/port/posix_sema.c @@@ -47,7 -51,8 +47,11 @@@ typedef struct PGSemaphoreDat static PGSemaphore sharedSemas; /* array of PGSemaphoreData in shared memory */ static int numSems; /* number of semas acquired so far */ ++<<<<<<< ours +static int maxSems; /* allocated size of above array */ ++======= + static int maxSems; /* allocated size of above arrays */ ++>>>>>>> theirs static void ReleaseSemaphores(int status, Datum arg); @@@ -72,6 -77,7 +76,10 @@@ PosixSemaphoreCreate(sem_t *sem static void PosixSemaphoreKill(sem_t *sem) { ++<<<<<<< ours ++======= + /* Got to use sem_destroy for unnamed semaphores */ ++>>>>>>> theirs if (sem_destroy(sem) < 0) elog(LOG, "sem_destroy failed: %m"); }