Update to 20141121

PR:		198402
Approved by:	maintainer timeout

4 files changed, 79 insertions, 4 deletions

diff --git a/security/go.crypto/Makefile b/security/go.crypto/Makefile
index f0b2289a8492..80451aef867f 100644
--- a/security/go.crypto/Makefile
+++ b/security/go.crypto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	go.crypto
-PORTVERSION=	20140828
+PORTVERSION=	20141121
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.c-s.li/ports/
 
@@ -21,6 +21,7 @@ GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/ocsp		\
 		${GO_PKGNAME}/openpgp		\
 		${GO_PKGNAME}/openpgp/armor	\
+		${GO_PKGNAME}/openpgp/clearsign	\
 		${GO_PKGNAME}/openpgp/elgamal	\
 		${GO_PKGNAME}/openpgp/errors	\
 		${GO_PKGNAME}/openpgp/packet	\
@@ -34,10 +35,46 @@ GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/scrypt		\
 		${GO_PKGNAME}/sha3		\
 		${GO_PKGNAME}/ssh		\
+		${GO_PKGNAME}/ssh/agent		\
+		${GO_PKGNAME}/ssh/terminal	\
+		${GO_PKGNAME}/ssh/test		\
+		${GO_PKGNAME}/ssh/testdata	\
 		${GO_PKGNAME}/twofish		\
 		${GO_PKGNAME}/xtea		\
 		${GO_PKGNAME}/xts
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|golang\.org\/x\/crypto|code\.google\.com\/p\/go\.crypto|g' \
+		${WRKSRC}/bcrypt/bcrypt.go \
+		${WRKSRC}/nacl/box/box.go \
+		${WRKSRC}/nacl/secretbox/secretbox.go \
+		${WRKSRC}/openpgp/armor/armor.go \
+		${WRKSRC}/openpgp/clearsign/clearsign.go \
+		${WRKSRC}/openpgp/keys.go \
+		${WRKSRC}/openpgp/packet/compressed.go \
+		${WRKSRC}/openpgp/packet/encrypted_key.go \
+		${WRKSRC}/openpgp/packet/one_pass_signature.go \
+		${WRKSRC}/openpgp/packet/opaque.go \
+		${WRKSRC}/openpgp/packet/packet.go \
+		${WRKSRC}/openpgp/packet/private_key.go \
+		${WRKSRC}/openpgp/packet/public_key.go \
+		${WRKSRC}/openpgp/packet/public_key_v3.go \
+		${WRKSRC}/openpgp/packet/reader.go \
+		${WRKSRC}/openpgp/packet/signature.go \
+		${WRKSRC}/openpgp/packet/signature_v3.go \
+		${WRKSRC}/openpgp/packet/symmetric_key_encrypted.go \
+		${WRKSRC}/openpgp/packet/symmetrically_encrypted.go \
+		${WRKSRC}/openpgp/read.go \
+		${WRKSRC}/openpgp/s2k/s2k.go \
+		${WRKSRC}/openpgp/write.go \
+		${WRKSRC}/salsa20/salsa20.go \
+		${WRKSRC}/scrypt/scrypt.go \
+		${WRKSRC}/ssh/agent/client.go \
+		${WRKSRC}/ssh/agent/forward.go \
+		${WRKSRC}/ssh/agent/keyring.go \
+		${WRKSRC}/ssh/agent/server.go
+
 .include <bsd.port.post.mk>
diff --git a/security/go.crypto/distinfo b/security/go.crypto/distinfo
index b62124a52e6e..94770b42898c 100644
--- a/security/go.crypto/distinfo
+++ b/security/go.crypto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (go.crypto-20140828.tar.gz) = 452576b5ab1819ab0e4c80ca3d9cb68688ed1440a042ed5bbfa69903a8b22b19
-SIZE (go.crypto-20140828.tar.gz) = 325260
+SHA256 (go.crypto-20141121.tar.gz) = 0db6094072e85dbd70c2f04bc71c7f62381c70a271ace072301f1bf0865854e3
+SIZE (go.crypto-20141121.tar.gz) = 851267
diff --git a/security/go.crypto/pkg-descr b/security/go.crypto/pkg-descr
index 2cec738149d3..8abf74ca382c 100644
--- a/security/go.crypto/pkg-descr
+++ b/security/go.crypto/pkg-descr
@@ -1,4 +1,4 @@
 go.crypto contains additional packages dealing with cryptography for Go, such
 as bcrypt, blowfish, openpgp and ssh.
 
-WWW:	http://code.google.com/p/go/source/browse?repo=crypto
+WWW: http://code.google.com/p/go/source/browse?repo=crypto
diff --git a/security/go.crypto/pkg-plist b/security/go.crypto/pkg-plist
index ed6fb73392d9..1b48e99ead39 100644
--- a/security/go.crypto/pkg-plist
+++ b/security/go.crypto/pkg-plist
@@ -10,6 +10,7 @@
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/ocsp.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp/armor.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp/clearsign.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp/elgamal.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp/errors.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp/packet.a
@@ -23,11 +24,16 @@
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/scrypt.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/sha3.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/ssh.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%/ssh/agent.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%/ssh/terminal.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%/ssh/test.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%/ssh/testdata.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/twofish.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/xtea.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/xts.a
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt/base64.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt/bcrypt.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt/bcrypt.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt/bcrypt_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/blowfish/block.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/blowfish/blowfish_test.go
@@ -62,60 +68,81 @@
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/md4/md4_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/md4/md4block.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box/box.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box/box.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box/box_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox/secretbox.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox/secretbox.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox/secretbox_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ocsp/ocsp.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ocsp/ocsp_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor/armor.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor/armor.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor/armor_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor/encode.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/canonical_text.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/canonical_text_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign/clearsign.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign/clearsign.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign/clearsign_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/elgamal/elgamal.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/elgamal/elgamal_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/errors/errors.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/keys.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/keys.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/keys_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/compressed.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/compressed.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/compressed_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/config.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/encrypted_key.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/encrypted_key.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/encrypted_key_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/literal.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/ocfb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/ocfb_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/one_pass_signature.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/one_pass_signature.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/opaque.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/opaque.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/opaque_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/packet.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/packet.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/packet_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/private_key.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/private_key.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/private_key_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key_v3.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key_v3.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/public_key_v3_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/reader.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/reader.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature_v3.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature_v3.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/signature_v3_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetric_key_encrypted.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetric_key_encrypted.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetric_key_encrypted_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetrically_encrypted.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetrically_encrypted.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/symmetrically_encrypted_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/userattribute.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/userattribute_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/userid.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet/userid_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/read.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/read.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/read_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k/s2k.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k/s2k.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k/s2k_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/write.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/write.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/write_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/otr/libotr_test_helper.c
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/otr/otr.go
@@ -139,17 +166,28 @@
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa/salsa20_ref.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa/salsa_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa20.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa20.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa20_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt/scrypt.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt/scrypt.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt/scrypt_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/doc.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/hashes.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/keccakKats.json.deflate
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/keccakf.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/register.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/sha3.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/sha3_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3/shake.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/client.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/client.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/client_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/forward.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/forward.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/keyring.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/keyring.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/server.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/server.go.bak
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/server_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent/testdata_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/benchmark_test.go