From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A097138334 for ; Wed, 11 Jul 2018 12:04:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 840C0E0857; Wed, 11 Jul 2018 12:04:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 172EAE0857 for ; Wed, 11 Jul 2018 12:04:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AABC335CC0 for ; Wed, 11 Jul 2018 12:04:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBA0E371 for ; Wed, 11 Jul 2018 12:04:42 +0000 (UTC) From: "Tony Vroon" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tony Vroon" Message-ID: <1531310680.c23c9071c6b8ffb14dc237bfedbcb1c447b36b95.chainsaw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/mailutils/files/mailutils-3.2-fix-build.patch X-VCS-Directories: net-mail/mailutils/files/ X-VCS-Committer: chainsaw X-VCS-Committer-Name: Tony Vroon X-VCS-Revision: c23c9071c6b8ffb14dc237bfedbcb1c447b36b95 X-VCS-Branch: master Date: Wed, 11 Jul 2018 12:04:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5c1d1d59-ce7a-4f05-b228-dafda90a43c6 X-Archives-Hash: 8808076ac051a5efb70e6ef0d739ab85 commit: c23c9071c6b8ffb14dc237bfedbcb1c447b36b95 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jul 3 17:55:44 2018 +0000 Commit: Tony Vroon gentoo org> CommitDate: Wed Jul 11 12:04:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23c9071 net-mail/mailutils: remove unused patches .../mailutils/files/mailutils-3.2-fix-build.patch | 70 ---------------------- 1 file changed, 70 deletions(-) diff --git a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch deleted file mode 100644 index 7036cd68ca3..00000000000 --- a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch +++ /dev/null @@ -1,70 +0,0 @@ -From afbb33cf9ff750e93a9a4c1f51a3b62d584f056e Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Sun, 19 Mar 2017 17:31:08 +0200 -Subject: Fix a bug in field-map handling. - -* libmailutils/cfg/driver.c (parse_mapping): Fix expected value type. -* libmu_auth/sql.c (get_field): Remove left-over mu_assoc_ref call -(see 622bc770). ---- - NEWS | 2 +- - libmailutils/cfg/driver.c | 7 ++++++- - libmu_auth/sql.c | 11 +++++++---- - 3 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/libmailutils/cfg/driver.c b/libmailutils/cfg/driver.c -index 7da75a8..8af543d 100644 ---- a/libmailutils/cfg/driver.c -+++ b/libmailutils/cfg/driver.c -@@ -617,10 +617,15 @@ static int - parse_mapping (void *item, void *data) - { - struct mapping_closure *clos = data; -- char *str = item; -+ struct mu_config_value *cval = item; -+ char const *str; - size_t len; - char *key, *val; - int rc; -+ -+ if (mu_cfg_assert_value_type (cval, MU_CFG_STRING)) -+ return 1; -+ str = cval->v.string; - - len = strcspn (str, "="); - if (str[len] == 0) -diff --git a/libmu_auth/sql.c b/libmu_auth/sql.c -index d69c36c..c50598d 100644 ---- a/libmu_auth/sql.c -+++ b/libmu_auth/sql.c -@@ -214,20 +214,23 @@ mu_sql_expand_query (const char *query, const char *ustr) - static int - get_field (mu_sql_connection_t conn, const char *id, char **ret, int mandatory) - { -- const char **name = mu_assoc_ref (mu_sql_module_config.field_map, id); -- int rc = mu_sql_get_field (conn, 0, name ? *name : id, ret); -+ int rc; -+ const char *name = mu_assoc_get (mu_sql_module_config.field_map, id); -+ if (!name) -+ name = id; -+ rc = mu_sql_get_field (conn, 0, name, ret); - if (rc) - { - if (mandatory || rc != MU_ERR_NOENT) - mu_error (_("cannot get SQL field `%s' (`%s'): %s"), -- id, name ? *name : id, mu_strerror (rc)); -+ id, name, mu_strerror (rc)); - } - else if (!*ret) - { - if (mandatory) - { - mu_error (_("SQL field `%s' (`%s') has NULL value"), -- id, name ? *name : id); -+ id, name); - rc = MU_ERR_READ; - } - else --- -cgit v1.0-41-gc330 -