summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpappy2020-01-01 20:51:03 +0100
committerpappy2020-01-01 20:54:05 +0100
commit4a3a2ca6b0eb6e795b87ce15766fe413156e0748 (patch)
tree34da951b680c60e230dae5644ff759d09f73d764
parent5528896cef5d7af583024aab32068c94f392a726 (diff)
downloadaur-4a3a2ca6b0eb6e795b87ce15766fe413156e0748.tar.gz
patch for conflicting gettid
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD4
-rw-r--r--gettid.patch88
4 files changed, 99 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83228e1e919..ff8e5bcec83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = cyrus-imapd2
- pkgdesc = Cyrus IMAP mail server
+ pkgdesc = Cyrus IMAP mail server - 2.5
pkgver = 2.5.15
pkgrel = 1
url = http://www.cyrusimap.org/
@@ -22,10 +22,12 @@ pkgbase = cyrus-imapd2
backup = etc/cyrus/cyrus.conf
backup = etc/cyrus/imapd.conf
source = https://www.cyrusimap.org/releases/cyrus-imapd-2.5.15.tar.gz
+ source = gettid.patch
source = cyrus-master-conf.d
source = cyrus-imapd.install
source = cyrus-master.service
sha512sums = 9a61baa15f5a2c18843c4cf8e7cb7c58050c22de3c674ed17c2ea57fc8a3ac7f9a6aa954f61bbc77104e16a5464ac83d05c2b84ece953f86ab820461ffcd62b3
+ sha512sums = 0657c5cd6bd1fe5c4ba35cfd79bf2c0a88e252a673f77d41a424f43e9ac418e3c28d0244c42d10f6726aea7911519170a8821911b9f594caf1234edb8b0704f3
sha512sums = 881540a400670e86499db76af7cc41aa663a4492e3c512dbf0687f42b4a54dc5aca9df3ad315dd1c606d084feeec1a07670d50fae82fb9e71f30d5321d94327f
sha512sums = 80bfc8a2fca10cd2aa965449c426c987adf156017b111cebc37b889b3d41b7c5ba8a574e3b858166a72101a0e55f02c16411d06aa4dadc0b6410d40d68902386
sha512sums = 6cc4bbed0d5342a28a69e4acfa4a89f7a8909c6271e2e819e8da855dca2873fdaa5cea6519cb09c169b507df273d030eff5677bb07c4bf6591939958dd8e1bfe
diff --git a/.gitignore b/.gitignore
index 018a3de0814..ee7e3d3a3c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*
-!PKGBUILD
-!.SRCINFO
-!.gitignore
+*.xz
+*.gz
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index fb6b1868d4e..4c2fe28957e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,10 +18,12 @@ options=('!makeflags')
backup=(etc/cyrus/cyrus.conf etc/cyrus/imapd.conf)
install="$_pkgname.install"
source=(https://www.cyrusimap.org/releases/cyrus-imapd-$pkgver.tar.gz
+ 'gettid.patch'
'cyrus-master-conf.d'
'cyrus-imapd.install'
'cyrus-master.service')
sha512sums=('9a61baa15f5a2c18843c4cf8e7cb7c58050c22de3c674ed17c2ea57fc8a3ac7f9a6aa954f61bbc77104e16a5464ac83d05c2b84ece953f86ab820461ffcd62b3'
+ '0657c5cd6bd1fe5c4ba35cfd79bf2c0a88e252a673f77d41a424f43e9ac418e3c28d0244c42d10f6726aea7911519170a8821911b9f594caf1234edb8b0704f3'
'881540a400670e86499db76af7cc41aa663a4492e3c512dbf0687f42b4a54dc5aca9df3ad315dd1c606d084feeec1a07670d50fae82fb9e71f30d5321d94327f'
'80bfc8a2fca10cd2aa965449c426c987adf156017b111cebc37b889b3d41b7c5ba8a574e3b858166a72101a0e55f02c16411d06aa4dadc0b6410d40d68902386'
'6cc4bbed0d5342a28a69e4acfa4a89f7a8909c6271e2e819e8da855dca2873fdaa5cea6519cb09c169b507df273d030eff5677bb07c4bf6591939958dd8e1bfe')
@@ -29,6 +31,8 @@ sha512sums=('9a61baa15f5a2c18843c4cf8e7cb7c58050c22de3c674ed17c2ea57fc8a3ac7f9a6
build() {
cd $srcdir/$_pkgname-$pkgver
+ patch -p1 -i $srcdir/gettid.patch
+
./configure \
--prefix=/usr \
--includedir=/usr/include/cyrus --mandir=/usr/share/man \
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));