=== Applying patches on top of PostgreSQL commit ID 232d8caeaaa6ef7e7dfdc1a349ac956690949076 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri May 30 18:41:20 UTC 2025 On branch cf/4390 nothing to commit, working tree clean === using 'git am' to apply patch ./v14-0001-Add-notBefore-and-notAfter-to-SSL-cert-info-disp.patch === Applying: rebased the patch and updated OpenSSL API calls to be compatible in versions 1.1.1 and later Using index info to reconstruct a base tree... M contrib/sslinfo/sslinfo.c M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/utils/activity/backend_status.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/libpq/libpq-be.h M src/include/utils/backend_status.h M src/test/regress/expected/rules.out M src/test/ssl/t/001_ssltests.pl M src/test/ssl/t/003_sslinfo.pl Falling back to patching base and 3-way merge... Auto-merging src/test/ssl/t/003_sslinfo.pl Auto-merging src/test/ssl/t/001_ssltests.pl Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/utils/backend_status.h Auto-merging src/include/libpq/libpq-be.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pgstatfuncs.c CONFLICT (content): Merge conflict in src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/utils/activity/backend_status.c Auto-merging src/backend/catalog/system_views.sql Auto-merging doc/src/sgml/monitoring.sgml Auto-merging contrib/sslinfo/sslinfo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 rebased the patch and updated OpenSSL API calls to be compatible in versions 1.1.1 and later 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". Unstaged changes after reset: M contrib/sslinfo/Makefile M contrib/sslinfo/meson.build M contrib/sslinfo/sslinfo.c M contrib/sslinfo/sslinfo.control M doc/src/sgml/monitoring.sgml M doc/src/sgml/sslinfo.sgml M src/backend/catalog/system_views.sql M src/backend/libpq/be-secure-openssl.c M src/backend/utils/activity/backend_status.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/libpq/libpq-be.h M src/include/utils/backend_status.h M src/test/regress/expected/rules.out M src/test/ssl/t/001_ssltests.pl M src/test/ssl/t/003_sslinfo.pl Removing contrib/sslinfo/sslinfo--1.2--1.3.sql === using patch(1) to apply patch ./v14-0001-Add-notBefore-and-notAfter-to-SSL-cert-info-disp.patch === patching file contrib/sslinfo/Makefile patching file contrib/sslinfo/meson.build patching file contrib/sslinfo/sslinfo--1.2--1.3.sql patching file contrib/sslinfo/sslinfo.c Hunk #1 succeeded at 18 with fuzz 2. Hunk #2 succeeded at 27 (offset -8 lines). Hunk #3 succeeded at 219 (offset -8 lines). Hunk #4 succeeded at 513 (offset -8 lines). patching file contrib/sslinfo/sslinfo.control patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 2398 (offset 19 lines). patching file doc/src/sgml/sslinfo.sgml patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1002 (offset 8 lines). patching file src/backend/libpq/be-secure-openssl.c patching file src/backend/utils/activity/backend_status.c Hunk #1 succeeded at 413 (offset 1 line). patching file src/backend/utils/adt/pgstatfuncs.c Hunk #5 FAILED at 615. 1 out of 6 hunks FAILED -- saving rejects to file src/backend/utils/adt/pgstatfuncs.c.rej patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 5636 (offset 43 lines). patching file src/include/libpq/libpq-be.h Hunk #1 succeeded at 320 (offset -3 lines). patching file src/include/utils/backend_status.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 1783 (offset 21 lines). Hunk #2 succeeded at 1911 (offset 21 lines). Hunk #3 succeeded at 2119 (offset 21 lines). Hunk #4 succeeded at 2152 (offset 21 lines). patching file src/test/ssl/t/001_ssltests.pl Hunk #1 succeeded at 580 (offset 28 lines). Hunk #2 succeeded at 782 (offset 28 lines). patching file src/test/ssl/t/003_sslinfo.pl Unstaged changes after reset: M contrib/sslinfo/Makefile M contrib/sslinfo/meson.build M contrib/sslinfo/sslinfo.c M contrib/sslinfo/sslinfo.control M doc/src/sgml/monitoring.sgml M doc/src/sgml/sslinfo.sgml M src/backend/catalog/system_views.sql M src/backend/libpq/be-secure-openssl.c M src/backend/utils/activity/backend_status.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/libpq/libpq-be.h M src/include/utils/backend_status.h M src/test/regress/expected/rules.out M src/test/ssl/t/001_ssltests.pl M src/test/ssl/t/003_sslinfo.pl Removing contrib/sslinfo/sslinfo--1.2--1.3.sql Removing src/backend/utils/adt/pgstatfuncs.c.rej === using 'git apply' to apply patch ./v14-0001-Add-notBefore-and-notAfter-to-SSL-cert-info-disp.patch === Applied patch to 'contrib/sslinfo/Makefile' cleanly. Applied patch to 'contrib/sslinfo/meson.build' cleanly. Falling back to direct application... Applied patch to 'contrib/sslinfo/sslinfo.c' cleanly. Applied patch to 'contrib/sslinfo/sslinfo.control' cleanly. Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'doc/src/sgml/sslinfo.sgml' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/libpq/be-secure-openssl.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_status.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' with conflicts. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/libpq/libpq-be.h' cleanly. Applied patch to 'src/include/utils/backend_status.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/ssl/t/001_ssltests.pl' cleanly. Applied patch to 'src/test/ssl/t/003_sslinfo.pl' cleanly. U src/backend/utils/adt/pgstatfuncs.c diff --cc src/backend/utils/adt/pgstatfuncs.c index e980109f245,77da3db731c..00000000000 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@@ -633,17 -643,17 +643,24 @@@ pg_stat_get_activity(PG_FUNCTION_ARGS } else { - values[25] = BoolGetDatum(false); /* gss_auth */ - nulls[26] = true; /* No GSS principal */ - values[27] = BoolGetDatum(false); /* GSS Encryption not in + values[27] = BoolGetDatum(false); /* gss_auth */ + nulls[28] = true; /* No GSS principal */ + values[29] = BoolGetDatum(false); /* GSS Encryption not in * use */ - values[28] = BoolGetDatum(false); /* GSS credentials not + values[30] = BoolGetDatum(false); /* GSS credentials not * delegated */ } ++<<<<<<< ours + if (beentry->st_query_id == INT64CONST(0)) + nulls[30] = true; + else + values[30] = Int64GetDatum(beentry->st_query_id); ++======= + if (beentry->st_query_id == 0) + nulls[32] = true; + else + values[32] = UInt64GetDatum(beentry->st_query_id); ++>>>>>>> theirs } else {