summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2023-04-26 15:04:36 +0300
committerStelios Tsampas2023-04-26 15:04:36 +0300
commit08f5cef4c30b5052b9c17712e4391a5c27594bdf (patch)
tree24ebf7bb866e36aa6757f71bebbc5ee6133d5cc8
parent1057a6ed8dd7d6222244716c4d76a9e1b1f3d13e (diff)
downloadaur-08f5cef4c30b5052b9c17712e4391a5c27594bdf.tar.gz
[proton-experimental] Update checksums
-rw-r--r--0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch68
-rw-r--r--PKGBUILD.testing2
2 files changed, 1 insertions, 69 deletions
diff --git a/0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch b/0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
deleted file mode 100644
index c65a533a7d9c..000000000000
--- a/0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 25946b48148784e8275c1685f6498ab88f553ca3 Mon Sep 17 00:00:00 2001
-From: Eric Pouech <eric.pouech@gmail.com>
-Date: Fri, 4 Feb 2022 09:34:49 +0100
-Subject: [PATCH] wldap32: Fix compilation in 32-bit.
-
-32-bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244.
-
-Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
-Signed-off-by: Hans Leidekker <hans@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/wldap32/libldap.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c
-index 8872421dabcd..592e526ecdc0 100644
---- a/dlls/wldap32/libldap.c
-+++ b/dlls/wldap32/libldap.c
-@@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) );
- C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) );
- C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) );
- C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) );
--C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) );
-+
-+static struct timeval *convert_timeval(const struct timevalU *tvu, struct timeval *tv)
-+{
-+ if (!tvu) return NULL;
-+ tv->tv_sec = tvu->tv_sec;
-+ tv->tv_usec = tvu->tv_usec;
-+ return tv;
-+}
-
- #define WLDAP32_LBER_ERROR (~0l)
-
-@@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args )
- static NTSTATUS wrap_ldap_result( void *args )
- {
- struct ldap_result_params *params = args;
-+ struct timeval tv;
- return ldap_result( params->ld, params->msgid, params->all,
-- (struct timeval *)params->timeout, (LDAPMessage **)params->result );
-+ convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result );
- }
-
- static NTSTATUS wrap_ldap_sasl_bind( void *args )
-@@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args )
- static NTSTATUS wrap_ldap_search_ext( void *args )
- {
- struct ldap_search_ext_params *params = args;
-+ struct timeval tv;
- return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs,
- params->attrsonly, (LDAPControl **)params->serverctrls,
-- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout,
-+ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv),
- params->sizelimit, (int *)params->msg );
- }
-
- static NTSTATUS wrap_ldap_search_ext_s( void *args )
- {
- struct ldap_search_ext_s_params *params = args;
-+ struct timeval tv;
- return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs,
- params->attrsonly, (LDAPControl **)params->serverctrls,
-- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout,
-+ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv),
- params->sizelimit, (LDAPMessage **)params->result );
- }
-
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 06f91d41ef54..0c2796d1beb9 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -353,7 +353,7 @@ sha256sums=('SKIP'
'SKIP'
'08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
- '9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3'
+ '1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622'
'SKIP'
'SKIP')
# Optional patches