diff --git a/component/cyrus-sasl/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch b/component/cyrus-sasl/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch new file mode 100644 index 0000000000000000000000000000000000000000..74e68ecd2d45c32cb3f25830647d8cda7155f909 --- /dev/null +++ b/component/cyrus-sasl/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch @@ -0,0 +1,32 @@ +From af48f6fec9a7b6374d4153c5db894d4a1f349645 Mon Sep 17 00:00:00 2001 +From: Jonas Jelten <jj@sft.mx> +Date: Sat, 2 Feb 2019 20:53:37 +0100 +Subject: [RFC] db_gdbm: fix gdbm_errno overlay from gdbm_close + +`gdbm_close` also sets gdbm_errno since version 1.17. +This leads to a problem in `libsasl` as the `gdbm_close` incovation overlays +the `gdbm_errno` value which is then later used for the error handling. +--- + sasldb/db_gdbm.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sasldb/db_gdbm.c b/sasldb/db_gdbm.c +index ee56a6b..c908808 100644 +--- a/sasldb/db_gdbm.c ++++ b/sasldb/db_gdbm.c +@@ -107,9 +107,11 @@ int _sasldb_getdata(const sasl_utils_t *utils, + gkey.dptr = key; + gkey.dsize = key_len; + gvalue = gdbm_fetch(db, gkey); ++ int fetch_errno = gdbm_errno; ++ + gdbm_close(db); + if (! gvalue.dptr) { +- if (gdbm_errno == GDBM_ITEM_NOT_FOUND) { ++ if (fetch_errno == GDBM_ITEM_NOT_FOUND) { + utils->seterror(conn, SASL_NOLOG, + "user: %s@%s property: %s not found in %s", + authid, realm, propName, path); +-- +2.30.1 + diff --git a/component/cyrus-sasl/buildout.cfg b/component/cyrus-sasl/buildout.cfg index eeaa8838036fb6841530c3f88bcfb22349046c70..ffde40c9519e2f20cc17fcf6f164ef1f40136d1d 100644 --- a/component/cyrus-sasl/buildout.cfg +++ b/component/cyrus-sasl/buildout.cfg @@ -15,6 +15,9 @@ shared = true url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz md5sum = a7f4e5e559a0e37b3ffc438c9456e425 location = @@LOCATION@@ +patch-options = -p1 +patches = + ${:_profile_base_location_}/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch#eef9bb30101c29f045ed68db45d5e5b3 pre-configure = "${libtool:location}/bin/libtoolize" -c -f && "${automake:location}/bin/aclocal" -I "${libtool:location}/share/aclocal" -I config -I cmulocal &&