gentoo resync : 14.07.2018

2 files changed, 0 insertions, 71 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 1d6f48bc545a..b4a2c7ad637f 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -3,7 +3,6 @@ AUX hdr.at 1400 BLAKE2B f7b3c5a2bf5ca268adefaac2898ce9a2823357ed77b4ab0f73a67cb8
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
 AUX mailutils-2.99.98-readline-6.3.patch 1321 BLAKE2B 061f3fbb554b2b8b9ed8452920c40ee6d9a93343b22aefcb550bbe03f9e0051ac8c770e58f44e4451ae63e3cca8350a09eed972dcf1db50bc6c40f1fb33a32a5 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5
-AUX mailutils-3.2-fix-build.patch 2100 BLAKE2B a87e77ee7e8378fddb53d1001aafd01265fe1379af6563d20d2d03b7dc8caf514b3db1d489e8b99a5d7b0aa39bf3b7498b6ff7c4d00a9452850a03075de5fb28 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505
 AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8567803f94e9cba58055b62a2bcfbd9e60db7cfd332c3c16faf5ac09ab3d9b7a43eb2b2b791ecf006e6d731ad555aa2da67 SHA512 2f10b61c47ec4981f912f180619627959338d7cf73e277bb25d6021044ae4752317773e6f7a13e7cba1dbf6782b3e32e92e77e1c265184bff89e8a79ce813954
 AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
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 7036cd68ca34..000000000000
--- 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 <gray@gnu.org>
-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
-