summarylogtreecommitdiffstats
path: root/gettid.patch
diff options
context:
space:
mode:
authorpappy2020-01-01 20:51:03 +0100
committerpappy2020-01-01 20:54:05 +0100
commit4a3a2ca6b0eb6e795b87ce15766fe413156e0748 (patch)
tree34da951b680c60e230dae5644ff759d09f73d764 /gettid.patch
parent5528896cef5d7af583024aab32068c94f392a726 (diff)
downloadaur-4a3a2ca6b0eb6e795b87ce15766fe413156e0748.tar.gz
patch for conflicting gettid
Diffstat (limited to 'gettid.patch')
-rw-r--r--gettid.patch88
1 files changed, 88 insertions, 0 deletions
diff --git a/gettid.patch b/gettid.patch
new file mode 100644
index 00000000000..690c84dbe3e
--- /dev/null
+++ b/gettid.patch
@@ -0,0 +1,88 @@
+diff -rNc cyrus-imapd-2.5.15.orig/lib/cyrusdb_berkeley.c cyrus-imapd-2.5.15/lib/cyrusdb_berkeley.c
+*** cyrus-imapd-2.5.15.orig/lib/cyrusdb_berkeley.c 2019-12-16 05:34:28.000000000 +0100
+--- cyrus-imapd-2.5.15/lib/cyrusdb_berkeley.c 2020-01-01 20:42:15.495203815 +0100
+***************
+*** 456,462 ****
+ return r;
+ }
+
+! static int gettid(struct txn **mytid, DB_TXN **tid, const char *where)
+ {
+ int r;
+
+--- 456,462 ----
+ return r;
+ }
+
+! static int mygettid(struct txn **mytid, DB_TXN **tid, const char *where)
+ {
+ int r;
+
+***************
+*** 499,505 ****
+ if (data) *data = NULL;
+ if (datalen) *datalen = 0;
+
+! r = gettid(mytid, &tid, "myfetch");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));
+--- 499,505 ----
+ if (data) *data = NULL;
+ if (datalen) *datalen = 0;
+
+! r = mygettid(mytid, &tid, "myfetch");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));
+***************
+*** 594,600 ****
+ /* k.flags |= DB_DBT_REALLOC;
+ d.flags |= DB_DBT_REALLOC;*/
+
+! r = gettid(mytid, &tid, "foreach");
+ if (r) return r;
+
+ if (0) {
+--- 594,600 ----
+ /* k.flags |= DB_DBT_REALLOC;
+ d.flags |= DB_DBT_REALLOC;*/
+
+! r = mygettid(mytid, &tid, "foreach");
+ if (r) return r;
+
+ if (0) {
+***************
+*** 739,745 ****
+ if (!data)
+ datalen = 0;
+
+! r = gettid(mytid, &tid, "mystore");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));
+--- 739,745 ----
+ if (!data)
+ datalen = 0;
+
+! r = mygettid(mytid, &tid, "mystore");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));
+***************
+*** 852,858 ****
+ assert(dbinit && db);
+ assert(key && keylen);
+
+! r = gettid(mytid, &tid, "delete");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));
+--- 852,858 ----
+ assert(dbinit && db);
+ assert(key && keylen);
+
+! r = mygettid(mytid, &tid, "delete");
+ if (r) return r;
+
+ memset(&k, 0, sizeof(k));