Update to 0.31.0

Changes:	https://github.com/certbot/certbot/blob/master/CHANGELOG.md
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-02-10 19:45:12 +00:00
parent 087c77ffec
commit 8d9b1a8a65
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=492636
25 changed files with 76 additions and 79 deletions

View File

@ -14,12 +14,12 @@ COMMENT= ACME protocol implementation in Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${PY_FLAVOR} \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}josepy>=1.0.0:security/py-josepy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openssl>=0.13.1:security/py-openssl@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.3.0:www/py-requests-toolbelt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497863
SHA256 (acme-0.30.2.tar.gz) = 295a5b7fce9f908e6e5cff8c40be1a3daf3e1ebabd2e139a4c87274e68eeb8f2
SIZE (acme-0.30.2.tar.gz) = 83942
TIMESTAMP = 1549641991
SHA256 (acme-0.31.0.tar.gz) = 7e5c2d01986e0f34ca08fee58981892704c82c48435dcd3592b424c312d8b2bf
SIZE (acme-0.31.0.tar.gz) = 82806

View File

@ -1,11 +1,11 @@
--- setup.py.orig 2018-03-20 00:33:22 UTC
--- setup.py.orig 2019-02-07 21:20:31 UTC
+++ setup.py
@@ -14,7 +14,6 @@ install_requires = [
@@ -13,7 +13,6 @@ install_requires = [
# formerly known as acme.jose:
'josepy>=1.0.0',
# Connection.set_tlsext_host_name (>=0.13)
- 'mock',
'PyOpenSSL>=0.13',
'PyOpenSSL>=0.13.1',
'pyrfc3339',
'pytz',
@@ -24,6 +23,7 @@ install_requires = [

View File

@ -1 +1 @@
ACME_VERSION= 0.30.2
ACME_VERSION= 0.31.0

View File

@ -2,7 +2,7 @@
PORTNAME= certbot-apache
PORTVERSION= ${ACME_VERSION}
PORTREVISION= 2
PORTREVISION= 0
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497865
SHA256 (certbot-apache-0.30.2.tar.gz) = 32fa915a8a51810fdfe828ac1361da4425c231d7384891e49e6338e4741464b2
SIZE (certbot-apache-0.30.2.tar.gz) = 161787
TIMESTAMP = 1549641994
SHA256 (certbot-apache-0.31.0.tar.gz) = cc4b840b2a439a63e2dce809272c3c3cd4b1aeefc4053cd188935135be137edd
SIZE (certbot-apache-0.31.0.tar.gz) = 168050

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497866
SHA256 (certbot-dns-cloudflare-0.30.2.tar.gz) = e3733022b04dd9fb1e9360107c843e25b59aa129e3b224f684a1710df879865f
SIZE (certbot-dns-cloudflare-0.30.2.tar.gz) = 13391
TIMESTAMP = 1549641995
SHA256 (certbot-dns-cloudflare-0.31.0.tar.gz) = f2c3559ce43fe7d56e7e5439f2bd5a437bc03b34a4ae3e17f4953bf1138b35cf
SIZE (certbot-dns-cloudflare-0.31.0.tar.gz) = 12934

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497867
SHA256 (certbot-dns-cloudxns-0.30.2.tar.gz) = 060027d18e8964ca23d6b26207c2cabb24e0e20f25ba2651dbfbeb453a4408c6
SIZE (certbot-dns-cloudxns-0.30.2.tar.gz) = 11430
TIMESTAMP = 1549641996
SHA256 (certbot-dns-cloudxns-0.31.0.tar.gz) = 79b02af4746494bb5b27ad0eab53bf48a26bb6f3445ab677c60281e28c4cb5e9
SIZE (certbot-dns-cloudxns-0.31.0.tar.gz) = 11410

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497868
SHA256 (certbot-dns-digitalocean-0.30.2.tar.gz) = 2a64494702c5855d919dd2393b0f941e8d5513c6588b142e89715dd3f1a6f37b
SIZE (certbot-dns-digitalocean-0.30.2.tar.gz) = 12705
TIMESTAMP = 1549641997
SHA256 (certbot-dns-digitalocean-0.31.0.tar.gz) = 7c0322e901f7240668710349d4b6935549fca32288ccebc9405c3d06471a0084
SIZE (certbot-dns-digitalocean-0.31.0.tar.gz) = 12699

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497869
SHA256 (certbot-dns-dnsimple-0.30.2.tar.gz) = 1f5c229b195cfd40b9b485d65648391757e60641349403c7a22295d5d5b2ce2c
SIZE (certbot-dns-dnsimple-0.30.2.tar.gz) = 11406
TIMESTAMP = 1549641998
SHA256 (certbot-dns-dnsimple-0.31.0.tar.gz) = 52748d19112f97d304549e7524e5c1998fc0d371a911f22cf22178d3e2c70072
SIZE (certbot-dns-dnsimple-0.31.0.tar.gz) = 11491

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497870
SHA256 (certbot-dns-dnsmadeeasy-0.30.2.tar.gz) = 36c05aae6577306d273539538b7d0440b4e52a9b510881e206f1215d532863b5
SIZE (certbot-dns-dnsmadeeasy-0.30.2.tar.gz) = 11444
TIMESTAMP = 1549641999
SHA256 (certbot-dns-dnsmadeeasy-0.31.0.tar.gz) = 538321125f9682aa27cc37a2ab77996c1ee0f2e98c6715b4adc9e3174787579e
SIZE (certbot-dns-dnsmadeeasy-0.31.0.tar.gz) = 11486

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497871
SHA256 (certbot-dns-gehirn-0.30.2.tar.gz) = a84131381fdcdd7db4d88f55465e9152ee92a6cf2c337c5e18c5b819eaf5c4b6
SIZE (certbot-dns-gehirn-0.30.2.tar.gz) = 11479
TIMESTAMP = 1549642000
SHA256 (certbot-dns-gehirn-0.31.0.tar.gz) = 111916f1914330064b5d38945094f15f6fca30f884c18d564d9c1d551d1c5452
SIZE (certbot-dns-gehirn-0.31.0.tar.gz) = 11556

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497872
SHA256 (certbot-dns-google-0.30.2.tar.gz) = 441281ead6430a3833cc200a031a263848ab046e198f01c86b236782e94d8ec9
SIZE (certbot-dns-google-0.30.2.tar.gz) = 22400
TIMESTAMP = 1549642002
SHA256 (certbot-dns-google-0.31.0.tar.gz) = 7c59915b62e53d46a3ace3ae0e0f7572e4bbe14e2d29d175ff5a2103419976e8
SIZE (certbot-dns-google-0.31.0.tar.gz) = 22092

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497873
SHA256 (certbot-dns-linode-0.30.2.tar.gz) = 60fbbe2a35a828a7e212d6bba29cbf295db1338970b2e406c1e5b089d5d7e37d
SIZE (certbot-dns-linode-0.30.2.tar.gz) = 11406
TIMESTAMP = 1549642003
SHA256 (certbot-dns-linode-0.31.0.tar.gz) = 1e7b8c7f803570dcd55ae78b3553f057876bfa758e23349a4f58bcc6879e828a
SIZE (certbot-dns-linode-0.31.0.tar.gz) = 11510

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497874
SHA256 (certbot-dns-luadns-0.30.2.tar.gz) = 593fd1c8d5aa0ab3319a6d904e06e82debe08b6d052fea1ed0a42be9bc51be21
SIZE (certbot-dns-luadns-0.30.2.tar.gz) = 11328
TIMESTAMP = 1549642004
SHA256 (certbot-dns-luadns-0.31.0.tar.gz) = 4f0765bd60bfaacc244642983a1eb0be1321a793c0383518e37072356fd3d350
SIZE (certbot-dns-luadns-0.31.0.tar.gz) = 11614

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497876
SHA256 (certbot-dns-nsone-0.30.2.tar.gz) = 4352baeabbf42fc2597a432f8e5529e1217d76622ba46d2e1a219d1b3106c104
SIZE (certbot-dns-nsone-0.30.2.tar.gz) = 11370
TIMESTAMP = 1549642005
SHA256 (certbot-dns-nsone-0.31.0.tar.gz) = 674fde475c8e9add12bbab315a211eb7b4cb48e7755041dd17966f9714ef2ada
SIZE (certbot-dns-nsone-0.31.0.tar.gz) = 11363

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497877
SHA256 (certbot-dns-ovh-0.30.2.tar.gz) = 229ccbfb88ee83e13a88b306168ef6e4b0af9ab9fbce136386391d065599ff0a
SIZE (certbot-dns-ovh-0.30.2.tar.gz) = 11839
TIMESTAMP = 1549642006
SHA256 (certbot-dns-ovh-0.31.0.tar.gz) = c324fbe9f78d03df87f2e1de4ab469ab092d223eaf264f255ab890e153d54f0e
SIZE (certbot-dns-ovh-0.31.0.tar.gz) = 11670

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497878
SHA256 (certbot-dns-rfc2136-0.30.2.tar.gz) = e48580ad5018e6bb9acb31de205f415c959c64580f4376a83d28a10d58aa9f84
SIZE (certbot-dns-rfc2136-0.30.2.tar.gz) = 13968
TIMESTAMP = 1549642008
SHA256 (certbot-dns-rfc2136-0.31.0.tar.gz) = 032cebdf3891f12acc7567cc95e133337267c82f1a6663e4c3a156cdf647270f
SIZE (certbot-dns-rfc2136-0.31.0.tar.gz) = 13664

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497879
SHA256 (certbot-dns-route53-0.30.2.tar.gz) = 09bf175f70669757540ae4acca38a08106b2ec564fdb3d6808986540e45c160f
SIZE (certbot-dns-route53-0.30.2.tar.gz) = 14166
TIMESTAMP = 1549642009
SHA256 (certbot-dns-route53-0.31.0.tar.gz) = 169756544b988d7fc7f806235078c2e0d452b95115111be4a41599f921a93bd5
SIZE (certbot-dns-route53-0.31.0.tar.gz) = 14498

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497880
SHA256 (certbot-dns-sakuracloud-0.30.2.tar.gz) = d32096f77c0c6be7d20f2bfbd3b232b49538d8c0fa1a13ba707db6d971edf7a1
SIZE (certbot-dns-sakuracloud-0.30.2.tar.gz) = 11301
TIMESTAMP = 1549642010
SHA256 (certbot-dns-sakuracloud-0.31.0.tar.gz) = 72d68d29aabc2762537ea1ef64985aec21146b04b7e9c62b8fccf8d33edb6890
SIZE (certbot-dns-sakuracloud-0.31.0.tar.gz) = 11588

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497881
SHA256 (certbot-nginx-0.30.2.tar.gz) = 6ba4dd772d0c7cdfb3383ca325b35639e01ac9e142e4baa6445cd85c7fb59552
SIZE (certbot-nginx-0.30.2.tar.gz) = 78637
TIMESTAMP = 1549642011
SHA256 (certbot-nginx-0.31.0.tar.gz) = d450d75650384f74baccb7673c89e2f52468afa478ed354eb6d4b99aa33bf865
SIZE (certbot-nginx-0.31.0.tar.gz) = 78396

View File

@ -3,7 +3,7 @@
PORTNAME= certbot
PORTVERSION= ${ACME_VERSION}
PORTREVISION= 2
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}josepy>=0:security/py-josepy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548497864
SHA256 (certbot-0.30.2.tar.gz) = 534487cb552ced8e47948ba3d2e7ca12c3a439133fc609485012b1a02fc7776e
SIZE (certbot-0.30.2.tar.gz) = 333414
TIMESTAMP = 1549641992
SHA256 (certbot-0.31.0.tar.gz) = 0c3196f80a102c0f9d82d566ba859efe3b70e9ed4670520224c844fafd930473
SIZE (certbot-0.31.0.tar.gz) = 336579

View File

@ -2,29 +2,26 @@
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909
# TODO: Upstream
--- certbot/compat.py.orig 2019-01-24 22:07:15 UTC
--- certbot/compat.py.orig 2019-02-07 21:20:29 UTC
+++ certbot/compat.py
@@ -184,6 +184,12 @@ LINUX_DEFAULT_FOLDERS = {
@@ -187,6 +187,11 @@ LINUX_DEFAULT_FOLDERS = {
'work': '/var/lib/letsencrypt',
'logs': '/var/log/letsencrypt',
}
+FREEBSD_DEFAULT_FOLDERS = {
+ 'config': '/usr/local/etc/letsencrypt',
+ 'work': '/var/db/letsencrypt',
+ 'logs': '/var/log/letsencrypt',
+}
+
def get_default_folder(folder_type):
"""
Return the relevant default folder for the current OS
@@ -195,7 +201,13 @@ def get_default_folder(folder_type):
@@ -200,8 +205,13 @@ def get_default_folder(folder_type):
"""
if 'fcntl' in sys.modules:
if os.name != 'nt':
- # Linux specific
- return LINUX_DEFAULT_FOLDERS[folder_type]
- # Windows specific
- return WINDOWS_DEFAULT_FOLDERS[folder_type]
+ # Unix-like
+ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'):
+ # FreeBSD specific
@ -32,6 +29,6 @@
+ else:
+ # Linux specific
+ return LINUX_DEFAULT_FOLDERS[folder_type]
+ else:
+ # Windows specific
+ return WINDOWS_DEFAULT_FOLDERS[folder_type]
# Windows specific
return WINDOWS_DEFAULT_FOLDERS[folder_type]

View File

@ -1,8 +1,8 @@
--- setup.py.orig 2018-12-05 23:47:59 UTC
--- setup.py.orig 2019-02-07 21:20:31 UTC
+++ setup.py
@@ -39,7 +39,6 @@ install_requires = [
'configobj',
'cryptography>=1.2', # load_pem_x509_certificate
'cryptography>=1.2.3', # load_pem_x509_certificate
'josepy',
- 'mock',
'parsedatetime>=1.3', # Calendar.parseDT