* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2015-12-24 7:44 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2015-12-24 7:44 UTC (permalink / raw
To: gentoo-commits
commit: f9b0c391e099a06a88ba5500736391ac20b55418
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 07:43:35 2015 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 07:43:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b0c391
Fix make check failure due to missing files
Package-Manager: portage-2.2.26
net-mail/mailutils/files/hdr.at | 36 ++++++++++++++
net-mail/mailutils/files/nohdr.at | 26 ++++++++++
net-mail/mailutils/files/twomsg.at | 73 +++++++++++++++++++++++++++++
net-mail/mailutils/files/weed.at | 29 ++++++++++++
net-mail/mailutils/mailutils-2.99.99.ebuild | 3 +-
5 files changed, 166 insertions(+), 1 deletion(-)
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
new file mode 100644
index 0000000..7c9d5e8
--- /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/nohdr.at b/net-mail/mailutils/files/nohdr.at
new file mode 100644
index 0000000..4caf855
--- /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/twomsg.at b/net-mail/mailutils/files/twomsg.at
new file mode 100644
index 0000000..20af661
--- /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 0000000..ec82c6c
--- /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...
+
+
+])
diff --git a/net-mail/mailutils/mailutils-2.99.99.ebuild b/net-mail/mailutils/mailutils-2.99.99.ebuild
index 28d0255..4b550a1 100644
--- a/net-mail/mailutils/mailutils-2.99.99.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.99.ebuild
@@ -62,6 +62,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-tcp_wrappers.patch"
# bug 567976
sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
+ # add missing tests so that make check doesn't fail
+ cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
if use mysql; then
sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
sql/Makefile.am || die
@@ -73,7 +75,6 @@ src_configure() {
append-flags -fno-strict-aliasing
# maildir is the Gentoo default
- # but fails tests. So set it in config file instead.
econf MU_DEFAULT_SCHEME=maildir \
CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
$(use_with berkdb berkeley-db) \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2017-04-07 14:10 Anthony G. Basile
0 siblings, 0 replies; 11+ messages in thread
From: Anthony G. Basile @ 2017-04-07 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 8f0df25fa5223a457743ca90870ab01ee48a9d37
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 14:09:50 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 14:10:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0df25f
net-mail/mailutils: fix bug #612712
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../mailutils/files/mailutils-3.2-fix-build.patch | 70 ++++++++++++++++++++++
net-mail/mailutils/mailutils-3.2.ebuild | 2 +
2 files changed, 72 insertions(+)
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 00000000000..7036cd68ca3
--- /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/mailutils-3.2.ebuild b/net-mail/mailutils/mailutils-3.2.ebuild
index 53b969a14bd..c06e69e20ee 100644
--- a/net-mail/mailutils/mailutils-3.2.ebuild
+++ b/net-mail/mailutils/mailutils-3.2.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
sql/Makefile.am || die
fi
+ # bug #612712
+ eapply "${FILESDIR}"/${P}-fix-build.patch
eapply_user
eautoreconf
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2017-10-19 8:02 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2017-10-19 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 8f710f701bfcf5e4f4122bf960e7c3752d82cb97
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 08:02:46 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 08:02:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f710f70
net-mail/mailutils: remove old
Package-Manager: Portage-2.3.11, Repoman-2.3.3
net-mail/mailutils/Manifest | 1 -
.../files/mailutils-2.99.98-array_bounds.patch | 11 --
net-mail/mailutils/mailutils-2.99.98-r1.ebuild | 127 ---------------------
3 files changed, 139 deletions(-)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 0f8a3ecb43b..540f6dcd083 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,3 @@
-DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
DIST mailutils-3.1.1.tar.xz 2759000 SHA256 e5a07994924f63d8f29efe94e63ba6b110ac70b2b7f61ffa6f54ae4c9287bc21 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c WHIRLPOOL 37c475e488f1967658e0f204cd9a47d402976f2af31566de6f9b815a4c4e1cace83a9367e8e343eb575a7128653f3e82f114c4966b1b1ac32c7512aa2246baf2
DIST mailutils-3.2.tar.xz 2795512 SHA256 96d354e69e93d5ed6dc2e1019bc3ed3c6e322248a2c477d8fc89dbed91ed077e SHA512 48499d64da65653f996257bd920ee6574840ce9872476425c499d2af6dda5f2cd88a6dc89affba5451ab28c347308a2ae1b53ec40679289d63d74775cd722f96 WHIRLPOOL 99eb034c708dcbbc0b2dcb086ea33010c5d90b3cc8b4b7b5eba2c786d042bd5ac517a611d3f185a84084c03f16b62e8c4efd75f1be315dd19df5868d2cfff82d
DIST mailutils-3.3.tar.xz 2618632 SHA256 27d7fbdff904abf4eebf008c56ca61f135b110f8304c22bc4926dca4f944b4f6 SHA512 ece4e59ca46e287b8e69e45b9ca1207f9a7ef450ea009212ed9284d5aceaeafe64b0ee6333f42c1edcea2a2c45d414b8436e49bf342938bd78b7157a751bce9c WHIRLPOOL cf78b4d5762c7888c8995603b772d6b9b2485cd48c149d22c2c61a646857cf0f23f80a285a740b5d8ad177999eae302b90eb931d08021ee7fbd813463ce147ab
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
deleted file mode 100644
index 8ac418c7c03..00000000000
--- a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/mailutils-2.99.98-r1.ebuild b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
deleted file mode 100644
index b42056d47ef..00000000000
--- a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
-python servers ssl static-libs +threads tcpd tokyocabinet"
-
-# Drop the libtool dep once libltdl goes stable.
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:= )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- epatch "${FILESDIR}/${P}-array_bounds.patch"
- epatch "${FILESDIR}/${P}-readline-6.3.patch" #503954
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- eautoreconf
- fi
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- # but fails tests. So set it in config file instead.
- #econf MU_DEFAULT_SCHEME=maildir \
- econf CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- doins "${FILESDIR}/mailutils.rc"
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2019-02-26 14:37 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2019-02-26 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 5cda653f481a0f4e17309af05290b425b8d2c53b
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 14:37:33 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 14:37:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cda653f
net-mail/mailutils: bump to 3.6
and fix underlinking
Closes: https://bugs.gentoo.org/677762
Closes: https://bugs.gentoo.org/665996
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 1 +
.../mailutils/files/mailutils-3.6-python3.patch | 59 +++++++++
.../files/mailutils-3.6-underlinking.patch | 11 ++
net-mail/mailutils/mailutils-3.6.ebuild | 141 +++++++++++++++++++++
4 files changed, 212 insertions(+)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index fa03c7764a6..2edacc73018 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,3 +1,4 @@
DIST mailutils-3.1.1.tar.xz 2759000 BLAKE2B 146dbc17f222f5f6293c88861fbe75679bde9497d1e9db577441290a2946632ee946ba726cd618363c3f6c1e3bfc87cbd9e94f701ca90f794e6182370bc35ac3 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c
DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53
+DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e
diff --git a/net-mail/mailutils/files/mailutils-3.6-python3.patch b/net-mail/mailutils/files/mailutils-3.6-python3.patch
new file mode 100644
index 00000000000..cad46d006a2
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.6-python3.patch
@@ -0,0 +1,59 @@
+From 4e66a6a9e5f5696d60f7df875175f2e0ad8f7376 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sun, 24 Feb 2019 22:56:21 +0200
+Subject: Bugfix
+
+* python/3/libmu_py/mailcap.c: Fix leftover uses of PyString_FromString
+and PyInt_FromLong.
+---
+ python/3/libmu_py/mailcap.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/python/3/libmu_py/mailcap.c b/python/3/libmu_py/mailcap.c
+index 6db1770..fdb5b71 100644
+--- a/python/3/libmu_py/mailcap.c
++++ b/python/3/libmu_py/mailcap.c
+@@ -91,11 +91,11 @@ api_mailcap_create (PyObject *self, PyObject *args)
+
+ status = mu_mailcap_create (&py_mc->mc);
+ if (status)
+- return _ro (PyInt_FromLong (status));
++ return _ro (PyLong_FromLong (status));
+ status = mu_mailcap_parse (py_mc->mc, py_stm->stm, NULL);
+ if (status == MU_ERR_PARSE)
+ status = 0; /* FIXME */
+- return _ro (PyInt_FromLong (status));
++ return _ro (PyLong_FromLong (status));
+ }
+
+ static PyObject *
+@@ -183,7 +183,7 @@ api_mailcap_entry_get_field (PyObject *self, PyObject *args)
+ status = mu_mailcap_entry_sget_field (py_entry->entry, name, &value);
+ return status_object (status,
+ status == 0
+- ? (value ? PyString_FromString (value)
++ ? (value ? PyUnicode_FromString (value)
+ : PyBool_FromLong (1))
+ : PyBool_FromLong (0));
+ }
+@@ -199,7 +199,7 @@ api_mailcap_entry_get_typefield (PyObject *self, PyObject *args)
+ return NULL;
+
+ status = mu_mailcap_entry_sget_type (py_entry->entry, &value);
+- return status_object (status, PyString_FromString (status == 0 ? value : ""));
++ return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
+ }
+
+ static PyObject *
+@@ -213,7 +213,7 @@ api_mailcap_entry_get_viewcommand (PyObject *self, PyObject *args)
+ return NULL;
+
+ status = mu_mailcap_entry_sget_command (py_entry->entry, &value);
+- return status_object (status, PyString_FromString (status == 0 ? value : ""));
++ return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
+ }
+
+ static PyMethodDef methods[] = {
+--
+cgit v1.0-41-gc330
+
diff --git a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
new file mode 100644
index 00000000000..512a05f3a31
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-02-26 17:11:29.398115222 +0300
++++ b/configure.ac 2019-02-26 17:14:13.733899654 +0300
+@@ -985,7 +985,7 @@
+ AC_CHECK_LIB(ldap, ldap_bind,[
+ status_ldap=yes
+ AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
+- MU_AUTHLIBS="$MU_AUTHLIBS -lldap"],
++ MU_AUTHLIBS="$MU_AUTHLIBS -lldap -llber"],
+ [status_ldap=no])
+ fi
+
diff --git a/net-mail/mailutils/mailutils-3.6.ebuild b/net-mail/mailutils/mailutils-3.6.ebuild
new file mode 100644
index 00000000000..0943bdb530c
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.6.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+ ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+ tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+ !mail-filter/libsieve
+ !mail-client/mailx
+ !mail-client/nail
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/mta
+ berkdb? ( sys-libs/db:= )
+ bidi? ( dev-libs/fribidi )
+ emacs? ( virtual/emacs )
+ gdbm? ( sys-libs/gdbm )
+ guile? ( dev-scheme/guile:12/2.2-1 )
+ kerberos? ( virtual/krb5 )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c )
+ nls? ( sys-devel/gettext )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( virtual/gsasl )
+ servers? ( virtual/libiconv dev-libs/libunistring )
+ ssl? ( net-libs/gnutls:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd )
+ servers? ( ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}/${PN}-3.5-add-include.patch" \
+ "${FILESDIR}/${PN}-3.6-python3.patch"
+ "${FILESDIR}/${PN}-3.6-underlinking.patch" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ if use mysql; then
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+ sql/Makefile.am || die
+ fi
+ # bug 669946
+ #eapply "${FILESDIR}/${PN}-3.5-add-include.patch"
+ #eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # maildir is the Gentoo default
+ econf MU_DEFAULT_SCHEME=maildir \
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ $(use_with berkdb berkeley-db) \
+ $(use_with bidi fribidi) \
+ $(use_enable ipv6) \
+ $(use_with gdbm) \
+ $(use_with sasl gsasl) \
+ $(use_with guile) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_with postgres) \
+ $(use_enable python) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with tokyocabinet) \
+ $(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_enable servers build-servers) \
+ $(use_with servers unistring ) \
+ $(use_enable clients build-clients) \
+ EMACS=$(usex emacs emacs no) \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-mail-spool=/var/spool/mail \
+ --with-readline \
+ --enable-sendmail \
+ --disable-debug
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" install
+
+ insinto /etc
+ # bug 613112
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf
+ keepdir /etc/mailutils.d/
+ insinto /etc/mailutils.d
+ doins "${FILESDIR}/mail"
+
+ if use python; then
+ python_optimize
+ if use static-libs; then
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+ fi
+ fi
+
+ if use servers; then
+ newinitd "${FILESDIR}"/imap4d.initd imap4d
+ newinitd "${FILESDIR}"/pop3d.initd pop3d
+ newinitd "${FILESDIR}"/comsatd.initd comsatd
+ fi
+
+ #dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+ # compatibility link
+ use clients && dosym /usr/bin/mail /bin/mail
+
+ use static-libs || find "${D}" -name "*.la" -delete
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2019-02-26 14:54 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2019-02-26 14:54 UTC (permalink / raw
To: gentoo-commits
commit: be3e45e534fb46bd51ef8ccc4655578143f93131
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 14:54:19 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 14:54:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3e45e5
net-mail/mailutils: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 1 -
.../files/mailutils-2.99.98-readline-6.3.patch | 39 ------
net-mail/mailutils/mailutils-3.1.1.ebuild | 134 ---------------------
net-mail/mailutils/mailutils-3.4-r1.ebuild | 133 --------------------
net-mail/mailutils/mailutils-3.4.ebuild | 132 --------------------
5 files changed, 439 deletions(-)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 2edacc73018..726cd73f543 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,3 @@
-DIST mailutils-3.1.1.tar.xz 2759000 BLAKE2B 146dbc17f222f5f6293c88861fbe75679bde9497d1e9db577441290a2946632ee946ba726cd618363c3f6c1e3bfc87cbd9e94f701ca90f794e6182370bc35ac3 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c
DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53
DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e
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
deleted file mode 100644
index de9a487aaaf..00000000000
--- a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
deleted file mode 100644
index b07d4d2835e..00000000000
--- a/net-mail/mailutils/mailutils-3.1.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~s390 x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
- mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:= )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- eapply "${FILESDIR}/${PN}-2.99.98-readline-6.3.patch" #503954
- # bug 567976
- sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
- # add missing tests so that make check doesn't fail
- cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- doins "${FILESDIR}/mailutils.rc"
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
diff --git a/net-mail/mailutils/mailutils-3.4-r1.ebuild b/net-mail/mailutils/mailutils-3.4-r1.ebuild
deleted file mode 100644
index 5139756cb96..00000000000
--- a/net-mail/mailutils/mailutils-3.4-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
- mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/22 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- # add missing tests so that make check doesn't fail
- cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eapply "${FILESDIR}/${P}-MH-testsuite.patch"
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
diff --git a/net-mail/mailutils/mailutils-3.4.ebuild b/net-mail/mailutils/mailutils-3.4.ebuild
deleted file mode 100644
index bb0e216c931..00000000000
--- a/net-mail/mailutils/mailutils-3.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
- mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:= )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- # add missing tests so that make check doesn't fail
- cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2019-11-08 9:22 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2019-11-08 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 79f3db5439143ecd8217586d3ba5244138080f77
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 09:22:22 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 09:22:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f3db54
net-mail/mailutils: bump to 3.8
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 1 +
.../mailutils/files/mailutils-3.8-fix-tests.patch | 48 +++++++
net-mail/mailutils/mailutils-3.8.ebuild | 140 +++++++++++++++++++++
3 files changed, 189 insertions(+)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f0659837136..87a0444dcad 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,2 +1,3 @@
DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
+DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
diff --git a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
new file mode 100644
index 00000000000..90808d88322
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
@@ -0,0 +1,48 @@
+commit 2fe205b5e0b025200150c62581283e99598a80a6
+Author: Eray Aslan <eras@gentoo.org>
+Date: Fri Nov 8 10:57:43 2019 +0300
+
+ save mailboxes as mbox for make test
+
+ when default mailbox scheme is chosen as maildir, mda tests fail with
+ messages like:
+
+ sed: read error on spool/root: Is a directory
+
+ make sure we save the test mailboxes as mbox
+
+ Signed-off-by: Eray Aslan <eras@gentoo.org>
+
+diff --git a/mda/tests/forward.at b/mda/tests/forward.at
+index 96170ad6a..75a9d6966 100644
+--- a/mda/tests/forward.at
++++ b/mda/tests/forward.at
+@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
+
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+- mailbox-pattern "$(pwd)/spool/\${user}";
++ mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }
+
+ mailer {
+diff --git a/mda/tests/mda.at b/mda/tests/mda.at
+index 6623fb623..083e7c318 100644
+--- a/mda/tests/mda.at
++++ b/mda/tests/mda.at
+@@ -16,7 +16,7 @@
+
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+- mailbox-pattern "$(pwd)/spool/\${user}";
++ mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }
+ EOF
+ ])
+@@ -56,4 +56,4 @@ cat spool/root
+
+ AT_CLEANUP
+
+-m4_popdef([TESTMDA_CONF])
+\ No newline at end of file
++m4_popdef([TESTMDA_CONF])
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
new file mode 100644
index 00000000000..b3f820b13cc
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+ ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+ tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+ !mail-filter/libsieve
+ !mail-client/mailx
+ !mail-client/nail
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/mta
+ berkdb? ( sys-libs/db:= )
+ bidi? ( dev-libs/fribidi )
+ emacs? ( virtual/emacs )
+ gdbm? ( sys-libs/gdbm )
+ guile? ( dev-scheme/guile:12/2.2-1 )
+ kerberos? ( virtual/krb5 )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c )
+ nls? ( sys-devel/gettext )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( virtual/gsasl )
+ servers? ( virtual/libiconv dev-libs/libunistring )
+ ssl? ( net-libs/gnutls:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.5-add-include.patch" \
+ "${FILESDIR}/${PN}-3.6-underlinking.patch" \
+ "${FILESDIR}/${PN}-3.8-fix-tests.patch" \
+ )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ if use mysql; then
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+ sql/Makefile.am || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # maildir is the Gentoo default
+ econf MU_DEFAULT_SCHEME=maildir \
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ $(use_with berkdb berkeley-db) \
+ $(use_with bidi fribidi) \
+ $(use_enable ipv6) \
+ $(use_with gdbm) \
+ $(use_with sasl gsasl) \
+ $(use_with guile) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_with postgres) \
+ $(use_enable python) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with tokyocabinet) \
+ $(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_enable servers build-servers) \
+ $(use_with servers unistring ) \
+ $(use_enable clients build-clients) \
+ EMACS=$(usex emacs emacs no) \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-mail-spool=/var/spool/mail \
+ --with-readline \
+ --enable-sendmail \
+ --disable-debug
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ # bug 613112
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf
+ keepdir /etc/mailutils.d/
+ insinto /etc/mailutils.d
+ doins "${FILESDIR}/mail"
+
+ if use python; then
+ python_optimize
+ if use static-libs; then
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+ fi
+ fi
+
+ if use servers; then
+ newinitd "${FILESDIR}"/imap4d.initd imap4d
+ newinitd "${FILESDIR}"/pop3d.initd pop3d
+ newinitd "${FILESDIR}"/comsatd.initd comsatd
+ fi
+
+ # compatibility link
+ if use clients && use split-usr; then
+ dosym ../usr/bin/mail /bin/mail
+ fi
+
+ if ! use static-libs; then
+ find "${D}" -name "*.la" -delete || die
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2020-02-23 14:09 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2020-02-23 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 5b6a443003a74df1ac2d620fd37de88316af6646
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 14:09:21 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 14:09:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6a4430
net-mail/mailutils: Fix building with GCC 10
Bug: https://bugs.gentoo.org/709274
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../mailutils/files/mailutils-3.4-fno-common.patch | 11 +++++++++++
.../mailutils/files/mailutils-3.8-fno-common.patch | 22 ++++++++++++++++++++++
net-mail/mailutils/mailutils-3.4-r3.ebuild | 6 ++++--
net-mail/mailutils/mailutils-3.7.ebuild | 7 +++++--
net-mail/mailutils/mailutils-3.8.ebuild | 9 +++++----
5 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
new file mode 100644
index 00000000000..d981ae6891a
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/lib/tcpwrap.h
++++ b/lib/tcpwrap.h
+@@ -18,7 +18,7 @@
+ #include <mailutils/types.h>
+
+ extern int mu_tcp_wrapper_enable;
+-const char *mu_tcp_wrapper_daemon;
++extern const char *mu_tcp_wrapper_daemon;
+ extern int mu_tcpwrapper_access (int fd);
+ extern void mu_tcpwrapper_cfg_init (void);
+ extern int mu_tcp_wrapper_prefork (int fd,
diff --git a/net-mail/mailutils/files/mailutils-3.8-fno-common.patch b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
new file mode 100644
index 00000000000..c7aa72df10e
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/imap4d/imap4d.h
++++ b/imap4d/imap4d.h
+@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
+ extern int test_mode;
+ extern int silent_expunge;
+
+-int tls_available;
+-
+ /* Input functions */
+ extern mu_stream_t iostream;
+ extern int io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
+--- a/lib/tcpwrap.h
++++ b/lib/tcpwrap.h
+@@ -17,7 +17,7 @@
+ #include <mailutils/types.h>
+
+ extern int mu_tcp_wrapper_enable;
+-const char *mu_tcp_wrapper_daemon;
++extern const char *mu_tcp_wrapper_daemon;
+ extern int mu_tcpwrapper_access (int fd);
+ extern void mu_tcpwrapper_cfg_init (void);
+ extern int mu_tcp_wrapper_prefork (int fd,
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index 509c103ba01..c3edc69e672 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -56,8 +56,10 @@ pkg_setup() {
src_prepare() {
# Disable bytecompilation of Python modules.
echo "#!/bin/sh" > build-aux/py-compile
- eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
- "${FILESDIR}/${P}-fix-endianness.patch"
+ eapply \
+ "${FILESDIR}"/${P}-MH-testsuite.patch \
+ "${FILESDIR}"/${P}-fix-endianness.patch \
+ "${FILESDIR}"/${PN}-3.4-fno-common.patch
# add missing tests so that make check doesn't fail
cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
if use mysql; then
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
index f565cbc30a7..344b83bfb47 100644
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ b/net-mail/mailutils/mailutils-3.7.ebuild
@@ -51,8 +51,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
servers? ( tcpd ldap )"
DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}/${PN}-3.5-add-include.patch" \
- "${FILESDIR}/${PN}-3.6-underlinking.patch" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-add-include.patch
+ "${FILESDIR}"/${PN}-3.6-underlinking.patch
+ "${FILESDIR}"/${PN}-3.8-fno-common.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index a0eac2746bf..010b4f58138 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -52,10 +52,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
PATCHES=(
- "${FILESDIR}/${PN}-3.5-add-include.patch" \
- "${FILESDIR}/${PN}-3.6-underlinking.patch" \
- "${FILESDIR}/${PN}-3.8-fix-tests.patch" \
- )
+ "${FILESDIR}"/${PN}-3.5-add-include.patch
+ "${FILESDIR}"/${PN}-3.6-underlinking.patch
+ "${FILESDIR}"/${PN}-3.8-fix-tests.patch
+ "${FILESDIR}"/${PN}-3.8-fno-common.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2020-05-13 6:51 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2020-05-13 6:51 UTC (permalink / raw
To: gentoo-commits
commit: e3af573c26166f7ea1a1e4aeec071866417a3d1a
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 06:50:22 2020 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed May 13 06:51:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3af573c
net-mail/mailutils: cleanup
Bug: https://bugs.gentoo.org/700806
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 2 -
net-mail/mailutils/files/hdr.at | 36 ------
.../files/mailutils-3.4-MH-testsuite.patch | 70 -----------
.../files/mailutils-3.4-fix-endianness.patch | 122 ------------------
.../mailutils/files/mailutils-3.4-fno-common.patch | 11 --
net-mail/mailutils/files/nohdr.at | 26 ----
net-mail/mailutils/files/twomsg.at | 73 -----------
net-mail/mailutils/files/weed.at | 29 -----
net-mail/mailutils/mailutils-3.4-r3.ebuild | 140 ---------------------
net-mail/mailutils/mailutils-3.7.ebuild | 140 ---------------------
10 files changed, 649 deletions(-)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 06add80a10b..225b3f015bf 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,2 @@
-DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
-DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
deleted file mode 100644
index 7c9d5e85c69..00000000000
--- a/net-mail/mailutils/files/hdr.at
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
deleted file mode 100644
index 919b6619e5f..00000000000
--- a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Fri, 10 Nov 2017 21:28:17 +0200
-Subject: Minor fix in MH testsuite
-
-Running fmtcheck without .mh_profile triggers mh_install, which
-surprises the testsuite with unexpected output "I'm going to
-create the standard MH path for you." Defining the MH envar to
-an existing file name suppresses it.
-
-* mh/tests/fmtcnd00.at: Always define MH prior to starting fmtcheck.
-* mh/tests/fmtcomp.at: Likewise.
-* mh/tests/fmtfunc.at: Likewise.
----
- mh/tests/fmtcnd00.at | 2 +-
- mh/tests/fmtcomp.at | 4 ++--
- mh/tests/fmtfunc.at | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mh/tests/fmtcnd00.at b/mh/tests/fmtcnd00.at
-index 507e8e5..f674d41 100644
---- a/mh/tests/fmtcnd00.at
-+++ b/mh/tests/fmtcnd00.at
-@@ -28,7 +28,7 @@ m4_pushdef([FMTCOND],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcond fmtcnd00])
- AT_DATA([msg],[$2])
--AT_CHECK([fmtcheck -format 'FORMAT' msg
-+AT_CHECK([MH=/dev/null fmtcheck -format 'FORMAT' msg
- ],
- [0],
- [$3])
-diff --git a/mh/tests/fmtcomp.at b/mh/tests/fmtcomp.at
-index 72cd823..615470a 100644
---- a/mh/tests/fmtcomp.at
-+++ b/mh/tests/fmtcomp.at
-@@ -22,7 +22,7 @@ dnl
- m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcomp])
--AT_CHECK([fmtcheck -disass -dump -format '$2'
-+AT_CHECK([MH=/dev/null fmtcheck -disass -dump -format '$2'
- ],
- [m4_if([$4],[],[0],[1])],
- [$3],[$4])
-@@ -296,7 +296,7 @@ m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtdiag])
- AT_DATA([input.fmt],[$2])
--AT_CHECK([fmtcheck -form input.fmt
-+AT_CHECK([MH=/dev/null fmtcheck -form input.fmt
- ],
- [1],
- [],
-diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at
-index 844a777..0829d45 100644
---- a/mh/tests/fmtfunc.at
-+++ b/mh/tests/fmtfunc.at
-@@ -212,7 +212,7 @@ AT_DATA([input.fmt],[%(getenv MH_TEST)
- AT_DATA([message],[
-
- ])
--AT_CHECK([MH_TEST=defined fmtcheck -form input.fmt -width 80 message
-+AT_CHECK([MH=/dev/null MH_TEST=defined fmtcheck -form input.fmt -width 80 message
- ],
- [0],
- [defined
---
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
deleted file mode 100644
index 0e52fae20c1..00000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 21 Jun 2018 09:46:43 +0300
-Subject: Fix endianness bug in string to IP conversion
-
-* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes)
-(_mu_sockaddr_to_bytes): Fix improper endianness conversion.
-* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion.
----
- libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++-------------------------
- libmailutils/cidr/tosa.c | 9 ++-------
- 2 files changed, 22 insertions(+), 32 deletions(-)
-
-diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
-index f57aadc..39d24fd 100644
---- a/libmailutils/cidr/fromsa.c
-+++ b/libmailutils/cidr/fromsa.c
-@@ -29,55 +29,50 @@
- #include <mailutils/cidr.h>
- #include <mailutils/errno.h>
-
--static void
--uint32_to_bytes (unsigned char *bytes, uint32_t u)
--{
-- int i;
--
-- for (i = 0; i < 4; i++)
-- {
-- bytes[i] = u & 0xff;
-- u >>= 8;
-- }
--}
--
- int
- _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
- {
-- uint32_t u;
-+ size_t len;
-
- switch (af)
- {
- case AF_INET:
-- memcpy (&u, buf, sizeof u);
-- uint32_to_bytes (bytes, u);
-- return 4;
--
-+ len = 4;
-+ break;
-+
- #ifdef MAILUTILS_IPV6
- case AF_INET6:
-- memcpy (bytes, buf, 16);
-- return 16;
-+ len = 16;
-+ break;
- #endif
-+
-+ default:
-+ len = 0;
- }
-- return 0;
-+ memcpy (bytes, buf, len);
-+ return len;
- }
-
- int
- _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
- {
-+ void *buf;
- switch (sa->sa_family)
- {
- case AF_INET:
-- uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
-- return 4;
-+ buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr);
-+ break;
-
- #ifdef MAILUTILS_IPV6
- case AF_INET6:
-- memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
-- return 16;
-+ buf = &(((struct sockaddr_in6*)sa)->sin6_addr);
-+ break;
- #endif
-+
-+ default:
-+ return 0;
- }
-- return 0;
-+ return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes);
- }
-
- int
-diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
-index 33715e1..2b372b1 100644
---- a/libmailutils/cidr/tosa.c
-+++ b/libmailutils/cidr/tosa.c
-@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
- } addr;
- struct sockaddr *sa;
- int socklen;
-- int i;
--
-+
- memset (&addr, 0, sizeof (addr));
- addr.sa.sa_family = cidr->family;
- switch (cidr->family)
- {
- case AF_INET:
- socklen = sizeof (addr.s_in);
-- for (i = 0; i < cidr->len; i++)
-- {
-- addr.s_in.sin_addr.s_addr <<= 8;
-- addr.s_in.sin_addr.s_addr |= cidr->address[i];
-- }
-+ memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4);
- break;
-
- #ifdef MAILUTILS_IPV6
---
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
deleted file mode 100644
index d981ae6891a..00000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/tcpwrap.h
-+++ b/lib/tcpwrap.h
-@@ -18,7 +18,7 @@
- #include <mailutils/types.h>
-
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd,
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
deleted file mode 100644
index 4caf85570f1..00000000000
--- a/net-mail/mailutils/files/nohdr.at
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/twomsg.at b/net-mail/mailutils/files/twomsg.at
deleted file mode 100644
index 20af66173d6..00000000000
--- a/net-mail/mailutils/files/twomsg.at
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
deleted file mode 100644
index ec82c6ce23b..00000000000
--- a/net-mail/mailutils/files/weed.at
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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...
-
-
-])
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
deleted file mode 100644
index 67cffc2dc93..00000000000
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/22 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- eapply \
- "${FILESDIR}"/${P}-MH-testsuite.patch \
- "${FILESDIR}"/${P}-fix-endianness.patch \
- "${FILESDIR}"/${PN}-3.4-fno-common.patch
- # add missing tests so that make check doesn't fail
- cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
deleted file mode 100644
index b5489a43e49..00000000000
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
- "${FILESDIR}"/${PN}-3.6-underlinking.patch
- "${FILESDIR}"/${PN}-3.8-fno-common.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2020-08-28 5:43 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2020-08-28 5:43 UTC (permalink / raw
To: gentoo-commits
commit: 8433b7974ff468f51397394afb1b8a204048868e
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 05:42:49 2020 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 05:42:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8433b797
net-mail/mailutils: bump to 3.10
Closes: https://bugs.gentoo.org/738032
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 1 +
.../mailutils/files/mailutils-3.10-get_size.patch | 38 ++++++
net-mail/mailutils/mailutils-3.10.ebuild | 139 +++++++++++++++++++++
3 files changed, 178 insertions(+)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 225b3f015bf..f1f4bc73b87 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,2 +1,3 @@
+DIST mailutils-3.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
diff --git a/net-mail/mailutils/files/mailutils-3.10-get_size.patch b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
new file mode 100644
index 00000000000..3ec15968916
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
@@ -0,0 +1,38 @@
+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
+
diff --git a/net-mail/mailutils/mailutils-3.10.ebuild b/net-mail/mailutils/mailutils-3.10.ebuild
new file mode 100644
index 00000000000..fe26904e088
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.10.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+ ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+ tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+ !mail-filter/libsieve
+ !mail-client/mailx
+ !mail-client/nail
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/mta
+ berkdb? ( sys-libs/db:= )
+ bidi? ( dev-libs/fribidi )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gdbm? ( sys-libs/gdbm:= )
+ guile? ( dev-scheme/guile:12/2.2-1 )
+ kerberos? ( virtual/krb5 )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c )
+ nls? ( sys-devel/gettext )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( virtual/gsasl )
+ servers? ( virtual/libiconv dev-libs/libunistring )
+ ssl? ( net-libs/gnutls:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-add-include.patch
+ "${FILESDIR}"/${PN}-3.10-get_size.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ if use mysql; then
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+ sql/Makefile.am || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # maildir is the Gentoo default
+ econf MU_DEFAULT_SCHEME=maildir \
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ $(use_with berkdb berkeley-db) \
+ $(use_with bidi fribidi) \
+ $(use_enable ipv6) \
+ $(use_with gdbm) \
+ $(use_with sasl gsasl) \
+ $(use_with guile) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_with postgres) \
+ $(use_enable python) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with tokyocabinet) \
+ $(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_enable servers build-servers) \
+ $(use_with servers unistring ) \
+ $(use_enable clients build-clients) \
+ EMACS=$(usex emacs emacs no) \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-mail-spool=/var/spool/mail \
+ --with-readline \
+ --enable-sendmail \
+ --disable-debug
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ # bug 613112
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf
+ keepdir /etc/mailutils.d/
+ insinto /etc/mailutils.d
+ doins "${FILESDIR}/mail"
+
+ if use python; then
+ python_optimize
+ if use static-libs; then
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+ fi
+ fi
+
+ if use servers; then
+ newinitd "${FILESDIR}"/imap4d.initd imap4d
+ newinitd "${FILESDIR}"/pop3d.initd pop3d
+ newinitd "${FILESDIR}"/comsatd.initd comsatd
+ fi
+
+ # compatibility link
+ if use clients && use split-usr; then
+ dosym ../usr/bin/mail /bin/mail
+ fi
+
+ if ! use static-libs; then
+ find "${D}" -name "*.la" -delete || die
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2021-05-31 21:00 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2021-05-31 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 4f8e0811558ed546c08cc8066df399333584ca6c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 20:56:52 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 31 20:56:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8e0811
net-mail/mailutils: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-mail/mailutils/Manifest | 3 -
.../files/mailutils-3.6-underlinking.patch | 11 --
.../mailutils/files/mailutils-3.8-fix-tests.patch | 48 -------
.../mailutils/files/mailutils-3.8-fno-common.patch | 22 ----
.../files/mailutils-3.9-python-config.patch | 27 ----
.../files/mailutils-3.9-underlinking.patch | 11 --
net-mail/mailutils/mailutils-3.11.1.ebuild | 138 --------------------
net-mail/mailutils/mailutils-3.12.ebuild | 139 --------------------
net-mail/mailutils/mailutils-3.8.ebuild | 141 ---------------------
net-mail/mailutils/mailutils-3.9.ebuild | 141 ---------------------
10 files changed, 681 deletions(-)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e516b435c71..69879191624 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1 @@
-DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df6409baffe8f1d9755826ef306cc5dc2433b9fd57ea56d5a64d299e8c4babc2dfee8b8f2ee8f1537519c0cb2a568a7717 SHA512 6a1f20d6bf9cda9c90d3bd07a4c23a52d78153a18e89b1cb69682b5efc6c450d7791d430855b47ed97e078e0ec175c4b2732317fd7115767ff01dc808f36145e
DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
-DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
diff --git a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
deleted file mode 100644
index 512a05f3a31..00000000000
--- a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2019-02-26 17:11:29.398115222 +0300
-+++ b/configure.ac 2019-02-26 17:14:13.733899654 +0300
-@@ -985,7 +985,7 @@
- AC_CHECK_LIB(ldap, ldap_bind,[
- status_ldap=yes
- AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
-- MU_AUTHLIBS="$MU_AUTHLIBS -lldap"],
-+ MU_AUTHLIBS="$MU_AUTHLIBS -lldap -llber"],
- [status_ldap=no])
- fi
-
diff --git a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
deleted file mode 100644
index 90808d88322..00000000000
--- a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 2fe205b5e0b025200150c62581283e99598a80a6
-Author: Eray Aslan <eras@gentoo.org>
-Date: Fri Nov 8 10:57:43 2019 +0300
-
- save mailboxes as mbox for make test
-
- when default mailbox scheme is chosen as maildir, mda tests fail with
- messages like:
-
- sed: read error on spool/root: Is a directory
-
- make sure we save the test mailboxes as mbox
-
- Signed-off-by: Eray Aslan <eras@gentoo.org>
-
-diff --git a/mda/tests/forward.at b/mda/tests/forward.at
-index 96170ad6a..75a9d6966 100644
---- a/mda/tests/forward.at
-+++ b/mda/tests/forward.at
-@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
-
- m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
- mailbox {
-- mailbox-pattern "$(pwd)/spool/\${user}";
-+ mailbox-pattern "mbox:$(pwd)/spool/\${user}";
- }
-
- mailer {
-diff --git a/mda/tests/mda.at b/mda/tests/mda.at
-index 6623fb623..083e7c318 100644
---- a/mda/tests/mda.at
-+++ b/mda/tests/mda.at
-@@ -16,7 +16,7 @@
-
- m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
- mailbox {
-- mailbox-pattern "$(pwd)/spool/\${user}";
-+ mailbox-pattern "mbox:$(pwd)/spool/\${user}";
- }
- EOF
- ])
-@@ -56,4 +56,4 @@ cat spool/root
-
- AT_CLEANUP
-
--m4_popdef([TESTMDA_CONF])
-\ No newline at end of file
-+m4_popdef([TESTMDA_CONF])
diff --git a/net-mail/mailutils/files/mailutils-3.8-fno-common.patch b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
deleted file mode 100644
index c7aa72df10e..00000000000
--- a/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/imap4d/imap4d.h
-+++ b/imap4d/imap4d.h
-@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
- extern int test_mode;
- extern int silent_expunge;
-
--int tls_available;
--
- /* Input functions */
- extern mu_stream_t iostream;
- extern int io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
---- a/lib/tcpwrap.h
-+++ b/lib/tcpwrap.h
-@@ -17,7 +17,7 @@
- #include <mailutils/types.h>
-
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd,
diff --git a/net-mail/mailutils/files/mailutils-3.9-python-config.patch b/net-mail/mailutils/files/mailutils-3.9-python-config.patch
deleted file mode 100644
index 5a2ecdd2aec..00000000000
--- a/net-mail/mailutils/files/mailutils-3.9-python-config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e3463bf6b5deb8ab5c6dffc6792a0a9a3bd7890 Mon Sep 17 00:00:00 2001
-From: Jordi Mallach <jordi@debian.org>
-Date: Sun, 22 Mar 2020 19:58:31 +0100
-Subject: Call $PYTHON_CONFIG instead of pyhon-config.
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6946a1aa6..4c089555a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1218,8 +1218,8 @@ if test "$status_python" = yes; then
- esac
-
- # See https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
-- PYTHON_LIBS=`python-config --libs --embed 2>/dev/null` || \
-- PYTHON_LIBS=`python-config --libs`
-+ PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed 2>/dev/null` || \
-+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`
- PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
- else
- status_python=no
---
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.9-underlinking.patch b/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
deleted file mode 100644
index a7992aff946..00000000000
--- a/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2020-03-23 14:09:46.662589298 +0300
-+++ b/configure.ac 2020-03-23 14:12:36.191030873 +0300
-@@ -958,7 +958,7 @@
- AC_CHECK_LIB(ldap, ldap_bind,[
- status_ldap=yes
- AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
-- MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap"],
-+ MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap -llber"],
- [status_ldap=no])
- fi
-
diff --git a/net-mail/mailutils/mailutils-3.11.1.ebuild b/net-mail/mailutils/mailutils-3.11.1.ebuild
deleted file mode 100644
index 09da4e0a5f0..00000000000
--- a/net-mail/mailutils/mailutils-3.11.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm:= )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-mail/mailutils/mailutils-3.12.ebuild b/net-mail/mailutils/mailutils-3.12.ebuild
deleted file mode 100644
index 3c4f06c8eef..00000000000
--- a/net-mail/mailutils/mailutils-3.12.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm:= )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf \
- MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
deleted file mode 100644
index 6aed9177e6c..00000000000
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
- "${FILESDIR}"/${PN}-3.6-underlinking.patch
- "${FILESDIR}"/${PN}-3.8-fix-tests.patch
- "${FILESDIR}"/${PN}-3.8-fno-common.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
deleted file mode 100644
index 812b2d9dc8d..00000000000
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm:= )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
- "${FILESDIR}"/${PN}-3.9-underlinking.patch
- "${FILESDIR}"/${PN}-3.8-fno-common.patch
- "${FILESDIR}"/${PN}-3.9-python-config.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
@ 2022-05-19 16:35 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2022-05-19 16:35 UTC (permalink / raw
To: gentoo-commits
commit: a25b0e4e4143608bc86450b5db990cf3c4254ae1
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 16:34:53 2022 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu May 19 16:34:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25b0e4e
net-mail/mailutils: drop 3.12-r4, 3.13-r1
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/mailutils/Manifest | 2 -
.../files/mailutils-3.12-disable_escapes.patch | 24 ----
.../files/mailutils-3.12-fix-big-endians.patch | 26 ----
.../files/mailutils-3.12-misssing-endif.patch | 23 ----
net-mail/mailutils/mailutils-3.12-r4.ebuild | 144 ---------------------
net-mail/mailutils/mailutils-3.13-r1.ebuild | 141 --------------------
6 files changed, 360 deletions(-)
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 4d73c53e3cd2..3d9fb2486140 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,2 @@
-DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
deleted file mode 100644
index 073d1b671219..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 19 Jul 2021 11:27:40 +0300
-Subject: mail: disable compose escapes in non-interctive mode.
-
-diff --git a/mail/send.c b/mail/send.c
-index 1bdfe1134..098374dab 100644
---- a/mail/send.c
-+++ b/mail/send.c
-@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
-
- if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
- done = 1;
-- else if (mailvar_get (&escape, mailvar_name_escape,
-- mailvar_type_string, 0) == 0
-+ else if (interactive
-+ && mailvar_get (&escape, mailvar_name_escape,
-+ mailvar_type_string, 0) == 0
- && buf[0] == escape[0])
- {
- if (buf[1] == buf[0])
---
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
deleted file mode 100644
index 5dd2f8f035d1..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 15 Apr 2021 08:37:29 +0300
-Subject: Bugfix in mimeview testsuite
-
-* mimeview/tests/bf.c (write_byte): Fix type of the character buffer.
----
- mimeview/tests/bf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mimeview/tests/bf.c b/mimeview/tests/bf.c
-index 6ccce848c..2e6b37e4a 100644
---- a/mimeview/tests/bf.c
-+++ b/mimeview/tests/bf.c
-@@ -68,7 +68,7 @@ write_string (FILE *fp, char *arg)
- int
- write_byte (FILE *fp, char *arg)
- {
-- int c;
-+ char c;
- if (strlen (arg) == 3
- && (arg[0] == '\'' || arg[0] == '"'))
- c = arg[1];
---
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
deleted file mode 100644
index 12d03af7b337..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 15 Apr 2021 08:36:56 +0300
-Subject: Minor fix
-
-* include/mailutils/sys/streamtrans.h: Add missing #endif
----
- include/mailutils/sys/streamtrans.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/mailutils/sys/streamtrans.h b/include/mailutils/sys/streamtrans.h
-index 8a4727cee..c9c866013 100644
---- a/include/mailutils/sys/streamtrans.h
-+++ b/include/mailutils/sys/streamtrans.h
-@@ -25,3 +25,5 @@ struct _mu_streamtrans
- struct _mu_stream base; /* Superclass */
- mu_stream_t transport; /* Transport stream */
- };
-+
-+#endif
---
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/mailutils-3.12-r4.ebuild b/net-mail/mailutils/mailutils-3.12-r4.ebuild
deleted file mode 100644
index c4e8479b9649..000000000000
--- a/net-mail/mailutils/mailutils-3.12-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="
- !mail-filter/libsieve
- !mail-client/mailx
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/libcrypt:=
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm:= )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam:= )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )
- "
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
- "${FILESDIR}"/${P}-misssing-endif.patch
- "${FILESDIR}"/${P}-fix-big-endians.patch
- "${FILESDIR}"/${P}-disable_escapes.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf \
- MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-mail/mailutils/mailutils-3.13-r1.ebuild b/net-mail/mailutils/mailutils-3.13-r1.ebuild
deleted file mode 100644
index d2d6db7cf078..000000000000
--- a/net-mail/mailutils/mailutils-3.13-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="
- !mail-filter/libsieve
- !mail-client/mailx
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/libcrypt:=
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( >=app-editors/emacs-23.1:* )
- gdbm? ( sys-libs/gdbm:= )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam:= )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring:= )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )
- "
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf \
- MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- if use clients && use split-usr; then
- dosym ../usr/bin/mail /bin/mail
- fi
-
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-05-19 16:35 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-08 9:22 [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/ Eray Aslan
-- strict thread matches above, loose matches on Subject: below --
2022-05-19 16:35 Eray Aslan
2021-05-31 21:00 Michał Górny
2020-08-28 5:43 Eray Aslan
2020-05-13 6:51 Eray Aslan
2020-02-23 14:09 David Seifert
2019-02-26 14:54 Eray Aslan
2019-02-26 14:37 Eray Aslan
2017-10-19 8:02 Eray Aslan
2017-04-07 14:10 Anthony G. Basile
2015-12-24 7:44 Eray Aslan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox