* [gentoo-commits] repo/gentoo:master commit in: net-mail/offlineimap/, net-mail/offlineimap/files/
@ 2016-07-31 16:35 Jason Zaman
0 siblings, 0 replies; 3+ messages in thread
From: Jason Zaman @ 2016-07-31 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 8dca56705fd45cc4b58533a9879ad1a3ce0706f2
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 16:32:53 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 16:34:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dca5670
net-mail/offlineimap: bump to 7.0.3 and EAPI6
Package-Manager: portage-2.2.28
net-mail/offlineimap/Manifest | 1 +
...ConfigHelperMixin-must-be-new-style-class.patch | 25 +++++++++
.../files/offlineimap-7.0.3-darwin10.patch | 12 +++++
net-mail/offlineimap/offlineimap-7.0.3.ebuild | 59 ++++++++++++++++++++++
4 files changed, 97 insertions(+)
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index 219d09b..2bddcb4 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,3 +1,4 @@
DIST offlineimap-6.5.5.tar.gz 175338 SHA256 9724245dbd7822a6b1eca340101d8eb785394e8d949b08932d887c41c5ab411d SHA512 d7571acfc1cb6cc60e263f7aa5ce0fec454f3f0a9f7ffe4c6c4fdc43316f938a25ca5229bd58828eac17498248be6a90777c46cbac2c39d3f7b829f7605274ef WHIRLPOOL f024a59d05e1ec91f5a7c2f4fdd6bf52d047982c4d0097120ee290e5f44116145348301cbcaa27b7833c914cc082f156d55155f009634568da54a247df6edd70
DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
DIST offlineimap-6.5.7.tar.gz 666620 SHA256 b7de52c7d8995e0657bb55da13531c8d6f96d828217159477c685ae408e390a3 SHA512 eb2d7c627b1a5563cb685549eeaaef2cd164e69ab5c541ee64b2d081dfe5493cd51de449e6283447e8132503545f7f37cb6bf7e6764b626f243e502cf77bda4f WHIRLPOOL dbedde3030f1483dda00ee56d2a735c6d131f65dcafac37f476b136de86dbd0d76d87b8701c99e642f050a181f6bb657be9bbae44e2f289137e785759136395f
+DIST offlineimap-7.0.3.tar.gz 688967 SHA256 db002ba68ac5ce9336487741d9828e33dd435ee33dc5009ae91c3586d1b4507e SHA512 5ebb0411810b617f7b878df147d10bedf1a9d928645f8080f6d81683f621f503bda3ecc50dbaa86fe0d8b500e355236eebced3833313abb694b0593e626be330 WHIRLPOOL 3e4b3b42f732771e5b1d680dac12a49e2dac2c0e45174e3b40fef961f8917280d76612a048121a7f379edb014f553966f6b40df362a65a93dcf2f752666b8ca3
diff --git a/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch b/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
new file mode 100644
index 0000000..38f3c3b
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
@@ -0,0 +1,25 @@
+From b19eaebad1e9ae58ed8db028b65c5391cab1271a Mon Sep 17 00:00:00 2001
+From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
+Date: Sat, 30 Jul 2016 04:23:25 +0200
+Subject: [PATCH] ConfigHelperMixin must be new-style class to not break
+ inheritance
+
+Github-fix: https://github.com/OfflineIMAP/offlineimap/issues/363
+Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
+---
+ offlineimap/CustomConfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/offlineimap/CustomConfig.py b/offlineimap/CustomConfig.py
+index b528e70..7dce4a6 100644
+--- a/offlineimap/CustomConfig.py
++++ b/offlineimap/CustomConfig.py
+@@ -165,7 +165,7 @@ def CustomConfigDefault():
+
+
+
+-class ConfigHelperMixin:
++class ConfigHelperMixin(object):
+ """Allow comfortable retrieving of config values pertaining
+ to a section.
+
diff --git a/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch b/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch
new file mode 100644
index 0000000..9ac221c
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch
@@ -0,0 +1,12 @@
+see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+
+--- a/offlineimap.py 2016-07-31 23:58:39.131404136 +0800
++++ b/offlineimap.py 2016-07-31 23:58:57.987466173 +0800
+@@ -20,6 +20,7 @@
+ import os
+ import sys
+
++from locale import *
+ from offlineimap import OfflineImap
+
+ oi = OfflineImap()
diff --git a/net-mail/offlineimap/offlineimap-7.0.3.ebuild b/net-mail/offlineimap/offlineimap-7.0.3.ebuild
new file mode 100644
index 0000000..f69cfee
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+
+RDEPEND="dev-python/six"
+DEPEND="doc? ( app-text/asciidoc )"
+
+# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+PATCHES=(
+ "${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+ "${FILESDIR}/${PN}-7.0.3-ConfigHelperMixin-must-be-new-style-class.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() {
+ echo
+ 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."
+ echo
+
+ if use sqlite ; then
+ elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+ elog "the sqlite backend you need to enable it in your .offlineimaprc"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/offlineimap/, net-mail/offlineimap/files/
@ 2016-09-02 20:51 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2016-09-02 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 8c3dc2081027b90f6f0c9845b630b24c77008b8f
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 20:50:03 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 20:51:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3dc208
net-mail/offlineimap: remove old
net-mail/offlineimap/Manifest | 4 --
...ConfigHelperMixin-must-be-new-style-class.patch | 25 ----------
net-mail/offlineimap/offlineimap-6.5.7.ebuild | 58 ----------------------
net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild | 54 --------------------
net-mail/offlineimap/offlineimap-7.0.4.ebuild | 53 --------------------
net-mail/offlineimap/offlineimap-7.0.5.ebuild | 53 --------------------
6 files changed, 247 deletions(-)
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index e95bec4..a337889 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,7 +1,3 @@
DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
-DIST offlineimap-6.5.7.tar.gz 666620 SHA256 b7de52c7d8995e0657bb55da13531c8d6f96d828217159477c685ae408e390a3 SHA512 eb2d7c627b1a5563cb685549eeaaef2cd164e69ab5c541ee64b2d081dfe5493cd51de449e6283447e8132503545f7f37cb6bf7e6764b626f243e502cf77bda4f WHIRLPOOL dbedde3030f1483dda00ee56d2a735c6d131f65dcafac37f476b136de86dbd0d76d87b8701c99e642f050a181f6bb657be9bbae44e2f289137e785759136395f
DIST offlineimap-6.7.0.3.tar.gz 679221 SHA256 0b7cd43501d1a65fb5e7e4f3a5d0a61f61435ec6b3a7385cc146e924eb6b03ed SHA512 21800eb14e814fa04b983e9718a5780deda4c99ae55ef900ccec9f1e65f9bb783c3469e00e6595c7dfddb60d760a6b3c98ae979da3219de51c8ae107ff1c077a WHIRLPOOL d8983260f309f427abcab65bc539bf8ff7ab38168643a863cc3d7e10a85dc864e4a6a11511a1cba32d2eb74833714f9b3f499b7d14d28800174c58816d59608c
-DIST offlineimap-7.0.3.tar.gz 688967 SHA256 db002ba68ac5ce9336487741d9828e33dd435ee33dc5009ae91c3586d1b4507e SHA512 5ebb0411810b617f7b878df147d10bedf1a9d928645f8080f6d81683f621f503bda3ecc50dbaa86fe0d8b500e355236eebced3833313abb694b0593e626be330 WHIRLPOOL 3e4b3b42f732771e5b1d680dac12a49e2dac2c0e45174e3b40fef961f8917280d76612a048121a7f379edb014f553966f6b40df362a65a93dcf2f752666b8ca3
-DIST offlineimap-7.0.4.tar.gz 689027 SHA256 3f848027a5b9865061f9ff56bc8a0ee6d7370f53fe5bb5a76e3e9220fea63ebc SHA512 29b22d5cf8deea937c6eb461b9a7e8211792e761374407ae6a17eb53a6a9a0f8ce6e43b84b90470802112389b50018cd6ee8ca85f7e0b3744720707e35a9119b WHIRLPOOL 3aa9a4e401e6851d806bff9a8a95f5bd37ce1ab16ccb5b9baa0ec2eefdb559489203927b5e3de6ad010b54c3ab6785662c979287cd706f7f05ec989ab6c8eaaf
-DIST offlineimap-7.0.5.tar.gz 689611 SHA256 76668c032d3e1c845addaf99b7f4dc61bbb2e06038a85322347d46d2233e9517 SHA512 f489468266455346f9bce30796b4fb270a61caf66dada22b21e5408b9207e41ae437e271a808662fe0105e30d670273c5f102b51c2b5b497665dc0ab3601e386 WHIRLPOOL e0bf449497810ed6035d5f3ad5d32db7f7d18f71d95af242895007d41bf2670ed85941bbd97357302039f5df2459e005806d3bff798f24ab61f75668416f2901
DIST offlineimap-7.0.6.tar.gz 690372 SHA256 f50002d0760794f1190526b74e2010becc16d2ff541526aadc95ec11cb064fd7 SHA512 9a1ff0abecb8d0b6cbedf4c7fad9f40de403ac789bb8bcfdea1dcacc1c36769643348ffe095d5e0b044f9ea17378512856a285c079c1713074432cc9f8ffeb27 WHIRLPOOL 596981227579162da62029c0a9ed4cda49ee35e8bc1ab6d1773f9933808c9909ef92c462e1f83f28deee2926dbc5641b417040281180921fe196fea53fd60c3b
diff --git a/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch b/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
deleted file mode 100644
index 38f3c3b..00000000
--- a/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b19eaebad1e9ae58ed8db028b65c5391cab1271a Mon Sep 17 00:00:00 2001
-From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
-Date: Sat, 30 Jul 2016 04:23:25 +0200
-Subject: [PATCH] ConfigHelperMixin must be new-style class to not break
- inheritance
-
-Github-fix: https://github.com/OfflineIMAP/offlineimap/issues/363
-Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
----
- offlineimap/CustomConfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/offlineimap/CustomConfig.py b/offlineimap/CustomConfig.py
-index b528e70..7dce4a6 100644
---- a/offlineimap/CustomConfig.py
-+++ b/offlineimap/CustomConfig.py
-@@ -165,7 +165,7 @@ def CustomConfigDefault():
-
-
-
--class ConfigHelperMixin:
-+class ConfigHelperMixin(object):
- """Allow comfortable retrieving of config values pertaining
- to a section.
-
diff --git a/net-mail/offlineimap/offlineimap-6.5.7.ebuild b/net-mail/offlineimap/offlineimap-6.5.7.ebuild
deleted file mode 100644
index d7bd886..00000000
--- a/net-mail/offlineimap/offlineimap-6.5.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite?,ssl?"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-
-DEPEND="doc? ( app-text/asciidoc )"
-
-src_prepare() {
- distutils-r1_src_prepare
- # see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
- epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.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() {
- echo
- 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."
- echo
-
- if use sqlite ; then
- elog "The sqlite USE flag only enables a dependency on sqlite. To use"
- elog "the sqlite backend you need to enable it in your .offlineimaprc"
- fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild b/net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild
deleted file mode 100644
index ed8d234..00000000
--- a/net-mail/offlineimap/offlineimap-7.0.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.3-darwin10.patch"
- "${FILESDIR}/${PN}-7.0.3-ConfigHelperMixin-must-be-new-style-class.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
-}
diff --git a/net-mail/offlineimap/offlineimap-7.0.4.ebuild b/net-mail/offlineimap/offlineimap-7.0.4.ebuild
deleted file mode 100644
index 2915dc7..00000000
--- a/net-mail/offlineimap/offlineimap-7.0.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.3-darwin10.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
-}
diff --git a/net-mail/offlineimap/offlineimap-7.0.5.ebuild b/net-mail/offlineimap/offlineimap-7.0.5.ebuild
deleted file mode 100644
index 2915dc7..00000000
--- a/net-mail/offlineimap/offlineimap-7.0.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.3-darwin10.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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/offlineimap/, net-mail/offlineimap/files/
@ 2020-05-06 11:51 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-05-06 11:51 UTC (permalink / raw
To: gentoo-commits
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 <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 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>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-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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-06 11:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-06 11:51 [gentoo-commits] repo/gentoo:master commit in: net-mail/offlineimap/, net-mail/offlineimap/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2016-09-02 20:51 Tim Harder
2016-07-31 16:35 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox