Update to 3.7.0

PR:		246379
Submitted by:	Matthew Horan <matt@matthoran.com> (maintainer)
Sponsored by:	Netzkommune GmbH

3 files changed, 52 insertions, 32 deletions

diff --git a/security/lego/Makefile b/security/lego/Makefile
index d84ef5d69e10..e206d6ae9160 100644
--- a/security/lego/Makefile
+++ b/security/lego/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lego
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.6.0
+DISTVERSION=	3.7.0
 CATEGORIES=	security
 
 MAINTAINER=	matt@matthoran.com
@@ -24,31 +24,30 @@ GH_PROJECT=	ini:go_ini_ini
 GH_TAGNAME=	v1.51.1:go_ini_ini
 GH_TUPLE=	\
 		Azure:azure-sdk-for-go:v32.4.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
-		Azure:go-autorest:autorest/azure/auth/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorestazure/auth \
-		Azure:go-autorest:autorest/azure/cli/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/azure/cli \
-		Azure:go-autorest:autorest/date/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/date \
-		Azure:go-autorest:autorest/validation/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/validation \
-		Azure:go-autorest:logger/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/logger \
-		Azure:go-autorest:tracing/v0.1.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/tracing \
-		Azure:go-autorest:autorest/adal/v0.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest/adal \
-		Azure:go-autorest:autorest/to/v0.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorestto \
-		Azure:go-autorest:autorest/v0.5.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
+		Azure:go-autorest:2913f263500c:azure_go_autorest_adal/vendor/github.com/Azure/go-autorest \
+		Azure:go-autorest:3133e83bedd2:azure_go_autorest_cli \
+		Azure:go-autorest:4bb4e3c99dd9:azure_go_autorest_date \
+		Azure:go-autorest:autorest/v0.5.0:azure_go_autorest_autorest \
+		Azure:go-autorest:da8db3a19ec5:azure_go_autorest_auth \
+		Azure:go-autorest:f29a2eccaa17:azure_go_autorest_to \
+		Azure:go-autorest:logger/v0.1.0:azure_go_autorest_logger \
+		Azure:go-autorest:tracing/v0.1.0:azure_go_autorest_tracing \
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		OpenDNS:vegadns2client:a3fa4a771d87:opendns_vegadns2client/vendor/github.com/OpenDNS/vegadns2client \
 		akamai:AkamaiOPEN-edgegrid-golang:v0.9.8:akamai_akamaiopen_edgegrid_golang/vendor/github.com/akamai/AkamaiOPEN-edgegrid-golang \
 		aliyun:alibaba-cloud-sdk-go:v1.61.112:aliyun_alibaba_cloud_sdk_go/vendor/github.com/aliyun/alibaba-cloud-sdk-go \
-		aws:aws-sdk-go:v1.23.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
-		cenkalti:backoff:v4.0.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff/v4 \
+		aws:aws-sdk-go:v1.30.20:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		cenkalti:backoff:v4.0.0:cenkalti_backoff_v4/vendor/github.com/cenkalti/backoff/v4 \
 		census-ecosystem:opencensus-go-exporter-ocagent:v0.4.12:census_ecosystem_opencensus_go_exporter_ocagent/vendor/contrib.go.opencensus.io/exporter/ocagent \
 		census-instrumentation:opencensus-go:v0.22.3:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		census-instrumentation:opencensus-proto:v0.2.1:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \
 		cloudflare:cloudflare-go:v0.10.2:cloudflare_cloudflare_go/vendor/github.com/cloudflare/cloudflare-go \
 		cpu:goacmedns:v0.0.2:cpu_goacmedns/vendor/github.com/cpu/goacmedns \
-		cpuguy83:go-md2man:f79a8a8ca69d:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man/v2 \
+		cpuguy83:go-md2man:f79a8a8ca69d:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		dimchansky:utfbom:v1.1.0:dimchansky_utfbom/vendor/github.com/dimchansky/utfbom \
-		dnsimple:dnsimple-go:v0.30.0:dnsimple_dnsimple_go/vendor/github.com/dnsimple/dnsimple-go \
+		dnsimple:dnsimple-go:v0.60.0:dnsimple_dnsimple_go/vendor/github.com/dnsimple/dnsimple-go \
 		exoscale:egoscale:v0.18.1:exoscale_egoscale/vendor/github.com/exoscale/egoscale \
 		fatih:structs:v1.1.0:fatih_structs/vendor/github.com/fatih/structs \
 		go-errors:errors:v1.0.1:go_errors_errors/vendor/github.com/go-errors/errors \
@@ -68,14 +67,14 @@ GH_TUPLE=	\
 		google:go-genproto:506484158171:google_go_genproto/vendor/google.golang.org/genproto \
 		google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
+		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
 		googleapis:google-api-go-client:v0.20.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:v0.54.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		gophercloud:gophercloud:v0.3.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
 		grpc-ecosystem:grpc-gateway:v1.8.5:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
 		grpc:grpc-go:v1.27.1:grpc_grpc_go/vendor/google.golang.org/grpc \
 		iij:doapi:0bbf12d6d7df:iij_doapi/vendor/github.com/iij/doapi \
-		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
+		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		json-iterator:go:v1.1.7:json_iterator_go/vendor/github.com/json-iterator/go \
 		kolo:xmlrpc:07c4ee3fd181:kolo_xmlrpc/vendor/github.com/kolo/xmlrpc \
 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
@@ -96,10 +95,10 @@ GH_TUPLE=	\
 		ns1:ns1-go:b51389932cbc:ns1_ns1_go/vendor/gopkg.in/ns1/ns1-go.v2 \
 		oracle:oci-go-sdk:v7.0.0:oracle_oci_go_sdk/vendor/github.com/oracle/oci-go-sdk \
 		ovh:go-ovh:ba5adb4cf014:ovh_go_ovh/vendor/github.com/ovh/go-ovh \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		rainycape:memcache:1031fa0ce2f2:rainycape_memcache/vendor/github.com/rainycape/memcache \
-		russross:blackfriday:v2.0.1:russross_blackfriday/vendor/github.com/russross/blackfriday/v2 \
+		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		sacloud:libsacloud:v1.26.1:sacloud_libsacloud/vendor/github.com/sacloud/libsacloud \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
@@ -107,7 +106,7 @@ GH_TUPLE=	\
 		stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \
 		timewasted:linode:37e84520dcf7:timewasted_linode/vendor/github.com/timewasted/linode \
-		transip:gotransip:v6.0.2:transip_gotransip/vendor/github.com/transip/gotransip/v6 \
+		transip:gotransip:v6.0.2:transip_gotransip_v6/vendor/github.com/transip/gotransip/v6 \
 		uber-go:ratelimit:c15da0234277:uber_go_ratelimit/vendor/go.uber.org/ratelimit \
 		urfave:cli:v1.22.1:urfave_cli/vendor/github.com/urfave/cli \
 		vultr:govultr:v0.1.4:vultr_govultr/vendor/github.com/vultr/govultr
diff --git a/security/lego/distinfo b/security/lego/distinfo
index 8f5649886f1e..658bc4e820e9 100644
--- a/security/lego/distinfo
+++ b/security/lego/distinfo
@@ -1,12 +1,26 @@
-TIMESTAMP = 1587749915
-SHA256 (go-acme-lego-v3.6.0_GH0.tar.gz) = a18ec4447b341ffc28771b11714db530a9cda1e7c6ffeef95eed21ad63ed1173
-SIZE (go-acme-lego-v3.6.0_GH0.tar.gz) = 372018
+TIMESTAMP = 1589217779
+SHA256 (go-acme-lego-v3.7.0_GH0.tar.gz) = 183ce619fae873183b2aa9f797167ecdfc38e149529967aa7ec8e789abf0ae6f
+SIZE (go-acme-lego-v3.7.0_GH0.tar.gz) = 390314
 SHA256 (go-ini-ini-v1.51.1_GH0.tar.gz) = 1a42156fe93f0360155e90a5869638c7ae0d56b16acc88c8941b66d4211c24a7
 SIZE (go-ini-ini-v1.51.1_GH0.tar.gz) = 43935
 SHA256 (Azure-azure-sdk-for-go-v32.4.0_GH0.tar.gz) = 3f0824be0fd8bdbe2ea9d39485b8d3d7296465ce65641ce9652491a37d936f96
 SIZE (Azure-azure-sdk-for-go-v32.4.0_GH0.tar.gz) = 17518065
+SHA256 (Azure-go-autorest-2913f263500c_GH0.tar.gz) = e354a5237f2e2f3bbc24fc3547cbdad15af302e65c29dca2455ad3fd79607d50
+SIZE (Azure-go-autorest-2913f263500c_GH0.tar.gz) = 176762
+SHA256 (Azure-go-autorest-3133e83bedd2_GH0.tar.gz) = ebbd8ce194087653033ecdf63fc250f0cce21134ff281a449c5480a82f37cbde
+SIZE (Azure-go-autorest-3133e83bedd2_GH0.tar.gz) = 156658
+SHA256 (Azure-go-autorest-4bb4e3c99dd9_GH0.tar.gz) = 9bac592597c8bb83cbd38c4d98b7fab66166e870fe6adf10eab0129b806619b4
+SIZE (Azure-go-autorest-4bb4e3c99dd9_GH0.tar.gz) = 141419
 SHA256 (Azure-go-autorest-autorest-v0.5.0_GH0.tar.gz) = 3c2b6cd2da4544728d920f86481bcee486dcd202aaf9849cbfa4783764418164
 SIZE (Azure-go-autorest-autorest-v0.5.0_GH0.tar.gz) = 177026
+SHA256 (Azure-go-autorest-da8db3a19ec5_GH0.tar.gz) = 0a97a8137494822b74f1194314248c99e6ccc2c67955d7ec5dd1b35c86e5e567
+SIZE (Azure-go-autorest-da8db3a19ec5_GH0.tar.gz) = 171711
+SHA256 (Azure-go-autorest-f29a2eccaa17_GH0.tar.gz) = 07051ed6c332b098705bc41b42703c2461c5e9f8d1d3581c022ecce2be721b3f
+SIZE (Azure-go-autorest-f29a2eccaa17_GH0.tar.gz) = 171856
+SHA256 (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = d642ed3d87f3dc9fcde6c7ff7b82a3b3463b70f6ff2d5a7c6c37099d754c464e
+SIZE (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = 141423
+SHA256 (Azure-go-autorest-tracing-v0.1.0_GH0.tar.gz) = 8cb5b9fc3169f11dc8ae625494c949ffca0c85193d8eadabe00dee9ff4ffedab
+SIZE (Azure-go-autorest-tracing-v0.1.0_GH0.tar.gz) = 141417
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (OpenDNS-vegadns2client-a3fa4a771d87_GH0.tar.gz) = ab765448eb6d377e71ece541ae817f2e5264c21604e24bff9f382f2509e5caa9
@@ -15,8 +29,8 @@ SHA256 (akamai-AkamaiOPEN-edgegrid-golang-v0.9.8_GH0.tar.gz) = 6660d7929722669ab
 SIZE (akamai-AkamaiOPEN-edgegrid-golang-v0.9.8_GH0.tar.gz) = 122859
 SHA256 (aliyun-alibaba-cloud-sdk-go-v1.61.112_GH0.tar.gz) = b70f8fa4b04fca9b562a813cd2849b38286cf91ef65758f6874a81f1548913b2
 SIZE (aliyun-alibaba-cloud-sdk-go-v1.61.112_GH0.tar.gz) = 3257274
-SHA256 (aws-aws-sdk-go-v1.23.0_GH0.tar.gz) = a00c1a6a5dc16d754d3a24dc1c3ed32b3981d52d4d5ae859ce4fea4832c987c9
-SIZE (aws-aws-sdk-go-v1.23.0_GH0.tar.gz) = 11740284
+SHA256 (aws-aws-sdk-go-v1.30.20_GH0.tar.gz) = d870f7a7259fd1b59c39ba35ea195d454547262a114221425ecd4dc80d4035cb
+SIZE (aws-aws-sdk-go-v1.30.20_GH0.tar.gz) = 14700063
 SHA256 (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 976c5d645edf39b748d4941157f750849a809657435bdfea9b47b51f1fe463aa
 SIZE (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 9317
 SHA256 (census-ecosystem-opencensus-go-exporter-ocagent-v0.4.12_GH0.tar.gz) = 44d09a4936ca7642acbb081f4b40563ee5263ebfdb7b6b83f0dc6b52495befd1
@@ -37,8 +51,8 @@ SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288
 SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
 SHA256 (dimchansky-utfbom-v1.1.0_GH0.tar.gz) = 86dd5045ac9318f945fed22f8dd1523051d65f7bea8da530b7e74759d8897463
 SIZE (dimchansky-utfbom-v1.1.0_GH0.tar.gz) = 8422
-SHA256 (dnsimple-dnsimple-go-v0.30.0_GH0.tar.gz) = fe8312d60c30c6fac42a25c28cce21720af5268ec1aafcc45a33d7bb113dba4c
-SIZE (dnsimple-dnsimple-go-v0.30.0_GH0.tar.gz) = 80864
+SHA256 (dnsimple-dnsimple-go-v0.60.0_GH0.tar.gz) = 076ee95c004e7accad5a78b67a67119086ad32f3a7c8c7db17000b2a009254da
+SIZE (dnsimple-dnsimple-go-v0.60.0_GH0.tar.gz) = 85135
 SHA256 (exoscale-egoscale-v0.18.1_GH0.tar.gz) = 197edc29b0e560fc8d3263c1a0f577bd508a2beb4ab0ab1758ff6156ed1d10d5
 SIZE (exoscale-egoscale-v0.18.1_GH0.tar.gz) = 163721
 SHA256 (fatih-structs-v1.1.0_GH0.tar.gz) = 7479adacd8172f74968da4e1e14f1cc47c0bc98c48f44c09c497416dc8c9dfe4
@@ -91,8 +105,8 @@ SHA256 (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 2e25c66a7fe59a49d94d24280afabfbc56396
 SIZE (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 826728
 SHA256 (iij-doapi-0bbf12d6d7df_GH0.tar.gz) = cc05306a4f4dee56a3e3c239a68909a9553ca8bfd2b08196308838e8b55debb4
 SIZE (iij-doapi-0bbf12d6d7df_GH0.tar.gz) = 9828
-SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
-SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
+SHA256 (jmespath-go-jmespath-v0.3.0_GH0.tar.gz) = 3ecaa95ad8c9b2805f3de299133f112f198b5829de6ca0e27fa28b9f4801e18a
+SIZE (jmespath-go-jmespath-v0.3.0_GH0.tar.gz) = 49962
 SHA256 (json-iterator-go-v1.1.7_GH0.tar.gz) = fb0560a12eab7071f8518104703b6b2b1e6a5a0b564c8d61b0b68d29f6471233
 SIZE (json-iterator-go-v1.1.7_GH0.tar.gz) = 77936
 SHA256 (kolo-xmlrpc-07c4ee3fd181_GH0.tar.gz) = 92933593d5aac08c597357cbd7edafe5ca8a8ecb6217bf6da1ccfbc8cbac1d88
@@ -133,8 +147,8 @@ SHA256 (oracle-oci-go-sdk-v7.0.0_GH0.tar.gz) = 16145dcb94252801dd9b3f12fc1d1a260
 SIZE (oracle-oci-go-sdk-v7.0.0_GH0.tar.gz) = 794408
 SHA256 (ovh-go-ovh-ba5adb4cf014_GH0.tar.gz) = 4bdc8e7a23a5d3f9e41d4087c12df8a93f885ea918c3c1495c005cd0ff8abe9b
 SIZE (ovh-go-ovh-ba5adb4cf014_GH0.tar.gz) = 18995
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (rainycape-memcache-1031fa0ce2f2_GH0.tar.gz) = 988707f8ea120168d32f779e076b85d847ac6f79a9c2bacabbb3b0c69815a1f5
diff --git a/security/lego/files/pkg-message.in b/security/lego/files/pkg-message.in
index 59c4cdcb26f7..69b84ae40d90 100644
--- a/security/lego/files/pkg-message.in
+++ b/security/lego/files/pkg-message.in
@@ -1,7 +1,7 @@
 [
 { type: install
   message: <<EOM
-There are example scripts in
+There are sample scripts in
     %%ETCDIR%%
 that you can use for renewing and deploying certificates.
 
@@ -18,7 +18,14 @@ Script to run to renew certificates, will be run as %%LEGO_USER%% (required)
 To run a script after the renewal to deploy certificates
     weekly_lego_deployscript="%%ETCDIR%%/deploy.sh"
 
-If using the example renew script, add the domains for which lego will manage
+Note that the deploy script is provided as a sample and may need to be modified
+for your environment. The script will attempt to deploy certificates to
+    %%ETCDIR%%/ssl/certs
+and private keys to
+    %%ETCDIR%%/ssl/private.
+The script also tries to restart nginx.
+
+If using the sample renew script, add the domains for which lego will manage
 certificates to
     %%ETCDIR%%/domains.txt, one domain on each line.