=== Applying patches on top of PostgreSQL commit ID 661643dedad97f8b924991fdc739b1f47b0fb60b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 25 01:43:20 UTC 2025
On branch cf/5597
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0002-Add-new-server-config-cleartext_passwords_action.patch ===
Applying: Add new server config cleartext_passwords_action
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/libpq/crypt.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/libpq/crypt.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/libpq/crypt.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/libpq/crypt.c
Auto-merging doc/src/sgml/config.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 Add new server config cleartext_passwords_action
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/passwordcheck/expected/passwordcheck.out
M	doc/src/sgml/config.sgml
M	src/backend/libpq/crypt.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/libpq/crypt.h
M	src/interfaces/ecpg/test/expected/connect-test5.stderr
M	src/test/regress/expected/create_role.out
M	src/test/regress/expected/password.out
=== using patch(1) to apply patch ./0002-Add-new-server-config-cleartext_passwords_action.patch ===
patching file contrib/passwordcheck/expected/passwordcheck.out
patching file doc/src/sgml/config.sgml
patching file src/backend/libpq/crypt.c
patching file src/backend/utils/misc/guc_tables.c
Hunk #1 succeeded at 417 (offset 4 lines).
Hunk #2 succeeded at 5425 (offset 34 lines).
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 FAILED at 97.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej
patching file src/include/libpq/crypt.h
patching file src/interfaces/ecpg/test/expected/connect-test5.stderr
patching file src/test/regress/expected/create_role.out
patching file src/test/regress/expected/password.out
Unstaged changes after reset:
M	contrib/passwordcheck/expected/passwordcheck.out
M	doc/src/sgml/config.sgml
M	src/backend/libpq/crypt.c
M	src/backend/utils/misc/guc_tables.c
M	src/include/libpq/crypt.h
M	src/interfaces/ecpg/test/expected/connect-test5.stderr
M	src/test/regress/expected/create_role.out
M	src/test/regress/expected/password.out
Removing src/backend/utils/misc/postgresql.conf.sample.rej
=== using 'git apply' to apply patch ./0002-Add-new-server-config-cleartext_passwords_action.patch ===
Applied patch to 'contrib/passwordcheck/expected/passwordcheck.out' cleanly.
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/libpq/crypt.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' with conflicts.
Applied patch to 'src/include/libpq/crypt.h' cleanly.
Applied patch to 'src/interfaces/ecpg/test/expected/connect-test5.stderr' cleanly.
Applied patch to 'src/test/regress/expected/create_role.out' cleanly.
Applied patch to 'src/test/regress/expected/password.out' cleanly.
U src/backend/utils/misc/postgresql.conf.sample
diff --cc src/backend/utils/misc/postgresql.conf.sample
index 341f88adc87,636f97131c9..00000000000
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@@ -97,7 -97,7 +97,11 @@@
  #password_encryption = scram-sha-256	# scram-sha-256 or md5
  #scram_iterations = 4096
  #md5_password_warnings = on
++<<<<<<< ours
 +#oauth_validator_libraries = ''	# comma-separated list of trusted validator modules
++=======
+ #cleartext_passwords_action = warn      # can be allow, warn, or disallow
++>>>>>>> theirs
  
  # GSSAPI using Kerberos
  #krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab'