gentoo resync : 14.05.2020

6 files changed, 129 insertions, 8 deletions

diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index c6b5c9c42dc1..a3ba2f034b2c 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,7 +1,10 @@
 AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c363a7142bb8abbb25c13b8cfe2b7e652c366aa2002b9e9995d6cc2e197a34315556e5db4586012ccd24fdf6d3faa1352956 SHA512 2183ae09cb9ed489ea447180f7b50e9e023a4630f8612b829e84499257590e9bb99ac0aa65cb45073c4a1ed5d537151df451b35aeaa45b5a1eb9e063246e5a02
 AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aafc69a94f7e744722856da04448e68972c9942f8b6a8e4eba84c7fe714be6cc3b7de25424984f21b96df24e22d2eff333ff SHA512 b195392db8e39264891b91c855cc0b1cfeb76e7b0a22281e509c17d4ae07458e980f7810c223f2a835f01f4ba63c1f9592c934121e763bb01846f20c51013186
+AUX offlineimap-norfc6555.patch 1690 BLAKE2B 6eb0b7a4d65a07793c049cadaa64093e17eccef2a5553c3cd415da05c4d7f830e3936058f73cbea06325c1789faf2764289fec29a8939c391423bbbb04624267 SHA512 c99a36cee97a185f20d265235ad24d48db914925b0564105cf4f69e77eed2d40ad5474646a8f2356284b8e212675a56b8d29a51deafe6543ac892ff8c0c8ce22
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
-EBUILD offlineimap-6.5.6.ebuild 2346 BLAKE2B f4cea6677350da94c785a4abcb4b52f0b4bc7acdb041a216a0775dea8bd0680f2b56ead87ebc99163b01a8fd27e6fd46f5043035904f2e5a575b554660e07b6d SHA512 4fef94705b37cc7f84d824a34baeaaaba1497f94f6f8f8bcb838c62aa0077a1f4fdd7d5e059d795b089b9603a0ee77befa8d90f2b604fe44436a0d910a751e7f
-EBUILD offlineimap-7.2.4-r1.ebuild 1681 BLAKE2B d5ceadd15b6c5c84b029d3886865d19a5a08ae26160bf7fbd51d685146407b9914ed9e394d5a69d14fe50e8488856721b2bb950b734294e3a5608a44b9c1a245 SHA512 e8956adf8a94eaa90251b060398d78a0b55cfb88b9cf2356fe2d951b912de2b2b08169a67dbb6d8d8587d35ff86a7269ef49afe14443c0fc9a1195aef6e78e36
-MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
+DIST offlineimap-7.3.3.tar.gz 724141 BLAKE2B 01c382d46cd192fbe4779e84d9551f64c3bcb2765a2255ee337c14996f082914fab400b24e47141d5b3cd9308f374a73d5ab620089884be91c47c18f60b7d100 SHA512 89d09cd9c5c76a75e3d783ab2230f6b10dff25d660fe9f183d1df0c216167f242d57ff17ec91bbbe8c61c0a8c0d8dbd6fca8a129cecd522ff8457ab39ff81c83
+EBUILD offlineimap-6.5.6.ebuild 2347 BLAKE2B 5a0535c1cad8263f0fb22d317d23f5d67cc606314ba322e1922f73780d99f8a5dad8a5c8e2aba344abaf66ceeccb2a7256a8a01faa81586320423356b2255094 SHA512 0cb35c6bff320230aa10d8aa4c423b62a543d72a29e7bacd3bb3e4c0de55c8b535ee5047160ecc283370e54823e304648ce5c1ec3728609870c8edb857aa71a1
+EBUILD offlineimap-7.2.4-r1.ebuild 1682 BLAKE2B 6eb51c25cd1daf10a1f82150f3da06b8bb25a0a7d83eda15d642f45ea1888d1e585bc8cfba4a1bd3fad1b81eab987f90fa38b67aae47bbcaf72aeac4887d2189 SHA512 35838a018fb842a3e7a538c911f55e6a8cea748fc6f8ebe360cb0bc0aa6bc5d74e374deb1de69e51e2356b71011a3d0916123e342859e4bea3a2216a3b151c4f
+EBUILD offlineimap-7.3.3.ebuild 1656 BLAKE2B 496ade37ab2db56d76a8d6eb0fe51ac728ee23c4bd65d39d17cd710929fa3a12407e9253242cd7a27bb7236ddfcc3ce1e8ae5f700a80714aaee1924e8e9f5e18 SHA512 f602b93b3ced382b26dd7780edcbf6220241c9e426f49ac44b1af94916fa63c5bd1456652a51cf98fc9c2331f4d497418e459a0c555d56750e498edfbdd721d3
+MISC metadata.xml 757 BLAKE2B 4e7b25ebb3d378a521d10b7686e06dfe923c3358171ba5b27d620656de255d56d8e9e7e68a4eafc94882d2cec90adc67e2b321e150221a0e6b7f9a01d9df7175 SHA512 bee9128d083adea102eb1345f1df791abbc911ba3fadee32108830c50b3b173fc15fb2d305790d6d3d1a35913f7479cbb39d5a430d0702e07610cbb16356305e
diff --git a/net-mail/offlineimap/files/offlineimap-norfc6555.patch b/net-mail/offlineimap/files/offlineimap-norfc6555.patch
new file mode 100644
index 000000000000..b3cb1a9317f7
--- /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 <matt@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 07cfd8325afd..8fdbbe751637 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>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@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-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
index 960a6e04aad2..7f098d1c0ca6 100644
--- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="https://www.offlineimap.org/"
 SRC_URI="https://github.com/OfflineIMAP/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl sqlite"
diff --git a/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
index 505ce0297519..c5f9a5db2760 100644
--- a/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="https://www.offlineimap.org/"
 SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
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 000000000000..54c9f79d35ad
--- /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_SETUPTOOLS=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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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
+}