From 62d6511bc6b5172379965a6098167dcfb0edae1c Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 6 Dec 2022 13:13:50 +0000 Subject: [PATCH] update/switch py-authres, py-policyd-spf, py-authres to python 3 --- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 5 ++- mail/Makefile | 6 +-- mail/py-authres/Makefile | 13 +++---- mail/py-authres/distinfo | 4 +- mail/py-authres/pkg/PLIST | 39 ++++++++++++++----- mail/py-policyd-spf/Makefile | 21 +++++----- mail/py-policyd-spf/distinfo | 4 +- mail/py-policyd-spf/patches/patch-policyd-spf | 15 ------- .../patches/patch-policyd-spf_1 | 9 +++-- mail/py-policyd-spf/patches/patch-setup_py | 7 ++-- mail/py-policyd-spf/pkg/PLIST | 25 ++++++++---- mail/py-spf/Makefile | 22 +++++------ mail/py-spf/distinfo | 4 +- mail/py-spf/pkg/PLIST | 12 +++++- 15 files changed, 104 insertions(+), 84 deletions(-) delete mode 100644 mail/py-policyd-spf/patches/patch-policyd-spf diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index eddfc674948..239e0fa044d 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.84 +PKGNAME = quirks-6.85 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index f0685216dde..27ff33ac94a 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1479 2022/12/05 12:00:36 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1480 2022/12/06 13:13:50 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -757,6 +757,9 @@ my $stem_extensions = { 'py-miasm' => 'py3-miasm', 'py-cssselect' => 'py3-cssselect', 'py-cparser' => 'py3-cparser', + 'py-authres' => 'py3-authres', + 'py-policyd-spf' => 'py3-policyd-spf', + 'py-spf' => 'py3-spf', }; my $obsolete_reason = {}; diff --git a/mail/Makefile b/mail/Makefile index 2b8bc08f34c..0e008a9c68f 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -189,10 +189,10 @@ SUBDIR += postfwd SUBDIR += postgrey SUBDIR += procmail - SUBDIR += py-authres + SUBDIR += py-authres,python3 SUBDIR += py-imaplib2,python3 - SUBDIR += py-policyd-spf - SUBDIR += py-spf + SUBDIR += py-policyd-spf,python3 + SUBDIR += py-spf,python3 SUBDIR += pyzor SUBDIR += razor-agents SUBDIR += rcube-contextmenu diff --git a/mail/py-authres/Makefile b/mail/py-authres/Makefile index 7eb6adc0e73..641af895b6f 100644 --- a/mail/py-authres/Makefile +++ b/mail/py-authres/Makefile @@ -1,6 +1,6 @@ COMMENT = module for RFC 5451 Authentication-Results Headers -MODPY_EGG_VERSION = 0.800 +MODPY_EGG_VERSION = 1.2.0 DISTNAME = authres-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = mail @@ -10,15 +10,12 @@ HOMEPAGE = https://launchpad.net/authentication-results-python # Apache 2.0 PERMIT_PACKAGE = Yes -MODPY_PI = Yes - MODULES = lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} - +MODPY_PI = Yes +MODPY_PYBUILD = setuptools NO_TEST = Yes -post-install: - ${INSTALL_DATA} ${WRKSRC}/authres/tests \ - ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/authres/tests +FLAVOR = python3 +FLAVORS = python3 .include diff --git a/mail/py-authres/distinfo b/mail/py-authres/distinfo index 9c15e369e86..4a42e2abcd2 100644 --- a/mail/py-authres/distinfo +++ b/mail/py-authres/distinfo @@ -1,2 +1,2 @@ -SHA256 (authres-0.800.tar.gz) = 0o45dqfUGJF8u/OEAYqg6KBInkG/2YRzCcX477Gfbv0= -SIZE (authres-0.800.tar.gz) = 19863 +SHA256 (authres-1.2.0.tar.gz) = k9G5la184h5i22SfNhBIEl3WAiVjoK6KI5CUZfH9Jbc= +SIZE (authres-1.2.0.tar.gz) = 23226 diff --git a/mail/py-authres/pkg/PLIST b/mail/py-authres/pkg/PLIST index 67e4d9bc56e..1adc705ffe0 100644 --- a/mail/py-authres/pkg/PLIST +++ b/mail/py-authres/pkg/PLIST @@ -1,21 +1,40 @@ +@pkgpath mail/py-authres lib/python${MODPY_VERSION}/site-packages/authres/ -lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/authres/__init__.py -lib/python${MODPY_VERSION}/site-packages/authres/__init__.pyc lib/python${MODPY_VERSION}/site-packages/authres/__main__.py -lib/python${MODPY_VERSION}/site-packages/authres/__main__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}arc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}arc.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_adsp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_adsp.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_b.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_b.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dmarc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dmarc.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}rrvs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}rrvs.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}smime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}smime.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}vbr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}vbr.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/authres/arc.py lib/python${MODPY_VERSION}/site-packages/authres/core.py -lib/python${MODPY_VERSION}/site-packages/authres/core.pyc lib/python${MODPY_VERSION}/site-packages/authres/dkim_adsp.py -lib/python${MODPY_VERSION}/site-packages/authres/dkim_adsp.pyc lib/python${MODPY_VERSION}/site-packages/authres/dkim_b.py -lib/python${MODPY_VERSION}/site-packages/authres/dkim_b.pyc lib/python${MODPY_VERSION}/site-packages/authres/dmarc.py -lib/python${MODPY_VERSION}/site-packages/authres/dmarc.pyc lib/python${MODPY_VERSION}/site-packages/authres/rrvs.py -lib/python${MODPY_VERSION}/site-packages/authres/rrvs.pyc lib/python${MODPY_VERSION}/site-packages/authres/smime.py -lib/python${MODPY_VERSION}/site-packages/authres/smime.pyc lib/python${MODPY_VERSION}/site-packages/authres/tests lib/python${MODPY_VERSION}/site-packages/authres/vbr.py -lib/python${MODPY_VERSION}/site-packages/authres/vbr.pyc diff --git a/mail/py-policyd-spf/Makefile b/mail/py-policyd-spf/Makefile index 0bdf9413ee5..bd906d9d501 100644 --- a/mail/py-policyd-spf/Makefile +++ b/mail/py-policyd-spf/Makefile @@ -1,27 +1,24 @@ COMMENT= external SPF policy checker for postfix -VER= 1.3 -P= 2 -REVISION= 1 -MODPY_EGG_VERSION=${VER}.${P} +# superseded by https://launchpad.net/spf-engine +MODPY_EGG_VERSION= 2.0.2 DISTNAME= pypolicyd-spf-${MODPY_EGG_VERSION} PKGNAME= py-policyd-spf-${MODPY_EGG_VERSION} CATEGORIES= mail -HOMEPAGE= http://www.openspf.org +HOMEPAGE= https://launchpad.net/pypolicyd-spf # Apache 2.0 PERMIT_PACKAGE= Yes -MASTER_SITES= http://launchpad.net/pypolicyd-spf/${VER}/${MODPY_EGG_VERSION}/+download/ - MODULES= lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} +MODPY_PI= Yes +MODPY_PYBUILD= setuptools -BUILD_DEPENDS= mail/py-spf -RUN_DEPENDS= mail/py-spf \ - net/py-dns \ - net/py-ipaddr +FLAVORS= python3 +FLAVOR= python3 + +RUN_DEPENDS= mail/py-spf${MODPY_FLAVOR} NO_TEST= Yes diff --git a/mail/py-policyd-spf/distinfo b/mail/py-policyd-spf/distinfo index 286993042fc..394e096beeb 100644 --- a/mail/py-policyd-spf/distinfo +++ b/mail/py-policyd-spf/distinfo @@ -1,2 +1,2 @@ -SHA256 (pypolicyd-spf-1.3.2.tar.gz) = cXTEaibJw1sNZt26ghsCsNwt+dH2vwydpx3NYHlbKWY= -SIZE (pypolicyd-spf-1.3.2.tar.gz) = 32973 +SHA256 (pypolicyd-spf-2.0.2.tar.gz) = 35z4iFg8EAP/jdLwyMHl9G3kZrVt5c5W7tX0J2XwqNo= +SIZE (pypolicyd-spf-2.0.2.tar.gz) = 38546 diff --git a/mail/py-policyd-spf/patches/patch-policyd-spf b/mail/py-policyd-spf/patches/patch-policyd-spf deleted file mode 100644 index 935eef7ee48..00000000000 --- a/mail/py-policyd-spf/patches/patch-policyd-spf +++ /dev/null @@ -1,15 +0,0 @@ -Pretend string to be unicode, -fixes compatibility with python 2.7 - -Index: policyd-spf ---- policyd-spf.orig -+++ policyd-spf -@@ -52,6 +52,8 @@ policydspfsupp._setExceptHook() - ############################################# - def _cidrmatch(ip, netwrk): - """Match connect IP against a CIDR network of other IP addresses.""" -+ netwrk = unicode(netwrk) -+ ip = unicode(ip) - - try: - address = ipaddress.ip_address(ip) diff --git a/mail/py-policyd-spf/patches/patch-policyd-spf_1 b/mail/py-policyd-spf/patches/patch-policyd-spf_1 index d754f4007ac..25482382978 100644 --- a/mail/py-policyd-spf/patches/patch-policyd-spf_1 +++ b/mail/py-policyd-spf/patches/patch-policyd-spf_1 @@ -1,11 +1,12 @@ ---- policyd-spf.1.orig Sun Nov 28 04:58:03 2010 -+++ policyd-spf.1 Wed Aug 24 16:04:09 2011 -@@ -254,7 +254,7 @@ followed by a empty line: +Index: policyd-spf.1 +--- policyd-spf.1.orig ++++ policyd-spf.1 +@@ -256,7 +256,7 @@ followed by a empty line: 1. Add the following to /etc/postfix/master.cf: policyd-spf unix - n n - 0 spawn - user=nobody argv=/usr/bin/policyd-spf + user=nobody argv=${PREFIX}/bin/policyd-spf - NOTE: Check the path to both the installed Python interpreter and + NOTE: Check the path to both the installed Python 3 interpreter and policyd-spf. These vary from system to system. To use non-default diff --git a/mail/py-policyd-spf/patches/patch-setup_py b/mail/py-policyd-spf/patches/patch-setup_py index 1ac34fb1c96..92d9d13ac65 100644 --- a/mail/py-policyd-spf/patches/patch-setup_py +++ b/mail/py-policyd-spf/patches/patch-setup_py @@ -1,6 +1,7 @@ ---- setup.py.orig Sun Jul 22 03:24:58 2012 -+++ setup.py Mon Nov 12 10:53:33 2012 -@@ -13,11 +13,13 @@ setup(name='python-policyd-spf', +Index: setup.py +--- setup.py.orig ++++ setup.py +@@ -13,11 +13,13 @@ setup(name='pypolicyd-spf', py_modules=['policydspfsupp', 'policydspfuser'], keywords = ['Postfix','spf','email'], scripts = ['policyd-spf'], diff --git a/mail/py-policyd-spf/pkg/PLIST b/mail/py-policyd-spf/pkg/PLIST index 6ec7746bf76..3befc6d79db 100644 --- a/mail/py-policyd-spf/pkg/PLIST +++ b/mail/py-policyd-spf/pkg/PLIST @@ -1,16 +1,25 @@ +@conflict py-policyd-spf-* +@pkgpath mail/py-policyd-spf bin/policyd-spf +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfsupp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfsupp.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfuser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfuser.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/policydspfsupp.py -lib/python${MODPY_VERSION}/site-packages/policydspfsupp.pyc lib/python${MODPY_VERSION}/site-packages/policydspfuser.py -lib/python${MODPY_VERSION}/site-packages/policydspfuser.pyc -lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}.dist-info/top_level.txt @man man/man1/policyd-spf.1 @man man/man5/policyd-spf.conf.5 @man man/man5/policyd-spf.peruser.5 +share/doc/py-policyd-spf/ +share/doc/py-policyd-spf/README.per_user_whitelisting +share/examples/py-policyd-spf/ @sample ${SYSCONFDIR}/python-policyd-spf/ -share/doc/${MODPY_PY_PREFIX}policyd-spf/ -share/doc/${MODPY_PY_PREFIX}policyd-spf/README.per_user_whitelisting -share/examples/${MODPY_PY_PREFIX}policyd-spf/ -share/examples/${MODPY_PY_PREFIX}policyd-spf/policyd-spf.conf +share/examples/py-policyd-spf/policyd-spf.conf @sample ${SYSCONFDIR}/python-policyd-spf/policyd-spf.conf -share/examples/${MODPY_PY_PREFIX}policyd-spf/policyd-spf.conf.commented +share/examples/py-policyd-spf/policyd-spf.conf.commented diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile index 34957eba086..9aeb0dc7476 100644 --- a/mail/py-spf/Makefile +++ b/mail/py-spf/Makefile @@ -1,12 +1,11 @@ COMMENT= Sender-Policy-Framework queries in Python -MODPY_EGG_VERSION=2.0.12 +MODPY_EGG_VERSION= 2.0.14 DISTNAME= pyspf-${MODPY_EGG_VERSION} -REVISION= 1 PKGNAME= py-spf-${MODPY_EGG_VERSION} CATEGORIES= mail -HOMEPAGE= http://bmsi.com/python/milter.html +HOMEPAGE= https://github.com/sdgathman/pyspf/ # Python PERMIT_PACKAGE= Yes @@ -14,18 +13,19 @@ PERMIT_PACKAGE= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymilter/} MODULES= lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} +MODPY_PI= Yes +MODPY_PYBUILD= setuptools +MODPY_PYTEST_ARGS= test/testspf.py -BUILD_DEPENDS= net/py-dns +FLAVORS= python3 +FLAVOR= python3 -RUN_DEPENDS= mail/py-authres \ - net/py-dns +RUN_DEPENDS= mail/py-authres${MODPY_FLAVOR} \ + net/py-dnspython${MODPY_FLAVOR} -TEST_DEPENDS=${FULLPKGNAME}:${BUILD_PKGPATH} \ - textproc/py-yaml \ - net/py-ipaddr +TEST_DEPENDS= textproc/py-yaml${MODPY_FLAVOR} do-test: - @cd ${WRKSRC}/test && ${MODPY_BIN} testspf.py + cd ${WRKSRC}/test && PYTHONPATH=.. ${MODPY_BIN} testspf.py .include diff --git a/mail/py-spf/distinfo b/mail/py-spf/distinfo index 6f5770055d3..769b85a4947 100644 --- a/mail/py-spf/distinfo +++ b/mail/py-spf/distinfo @@ -1,2 +1,2 @@ -SHA256 (pyspf-2.0.12.tar.gz) = iqIboOOv+KTorY9YbFAKXR+cTJAsPxG8wQdGWFfNQaI= -SIZE (pyspf-2.0.12.tar.gz) = 67189 +SHA256 (pyspf-2.0.14.tar.gz) = V6fvAb2gkBc6r7avAQYlFobtc/A9tOkR/NNMV/w0cYY= +SIZE (pyspf-2.0.14.tar.gz) = 69446 diff --git a/mail/py-spf/pkg/PLIST b/mail/py-spf/pkg/PLIST index 7773c93b581..a93696f4902 100644 --- a/mail/py-spf/pkg/PLIST +++ b/mail/py-spf/pkg/PLIST @@ -1,5 +1,13 @@ +@conflict py-spf-* +@pkgpath mail/py-spf bin/spfquery.py bin/type99.py -lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}spf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}spf.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/spf.py -lib/python${MODPY_VERSION}/site-packages/spf.pyc