[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/

[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/

[Michael Palimaka]

commit:     e4d9b4acc016bf3ffdb840436cd3f1925c33c2a4
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 09:10:15 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 15:15:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d9b4ac

net-mail/mailutils: remove unused patch

 .../mailutils/files/mailutils-tcp_wrappers.patch   | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/net-mail/mailutils/files/mailutils-tcp_wrappers.patch b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
deleted file mode 100644
index 81517caeeb8..00000000000
--- a/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/maidag/maidag.c	2015-07-02 22:45:39.000000000 +0300
-+++ b/maidag/maidag.c	2015-12-22 11:55:17.000000000 +0200
-@@ -518,7 +518,9 @@
-   
-   mu_gocs_register ("sieve", mu_sieve_module_init);
- 
-+#ifdef WITH_LIBWRAP
-   mu_tcpwrapper_cfg_init ();
-+#endif
-   mu_acl_cfg_init ();
-   mu_m_server_cfg_init (NULL);
-   maidag_cfg_init ();
-@@ -531,7 +533,9 @@
- 
-   mu_m_server_create (&server, program_version);
-   mu_m_server_set_conn (server, lmtp_connection);
-+#ifdef WITH_LIBWRAP
-   mu_m_server_set_prefork (server, mu_tcp_wrapper_prefork);
-+#endif
-   mu_m_server_set_mode (server, MODE_INTERACTIVE);
-   mu_m_server_set_max_children (server, 20);
-   mu_m_server_set_timeout (server, 600);

[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/

[Tony Vroon]

commit:     c23c9071c6b8ffb14dc237bfedbcb1c447b36b95
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul  3 17:55:44 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> 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 <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
-

[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/

[Conrad Kostecki]

commit:     6ece45a64e622511855ff6e00c976f8e8104c5d3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 21 11:04:03 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:27:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ece45a6

net-mail/mailutils: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19572
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mailutils/files/mailutils-3.10-get_size.patch  | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/net-mail/mailutils/files/mailutils-3.10-get_size.patch b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
deleted file mode 100644
index 3ec15968916..00000000000
--- a/net-mail/mailutils/files/mailutils-3.10-get_size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 37713b42a501892469234b90454731d8d8b7a3e6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 17 Aug 2020 20:34:21 +0300
-Subject: Bugfix (complements fd9a86d37b)
-
-* mda/lib/mailquota.c (sql_retrieve_quota): Fix a leftover use of
-get_size.
----
- mda/lib/mailquota.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/mda/lib/mailquota.c b/mda/lib/mailquota.c
-index 7b7dd52d9..af719a591 100644
---- a/mda/lib/mailquota.c
-+++ b/mda/lib/mailquota.c
-@@ -270,16 +270,10 @@ sql_retrieve_quota (char *name, mu_off_t *quota)
- 	}
-       else if (tmp == NULL || tmp[0] == 0 || mu_c_strcasecmp (tmp, "none") == 0)
- 	rc = RETR_UNLIMITED;
--      else
-+      else if (get_quota (quota, tmp)) 
- 	{
--	  char *p;
--	  
--	  if (get_size (tmp, quota, &p))
--	    {
--	      mu_error (_("bogus mailbox quota for `%s' (near `%s')"),
--			name, p);
--	      *quota = groupquota;
--	    }
-+	  *quota = groupquota;
-+	  rc = RETR_OK;
- 	}
-     }
-   
--- 
-cgit v1.2.1
-