Repair building with current the libldap 2.6 release

3 files changed, 120 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1cedbfcdbae..cf4e670ef141 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wine-stable
 	pkgdesc = A compatibility layer for running Windows programs
 	pkgver = 6.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.winehq.com
 	install = wine.install
 	arch = x86_64
@@ -146,10 +146,12 @@ pkgbase = wine-stable
 	source = https://dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz.sign
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
+	source = 0001-ldap-rename-ldap_connect-to-oldap_connect.patch
 	validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
 	b2sums = 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775
 	b2sums = SKIP
 	b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
 	b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
+	b2sums = b3ca0a31ee21f765a526729560a77a62f9e6a10a8a280d7cc6b5f8950542e99116ad26fcceeeb193bc0db92b85ab7d40da3777875f56b9370309993df1dc9a3e
 
 pkgname = wine-stable
diff --git a/0001-ldap-rename-ldap_connect-to-oldap_connect.patch b/0001-ldap-rename-ldap_connect-to-oldap_connect.patch
new file mode 100644
index 000000000000..bbfd24b7cdc1
--- /dev/null
+++ b/0001-ldap-rename-ldap_connect-to-oldap_connect.patch
@@ -0,0 +1,112 @@
+From 1e396aa28d74467107fd319b00ab96e75a4759e3 Mon Sep 17 00:00:00 2001
+From: Mike Swanson <mikeonthecomputer@gmail.com>
+Date: Fri, 7 Jan 2022 14:59:22 -0800
+Subject: [PATCH] =?UTF-8?q?ldap:=20rename=20=E2=80=9Cldap=5Fconnect?=
+ =?UTF-8?q?=E2=80=9D=20to=20=E2=80=9Coldap=5Fconnect=E2=80=9D?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Avoids a symbol conflict introduced with OpenLDAP 2.6
+
+It’s a bit of a brute-force solution compared to cherry-picking
+upstream Wine fixes, but the latter do not apply cleanly and 7.0 is
+around the corner. This’ll work for now unless 6.0.3 somehow happens
+before 7.0.
+
+Thanks to lilac on the AUR for wine-valve for the patch, 739f2caa0c
+for reporting it to me.
+---
+ dlls/adsldp/adsldp.c           | 2 +-
+ dlls/wldap32/init.c            | 4 ++--
+ dlls/wldap32/tests/parse.c     | 4 ++--
+ dlls/wldap32/winldap_private.h | 2 +-
+ dlls/wldap32/wldap32.spec      | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c
+index 13bd73c1296..b3b0afb989c 100644
+--- a/dlls/adsldp/adsldp.c
++++ b/dlls/adsldp/adsldp.c
+@@ -1021,7 +1021,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B
+             goto fail;
+         }
+ 
+-        err = ldap_connect(ld, NULL);
++        err = oldap_connect(ld, NULL);
+         if (err != LDAP_SUCCESS)
+         {
+             hr = HRESULT_FROM_WIN32(map_ldap_error(err));
+diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
+index afaef3b52f2..854c76f0d7c 100644
+--- a/dlls/wldap32/init.c
++++ b/dlls/wldap32/init.c
+@@ -305,7 +305,7 @@ exit:
+ }
+ 
+ /***********************************************************************
+- *      ldap_connect     (WLDAP32.@)
++ *      oldap_connect     (WLDAP32.@)
+  *
+  * Connect to an LDAP server. 
+  *
+@@ -322,7 +322,7 @@ exit:
+  *  The timeout parameter may be NULL in which case a default timeout
+  *  value will be used.
+  */
+-ULONG CDECL ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout )
++ULONG CDECL oldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout )
+ {
+     TRACE( "(%p, %p)\n", ld, timeout );
+ 
+diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c
+index 9fdd4db03ad..78e041771ae 100644
+--- a/dlls/wldap32/tests/parse.c
++++ b/dlls/wldap32/tests/parse.c
+@@ -159,7 +159,7 @@ static void test_ldap_bind_sA( void )
+         return;
+     }
+ 
+-    ret = ldap_connect( ld, NULL );
++    ret = oldap_connect( ld, NULL );
+     ok( !ret, "ldap_connect failed 0x%08x\n", ret );
+ 
+     ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE );
+@@ -190,7 +190,7 @@ static void test_ldap_server_control( void )
+         return;
+     }
+ 
+-    ret = ldap_connect( ld, NULL );
++    ret = oldap_connect( ld, NULL );
+     ok( !ret, "ldap_connect failed 0x%08x\n", ret );
+ 
+     /* test setting a not supported server control */
+diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
+index 69035050961..ba3400b9cd3 100644
+--- a/dlls/wldap32/winldap_private.h
++++ b/dlls/wldap32/winldap_private.h
+@@ -320,7 +320,7 @@ ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_b
+ ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*);
+ ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
+ ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
+-ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
++ULONG CDECL oldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
+ WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ ULONG CDECL ldap_control_freeA(LDAPControlA*);
+ ULONG CDECL ldap_control_freeW(LDAPControlW*);
+diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec
+index 8a8e29fc198..5598b134b11 100644
+--- a/dlls/wldap32/wldap32.spec
++++ b/dlls/wldap32/wldap32.spec
+@@ -75,7 +75,7 @@
+  85 cdecl ldap_compare_ext_sW(ptr wstr wstr wstr ptr ptr ptr)
+  86 cdecl ldap_compare_sA(ptr str str str)
+  87 cdecl ldap_compare_sW(ptr wstr wstr wstr)
+- 88 cdecl ldap_connect(ptr ptr)
++ 88 cdecl oldap_connect(ptr ptr)
+  89 cdecl ldap_control_free(ptr) ldap_control_freeA
+  90 cdecl ldap_control_freeA(ptr)
+  91 cdecl ldap_control_freeW(ptr)
+-- 
+2.34.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 3e3fe5a4c3fe..f3625eed66ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,17 @@
 
 pkgname=wine-stable
 pkgver=6.0.2
-pkgrel=1
+pkgrel=2
 
 source=(https://dl.winehq.org/wine/source/6.0/wine-$pkgver.tar.xz{,.sign}
         30-win32-aliases.conf
-        wine-binfmt.conf)
+        wine-binfmt.conf
+        0001-ldap-rename-ldap_connect-to-oldap_connect.patch)
 b2sums=('176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775'
         'SKIP'
         '45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b'
-        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588')
+        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588'
+        'b3ca0a31ee21f765a526729560a77a62f9e6a10a8a280d7cc6b5f8950542e99116ad26fcceeeb193bc0db92b85ab7d40da3777875f56b9370309993df1dc9a3e')
 validpgpkeys=(DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
 pkgdesc="A compatibility layer for running Windows programs"