From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8A6B41393F1 for ; Tue, 15 Sep 2015 15:19:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C906CE0872; Tue, 15 Sep 2015 15:19:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51C56E0872 for ; Tue, 15 Sep 2015 15:19:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8C02340A1E for ; Tue, 15 Sep 2015 15:19:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D336A18D for ; Tue, 15 Sep 2015 15:19:24 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1442330303.948a8a4aa89c00dd9f8dac44172d9b05284678c8.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/pypolicyd-spf/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild X-VCS-Directories: mail-filter/pypolicyd-spf/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 948a8a4aa89c00dd9f8dac44172d9b05284678c8 X-VCS-Branch: master Date: Tue, 15 Sep 2015 15:19:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb142960-ab90-4424-9b09-292470330869 X-Archives-Hash: 7bce681684202e0bece9aeee0755c228 commit: 948a8a4aa89c00dd9f8dac44172d9b05284678c8 Author: Michael Orlitzky gentoo org> AuthorDate: Tue Sep 15 15:18:04 2015 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Sep 15 15:18:23 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948a8a4a mail-filter/pypolicyd-spf: remove python2 support to avoid ipaddress conflict. Current versions of pypolicyd-spf support both python2 and python3. With python2, the dev-python/ipaddr library provides support for IP address parsing. And with python3 (>= 3.3), the built-in ipaddress module is used. In fact, this determination is made based on the presence (or absence) of the ipaddress module. So far this has been fine. But recently, dev-python/ipaddress was introduced to backport the python3 ipaddress module to python2. Now, when dev-python/ipaddress is detected, pypolicyd-spf (incorrectly) assumes the python3 implementation. This is bug #559364 by Robert Trace. Upstream will be python3-only in the next release. They have suggested that we drop support for python2, and that's what this revision does. Since this can cause mail to be rejected or delayed, the new revision replaces the original. Bug: 559364 Package-Manager: portage-2.2.20.1 ...-1.3.2.ebuild => pypolicyd-spf-1.3.2-r1.ebuild} | 27 +++++++--------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild similarity index 53% rename from mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild rename to mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild index 0800461..cf6af6a 100644 --- a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild +++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild @@ -4,16 +4,13 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -# With >=python-3.3, the built-in ipaddress module handles the parsing -# of IP addresses. If python is built without ipv6 support, then -# ipaddress can't parse ipv6 addresses, and the daemon will crash if it -# sees an ipv6 SPF record. In other words, it's completely broken. -# -# Ideally this would remain optional for python-2.x, but until there's -# an easy way to do that, "maybe annoying" seems a better option than -# "maybe broken." +# See bug #559364 before getting clever with this. +PYTHON_COMPAT=( python{3_3,3_4} ) + +# The built-in ipaddress module handles the parsing of IP addresses. If +# python is built without ipv6 support, then ipaddress can't parse ipv6 +# addresses, and the daemon will crash if it sees an ipv6 SPF record. In +# other words, it's completely broken. PYTHON_REQ_USE="ipv6" inherit distutils-r1 @@ -27,15 +24,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -# ipaddr is only needed with