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

update certbot/py-acme to 1.3.0, switch unique dependencies to py3 only

Browse Source
This commit is contained in:
sthen 2020-03-04 14:33:28 +00:00
parent e022fc9a0c
commit e3fbe4b0cf
15 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.870 2020/03/03 10:52:00 sthen Exp $
# $OpenBSD: Makefile,v 1.871 2020/03/04 14:33:29 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.261
PKGNAME = quirks-3.262
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

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

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.888 2020/03/03 10:52:00 sthen Exp $
# $OpenBSD: Quirks.pm,v 1.889 2020/03/04 14:33:29 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -376,6 +376,8 @@ my $stem_extensions = {
'py-pdfminer' => 'py3-pdfminer',
'jupyter-notebook3' => 'jupyter-notebook',
'py-html2text' => 'py3-html2text',
'py-acme' => 'py3-acme',
'py-josepy' => 'py3-josepy',
};
my $obsolete_reason = {

3
security/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.568 2020/02/29 19:34:27 kmos Exp $
# $OpenBSD: Makefile,v 1.569 2020/03/04 14:33:28 sthen Exp $
SUBDIR =
SUBDIR += ADMsnmp
@ -303,7 +303,6 @@
SUBDIR += py-fido2
SUBDIR += py-gnupg
SUBDIR += py-gnupg,python3
SUBDIR += py-josepy
SUBDIR += py-josepy,python3
SUBDIR += py-keyring
SUBDIR += py-keyring,python3

3
security/letsencrypt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2015/12/31 22:31:34 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2020/03/04 14:33:29 sthen Exp $
# Packaging guide:
# https://github.com/letsencrypt/letsencrypt/wiki/Packaging
@ -6,7 +6,6 @@
SUBDIR =
SUBDIR += acme-tiny
SUBDIR += client
SUBDIR += py-acme
SUBDIR += py-acme,python3
.include <bsd.port.subdir.mk>

5
security/letsencrypt/Makefile.inc
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile.inc,v 1.54 2020/02/05 19:43:09 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.55 2020/03/04 14:33:29 sthen Exp $
CATEGORIES?= security/letsencrypt security
MODPY_PI?= Yes
MODPY_SETUPTOOLS?= Yes
MODPY_EGG_VERSION?= 1.2.0
MODPY_EGG_VERSION?= 1.3.0
REVISION?= 0
MODULES?= lang/python

4
security/letsencrypt/client/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (certbot-1.2.0.tar.gz) = ldy64IX45OsYRC/nsSmUsIlkqabo41LlVs20qKYlNzw=
SIZE (certbot-1.2.0.tar.gz) = 359006
SHA256 (certbot-1.3.0.tar.gz) = vCCRy7wvQyhy7WkwkEbnl3HZyBzUQb3j5qZVPs0Esdg=
SIZE (certbot-1.3.0.tar.gz) = 362957

32
security/letsencrypt/client/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.27 2019/12/05 17:16:28 sthen Exp $
@comment $OpenBSD: PLIST,v 1.28 2020/03/04 14:33:29 sthen Exp $
@extraunexec rm -rf /var/log/certbot/* /var/lib/certbot/*
bin/certbot
bin/letsencrypt
@ -18,6 +18,7 @@ lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}crypto_util.${M
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}ocsp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}reverter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/
@ -27,7 +28,6 @@ lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}__ini
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}auth_handler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}cert_manager.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
@ -37,8 +37,6 @@ lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}hooks
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}lock.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}ocsp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}renewal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
@ -46,7 +44,28 @@ lib/python${MODPY_VERSION}/site-packages/certbot/_internal/${MODPY_PYCACHE}updat
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/account.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/auth_handler.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cert_manager.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}cli_constants.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}cli_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}group_adder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}helpful.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}paths_parser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}plugins_parsing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}report_config_interaction.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}subparsers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/${MODPY_PYCACHE}verb_help.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/cli_constants.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/cli_utils.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/group_adder.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/helpful.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/paths_parser.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/plugins_parsing.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/report_config_interaction.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/subparsers.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/cli/verb_help.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/client.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/configuration.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/constants.py
@ -66,8 +85,6 @@ lib/python${MODPY_VERSION}/site-packages/certbot/_internal/hooks.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/lock.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/log.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/main.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/notify.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/ocsp.py
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/plugins/
lib/python${MODPY_VERSION}/site-packages/certbot/_internal/plugins/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/certbot/_internal/plugins/${MODPY_PYCACHE}/
@ -113,6 +130,7 @@ lib/python${MODPY_VERSION}/site-packages/certbot/display/util.py
lib/python${MODPY_VERSION}/site-packages/certbot/errors.py
lib/python${MODPY_VERSION}/site-packages/certbot/interfaces.py
lib/python${MODPY_VERSION}/site-packages/certbot/main.py
lib/python${MODPY_VERSION}/site-packages/certbot/ocsp.py
lib/python${MODPY_VERSION}/site-packages/certbot/plugins/
lib/python${MODPY_VERSION}/site-packages/certbot/plugins/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/certbot/plugins/${MODPY_PYCACHE}/

9
security/letsencrypt/py-acme/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2020/02/05 19:43:09 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2020/03/04 14:33:29 sthen Exp $
COMMENT= ACME protocol implementation
@ -8,7 +8,7 @@ DISTNAME= acme-${MODPY_EGG_VERSION}
PKGNAME= ${MODPY_PY_PREFIX}${DISTNAME:S/.dev/pre/}
FLAVORS= python3
FLAVOR?=
FLAVOR= python3
RUN_DEPENDS= devel/py-asn1${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
@ -23,15 +23,10 @@ RUN_DEPENDS= devel/py-asn1${MODPY_FLAVOR} \
www/py-werkzeug${MODPY_FLAVOR}
BUILD_DEPENDS= ${RUN_DEPENDS}
SUBST_VARS= MODPY_FLAVOR
MODPY_PYTEST = Yes
TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} \
security/py-josepy${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
TEST_DEPENDS+= devel/py-funcsigs
.endif
.include <bsd.port.mk>

4
security/letsencrypt/py-acme/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (acme-1.2.0.tar.gz) = BjDHQNSb2pRel701/I1vAtCCyMueGPj+wNuz05WsJqs=
SIZE (acme-1.2.0.tar.gz) = 79192
SHA256 (acme-1.3.0.tar.gz) = wN6eH7y0ooUJglpNGatUVZEIYrI/ozis68e758Cr0g0=
SIZE (acme-1.3.0.tar.gz) = 78471

7
security/letsencrypt/py-acme/pkg/PLIST
View File

@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST,v 1.11 2019/12/05 17:16:28 sthen Exp $
@pkgpath security/py-acme${MODPY_FLAVOR}
@comment $OpenBSD: PLIST,v 1.12 2020/03/04 14:33:29 sthen Exp $
@conflict py-acme-*
@pkgpath security/py-acme
@pkgpath security/py-acme,python3
@pkgpath security/letsencrypt/py-acme
lib/python${MODPY_VERSION}/site-packages/acme/
lib/python${MODPY_VERSION}/site-packages/acme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/acme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

6
security/py-josepy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2020/02/03 20:40:40 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2020/03/04 14:33:29 sthen Exp $
COMMENT= Javascript Object Signing and Encryption (JOSE)
@ -7,10 +7,10 @@ CATEGORIES= security devel
MODPY_EGG_VERSION= 1.3.0
DISTNAME= josepy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
REVISION= 0
REVISION= 1
FLAVORS= python3
FLAVOR?=
FLAVOR= python3
# Apache 2.0
PERMIT_PACKAGE= Yes

4
security/py-josepy/pkg/PLIST
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2019/07/10 13:20:28 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/03/04 14:33:29 sthen Exp $
@conflict py-acme-<0.22.0${MODPY_FLAVOR}
@conflict py-josepy-*
@pkgpath security/py-josepy
bin/jws${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/josepy/
lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

4
sysutils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.556 2020/02/28 21:01:11 martin Exp $
# $OpenBSD: Makefile,v 1.557 2020/03/04 14:33:29 sthen Exp $
SUBDIR =
SUBDIR += accountsservice
@ -248,7 +248,7 @@
SUBDIR += py-daemon,python3
SUBDIR += py-daemonize
SUBDIR += py-daemonize,python3
SUBDIR += py-distro
SUBDIR += py-distro,python3
SUBDIR += py-elasticsearch-curator
SUBDIR += py-filelock
SUBDIR += py-filelock,python3

7
sysutils/py-distro/Makefile
View File

@ -1,20 +1,23 @@
# $OpenBSD: Makefile,v 1.1.1.1 2019/09/11 21:03:51 sthen Exp $
# $OpenBSD: Makefile,v 1.2 2020/03/04 14:33:29 sthen Exp $
COMMENT= provide information about the OS platform
MODPY_EGG_VERSION= 1.4.0
DISTNAME= distro-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
REVISION= 0
CATEGORIES= sysutils
# Apache 2.0
PERMIT_PACKAGE= Yes
FLAVORS= python3
FLAVOR= python3
MODULES= lang/python
MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_PYTEST= Yes
TEST_DEPENDS= devel/py-test-cov${MODPY_FLAVOR}

3
sysutils/py-distro/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/09/11 21:03:51 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/03/04 14:33:29 sthen Exp $
@pkgpath sysutils/py-distro
bin/distro
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}distro.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/distro-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/