From 9ab11effb25dbfd53277ba2fb8e8a3a8434663f7 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Tue, 26 Dec 2023 12:53:09 +0100
Subject: [PATCH] memcached - update to version 1.6.22
---
components/network/memcached/patches/01-iov_base.patch | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/components/network/memcached/patches/01-iov_base.patch b/components/network/memcached/patches/01-iov_base.patch
index f62c958..03817a1 100644
--- a/components/network/memcached/patches/01-iov_base.patch
+++ b/components/network/memcached/patches/01-iov_base.patch
@@ -1,22 +1,13 @@
Our iov_base is caddr_t, not void*
---- memcached-1.6.2/memcached.c.1 2020-03-26 08:28:03.981372958 +0000
-+++ memcached-1.6.2/memcached.c 2020-03-26 08:28:53.780496301 +0000
-@@ -3808,7 +3808,7 @@
+--- memcached-1.6.22/storage.c 2023-10-16 08:03:25.000000000 +0200
++++ memcached-1.6.22/storage.c.new 2023-12-26 11:07:11.882044125 +0100
+@@ -295,7 +295,7 @@
}
// fill the header so we can get the full data + crc back.
-- io->io.iov[0].iov_base = new_it;
-+ io->io.iov[0].iov_base = (void *)new_it;
- io->io.iov[0].iov_len = ITEM_ntotal(new_it) - new_it->nbytes;
+- eio->iov[0].iov_base = new_it;
++ eio->iov[0].iov_base = (void *)new_it;
+ eio->iov[0].iov_len = ITEM_ntotal(new_it) - new_it->nbytes;
ciovcnt++;
-@@ -6771,7 +6771,7 @@
- msg.msg_namelen = resp->request_addr_size;
-
- // First IOV is the custom UDP header.
-- iovs[0].iov_base = udp_hdr;
-+ iovs[0].iov_base = (void *)udp_hdr;
- iovs[0].iov_len = UDP_HEADER_SIZE;
- build_udp_header(udp_hdr, resp);
- iovused++;
--
Gitblit v1.9.3