Update go-crypto to 0.0.20180308. No changelog from upstream.

The circular dependency that prompted splitting this package is no longer
an issue, as acme now depends on context instead of golang.org/x/net/context.
Thus, this package now contains what used to be go-crypto-acme and conflicts
with it.

4 files changed, 64 insertions, 17 deletions

diff --git a/security/go-crypto/Makefile b/security/go-crypto/Makefile
index 6647aae22bc..96a3fbaf643 100644
--- a/security/go-crypto/Makefile
+++ b/security/go-crypto/Makefile
@@ -1,13 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2018/03/04 15:52:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/11 20:43:33 bsiegert Exp $
 
 COMMENT=	Go supplementary cryptography libraries
-PKGREVISION=	1
+DISTNAME=	go-crypto-0.0.20180308
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
+GITHUB_PROJECT=	crypto
+GITHUB_TAG=	c7dcf104e3
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/golang/crypto/
+LICENSE=	modified-bsd
 
 GO_SRCPATH=	golang.org/x/crypto
 GO_DIST_BASE=	${GITHUB_PROJECT}-${GITHUB_TAG}*
 
-# The "acme" package depends on x/net/context.
-pre-patch:
-	${RM} -r ${WRKSRC}/acme
+CONFLICTS=	go-crypto-acme-[0-9]*
 
-.include "Makefile.common"
+.include "../../lang/go/go-package.mk"
+.include "../../devel/go-sys/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/go-crypto/PLIST b/security/go-crypto/PLIST
index 97706858b23..c590494c52d 100644
--- a/security/go-crypto/PLIST
+++ b/security/go-crypto/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2017/05/02 17:06:30 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/03/11 20:43:33 bsiegert Exp $
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/acme/autocert.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/argon2.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/bcrypt.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/blake2b.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/blake2s.a
@@ -6,13 +9,15 @@ gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/blowfish.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/bn256.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/cast5.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/chacha20poly1305.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/chacha20poly1305/internal/chacha20.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/cryptobyte.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/cryptobyte/asn1.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/curve25519.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/ed25519.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/ed25519/internal/edwards25519.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/hkdf.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/internal/chacha20.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/md4.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/nacl/auth.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/nacl/box.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/nacl/secretbox.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/crypto/ocsp.a
@@ -47,7 +52,28 @@ gopkg/src/golang.org/x/crypto/CONTRIBUTING.md
 gopkg/src/golang.org/x/crypto/CONTRIBUTORS
 gopkg/src/golang.org/x/crypto/LICENSE
 gopkg/src/golang.org/x/crypto/PATENTS
-gopkg/src/golang.org/x/crypto/README
+gopkg/src/golang.org/x/crypto/README.md
+gopkg/src/golang.org/x/crypto/acme/acme.go
+gopkg/src/golang.org/x/crypto/acme/acme_test.go
+gopkg/src/golang.org/x/crypto/acme/autocert/autocert.go
+gopkg/src/golang.org/x/crypto/acme/autocert/autocert_test.go
+gopkg/src/golang.org/x/crypto/acme/autocert/cache.go
+gopkg/src/golang.org/x/crypto/acme/autocert/cache_test.go
+gopkg/src/golang.org/x/crypto/acme/autocert/example_test.go
+gopkg/src/golang.org/x/crypto/acme/autocert/listener.go
+gopkg/src/golang.org/x/crypto/acme/autocert/renewal.go
+gopkg/src/golang.org/x/crypto/acme/autocert/renewal_test.go
+gopkg/src/golang.org/x/crypto/acme/jws.go
+gopkg/src/golang.org/x/crypto/acme/jws_test.go
+gopkg/src/golang.org/x/crypto/acme/types.go
+gopkg/src/golang.org/x/crypto/acme/types_test.go
+gopkg/src/golang.org/x/crypto/argon2/argon2.go
+gopkg/src/golang.org/x/crypto/argon2/argon2_test.go
+gopkg/src/golang.org/x/crypto/argon2/blake2b.go
+gopkg/src/golang.org/x/crypto/argon2/blamka_amd64.go
+gopkg/src/golang.org/x/crypto/argon2/blamka_amd64.s
+gopkg/src/golang.org/x/crypto/argon2/blamka_generic.go
+gopkg/src/golang.org/x/crypto/argon2/blamka_ref.go
 gopkg/src/golang.org/x/crypto/bcrypt/base64.go
 gopkg/src/golang.org/x/crypto/bcrypt/bcrypt.go
 gopkg/src/golang.org/x/crypto/bcrypt/bcrypt_test.go
@@ -59,6 +85,7 @@ gopkg/src/golang.org/x/crypto/blake2b/blake2b_amd64.s
 gopkg/src/golang.org/x/crypto/blake2b/blake2b_generic.go
 gopkg/src/golang.org/x/crypto/blake2b/blake2b_ref.go
 gopkg/src/golang.org/x/crypto/blake2b/blake2b_test.go
+gopkg/src/golang.org/x/crypto/blake2b/blake2x.go
 gopkg/src/golang.org/x/crypto/blake2b/register.go
 gopkg/src/golang.org/x/crypto/blake2s/blake2s.go
 gopkg/src/golang.org/x/crypto/blake2s/blake2s_386.go
@@ -68,6 +95,7 @@ gopkg/src/golang.org/x/crypto/blake2s/blake2s_amd64.s
 gopkg/src/golang.org/x/crypto/blake2s/blake2s_generic.go
 gopkg/src/golang.org/x/crypto/blake2s/blake2s_ref.go
 gopkg/src/golang.org/x/crypto/blake2s/blake2s_test.go
+gopkg/src/golang.org/x/crypto/blake2s/blake2x.go
 gopkg/src/golang.org/x/crypto/blake2s/register.go
 gopkg/src/golang.org/x/crypto/blowfish/block.go
 gopkg/src/golang.org/x/crypto/blowfish/blowfish_test.go
@@ -92,10 +120,9 @@ gopkg/src/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go
 gopkg/src/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go
 gopkg/src/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_test.go
 gopkg/src/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go
-gopkg/src/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_generic.go
-gopkg/src/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_test.go
 gopkg/src/golang.org/x/crypto/codereview.cfg
 gopkg/src/golang.org/x/crypto/cryptobyte/asn1.go
+gopkg/src/golang.org/x/crypto/cryptobyte/asn1/asn1.go
 gopkg/src/golang.org/x/crypto/cryptobyte/asn1_test.go
 gopkg/src/golang.org/x/crypto/cryptobyte/builder.go
 gopkg/src/golang.org/x/crypto/cryptobyte/cryptobyte_test.go
@@ -120,11 +147,18 @@ gopkg/src/golang.org/x/crypto/ed25519/testdata/sign.input.gz
 gopkg/src/golang.org/x/crypto/hkdf/example_test.go
 gopkg/src/golang.org/x/crypto/hkdf/hkdf.go
 gopkg/src/golang.org/x/crypto/hkdf/hkdf_test.go
+gopkg/src/golang.org/x/crypto/internal/chacha20/chacha_generic.go
+gopkg/src/golang.org/x/crypto/internal/chacha20/chacha_test.go
+gopkg/src/golang.org/x/crypto/md4/example_test.go
 gopkg/src/golang.org/x/crypto/md4/md4.go
 gopkg/src/golang.org/x/crypto/md4/md4_test.go
 gopkg/src/golang.org/x/crypto/md4/md4block.go
+gopkg/src/golang.org/x/crypto/nacl/auth/auth.go
+gopkg/src/golang.org/x/crypto/nacl/auth/auth_test.go
+gopkg/src/golang.org/x/crypto/nacl/auth/example_test.go
 gopkg/src/golang.org/x/crypto/nacl/box/box.go
 gopkg/src/golang.org/x/crypto/nacl/box/box_test.go
+gopkg/src/golang.org/x/crypto/nacl/box/example_test.go
 gopkg/src/golang.org/x/crypto/nacl/secretbox/example_test.go
 gopkg/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
 gopkg/src/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
@@ -219,6 +253,7 @@ gopkg/src/golang.org/x/crypto/salsa20/salsa/salsa20_ref.go
 gopkg/src/golang.org/x/crypto/salsa20/salsa/salsa_test.go
 gopkg/src/golang.org/x/crypto/salsa20/salsa20.go
 gopkg/src/golang.org/x/crypto/salsa20/salsa20_test.go
+gopkg/src/golang.org/x/crypto/scrypt/example_test.go
 gopkg/src/golang.org/x/crypto/scrypt/scrypt.go
 gopkg/src/golang.org/x/crypto/scrypt/scrypt_test.go
 gopkg/src/golang.org/x/crypto/sha3/doc.go
@@ -288,11 +323,14 @@ gopkg/src/golang.org/x/crypto/ssh/terminal/util_plan9.go
 gopkg/src/golang.org/x/crypto/ssh/terminal/util_solaris.go
 gopkg/src/golang.org/x/crypto/ssh/terminal/util_windows.go
 gopkg/src/golang.org/x/crypto/ssh/test/agent_unix_test.go
+gopkg/src/golang.org/x/crypto/ssh/test/banner_test.go
 gopkg/src/golang.org/x/crypto/ssh/test/cert_test.go
 gopkg/src/golang.org/x/crypto/ssh/test/dial_unix_test.go
 gopkg/src/golang.org/x/crypto/ssh/test/doc.go
 gopkg/src/golang.org/x/crypto/ssh/test/forward_unix_test.go
+gopkg/src/golang.org/x/crypto/ssh/test/multi_auth_test.go
 gopkg/src/golang.org/x/crypto/ssh/test/session_test.go
+gopkg/src/golang.org/x/crypto/ssh/test/sshd_test_pw.c
 gopkg/src/golang.org/x/crypto/ssh/test/test_unix_test.go
 gopkg/src/golang.org/x/crypto/ssh/test/testdata_test.go
 gopkg/src/golang.org/x/crypto/ssh/testdata/doc.go
diff --git a/security/go-crypto/buildlink3.mk b/security/go-crypto/buildlink3.mk
index d67e997ec80..75f3d5685bb 100644
--- a/security/go-crypto/buildlink3.mk
+++ b/security/go-crypto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:28 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/11 20:43:33 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-crypto
 
@@ -11,6 +11,7 @@ BUILDLINK_DEPMETHOD.go-crypto?=		build
 BUILDLINK_API_DEPENDS.go-crypto+=	go-crypto>=0.0.20170317
 BUILDLINK_PKGSRCDIR.go-crypto?=		../../security/go-crypto
 
+.include "../../devel/go-sys/buildlink3.mk"
 .endif	# GO_CRYPTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-crypto
diff --git a/security/go-crypto/distinfo b/security/go-crypto/distinfo
index 03af909f241..901ced44b93 100644
--- a/security/go-crypto/distinfo
+++ b/security/go-crypto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2017/05/02 17:06:30 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2018/03/11 20:43:33 bsiegert Exp $
 
-SHA1 (go-crypto-0.0.20170502-8e03fc1ab6.tar.gz) = 9ca2509af63d3b9a366bae97fec3273028f5ffb0
-RMD160 (go-crypto-0.0.20170502-8e03fc1ab6.tar.gz) = e70c123d58914240cf4cb20bcd3c6b1bc13e2139
-SHA512 (go-crypto-0.0.20170502-8e03fc1ab6.tar.gz) = efcc9cb7d4b526a3d27a17198db3cfecdd5f2c7a9242244cdce0f8519b58aae2ac2287749d521504f43b56795b2811496b7a6bb62ad450c9ff62801a39638a53
-Size (go-crypto-0.0.20170502-8e03fc1ab6.tar.gz) = 1331613 bytes
+SHA1 (go-crypto-0.0.20180308-c7dcf104e3.tar.gz) = 1322992aaebe336ce424954c196e49a076ee017c
+RMD160 (go-crypto-0.0.20180308-c7dcf104e3.tar.gz) = 3d8f852250f3f78557476b624e7c9e3b25db33b0
+SHA512 (go-crypto-0.0.20180308-c7dcf104e3.tar.gz) = e22312a9a4c87ee35e1df182cafa4016733780a37bd8688f1d5cb87b47306b60bc7f8b24d69ecd9e00482483100849b6e821e6c8c96eccff02f65a9c71fc629e
+Size (go-crypto-0.0.20180308-c7dcf104e3.tar.gz) = 1451474 bytes