cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update/switch py-authres, py-policyd-spf, py-authres to python 3

Browse Source
This commit is contained in:
sthen 2022-12-06 13:13:50 +00:00
parent eeb6977bff
commit 62d6511bc6
15 changed files with 104 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/quirks/Makefile
View File

@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES = DISTFILES =
# API.rev # API.rev
PKGNAME = quirks-6.84 PKGNAME = quirks-6.85
PKG_ARCH = * PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org> MAINTAINER = Marc Espie <espie@openbsd.org>

5
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl #! /usr/bin/perl
# ex:ts=8 sw=4: # 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 <espie@openbsd.org> # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
# #
@ -757,6 +757,9 @@ my $stem_extensions = {
'py-miasm' => 'py3-miasm', 'py-miasm' => 'py3-miasm',
'py-cssselect' => 'py3-cssselect', 'py-cssselect' => 'py3-cssselect',
'py-cparser' => 'py3-cparser', 'py-cparser' => 'py3-cparser',
'py-authres' => 'py3-authres',
'py-policyd-spf' => 'py3-policyd-spf',
'py-spf' => 'py3-spf',
}; };
my $obsolete_reason = {}; my $obsolete_reason = {};

6
mail/Makefile
View File

@ -189,10 +189,10 @@
SUBDIR += postfwd SUBDIR += postfwd
SUBDIR += postgrey SUBDIR += postgrey
SUBDIR += procmail SUBDIR += procmail
SUBDIR += py-authres SUBDIR += py-authres,python3
SUBDIR += py-imaplib2,python3 SUBDIR += py-imaplib2,python3
SUBDIR += py-policyd-spf SUBDIR += py-policyd-spf,python3
SUBDIR += py-spf SUBDIR += py-spf,python3
SUBDIR += pyzor SUBDIR += pyzor
SUBDIR += razor-agents SUBDIR += razor-agents
SUBDIR += rcube-contextmenu SUBDIR += rcube-contextmenu

13
mail/py-authres/Makefile
View File

@ -1,6 +1,6 @@
COMMENT = module for RFC 5451 Authentication-Results Headers COMMENT = module for RFC 5451 Authentication-Results Headers
MODPY_EGG_VERSION = 0.800 MODPY_EGG_VERSION = 1.2.0
DISTNAME = authres-${MODPY_EGG_VERSION} DISTNAME = authres-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME} PKGNAME = py-${DISTNAME}
CATEGORIES = mail CATEGORIES = mail
@ -10,15 +10,12 @@ HOMEPAGE = https://launchpad.net/authentication-results-python
# Apache 2.0 # Apache 2.0
PERMIT_PACKAGE = Yes PERMIT_PACKAGE = Yes
MODPY_PI = Yes
MODULES = lang/python MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} MODPY_PI = Yes
MODPY_PYBUILD = setuptools
NO_TEST = Yes NO_TEST = Yes
post-install: FLAVOR = python3
${INSTALL_DATA} ${WRKSRC}/authres/tests \ FLAVORS = python3
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/authres/tests
.include <bsd.port.mk> .include <bsd.port.mk>

4
mail/py-authres/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (authres-0.800.tar.gz) = 0o45dqfUGJF8u/OEAYqg6KBInkG/2YRzCcX477Gfbv0= SHA256 (authres-1.2.0.tar.gz) = k9G5la184h5i22SfNhBIEl3WAiVjoK6KI5CUZfH9Jbc=
SIZE (authres-0.800.tar.gz) = 19863 SIZE (authres-1.2.0.tar.gz) = 23226

39
mail/py-authres/pkg/PLIST
View File

@ -1,21 +1,40 @@
@pkgpath mail/py-authres
lib/python${MODPY_VERSION}/site-packages/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__.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__.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.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.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.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.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.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.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/tests
lib/python${MODPY_VERSION}/site-packages/authres/vbr.py lib/python${MODPY_VERSION}/site-packages/authres/vbr.py
lib/python${MODPY_VERSION}/site-packages/authres/vbr.pyc

21
mail/py-policyd-spf/Makefile
View File

@ -1,27 +1,24 @@
COMMENT= external SPF policy checker for postfix COMMENT= external SPF policy checker for postfix
VER= 1.3 # superseded by https://launchpad.net/spf-engine
P= 2 MODPY_EGG_VERSION= 2.0.2
REVISION= 1
MODPY_EGG_VERSION=${VER}.${P}
DISTNAME= pypolicyd-spf-${MODPY_EGG_VERSION} DISTNAME= pypolicyd-spf-${MODPY_EGG_VERSION}
PKGNAME= py-policyd-spf-${MODPY_EGG_VERSION} PKGNAME= py-policyd-spf-${MODPY_EGG_VERSION}
CATEGORIES= mail CATEGORIES= mail
HOMEPAGE= http://www.openspf.org HOMEPAGE= https://launchpad.net/pypolicyd-spf
# Apache 2.0 # Apache 2.0
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
MASTER_SITES= http://launchpad.net/pypolicyd-spf/${VER}/${MODPY_EGG_VERSION}/+download/
MODULES= lang/python MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} MODPY_PI= Yes
MODPY_PYBUILD= setuptools
BUILD_DEPENDS= mail/py-spf FLAVORS= python3
RUN_DEPENDS= mail/py-spf \ FLAVOR= python3
net/py-dns \
net/py-ipaddr RUN_DEPENDS= mail/py-spf${MODPY_FLAVOR}
NO_TEST= Yes NO_TEST= Yes

4
mail/py-policyd-spf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pypolicyd-spf-1.3.2.tar.gz) = cXTEaibJw1sNZt26ghsCsNwt+dH2vwydpx3NYHlbKWY= SHA256 (pypolicyd-spf-2.0.2.tar.gz) = 35z4iFg8EAP/jdLwyMHl9G3kZrVt5c5W7tX0J2XwqNo=
SIZE (pypolicyd-spf-1.3.2.tar.gz) = 32973 SIZE (pypolicyd-spf-2.0.2.tar.gz) = 38546

15
mail/py-policyd-spf/patches/patch-policyd-spf
View File

@ -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)

9
mail/py-policyd-spf/patches/patch-policyd-spf_1
View File

@ -1,11 +1,12 @@
--- policyd-spf.1.orig Sun Nov 28 04:58:03 2010 Index: policyd-spf.1
+++ policyd-spf.1 Wed Aug 24 16:04:09 2011 --- policyd-spf.1.orig
@@ -254,7 +254,7 @@ followed by a empty line: +++ policyd-spf.1
@@ -256,7 +256,7 @@ followed by a empty line:
1. Add the following to /etc/postfix/master.cf: 1. Add the following to /etc/postfix/master.cf:
policyd-spf unix - n n - 0 spawn policyd-spf unix - n n - 0 spawn
- user=nobody argv=/usr/bin/policyd-spf - user=nobody argv=/usr/bin/policyd-spf
+ user=nobody argv=${PREFIX}/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 policyd-spf. These vary from system to system. To use non-default

7
mail/py-policyd-spf/patches/patch-setup_py
View File

@ -1,6 +1,7 @@
--- setup.py.orig Sun Jul 22 03:24:58 2012 Index: setup.py
+++ setup.py Mon Nov 12 10:53:33 2012 --- setup.py.orig
@@ -13,11 +13,13 @@ setup(name='python-policyd-spf', +++ setup.py
@@ -13,11 +13,13 @@ setup(name='pypolicyd-spf',
py_modules=['policydspfsupp', 'policydspfuser'], py_modules=['policydspfsupp', 'policydspfuser'],
keywords = ['Postfix','spf','email'], keywords = ['Postfix','spf','email'],
scripts = ['policyd-spf'], scripts = ['policyd-spf'],

25
mail/py-policyd-spf/pkg/PLIST
View File

@ -1,16 +1,25 @@
@conflict py-policyd-spf-*
@pkgpath mail/py-policyd-spf
bin/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.py
lib/python${MODPY_VERSION}/site-packages/policydspfsupp.pyc
lib/python${MODPY_VERSION}/site-packages/policydspfuser.py 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}.dist-info/
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/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/man1/policyd-spf.1
@man man/man5/policyd-spf.conf.5 @man man/man5/policyd-spf.conf.5
@man man/man5/policyd-spf.peruser.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/ @sample ${SYSCONFDIR}/python-policyd-spf/
share/doc/${MODPY_PY_PREFIX}policyd-spf/ share/examples/py-policyd-spf/policyd-spf.conf
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
@sample ${SYSCONFDIR}/python-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

22
mail/py-spf/Makefile
View File

@ -1,12 +1,11 @@
COMMENT= Sender-Policy-Framework queries in Python COMMENT= Sender-Policy-Framework queries in Python
MODPY_EGG_VERSION=2.0.12 MODPY_EGG_VERSION= 2.0.14
DISTNAME= pyspf-${MODPY_EGG_VERSION} DISTNAME= pyspf-${MODPY_EGG_VERSION}
REVISION= 1
PKGNAME= py-spf-${MODPY_EGG_VERSION} PKGNAME= py-spf-${MODPY_EGG_VERSION}
CATEGORIES= mail CATEGORIES= mail
HOMEPAGE= http://bmsi.com/python/milter.html HOMEPAGE= https://github.com/sdgathman/pyspf/
# Python # Python
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
@ -14,18 +13,19 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymilter/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymilter/}
MODULES= lang/python 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 \ RUN_DEPENDS= mail/py-authres${MODPY_FLAVOR} \
net/py-dns net/py-dnspython${MODPY_FLAVOR}
TEST_DEPENDS=${FULLPKGNAME}:${BUILD_PKGPATH} \ TEST_DEPENDS= textproc/py-yaml${MODPY_FLAVOR}
textproc/py-yaml \
net/py-ipaddr
do-test: do-test:
@cd ${WRKSRC}/test && ${MODPY_BIN} testspf.py cd ${WRKSRC}/test && PYTHONPATH=.. ${MODPY_BIN} testspf.py
.include <bsd.port.mk> .include <bsd.port.mk>

4
mail/py-spf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pyspf-2.0.12.tar.gz) = iqIboOOv+KTorY9YbFAKXR+cTJAsPxG8wQdGWFfNQaI= SHA256 (pyspf-2.0.14.tar.gz) = V6fvAb2gkBc6r7avAQYlFobtc/A9tOkR/NNMV/w0cYY=
SIZE (pyspf-2.0.12.tar.gz) = 67189 SIZE (pyspf-2.0.14.tar.gz) = 69446

12
mail/py-spf/pkg/PLIST
View File

@ -1,5 +1,13 @@
@conflict py-spf-*
@pkgpath mail/py-spf
bin/spfquery.py bin/spfquery.py
bin/type99.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.py
lib/python${MODPY_VERSION}/site-packages/spf.pyc