=== Applying patches on top of PostgreSQL commit ID 6d04cd2b84496d727344be1acb6287452982c9bd === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 5 20:16:34 UTC 2026 On branch cf/6552 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-oauth-Allow-validators-to-register-custom-HBA-opt.patch === Applying: oauth: Allow validators to register custom HBA options Using index info to reconstruct a base tree... M doc/src/sgml/client-auth.sgml M doc/src/sgml/oauth-validators.sgml M src/backend/libpq/auth-oauth.c M src/backend/libpq/hba.c M src/include/libpq/hba.h M src/include/libpq/oauth.h M src/test/modules/oauth_validator/t/001_server.pl M src/test/modules/oauth_validator/validator.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/oauth_validator/validator.c CONFLICT (content): Merge conflict in src/test/modules/oauth_validator/validator.c Auto-merging src/test/modules/oauth_validator/t/001_server.pl Auto-merging src/include/libpq/hba.h Auto-merging src/backend/libpq/hba.c Auto-merging src/backend/libpq/auth-oauth.c Auto-merging doc/src/sgml/oauth-validators.sgml Auto-merging doc/src/sgml/client-auth.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 oauth: Allow validators to register custom HBA options 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 ./v5-0001-oauth-Allow-validators-to-register-custom-HBA-opt.patch === patching file doc/src/sgml/client-auth.sgml Hunk #1 succeeded at 2443 (offset -89 lines). patching file doc/src/sgml/oauth-validators.sgml Hunk #1 succeeded at 256 with fuzz 2 (offset 5 lines). Hunk #2 FAILED at 348. Hunk #3 succeeded at 662 with fuzz 2 (offset 225 lines). 1 out of 3 hunks FAILED -- saving rejects to file doc/src/sgml/oauth-validators.sgml.rej patching file src/include/libpq/hba.h Hunk #1 FAILED at 140. 1 out of 1 hunk FAILED -- saving rejects to file src/include/libpq/hba.h.rej patching file src/include/libpq/oauth.h Hunk #1 succeeded at 96 with fuzz 2. Hunk #2 FAILED at 118. 1 out of 2 hunks FAILED -- saving rejects to file src/include/libpq/oauth.h.rej patching file src/backend/libpq/auth-oauth.c Hunk #1 FAILED at 25. Hunk #2 FAILED at 40. Hunk #3 succeeded at 118 with fuzz 2 (offset 9 lines). Hunk #4 succeeded at 315 with fuzz 2 (offset 19 lines). Hunk #5 FAILED at 835. Hunk #6 succeeded at 1147 with fuzz 2 (offset 227 lines). 3 out of 6 hunks FAILED -- saving rejects to file src/backend/libpq/auth-oauth.c.rej patching file src/backend/libpq/hba.c Hunk #1 succeeded at 2307 with fuzz 2 (offset -190 lines). patching file src/test/modules/oauth_validator/t/001_server.pl Hunk #1 FAILED at 602. Hunk #2 succeeded at 656 with fuzz 2 (offset -18 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/test/modules/oauth_validator/t/001_server.pl.rej patching file src/test/modules/oauth_validator/validator.c Hunk #1 FAILED at 42. Hunk #2 succeeded at 112 (offset 16 lines). Hunk #3 succeeded at 171 with fuzz 2 (offset 39 lines). Hunk #4 FAILED at 172. Hunk #5 succeeded at 226 with fuzz 2 (offset 42 lines). Hunk #6 FAILED at 199. 3 out of 6 hunks FAILED -- saving rejects to file src/test/modules/oauth_validator/validator.c.rej Unstaged changes after reset: M doc/src/sgml/client-auth.sgml M doc/src/sgml/oauth-validators.sgml M src/backend/libpq/auth-oauth.c M src/backend/libpq/hba.c M src/include/libpq/oauth.h M src/test/modules/oauth_validator/t/001_server.pl M src/test/modules/oauth_validator/validator.c Removing doc/src/sgml/oauth-validators.sgml.rej Removing src/backend/libpq/auth-oauth.c.rej Removing src/include/libpq/hba.h.rej Removing src/include/libpq/oauth.h.rej Removing src/test/modules/oauth_validator/t/001_server.pl.rej Removing src/test/modules/oauth_validator/validator.c.rej === using 'git apply' to apply patch ./v5-0001-oauth-Allow-validators-to-register-custom-HBA-opt.patch === Applied patch to 'doc/src/sgml/client-auth.sgml' cleanly. Applied patch to 'doc/src/sgml/oauth-validators.sgml' cleanly. Applied patch to 'src/include/libpq/hba.h' cleanly. Applied patch to 'src/include/libpq/oauth.h' cleanly. Applied patch to 'src/backend/libpq/auth-oauth.c' cleanly. Applied patch to 'src/backend/libpq/hba.c' cleanly. Applied patch to 'src/test/modules/oauth_validator/t/001_server.pl' cleanly. Applied patch to 'src/test/modules/oauth_validator/validator.c' with conflicts. U src/test/modules/oauth_validator/validator.c diff --cc src/test/modules/oauth_validator/validator.c index e8b4dc668ea,85fb4c08bf2..00000000000 --- a/src/test/modules/oauth_validator/validator.c +++ b/src/test/modules/oauth_validator/validator.c @@@ -147,7 -147,7 +147,11 @@@ validator_startup(ValidatorModuleState * startup_cb). */ RegisterOAuthHBAOptions(state, lengthof(hba_opts), hba_opts); ++<<<<<<< ours + for (size_t i = 0; i < lengthof(hba_opts); i++) ++======= + for (int i = 0; i < lengthof(hba_opts); i++) ++>>>>>>> theirs { if (GetOAuthHBAOption(state, hba_opts[i])) elog(ERROR,