=== Applying patches on top of PostgreSQL commit ID 7cb9060dcde08ca63df1f0d701b0674e0e8ae811 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul 30 16:17:31 UTC 2026
On branch cf/7007
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-ssl-Remove-static-var-tracking-tls_init_hook-warn.patch ===
Applying: ssl: Remove static var tracking tls_init_hook warnings
Using index info to reconstruct a base tree...
M	src/backend/libpq/be-secure-openssl.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/libpq/be-secure-openssl.c
CONFLICT (content): Merge conflict in src/backend/libpq/be-secure-openssl.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 ssl: Remove static var tracking tls_init_hook warnings
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 ./v3-0001-ssl-Remove-static-var-tracking-tls_init_hook-warn.patch ===
patching file src/backend/libpq/be-secure-openssl.c
Hunk #1 FAILED at 98.
Hunk #2 FAILED at 160.
Hunk #3 FAILED at 249.
Hunk #4 FAILED at 344.
Hunk #5 FAILED at 608.
Hunk #6 FAILED at 634.
Hunk #7 FAILED at 645.
7 out of 7 hunks FAILED -- saving rejects to file src/backend/libpq/be-secure-openssl.c.rej
Removing src/backend/libpq/be-secure-openssl.c.rej
=== using 'git apply' to apply patch ./v3-0001-ssl-Remove-static-var-tracking-tls_init_hook-warn.patch ===
Applied patch to 'src/backend/libpq/be-secure-openssl.c' with conflicts.
U src/backend/libpq/be-secure-openssl.c
diff --cc src/backend/libpq/be-secure-openssl.c
index 04764700845,60e01c969fa..00000000000
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@@ -622,7 -627,7 +622,11 @@@ host_context_cleanup_cb(void *arg
  static bool
  init_host_context(HostsLine *host, bool isServerStart, bool *hasWarned)
  {
++<<<<<<< ours
 +	SSL_CTX    *ctx = SSL_CTX_new(TLS_method());
++=======
+ 	SSL_CTX    *ctx = SSL_CTX_new(SSLv23_method());
++>>>>>>> theirs
  
  	if (!ctx)
  	{