reinit the tree, so we can have metadata

12 files changed, 372 insertions, 0 deletions

diff --git a/net-mail/mailutils/files/comsatd.initd b/net-mail/mailutils/files/comsatd.initd
new file mode 100644
index 000000000000..83da288a41d9
--- /dev/null
+++ b/net-mail/mailutils/files/comsatd.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Comsatd
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Comsatd"
+exec="/usr/sbin/comsatd"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
new file mode 100644
index 000000000000..7c9d5e85c693
--- /dev/null
+++ b/net-mail/mailutils/files/hdr.at
@@ -0,0 +1,36 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -h],[hdr],
+[readmsg -h SOMETHING],
+[0],
+[From bar@dontmailme.org  Fri Dec 28 23:28:09 2001
+Received: (from bar@dontmailme.org) 
+	by dontmailme.org id fERKR9N16790
+	for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are!  However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/net-mail/mailutils/files/imap4d.initd b/net-mail/mailutils/files/imap4d.initd
new file mode 100644
index 000000000000..39617b994d11
--- /dev/null
+++ b/net-mail/mailutils/files/imap4d.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Imap4d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Imap4d"
+exec="/usr/sbin/imap4d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/mail b/net-mail/mailutils/files/mail
new file mode 100644
index 000000000000..413ca858a645
--- /dev/null
+++ b/net-mail/mailutils/files/mail
@@ -0,0 +1,5 @@
+# Sample mail config file
+# See info mail for more options
+
+# no debug
+debug { };
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
new file mode 100644
index 000000000000..8ac418c7c037
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
@@ -0,0 +1,11 @@
+--- libmu_auth/ldap.c	2012-03-25 14:02:22.000000000 +0300
++++ libmu_auth/ldap.c	2013-03-22 12:29:19.034880845 +0200
+@@ -534,7 +534,7 @@
+ 
+   env[0] = "user";
+   env[1] = key;
+-  env[3] = NULL;
++  env[2] = NULL;
+ 
+   ws.ws_env = env;
+   if (mu_wordsplit (filter_pat, &ws,
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
new file mode 100644
index 000000000000..de9a487aaaf3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/503954
+
+fix build w/readline-6.3
+
+patch by Martin von Gagern
+
+--- mailutils-2.99.98/mu/shell.c
++++ mailutils-2.99.98/mu/shell.c
+@@ -336,7 +336,7 @@ mutool_initialize_readline (const char *
+ {
+   /* Allow conditional parsing of the ~/.inputrc file. */
+   rl_readline_name = (char *) name;
+-  rl_attempted_completion_function = (CPPFunction *) shell_completion;
++  rl_attempted_completion_function = shell_completion;
+   rl_getc_function = _shell_getc;
+   read_history (get_history_file_name ());
+ }
+--- mailutils-2.99.98/mail/mailline.c
++++ mailutils-2.99.98/mail/mailline.c
+@@ -93,7 +93,7 @@ ml_readline_init ()
+ 
+ #ifdef WITH_READLINE
+   rl_readline_name = "mail";
+-  rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
++  rl_attempted_completion_function = ml_command_completion;
+   rl_getc_function = ml_getc;
+ #endif
+ #ifdef HAVE_SIGACTION
+--- mailutils-2.99.98/examples/nntpclient.c
++++ mailutils-2.99.98/examples/nntpclient.c
+@@ -163,7 +163,7 @@ initialize_readline ()
+   rl_readline_name = (char *) "nntp";
+ 
+   /* Tell the completer that we want a crack first. */
+-  rl_attempted_completion_function = (CPPFunction *) nntp_completion;
++  rl_attempted_completion_function = nntp_completion;
+ }
+ 
+ /* Attempt to complete on the contents of TEXT.  START and END bound the
diff --git a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
new file mode 100644
index 000000000000..7036cd68ca34
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
@@ -0,0 +1,70 @@
+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
+
diff --git a/net-mail/mailutils/files/mailutils.rc b/net-mail/mailutils/files/mailutils.rc
new file mode 100644
index 000000000000..07a551963ec3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils.rc
@@ -0,0 +1,11 @@
+# Sample mailutils config file.  Read by all mailutils programs.
+# See info mailutils for details.
+
+# Gentoo default is maildir
+mailbox {
+  mailbox-type maildir;
+  mailbox-pattern .maildir;
+};
+
+# Place individual config files here
+include /etc/mailutils.d/;
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
new file mode 100644
index 000000000000..4caf85570f1e
--- /dev/null
+++ b/net-mail/mailutils/files/nohdr.at
@@ -0,0 +1,26 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -n],[nohdr],
+[readmsg -n SOMETHING],
+[0],
+[It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are!  However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/net-mail/mailutils/files/pop3d.initd b/net-mail/mailutils/files/pop3d.initd
new file mode 100644
index 000000000000..dcbe9cca5024
--- /dev/null
+++ b/net-mail/mailutils/files/pop3d.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Pop3d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Pop3d"
+exec="/usr/sbin/pop3d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at
new file mode 100644
index 000000000000..20af66173d6a
--- /dev/null
+++ b/net-mail/mailutils/files/twomsg.at
@@ -0,0 +1,73 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg 1 2],[twomsg],
+[1 2],
+[0],
+[Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <foobar@nonexistent.net>
+To: Bar <bar@dontmailme.org>
+Subject: Jabberwocky
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two!  One, two!  And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day!  Calloh!  Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are!  However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
+
diff --git a/net-mail/mailutils/files/weed.at b/net-mail/mailutils/files/weed.at
new file mode 100644
index 000000000000..ec82c6ce23b5
--- /dev/null
+++ b/net-mail/mailutils/files/weed.at
@@ -0,0 +1,29 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -w],[weed],
+[-w date,subject SOMETHING],
+[0],
+[Date: Fri, 28 Dec 2001 23:28:08 +0200
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are!  However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])