=== Applying patches on top of PostgreSQL commit ID 60b64e6a31a21449f4db49017417c225ee322986 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Aug 15 02:21:20 UTC 2025
On branch cf/5661
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-libpq-Set-LDAP-protocol-version-3.patch ===
Applying: libpq: Set LDAP protocol version 3
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/fe-connect.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-connect.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-connect.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 libpq: Set LDAP protocol version 3
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	src/interfaces/libpq/fe-connect.c
=== using patch(1) to apply patch ./v3-0001-libpq-Set-LDAP-protocol-version-3.patch ===
patching file src/interfaces/libpq/fe-connect.c
Hunk #1 FAILED at 5069.
Hunk #2 succeeded at 5635 (offset 435 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/interfaces/libpq/fe-connect.c.rej
Unstaged changes after reset:
M	src/interfaces/libpq/fe-connect.c
Removing src/interfaces/libpq/fe-connect.c.rej
=== using 'git apply' to apply patch ./v3-0001-libpq-Set-LDAP-protocol-version-3.patch ===
Applied patch to 'src/interfaces/libpq/fe-connect.c' with conflicts.
U src/interfaces/libpq/fe-connect.c
diff --cc src/interfaces/libpq/fe-connect.c
index a3d12931fff,d9d064174de..00000000000
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@@ -5494,7 -5069,7 +5494,11 @@@ ldapServiceLookup(const char *purl, PQc
  			   *entry;
  	struct berval **values;
  	LDAP_TIMEVAL time = {PGLDAP_TIMEOUT, 0};
++<<<<<<< ours
 +	int			ldapversion = LDAP_VERSION3;
++=======
+ 	int	ldapversion = LDAP_VERSION3;
++>>>>>>> theirs
  
  	if ((url = strdup(purl)) == NULL)
  	{