Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyrus-sasl/files/
Date: Tue, 23 Nov 2021 20:37:23
Message-Id: 1637699724.76ca69ecd520c40aec797914e669f3fd621a50de.conikost@gentoo
1 commit: 76ca69ecd520c40aec797914e669f3fd621a50de
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Nov 23 19:54:47 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 20:35:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ca69ec
7
8 dev-libs/cyrus-sasl: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/23056
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...bm-fix-gdbm_errno-overlay-from-gdbm_close.patch | 35 ----------------------
16 1 file changed, 35 deletions(-)
17
18 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch
19 deleted file mode 100644
20 index f1e3ae9850c8..000000000000
21 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch
22 +++ /dev/null
23 @@ -1,35 +0,0 @@
24 -From af48f6fec9a7b6374d4153c5db894d4a1f349645 Mon Sep 17 00:00:00 2001
25 -Message-Id: <af48f6fec9a7b6374d4153c5db894d4a1f349645.1635327406.git.mkletzan@××××××.com>
26 -From: Jonas Jelten <jj@×××.mx>
27 -Date: Sat, 2 Feb 2019 20:53:37 +0100
28 -Subject: [PATCH] db_gdbm: fix gdbm_errno overlay from gdbm_close
29 -
30 -`gdbm_close` also sets gdbm_errno since version 1.17.
31 -This leads to a problem in `libsasl` as the `gdbm_close` incovation overlays
32 -the `gdbm_errno` value which is then later used for the error handling.
33 -
34 -Signed-off-by: Martin Kletzander <mkletzan@××××××.com>
35 ----
36 - sasldb/db_gdbm.c | 4 +++-
37 - 1 file changed, 3 insertions(+), 1 deletion(-)
38 -
39 -diff --git a/sasldb/db_gdbm.c b/sasldb/db_gdbm.c
40 -index ee56a6bf8516..c908808e04a1 100644
41 ---- a/sasldb/db_gdbm.c
42 -+++ b/sasldb/db_gdbm.c
43 -@@ -107,9 +107,11 @@ int _sasldb_getdata(const sasl_utils_t *utils,
44 - gkey.dptr = key;
45 - gkey.dsize = key_len;
46 - gvalue = gdbm_fetch(db, gkey);
47 -+ int fetch_errno = gdbm_errno;
48 -+
49 - gdbm_close(db);
50 - if (! gvalue.dptr) {
51 -- if (gdbm_errno == GDBM_ITEM_NOT_FOUND) {
52 -+ if (fetch_errno == GDBM_ITEM_NOT_FOUND) {
53 - utils->seterror(conn, SASL_NOLOG,
54 - "user: %s@%s property: %s not found in %s",
55 - authid, realm, propName, path);
56 ---
57 -2.33.1
58 -