File cyrus-imapd-2.5.13-glibc-2.30-compatibility.patch of Package cyrus-imapd

Overview Repositories Revisions Requests Users Attributes Meta

File cyrus-imapd-2.5.13-glibc-2.30-compatibility.patch of Package cyrus-imapd

From: Matthias Fehring <buschmann23@opensuse.org>
Date: 2019-10-22 11:08:00 +0200
Subject: glibc 2.30 compatibility
Upstream: no

glibc 2.30 added the function gettid that conflicts with
the same named function of cyrus imapd bdb implementation

---
 cyrusdb_berkeley.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/lib/cyrusdb_berkeley.c	2019-05-27 03:27:34.000000000 +0200
+++ b/lib/cyrusdb_berkeley.c	2019-10-22 11:06:56.483915238 +0200
@@ -456,7 +456,7 @@
     return r;
 }

-static int gettid(struct txn **mytid, DB_TXN **tid, const char *where)
+static int gettxnid(struct txn **mytid, DB_TXN **tid, const char *where)
 {
     int r;

@@ -499,7 +499,7 @@
     if (data) *data = NULL;
     if (datalen) *datalen = 0;

-    r = gettid(mytid, &tid, "myfetch");
+    r = gettxnid(mytid, &tid, "myfetch");
     if (r) return r;

memset(&k, 0, sizeof(k));
@@ -594,7 +594,7 @@
     /* k.flags |= DB_DBT_REALLOC;
        d.flags |= DB_DBT_REALLOC;*/

-    r = gettid(mytid, &tid, "foreach");
+    r = gettxnid(mytid, &tid, "foreach");
     if (r) return r;

if (0) {
@@ -739,7 +739,7 @@
     if (!data)
 	datalen = 0;

-    r = gettid(mytid, &tid, "mystore");
+    r = gettxnid(mytid, &tid, "mystore");
     if (r) return r;

memset(&k, 0, sizeof(k));
@@ -852,7 +852,7 @@
     assert(dbinit && db);
     assert(key && keylen);

-    r = gettid(mytid, &tid, "delete");
+    r = gettxnid(mytid, &tid, "delete");
     if (r) return r;

memset(&k, 0, sizeof(k));

Places

File cyrus-imapd-2.5.13-glibc-2.30-compatibility.patch of Package cyrus-imapd

Places