Index: security/py-acme/Makefile =================================================================== --- security/py-acme/Makefile +++ security/py-acme/Makefile @@ -33,5 +33,11 @@ do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "version.mk" -.include +.include Index: security/py-acme/distinfo =================================================================== --- security/py-acme/distinfo +++ security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280498 -SHA256 (acme-1.3.0.tar.gz) = c0de9e1fbcb4a28509825a4d19ab5455910862b23fa338acebc7bbe7c0abd20d -SIZE (acme-1.3.0.tar.gz) = 78471 +TIMESTAMP = 1588785607 +SHA256 (acme-1.4.0.tar.gz) = f12cb59762e0b833911b87e95cb16e85a162517ba4aa3440594bdf3b8126fc69 +SIZE (acme-1.4.0.tar.gz) = 86350 Index: security/py-acme/files/patch-setup.py =================================================================== --- security/py-acme/files/patch-setup.py +++ security/py-acme/files/patch-setup.py @@ -1,18 +0,0 @@ ---- setup.py.orig 2019-12-05 17:30:21 UTC -+++ setup.py -@@ -14,7 +14,6 @@ install_requires = [ - # 1.1.0+ is required to avoid the warnings described at - # https://github.com/certbot/josepy/issues/13. - 'josepy>=1.1.0', -- 'mock', - # Connection.set_tlsext_host_name (>=0.13) - 'PyOpenSSL>=0.13.1', - 'pyrfc3339', -@@ -26,6 +25,7 @@ install_requires = [ - ] - - dev_extras = [ -+ 'mock', - 'pytest', - 'pytest-xdist', - 'tox', Index: security/py-acme/version.mk =================================================================== --- security/py-acme/version.mk +++ security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 1.3.0 +ACME_VERSION= 1.4.0 Index: security/py-certbot-apache/Makefile =================================================================== --- security/py-certbot-apache/Makefile +++ security/py-certbot-apache/Makefile @@ -14,7 +14,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-augeas>0:textproc/py-python-augeas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} @@ -29,5 +28,11 @@ @${REINPLACE_CMD} -e 's|/etc/apache2|${LOCALBASE}/etc/apache24|' \ ${WRKSRC}/certbot_apache/_internal/configurator.py +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-apache/distinfo =================================================================== --- security/py-certbot-apache/distinfo +++ security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280684 -SHA256 (certbot-apache-1.3.0.tar.gz) = 4a6bb818a7a70803127590a54bb25c1e79810761c9d4c92cf9f16a56b518bd52 -SIZE (certbot-apache-1.3.0.tar.gz) = 217789 +TIMESTAMP = 1588785664 +SHA256 (certbot-apache-1.4.0.tar.gz) = 6067f537deb7f70b979d11ed19846712dbf5c484ca927841805e78d8797b4640 +SIZE (certbot-apache-1.4.0.tar.gz) = 221695 Index: security/py-certbot-dns-cloudflare/Makefile =================================================================== --- security/py-certbot-dns-cloudflare/Makefile +++ security/py-certbot-dns-cloudflare/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudflare>=1.5.1:dns/py-cloudflare@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-cloudflare/distinfo =================================================================== --- security/py-certbot-dns-cloudflare/distinfo +++ security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280685 -SHA256 (certbot-dns-cloudflare-1.3.0.tar.gz) = b724b89fb6068f430d300b5581dd0407c5237ee1b3144bbdaebacdda8f9f2c09 -SIZE (certbot-dns-cloudflare-1.3.0.tar.gz) = 14609 +TIMESTAMP = 1588785665 +SHA256 (certbot-dns-cloudflare-1.4.0.tar.gz) = 0401b9964f5b515397f1f11cb0d6cbc36e0b5068bf37a21c86c7ac92f041976a +SIZE (certbot-dns-cloudflare-1.4.0.tar.gz) = 15581 Index: security/py-certbot-dns-cloudxns/Makefile =================================================================== --- security/py-certbot-dns-cloudxns/Makefile +++ security/py-certbot-dns-cloudxns/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-cloudxns/distinfo =================================================================== --- security/py-certbot-dns-cloudxns/distinfo +++ security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280686 -SHA256 (certbot-dns-cloudxns-1.3.0.tar.gz) = 56ea05da783fa7c5f0e11062137620422ba05883a47a1228c381ba735915c7cf -SIZE (certbot-dns-cloudxns-1.3.0.tar.gz) = 11765 +TIMESTAMP = 1588785665 +SHA256 (certbot-dns-cloudxns-1.4.0.tar.gz) = 2e96addafb2df17c012949dcf55a04e702b4441490572e0849d44fc1a5b95a13 +SIZE (certbot-dns-cloudxns-1.4.0.tar.gz) = 12752 Index: security/py-certbot-dns-digitalocean/Makefile =================================================================== --- security/py-certbot-dns-digitalocean/Makefile +++ security/py-certbot-dns-digitalocean/Makefile @@ -14,7 +14,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-digitalocean>=1.11:www/py-python-digitalocean@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} @@ -26,8 +25,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-digitalocean/distinfo =================================================================== --- security/py-certbot-dns-digitalocean/distinfo +++ security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280687 -SHA256 (certbot-dns-digitalocean-1.3.0.tar.gz) = cab0cb6a82ec8108131a600b51af22630519d485f2c0da28e544516bd2b30111 -SIZE (certbot-dns-digitalocean-1.3.0.tar.gz) = 12970 +TIMESTAMP = 1588785666 +SHA256 (certbot-dns-digitalocean-1.4.0.tar.gz) = 45d59510a0fc13457b3aedaed96ff15c806eed6389457246e8823bdfb654fb01 +SIZE (certbot-dns-digitalocean-1.4.0.tar.gz) = 14038 Index: security/py-certbot-dns-dnsimple/Makefile =================================================================== --- security/py-certbot-dns-dnsimple/Makefile +++ security/py-certbot-dns-dnsimple/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=3.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-dnsimple/distinfo =================================================================== --- security/py-certbot-dns-dnsimple/distinfo +++ security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280688 -SHA256 (certbot-dns-dnsimple-1.3.0.tar.gz) = ba8833c2c0c46a2f3505a1e42e6d2fc956d4137212d001b894ae2984747142e5 -SIZE (certbot-dns-dnsimple-1.3.0.tar.gz) = 11966 +TIMESTAMP = 1588785667 +SHA256 (certbot-dns-dnsimple-1.4.0.tar.gz) = 940ef568bce2d733e72a472b38689ddb19a02789b1d816aab7ac1d88db91d79c +SIZE (certbot-dns-dnsimple-1.4.0.tar.gz) = 12825 Index: security/py-certbot-dns-dnsmadeeasy/Makefile =================================================================== --- security/py-certbot-dns-dnsmadeeasy/Makefile +++ security/py-certbot-dns-dnsmadeeasy/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-dnsmadeeasy/distinfo =================================================================== --- security/py-certbot-dns-dnsmadeeasy/distinfo +++ security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280689 -SHA256 (certbot-dns-dnsmadeeasy-1.3.0.tar.gz) = 15f109587cc0301cfb7d5ebc1c4a25c2c7af24243a56519413000018cfe63aa8 -SIZE (certbot-dns-dnsmadeeasy-1.3.0.tar.gz) = 11760 +TIMESTAMP = 1588785668 +SHA256 (certbot-dns-dnsmadeeasy-1.4.0.tar.gz) = 973c65680997c1c7aee443ca3a34c89f70617325ad53b0247d7fd100c9f98a12 +SIZE (certbot-dns-dnsmadeeasy-1.4.0.tar.gz) = 12874 Index: security/py-certbot-dns-gehirn/Makefile =================================================================== --- security/py-certbot-dns-gehirn/Makefile +++ security/py-certbot-dns-gehirn/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.1.22:dns/py-dns-lexicon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-gehirn/distinfo =================================================================== --- security/py-certbot-dns-gehirn/distinfo +++ security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280690 -SHA256 (certbot-dns-gehirn-1.3.0.tar.gz) = 964fd5f105ba70485f275c3fa65435663182fa0a76be0f1b2333751a0a8fc7b2 -SIZE (certbot-dns-gehirn-1.3.0.tar.gz) = 11808 +TIMESTAMP = 1588785669 +SHA256 (certbot-dns-gehirn-1.4.0.tar.gz) = f9897519500f06682f0282b75f964abd12c2f6fd2cc42eef63fd3017aef4f63e +SIZE (certbot-dns-gehirn-1.4.0.tar.gz) = 12699 Index: security/py-certbot-dns-google/Makefile =================================================================== --- security/py-certbot-dns-google/Makefile +++ security/py-certbot-dns-google/Makefile @@ -14,10 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}google-api-python-client>1.5:www/py-google-api-python-client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-api-python-client>1.5.5:www/py-google-api-python-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>=2.0:security/py-oauth2client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=4.0:security/py-oauth2client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -27,8 +26,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-google/distinfo =================================================================== --- security/py-certbot-dns-google/distinfo +++ security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280691 -SHA256 (certbot-dns-google-1.3.0.tar.gz) = 3d7e3ff21a5e539e59dba05b318a14ee473e6926e0c924151ca30206e8ca4523 -SIZE (certbot-dns-google-1.3.0.tar.gz) = 22354 +TIMESTAMP = 1588785670 +SHA256 (certbot-dns-google-1.4.0.tar.gz) = b6a3a0b7f4d8c7fc9cdade8c38bdd3e1f92f571a96f14c29e7677b044339ed76 +SIZE (certbot-dns-google-1.4.0.tar.gz) = 23293 Index: security/py-certbot-dns-linode/Makefile =================================================================== --- security/py-certbot-dns-linode/Makefile +++ security/py-certbot-dns-linode/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.3:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-linode/distinfo =================================================================== --- security/py-certbot-dns-linode/distinfo +++ security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280691 -SHA256 (certbot-dns-linode-1.3.0.tar.gz) = 1752d922730652829996463cd2d5f87af63cb2298fedc102b4c0df55299cd173 -SIZE (certbot-dns-linode-1.3.0.tar.gz) = 12354 +TIMESTAMP = 1588785671 +SHA256 (certbot-dns-linode-1.4.0.tar.gz) = d0474aac34a0bc482614f70c8ec152144a5ec0a48a125bfbccc339e1b536a7ad +SIZE (certbot-dns-linode-1.4.0.tar.gz) = 13196 Index: security/py-certbot-dns-luadns/Makefile =================================================================== --- security/py-certbot-dns-luadns/Makefile +++ security/py-certbot-dns-luadns/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-luadns/distinfo =================================================================== --- security/py-certbot-dns-luadns/distinfo +++ security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280692 -SHA256 (certbot-dns-luadns-1.3.0.tar.gz) = 298c71e6977eaa72f5dc9714271f2c6cecd6004f8741a469f544c5dca78610d1 -SIZE (certbot-dns-luadns-1.3.0.tar.gz) = 11840 +TIMESTAMP = 1588785672 +SHA256 (certbot-dns-luadns-1.4.0.tar.gz) = e789f756ebb449841ecafc51f1a8ded2c683477306b2cbb47f91bdd3d7487b08 +SIZE (certbot-dns-luadns-1.4.0.tar.gz) = 12689 Index: security/py-certbot-dns-nsone/Makefile =================================================================== --- security/py-certbot-dns-nsone/Makefile +++ security/py-certbot-dns-nsone/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-nsone/distinfo =================================================================== --- security/py-certbot-dns-nsone/distinfo +++ security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280693 -SHA256 (certbot-dns-nsone-1.3.0.tar.gz) = 43cf9c1a22aaf0099855b25acd0aea4a37befc66adafb08b9af04799032deabf -SIZE (certbot-dns-nsone-1.3.0.tar.gz) = 11700 +TIMESTAMP = 1588785673 +SHA256 (certbot-dns-nsone-1.4.0.tar.gz) = 53e0de4e53e0068039114bbbb25c1af074b7c7ea92796699663b47dad21d0263 +SIZE (certbot-dns-nsone-1.4.0.tar.gz) = 12740 Index: security/py-certbot-dns-ovh/Makefile =================================================================== --- security/py-certbot-dns-ovh/Makefile +++ security/py-certbot-dns-ovh/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.7.14:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-ovh/distinfo =================================================================== --- security/py-certbot-dns-ovh/distinfo +++ security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280694 -SHA256 (certbot-dns-ovh-1.3.0.tar.gz) = eba02419443a5365f55291c98d30e78745353a81afea8b2d6e5913dadd9be904 -SIZE (certbot-dns-ovh-1.3.0.tar.gz) = 11959 +TIMESTAMP = 1588785673 +SHA256 (certbot-dns-ovh-1.4.0.tar.gz) = 9899506f7d7b8eb5903b2be5041e2a874a88ff9916aaccce9cf3dd367d0c9c2d +SIZE (certbot-dns-ovh-1.4.0.tar.gz) = 13032 Index: security/py-certbot-dns-rfc2136/Makefile =================================================================== --- security/py-certbot-dns-rfc2136/Makefile +++ security/py-certbot-dns-rfc2136/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-rfc2136/distinfo =================================================================== --- security/py-certbot-dns-rfc2136/distinfo +++ security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280695 -SHA256 (certbot-dns-rfc2136-1.3.0.tar.gz) = 3415526d29cd4df6421b05b27ead1f53540312039a28c2977a97fc63e132a3a8 -SIZE (certbot-dns-rfc2136-1.3.0.tar.gz) = 14209 +TIMESTAMP = 1588785674 +SHA256 (certbot-dns-rfc2136-1.4.0.tar.gz) = 3630c2d23753925f46a25ef969ad98a8294df0b7a1b781b778dfaa0c620642d5 +SIZE (certbot-dns-rfc2136-1.4.0.tar.gz) = 15185 Index: security/py-certbot-dns-route53/Makefile =================================================================== --- security/py-certbot-dns-route53/Makefile +++ security/py-certbot-dns-route53/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -23,5 +22,11 @@ NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-route53/distinfo =================================================================== --- security/py-certbot-dns-route53/distinfo +++ security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280696 -SHA256 (certbot-dns-route53-1.3.0.tar.gz) = 512657e173164543fa2a089e66ddc40d1270353f3e4b82ab8383dc9794aedc46 -SIZE (certbot-dns-route53-1.3.0.tar.gz) = 14865 +TIMESTAMP = 1588785675 +SHA256 (certbot-dns-route53-1.4.0.tar.gz) = d89e7305812e23ae8741a90837394ce12a51a0452a87eb058f751aa4a8adc09c +SIZE (certbot-dns-route53-1.4.0.tar.gz) = 15673 Index: security/py-certbot-dns-sakuracloud/Makefile =================================================================== --- security/py-certbot-dns-sakuracloud/Makefile +++ security/py-certbot-dns-sakuracloud/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.1.23:dns/py-dns-lexicon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python @@ -25,8 +24,14 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-dns-sakuracloud/distinfo =================================================================== --- security/py-certbot-dns-sakuracloud/distinfo +++ security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280697 -SHA256 (certbot-dns-sakuracloud-1.3.0.tar.gz) = f8caffeda33eb7bc27c2469da107db9644d9077c6fce22c69b44c07d0d8edcca -SIZE (certbot-dns-sakuracloud-1.3.0.tar.gz) = 11838 +TIMESTAMP = 1588785676 +SHA256 (certbot-dns-sakuracloud-1.4.0.tar.gz) = e8e1e3d39148889901e0386e168998cb86efd5ce23d6a0a5721108800fb5420b +SIZE (certbot-dns-sakuracloud-1.4.0.tar.gz) = 12690 Index: security/py-certbot-nginx/Makefile =================================================================== --- security/py-certbot-nginx/Makefile +++ security/py-certbot-nginx/Makefile @@ -14,7 +14,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} @@ -24,13 +23,14 @@ NO_ARCH= yes -OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot_nginx/_internal/constants.py -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +.include -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot_nginx/_internal/configurator.py +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot-nginx/distinfo =================================================================== --- security/py-certbot-nginx/distinfo +++ security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280698 -SHA256 (certbot-nginx-1.3.0.tar.gz) = 9aa0869c1250b7ea0a1eb1df6bdb5d0d6190d6ca0400da1033a8decc0df6f65b -SIZE (certbot-nginx-1.3.0.tar.gz) = 71274 +TIMESTAMP = 1588785677 +SHA256 (certbot-nginx-1.4.0.tar.gz) = 44a9f74dee7e2f8a32aafaf793280e8fcd4d50a9ffb7c5ed47a0bc591ce6ecca +SIZE (certbot-nginx-1.4.0.tar.gz) = 75818 Index: security/py-certbot/Makefile =================================================================== --- security/py-certbot/Makefile +++ security/py-certbot/Makefile @@ -49,5 +49,11 @@ do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +.include + +.if ${PYTHON_REL} < 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +.endif + .include "${.CURDIR}/../py-acme/version.mk" -.include +.include Index: security/py-certbot/distinfo =================================================================== --- security/py-certbot/distinfo +++ security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584280683 -SHA256 (certbot-1.3.0.tar.gz) = bc2091cbbc2f432872ed69309046e79771d9c81cd441bde3e6a6553ecd04b1d8 -SIZE (certbot-1.3.0.tar.gz) = 362957 +TIMESTAMP = 1588785663 +SHA256 (certbot-1.4.0.tar.gz) = 69b5b7925de0d3b693b00a40bf109d85afb24c7199bf616339d74d59a80d8d96 +SIZE (certbot-1.4.0.tar.gz) = 370661 Index: security/py-certbot/files/patch-setup.py =================================================================== --- security/py-certbot/files/patch-setup.py +++ /dev/null @@ -1,18 +0,0 @@ ---- setup.py.orig 2020-01-14 18:41:32 UTC -+++ setup.py -@@ -47,7 +47,6 @@ install_requires = [ - # 1.1.0+ is required to avoid the warnings described at - # https://github.com/certbot/josepy/issues/13. - 'josepy>=1.1.0', -- 'mock', - 'parsedatetime>=1.3', # Calendar.parseDT - 'pyrfc3339', - 'pytz', -@@ -76,6 +75,7 @@ elif os.name == 'nt': - dev_extras = [ - 'coverage', - 'ipdb', -+ 'mock', - 'pytest', - 'pytest-cov', - 'pytest-xdist',