=== Applying patches on top of PostgreSQL commit ID 8a53539bd603e5fe8fa52bdbb7277f6f49724522 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. === applying patch ./v24-0001-Revert-ECPG-s-use-of-pnstrdup.patch patching file src/interfaces/ecpg/compatlib/informix.c [cf/4412 fe5b839572] Revert ECPG's use of pnstrdup() Author: Jacob Champion Date: Tue Jul 2 12:26:04 2024 -0700 1 file changed, 21 insertions(+), 2 deletions(-) === applying patch ./v24-0002-Remove-fe_memutils-from-libpgcommon_shlib.patch patching file src/common/Makefile patching file src/common/meson.build [cf/4412 718520e73e] Remove fe_memutils from libpgcommon_shlib Author: Jacob Champion Date: Mon Jul 1 14:18:33 2024 -0700 2 files changed, 2 insertions(+), 2 deletions(-) === applying patch ./v24-0003-common-jsonapi-support-libpq-as-a-client.patch patching file src/bin/pg_combinebackup/Makefile patching file src/bin/pg_combinebackup/meson.build patching file src/bin/pg_verifybackup/Makefile patching file src/common/Makefile patching file src/common/jsonapi.c patching file src/common/meson.build patching file src/common/parse_manifest.c patching file src/include/common/jsonapi.h patching file src/test/modules/test_json_parser/Makefile patching file src/test/modules/test_json_parser/meson.build [cf/4412 733bb3ad69] common/jsonapi: support libpq as a client Author: Jacob Champion Date: Mon May 3 15:38:26 2021 -0700 10 files changed, 361 insertions(+), 137 deletions(-) === applying patch ./v24-0004-libpq-add-OAUTHBEARER-SASL-mechanism.patch patching file config/programs.m4 patching file configure Hunk #5 succeeded at 13090 (offset 1 line). Hunk #6 succeeded at 14199 (offset 1 line). patching file configure.ac patching file doc/src/sgml/libpq.sgml patching file meson.build Hunk #1 succeeded at 909 (offset 69 lines). Hunk #2 succeeded at 3097 (offset 94 lines). Hunk #3 succeeded at 3769 (offset 94 lines). patching file meson_options.txt patching file src/Makefile.global.in patching file src/include/common/oauth-common.h patching file src/include/pg_config.h.in Hunk #1 succeeded at 250 (offset 4 lines). Hunk #2 succeeded at 739 (offset 10 lines). patching file src/interfaces/libpq/Makefile Hunk #1 succeeded at 63 (offset 2 lines). Hunk #2 succeeded at 89 (offset 2 lines). Hunk #3 succeeded at 118 (offset 2 lines). Hunk #4 succeeded at 127 (offset 2 lines). patching file src/interfaces/libpq/exports.txt patching file src/interfaces/libpq/fe-auth-oauth-curl.c patching file src/interfaces/libpq/fe-auth-oauth.c patching file src/interfaces/libpq/fe-auth-oauth.h patching file src/interfaces/libpq/fe-auth-sasl.h patching file src/interfaces/libpq/fe-auth-scram.c patching file src/interfaces/libpq/fe-auth.c patching file src/interfaces/libpq/fe-auth.h patching file src/interfaces/libpq/fe-connect.c Hunk #4 succeeded at 3716 (offset 17 lines). Hunk #5 succeeded at 3872 (offset 17 lines). Hunk #6 succeeded at 3915 (offset 17 lines). Hunk #7 succeeded at 3958 (offset 17 lines). Hunk #8 succeeded at 4674 (offset 17 lines). Hunk #9 succeeded at 4792 (offset 17 lines). Hunk #10 succeeded at 7279 (offset 17 lines). patching file src/interfaces/libpq/fe-misc.c patching file src/interfaces/libpq/libpq-fe.h patching file src/interfaces/libpq/libpq-int.h patching file src/interfaces/libpq/meson.build patching file src/makefiles/meson.build patching file src/tools/pgindent/typedefs.list Hunk #2 succeeded at 369 (offset 1 line). Hunk #3 succeeded at 1717 (offset 2 lines). Hunk #4 succeeded at 1782 (offset 2 lines). Hunk #5 succeeded at 1943 (offset 2 lines). Hunk #6 succeeded at 3450 (offset 3 lines). [cf/4412 9ac7027edd] libpq: add OAUTHBEARER SASL mechanism Author: Jacob Champion Date: Tue Apr 13 10:27:27 2021 -0700 25 files changed, 3394 insertions(+), 27 deletions(-) create mode 100644 src/include/common/oauth-common.h create mode 100644 src/interfaces/libpq/fe-auth-oauth-curl.c create mode 100644 src/interfaces/libpq/fe-auth-oauth.c create mode 100644 src/interfaces/libpq/fe-auth-oauth.h === applying patch ./v24-0005-backend-add-OAUTHBEARER-SASL-mechanism.patch patching file .cirrus.tasks.yml Hunk #5 succeeded at 315 with fuzz 1 (offset 2 lines). Hunk #6 succeeded at 693 (offset 12 lines). patching file doc/src/sgml/client-auth.sgml Hunk #3 succeeded at 2328 (offset 17 lines). patching file doc/src/sgml/filelist.sgml patching file doc/src/sgml/oauth-validators.sgml patching file doc/src/sgml/postgres.sgml patching file src/backend/libpq/Makefile patching file src/backend/libpq/auth-oauth.c patching file src/backend/libpq/auth-sasl.c patching file src/backend/libpq/auth-scram.c patching file src/backend/libpq/auth.c patching file src/backend/libpq/hba.c patching file src/backend/libpq/meson.build patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 49 (offset 1 line). Hunk #2 succeeded at 4698 (offset -10 lines). patching file src/common/Makefile patching file src/include/libpq/auth.h patching file src/include/libpq/hba.h patching file src/include/libpq/oauth.h patching file src/include/libpq/sasl.h patching file src/interfaces/libpq/fe-auth-oauth-curl.c patching file src/test/modules/Makefile patching file src/test/modules/meson.build patching file src/test/modules/oauth_validator/.gitignore patching file src/test/modules/oauth_validator/Makefile patching file src/test/modules/oauth_validator/expected/validator.out patching file src/test/modules/oauth_validator/meson.build patching file src/test/modules/oauth_validator/sql/validator.sql patching file src/test/modules/oauth_validator/t/001_server.pl patching file src/test/modules/oauth_validator/t/oauth_server.py patching file src/test/modules/oauth_validator/validator.c patching file src/test/perl/PostgreSQL/Test/Cluster.pm Hunk #1 succeeded at 2397 (offset 9 lines). Hunk #2 succeeded at 2445 (offset 9 lines). patching file src/test/perl/PostgreSQL/Test/OAuthServer.pm patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 1718 (offset 2 lines). Hunk #2 succeeded at 3060 (offset 3 lines). Hunk #3 succeeded at 3654 (offset 3 lines). [cf/4412 f3d5b76bee] backend: add OAUTHBEARER SASL mechanism Author: Jacob Champion Date: Tue May 4 16:21:11 2021 -0700 32 files changed, 1522 insertions(+), 40 deletions(-) create mode 100644 doc/src/sgml/oauth-validators.sgml create mode 100644 src/backend/libpq/auth-oauth.c create mode 100644 src/include/libpq/oauth.h create mode 100644 src/test/modules/oauth_validator/.gitignore create mode 100644 src/test/modules/oauth_validator/Makefile create mode 100644 src/test/modules/oauth_validator/expected/validator.out create mode 100644 src/test/modules/oauth_validator/meson.build create mode 100644 src/test/modules/oauth_validator/sql/validator.sql create mode 100644 src/test/modules/oauth_validator/t/001_server.pl create mode 100755 src/test/modules/oauth_validator/t/oauth_server.py create mode 100644 src/test/modules/oauth_validator/validator.c create mode 100644 src/test/perl/PostgreSQL/Test/OAuthServer.pm === applying patch ./v24-0006-Review-comments.patch patching file src/backend/libpq/auth-oauth.c patching file src/interfaces/libpq/fe-auth-oauth-curl.c patching file src/interfaces/libpq/fe-auth-oauth.c [cf/4412 fa22db6845] Review comments Author: Daniel Gustafsson Date: Thu Mar 28 21:59:02 2024 +0100 3 files changed, 92 insertions(+), 54 deletions(-) === applying patch ./v24-0007-DO-NOT-MERGE-Add-pytest-suite-for-OAuth.patch patching file .cirrus.tasks.yml Hunk #2 succeeded at 319 with fuzz 1 (offset 2 lines). Hunk #3 succeeded at 374 (offset 2 lines). Hunk #4 FAILED at 384. 1 out of 4 hunks FAILED -- saving rejects to file .cirrus.tasks.yml.rej patching file meson.build Hunk #1 succeeded at 3410 (offset 94 lines). Hunk #2 succeeded at 3574 (offset 94 lines). patching file src/test/meson.build patching file src/test/python/.gitignore patching file src/test/python/Makefile patching file src/test/python/README patching file src/test/python/client/__init__.py patching file src/test/python/client/conftest.py patching file src/test/python/client/test_client.py patching file src/test/python/client/test_oauth.py patching file src/test/python/conftest.py patching file src/test/python/meson.build patching file src/test/python/pq3.py patching file src/test/python/pytest.ini patching file src/test/python/requirements.txt patching file src/test/python/server/__init__.py patching file src/test/python/server/conftest.py patching file src/test/python/server/meson.build patching file src/test/python/server/oauthtest.c patching file src/test/python/server/test_oauth.py patching file src/test/python/server/test_server.py patching file src/test/python/test_internals.py patching file src/test/python/test_pq3.py patching file src/test/python/tls.py patching file src/tools/make_venv