[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: 4ba91eed15ea76165f60e3478cd4461ce3d0cd3d Author: Eray Aslan gentoo org> AuthorDate: Fri Jul 30 07:07:37 2021 + Commit: Eray Aslan gentoo org> CommitDate: Fri Jul 30 07:07:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba91eed net-mail/mailutils: disable escapes in non-interactive mode unlike other mail(1) implementations, mailutils mail command allowed escape characters in non-interactive mode, resulting in CVE-2021-32749 in fail2ban package. backport fix for mailutils-3.12 Bug: https://bugs.gentoo.org/802513 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Eray Aslan gentoo.org> .../files/mailutils-3.12-disable_escapes.patch | 24 net-mail/mailutils/mailutils-3.12-r3.ebuild| 144 + 2 files changed, 168 insertions(+) diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch new file mode 100644 index 000..073d1b67121 --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch @@ -0,0 +1,24 @@ +From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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 (, mailvar_name_escape, +- mailvar_type_string, 0) == 0 ++ else if (interactive ++ && mailvar_get (, 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/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild new file mode 100644 index 000..c4afe8dbaa5 --- /dev/null +++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 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
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: b53245a868edbae2e47e15767cb7dddc73c36524 Author: Eray Aslan gentoo org> AuthorDate: Sat Apr 17 09:04:39 2021 + Commit: Eray Aslan gentoo org> CommitDate: Sat Apr 17 09:04:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53245a8 net-mail/mailutils: fix big endian archs also - fix HOMEPAGE - add missing endif thanks to ernsteiswuerfel and Rolf Eike Beer Closes: https://bugs.gentoo.org/670924 Closes: https://bugs.gentoo.org/727998 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Eray Aslan gentoo.org> .../files/mailutils-3.12-fix-big-endians.patch | 26 .../files/mailutils-3.12-misssing-endif.patch | 23 net-mail/mailutils/mailutils-3.12-r1.ebuild| 141 + 3 files changed, 190 insertions(+) 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 new file mode 100644 index 000..5dd2f8f035d --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch @@ -0,0 +1,26 @@ +From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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 new file mode 100644 index 000..12d03af7b33 --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch @@ -0,0 +1,23 @@ +From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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-r1.ebuild b/net-mail/mailutils/mailutils-3.12-r1.ebuild new file mode 100644 index 000..89bc57c915a --- /dev/null +++ b/net-mail/mailutils/mailutils-3.12-r1.ebuild @@ -0,0 +1,141 @@ +# 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://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 ~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=( +
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: 900e16dc46161a5dfd12fc84f42cabfbf3e4ec98 Author: Eray Aslan gentoo org> AuthorDate: Mon Mar 23 11:51:07 2020 + Commit: Eray Aslan gentoo org> CommitDate: Mon Mar 23 11:51:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900e16dc net-mail/mailutils: bump to 3.9 Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Eray Aslan gentoo.org> net-mail/mailutils/Manifest| 1 + .../files/mailutils-3.9-python-config.patch| 27 .../files/mailutils-3.9-underlinking.patch | 11 ++ net-mail/mailutils/mailutils-3.9.ebuild| 141 + 4 files changed, 180 insertions(+) diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index 87a0444dcad..06add80a10b 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -1,3 +1,4 @@ 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/mailutils-3.9-python-config.patch b/net-mail/mailutils/files/mailutils-3.9-python-config.patch new file mode 100644 index 000..5a2ecdd2aec --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.9-python-config.patch @@ -0,0 +1,27 @@ +From 5e3463bf6b5deb8ab5c6dffc6792a0a9a3bd7890 Mon Sep 17 00:00:00 2001 +From: Jordi Mallach +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 new file mode 100644 index 000..a7992aff946 --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.9-underlinking.patch @@ -0,0 +1,11 @@ +--- 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.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild new file mode 100644 index 000..533d9f7d249 --- /dev/null +++ b/net-mail/mailutils/mailutils-3.9.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,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 ~x86-macos" +IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \ + ldap mysql nls pam postgres python servers split-usr ssl
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: b1b7039c0c52b15ff5e12bd1cf6aa8ece327bc03 Author: Eray Aslan gentoo org> AuthorDate: Thu Aug 8 06:00:04 2019 + Commit: Eray Aslan gentoo org> CommitDate: Thu Aug 8 06:00:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b7039c net-mail/mailutils: remove old Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Eray Aslan gentoo.org> net-mail/mailutils/Manifest| 2 - .../mailutils/files/mailutils-3.6-python3.patch| 59 - net-mail/mailutils/mailutils-3.4-r2.ebuild | 133 net-mail/mailutils/mailutils-3.5.ebuild| 131 net-mail/mailutils/mailutils-3.6.ebuild| 135 - 5 files changed, 460 deletions(-) diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index 22a6799b2dc..f0659837136 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.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53 -DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d diff --git a/net-mail/mailutils/files/mailutils-3.6-python3.patch b/net-mail/mailutils/files/mailutils-3.6-python3.patch deleted file mode 100644 index cad46d006a2..000 --- a/net-mail/mailutils/files/mailutils-3.6-python3.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4e66a6a9e5f5696d60f7df875175f2e0ad8f7376 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -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 (_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, ); - 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, ); -- 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, ); -- 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/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild deleted file mode 100644 index 00f17a8e434..000 --- a/net-mail/mailutils/mailutils-3.4-r2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: 122460d2688bed562f0806ad34c192d5ac231a84 Author: Eray Aslan gentoo org> AuthorDate: Thu Feb 7 13:13:38 2019 + Commit: Eray Aslan gentoo org> CommitDate: Thu Feb 7 13:13:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122460d2 net-mail/mailutils: bump to 3.5 and add missing header file Closes: https://bugs.gentoo.org/669946 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Eray Aslan gentoo.org> net-mail/mailutils/Manifest| 1 + .../files/mailutils-3.5-add-include.patch | 10 ++ net-mail/mailutils/mailutils-3.5.ebuild| 131 + 3 files changed, 142 insertions(+) diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index bb4ed6648ba..fa03c7764a6 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -1,2 +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 diff --git a/net-mail/mailutils/files/mailutils-3.5-add-include.patch b/net-mail/mailutils/files/mailutils-3.5-add-include.patch new file mode 100644 index 000..307840b5025 --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.5-add-include.patch @@ -0,0 +1,10 @@ +--- a/frm/frm.h2018-02-10 09:06:00.0 +0300 b/frm/frm.h2019-02-07 09:40:57.541489264 +0300 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_TERMIOS_H + # include diff --git a/net-mail/mailutils/mailutils-3.5.ebuild b/net-mail/mailutils/mailutils-3.5.ebuild new file mode 100644 index 000..f09fc7f30b0 --- /dev/null +++ b/net-mail/mailutils/mailutils-3.5.ebuild @@ -0,0 +1,131 @@ +# 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? ( 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() { + 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) \ +
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: f99b2a0dc1644fd2983a787ff7d0354b09946f7e Author: Eray Aslan gentoo org> AuthorDate: Fri Jun 22 12:20:34 2018 + Commit: Eray Aslan gentoo org> CommitDate: Fri Jun 22 12:21:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99b2a0d net-mail/mailutils: fix endiannes problem Closes: https://bugs.gentoo.org/654992 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/mailutils-3.4-fix-endianness.patch | 122 +++ net-mail/mailutils/mailutils-3.4-r2.ebuild | 133 + 2 files changed, 255 insertions(+) diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch new file mode 100644 index 000..0e52fae20c1 --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch @@ -0,0 +1,122 @@ +From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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 + #include + +-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 (, 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 (, 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 (_in.sin_addr.s_addr, cidr->address, 4); + break; + + #ifdef MAILUTILS_IPV6 +-- +cgit v1.0-41-gc330 + diff --git a/net-mail/mailutils/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild new file mode 100644 index 000..29af9bd8f3a --- /dev/null +++ b/net-mail/mailutils/mailutils-3.4-r2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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 +
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: b7a3f08c381724ea2c16a1ed76c11063d8f2259c Author: Eray Aslan gentoo org> AuthorDate: Tue Jun 19 15:56:16 2018 + Commit: Eray Aslan gentoo org> CommitDate: Tue Jun 19 15:56:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a3f08c net-mail/mailutils: fix guile dependency. and fix mh format test failure Bug: https://bugs.gentoo.org/648754 Closes: https://bugs.gentoo.org/640644 Closes: https://bugs.gentoo.org/644804 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/mailutils-3.4-MH-testsuite.patch | 70 +++ net-mail/mailutils/mailutils-3.4-r1.ebuild | 133 + 2 files changed, 203 insertions(+) diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch new file mode 100644 index 000..919b6619e5f --- /dev/null +++ b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch @@ -0,0 +1,70 @@ +From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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/mailutils-3.4-r1.ebuild b/net-mail/mailutils/mailutils-3.4-r1.ebuild new file mode 100644 index 000..c52787aad2c --- /dev/null +++ b/net-mail/mailutils/mailutils-3.4-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~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" +
[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
commit: 262d9d7e58d664c50b12bf84e9dbc97cc9cb4539 Author: Eray Aslan gentoo org> AuthorDate: Thu Dec 24 07:38:12 2015 + Commit: Eray Aslan gentoo org> CommitDate: Thu Dec 24 07:38:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=262d9d7e Fix building with -tcpd USE flag (#569066) Package-Manager: portage-2.2.26 .../mailutils/files/mailutils-tcp_wrappers.patch | 22 ++ net-mail/mailutils/mailutils-2.99.99.ebuild| 7 +-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/net-mail/mailutils/files/mailutils-tcp_wrappers.patch b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch new file mode 100644 index 000..81517ca --- /dev/null +++ b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch @@ -0,0 +1,22 @@ +--- a/maidag/maidag.c 2015-07-02 22:45:39.0 +0300 b/maidag/maidag.c 2015-12-22 11:55:17.0 +0200 +@@ -518,7 +518,9 @@ + + mu_gocs_register ("sieve", mu_sieve_module_init); + ++#ifdef WITH_LIBWRAP + mu_tcpwrapper_cfg_init (); ++#endif + mu_acl_cfg_init (); + mu_m_server_cfg_init (NULL); + maidag_cfg_init (); +@@ -531,7 +533,9 @@ + + mu_m_server_create (, program_version); + mu_m_server_set_conn (server, lmtp_connection); ++#ifdef WITH_LIBWRAP + mu_m_server_set_prefork (server, mu_tcp_wrapper_prefork); ++#endif + mu_m_server_set_mode (server, MODE_INTERACTIVE); + mu_m_server_set_max_children (server, 20); + mu_m_server_set_timeout (server, 600); diff --git a/net-mail/mailutils/mailutils-2.99.99.ebuild b/net-mail/mailutils/mailutils-2.99.99.ebuild index 16a9fec..aac4a57 100644 --- a/net-mail/mailutils/mailutils-2.99.99.ebuild +++ b/net-mail/mailutils/mailutils-2.99.99.ebuild @@ -48,7 +48,8 @@ RDEPEND="!mail-client/nmh DEPEND="${RDEPEND} virtual/pkgconfig" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + servers? ( tcpd )" pkg_setup() { use python && python-single-r1_pkg_setup @@ -58,10 +59,11 @@ src_prepare() { # Disable bytecompilation of Python modules. echo "#!/bin/sh" > build-aux/py-compile epatch "${FILESDIR}/${PN}-2.99.98-readline-6.3.patch" #503954 + epatch "${FILESDIR}/${PN}-tcp_wrappers.patch" if use mysql; then sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \ sql/Makefile.am || die - eautoreconf + eautoreconf fi } @@ -90,6 +92,7 @@ src_configure() { $(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 \