commit: 1cb4768febc09ec7e6b17a2b95853242f45042d7 Author: Matt Smith <matt <AT> offtopica <DOT> uk> AuthorDate: Fri May 1 17:38:13 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed May 6 11:51:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb4768f
net-mail/offlineimap: Bump to 7.3.3 Bump net-mail/offlineimap to 7.3.3 and add myself as a proxy maintainer. Signed-off-by: Matt Smith <matt <AT> offtopica.uk> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-mail/offlineimap/Manifest | 1 + .../offlineimap/files/offlineimap-norfc6555.patch | 52 ++++++++++++++++++++ net-mail/offlineimap/metadata.xml | 15 +++++- net-mail/offlineimap/offlineimap-7.3.3.ebuild | 55 ++++++++++++++++++++++ 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest index b3af6e2dd28..6171f7d136d 100644 --- a/net-mail/offlineimap/Manifest +++ b/net-mail/offlineimap/Manifest @@ -1,2 +1,3 @@ DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8 +DIST offlineimap-7.3.3.tar.gz 724141 BLAKE2B 01c382d46cd192fbe4779e84d9551f64c3bcb2765a2255ee337c14996f082914fab400b24e47141d5b3cd9308f374a73d5ab620089884be91c47c18f60b7d100 SHA512 89d09cd9c5c76a75e3d783ab2230f6b10dff25d660fe9f183d1df0c216167f242d57ff17ec91bbbe8c61c0a8c0d8dbd6fca8a129cecd522ff8457ab39ff81c83 diff --git a/net-mail/offlineimap/files/offlineimap-norfc6555.patch b/net-mail/offlineimap/files/offlineimap-norfc6555.patch new file mode 100644 index 00000000000..b3cb1a9317f --- /dev/null +++ b/net-mail/offlineimap/files/offlineimap-norfc6555.patch @@ -0,0 +1,52 @@ +From 24931745105f389b03de2811cb9d62a450f0efe3 Mon Sep 17 00:00:00 2001 +From: Matt Smith <m...@offtopica.uk> +Date: Fri, 1 May 2020 17:54:48 +0100 +Subject: [PATCH] Revert "implement Happy Eyeballs" + +This reverts commit 0d5496ba0a21aa6df5d10391af01d5017fb973bf. +--- + offlineimap/imaplibutil.py | 10 +--------- + requirements.txt | 1 - + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py +index 86b1cb9..6ebe8d8 100644 +--- a/offlineimap/imaplibutil.py ++++ b/offlineimap/imaplibutil.py +@@ -19,7 +19,6 @@ import fcntl + import time + import subprocess + import threading +-import rfc6555 + import socket + import errno + import zlib +@@ -79,15 +78,8 @@ class UsefulIMAPMixIn(object): + def open_socket(self): + """open_socket() + Open socket choosing first address family available.""" +- if self.af == socket.AF_UNSPEC: +- # happy-eyeballs! +- return rfc6555.create_connection((self.host, self.port)) +- else: +- return self._open_socket_for_af(self.af) +- +- def _open_socket_for_af(self, af): + msg = (-1, 'could not open socket') +- for res in socket.getaddrinfo(self.host, self.port, af, socket.SOCK_STREAM): ++ for res in socket.getaddrinfo(self.host, self.port, self.af, socket.SOCK_STREAM): + af, socktype, proto, canonname, sa = res + try: + # use socket of our own, possiblly socksified socket. +diff --git a/requirements.txt b/requirements.txt +index 1e2a2ae..3b1819e 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -2,4 +2,3 @@ + six + gssapi[kerberos] + portalocker[cygwin] +-rfc6555 +-- +2.26.2 + diff --git a/net-mail/offlineimap/metadata.xml b/net-mail/offlineimap/metadata.xml index 07cfd8325af..8fdbbe75163 100644 --- a/net-mail/offlineimap/metadata.xml +++ b/net-mail/offlineimap/metadata.xml @@ -1,9 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>m...@offtopica.uk</email> + <name>Matt Smith</name> + </maintainer> + <maintainer type="project"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + OfflineIMAP is software that downloads your email mailbox(es) as local Maildirs. + OfflineIMAP will synchronize both sides via IMAP. + </longdescription> <use> - <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag> + <flag name="sqlite">Enable runtime support for sqlite mail status backend.</flag> </use> <upstream> <remote-id type="github">OfflineIMAP/offlineimap</remote-id> diff --git a/net-mail/offlineimap/offlineimap-7.3.3.ebuild b/net-mail/offlineimap/offlineimap-7.3.3.ebuild new file mode 100644 index 00000000000..fb8580cca93 --- /dev/null +++ b/net-mail/offlineimap/offlineimap-7.3.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_STEUPTOOLS=no +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads,sqlite,ssl?" + +inherit distutils-r1 + +DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support" +HOMEPAGE="https://www.offlineimap.org/ https://github.com/offlineimap/offlineimap"; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ssl" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/six[${PYTHON_USEDEP}] + ')" +DEPEND="doc? ( app-text/asciidoc )" + +PATCHES=( + "${FILESDIR}/${PN}-7.0.3-darwin10.patch" + "${FILESDIR}/${PN}-norfc6555.patch" +) + +src_compile() { + distutils-r1_src_compile + use doc && emake -C docs man +} + +src_install() { + distutils-r1_src_install + dodoc offlineimap.conf offlineimap.conf.minimal + use doc && doman docs/{offlineimap.1,offlineimapui.7} +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "You will need to configure offlineimap by creating ~/.offlineimaprc" + elog "Sample configurations are in /usr/share/doc/${PF}/" + elog "" + elog "If you connect via ssl/tls and don't use CA cert checking, it will" + elog "display the server's cert fingerprint and require you to add it to the" + elog "configuration file to be sure it connects to the same server every" + elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't" + elog "check SSL server certificate) in cases where you have no CA cert." + fi +}
