Update go-net to 20151229. Instead of boring commitlogs, my summary of

changes is:

- http2 package replaces spdy. New interactive HTTP2 debugger, h2i.
- New context/ctxhttp for context-aware HTTP request handlers.
- New xsrftoken package for generating and checking XSRF tokens.
- Improved HTML5-capable HTML parser.

4 files changed, 112 insertions, 19 deletions

diff --git a/net/go-net/Makefile b/net/go-net/Makefile
index fec0178ccc9..990a33b899e 100644
--- a/net/go-net/Makefile
+++ b/net/go-net/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/13 14:34:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/03 20:22:53 bsiegert Exp $
 #
 
-DISTNAME=		go-net-20150310
-PKGREVISION=		1
+DISTNAME=		go-net-20151229
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=		net
-GITHUB_TAG=		6dc0abcce2
+GITHUB_TAG=		0cb26f788d
 
 MAINTAINER=		bsiegert@NetBSD.org
 HOMEPAGE=		http://golang.org/
@@ -17,5 +16,6 @@ GO_SRCPATH=		golang.org/x/net
 GO_DIST_BASE=		${GITHUB_PROJECT}-${GITHUB_TAG}*
 
 .include "../../textproc/go-text/buildlink3.mk"
+.include "../../security/go-crypto/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/go-net/PLIST b/net/go-net/PLIST
index 440c6dcad38..64e1e4231e0 100644
--- a/net/go-net/PLIST
+++ b/net/go-net/PLIST
@@ -1,29 +1,41 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/10 21:28:45 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/01/03 20:22:53 bsiegert Exp $
+bin/h2i
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context/ctxhttp.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/dict.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html/atom.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html/charset.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/http2.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/http2/hpack.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/icmp.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/idna.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/iana.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/nettest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/timeseries.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/ipv4.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/ipv6.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/netutil.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/proxy.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/publicsuffix.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/spdy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/trace.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav/internal/xml.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/websocket.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/xsrftoken.a
 gopkg/src/golang.org/x/net/AUTHORS
 gopkg/src/golang.org/x/net/CONTRIBUTING.md
 gopkg/src/golang.org/x/net/CONTRIBUTORS
 gopkg/src/golang.org/x/net/LICENSE
 gopkg/src/golang.org/x/net/PATENTS
 gopkg/src/golang.org/x/net/README
+gopkg/src/golang.org/x/net/codereview.cfg
 gopkg/src/golang.org/x/net/context/context.go
 gopkg/src/golang.org/x/net/context/context_test.go
+gopkg/src/golang.org/x/net/context/ctxhttp/cancelreq.go
+gopkg/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
+gopkg/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
+gopkg/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
 gopkg/src/golang.org/x/net/context/withtimeout_test.go
 gopkg/src/golang.org/x/net/dict/dict.go
 gopkg/src/golang.org/x/net/html/atom/atom.go
@@ -33,8 +45,6 @@ gopkg/src/golang.org/x/net/html/atom/table.go
 gopkg/src/golang.org/x/net/html/atom/table_test.go
 gopkg/src/golang.org/x/net/html/charset/charset.go
 gopkg/src/golang.org/x/net/html/charset/charset_test.go
-gopkg/src/golang.org/x/net/html/charset/gen.go
-gopkg/src/golang.org/x/net/html/charset/table.go
 gopkg/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
 gopkg/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
 gopkg/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
@@ -111,6 +121,57 @@ gopkg/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
 gopkg/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
 gopkg/src/golang.org/x/net/html/token.go
 gopkg/src/golang.org/x/net/html/token_test.go
+gopkg/src/golang.org/x/net/http2/.gitignore
+gopkg/src/golang.org/x/net/http2/Dockerfile
+gopkg/src/golang.org/x/net/http2/Makefile
+gopkg/src/golang.org/x/net/http2/README
+gopkg/src/golang.org/x/net/http2/client_conn_pool.go
+gopkg/src/golang.org/x/net/http2/configure_transport.go
+gopkg/src/golang.org/x/net/http2/errors.go
+gopkg/src/golang.org/x/net/http2/errors_test.go
+gopkg/src/golang.org/x/net/http2/fixed_buffer.go
+gopkg/src/golang.org/x/net/http2/fixed_buffer_test.go
+gopkg/src/golang.org/x/net/http2/flow.go
+gopkg/src/golang.org/x/net/http2/flow_test.go
+gopkg/src/golang.org/x/net/http2/frame.go
+gopkg/src/golang.org/x/net/http2/frame_test.go
+gopkg/src/golang.org/x/net/http2/go15.go
+gopkg/src/golang.org/x/net/http2/gotrack.go
+gopkg/src/golang.org/x/net/http2/gotrack_test.go
+gopkg/src/golang.org/x/net/http2/h2demo/.gitignore
+gopkg/src/golang.org/x/net/http2/h2demo/Makefile
+gopkg/src/golang.org/x/net/http2/h2demo/README
+gopkg/src/golang.org/x/net/http2/h2demo/h2demo.go
+gopkg/src/golang.org/x/net/http2/h2demo/launch.go
+gopkg/src/golang.org/x/net/http2/h2demo/rootCA.key
+gopkg/src/golang.org/x/net/http2/h2demo/rootCA.pem
+gopkg/src/golang.org/x/net/http2/h2demo/rootCA.srl
+gopkg/src/golang.org/x/net/http2/h2demo/server.crt
+gopkg/src/golang.org/x/net/http2/h2demo/server.key
+gopkg/src/golang.org/x/net/http2/h2i/README.md
+gopkg/src/golang.org/x/net/http2/h2i/h2i.go
+gopkg/src/golang.org/x/net/http2/headermap.go
+gopkg/src/golang.org/x/net/http2/hpack/encode.go
+gopkg/src/golang.org/x/net/http2/hpack/encode_test.go
+gopkg/src/golang.org/x/net/http2/hpack/hpack.go
+gopkg/src/golang.org/x/net/http2/hpack/hpack_test.go
+gopkg/src/golang.org/x/net/http2/hpack/huffman.go
+gopkg/src/golang.org/x/net/http2/hpack/tables.go
+gopkg/src/golang.org/x/net/http2/http2.go
+gopkg/src/golang.org/x/net/http2/http2_test.go
+gopkg/src/golang.org/x/net/http2/not_go15.go
+gopkg/src/golang.org/x/net/http2/not_go16.go
+gopkg/src/golang.org/x/net/http2/pipe.go
+gopkg/src/golang.org/x/net/http2/pipe_test.go
+gopkg/src/golang.org/x/net/http2/priority_test.go
+gopkg/src/golang.org/x/net/http2/server.go
+gopkg/src/golang.org/x/net/http2/server_test.go
+gopkg/src/golang.org/x/net/http2/testdata/draft-ietf-httpbis-http2.xml
+gopkg/src/golang.org/x/net/http2/transport.go
+gopkg/src/golang.org/x/net/http2/transport_test.go
+gopkg/src/golang.org/x/net/http2/write.go
+gopkg/src/golang.org/x/net/http2/writesched.go
+gopkg/src/golang.org/x/net/http2/z_spec_test.go
 gopkg/src/golang.org/x/net/icmp/dstunreach.go
 gopkg/src/golang.org/x/net/icmp/echo.go
 gopkg/src/golang.org/x/net/icmp/endpoint.go
@@ -144,10 +205,16 @@ gopkg/src/golang.org/x/net/internal/iana/gen.go
 gopkg/src/golang.org/x/net/internal/nettest/error_posix.go
 gopkg/src/golang.org/x/net/internal/nettest/error_stub.go
 gopkg/src/golang.org/x/net/internal/nettest/interface.go
+gopkg/src/golang.org/x/net/internal/nettest/rlimit.go
+gopkg/src/golang.org/x/net/internal/nettest/rlimit_stub.go
+gopkg/src/golang.org/x/net/internal/nettest/rlimit_unix.go
+gopkg/src/golang.org/x/net/internal/nettest/rlimit_windows.go
 gopkg/src/golang.org/x/net/internal/nettest/stack.go
 gopkg/src/golang.org/x/net/internal/nettest/stack_stub.go
 gopkg/src/golang.org/x/net/internal/nettest/stack_unix.go
 gopkg/src/golang.org/x/net/internal/nettest/stack_windows.go
+gopkg/src/golang.org/x/net/internal/timeseries/timeseries.go
+gopkg/src/golang.org/x/net/internal/timeseries/timeseries_test.go
 gopkg/src/golang.org/x/net/ipv4/control.go
 gopkg/src/golang.org/x/net/ipv4/control_bsd.go
 gopkg/src/golang.org/x/net/ipv4/control_pktinfo.go
@@ -221,6 +288,11 @@ gopkg/src/golang.org/x/net/ipv4/zsys_freebsd_arm.go
 gopkg/src/golang.org/x/net/ipv4/zsys_linux_386.go
 gopkg/src/golang.org/x/net/ipv4/zsys_linux_amd64.go
 gopkg/src/golang.org/x/net/ipv4/zsys_linux_arm.go
+gopkg/src/golang.org/x/net/ipv4/zsys_linux_arm64.go
+gopkg/src/golang.org/x/net/ipv4/zsys_linux_mips64.go
+gopkg/src/golang.org/x/net/ipv4/zsys_linux_mips64le.go
+gopkg/src/golang.org/x/net/ipv4/zsys_linux_ppc64.go
+gopkg/src/golang.org/x/net/ipv4/zsys_linux_ppc64le.go
 gopkg/src/golang.org/x/net/ipv4/zsys_netbsd.go
 gopkg/src/golang.org/x/net/ipv4/zsys_openbsd.go
 gopkg/src/golang.org/x/net/ipv4/zsys_solaris.go
@@ -295,6 +367,11 @@ gopkg/src/golang.org/x/net/ipv6/zsys_freebsd_arm.go
 gopkg/src/golang.org/x/net/ipv6/zsys_linux_386.go
 gopkg/src/golang.org/x/net/ipv6/zsys_linux_amd64.go
 gopkg/src/golang.org/x/net/ipv6/zsys_linux_arm.go
+gopkg/src/golang.org/x/net/ipv6/zsys_linux_arm64.go
+gopkg/src/golang.org/x/net/ipv6/zsys_linux_mips64.go
+gopkg/src/golang.org/x/net/ipv6/zsys_linux_mips64le.go
+gopkg/src/golang.org/x/net/ipv6/zsys_linux_ppc64.go
+gopkg/src/golang.org/x/net/ipv6/zsys_linux_ppc64le.go
 gopkg/src/golang.org/x/net/ipv6/zsys_netbsd.go
 gopkg/src/golang.org/x/net/ipv6/zsys_openbsd.go
 gopkg/src/golang.org/x/net/ipv6/zsys_solaris.go
@@ -311,19 +388,32 @@ gopkg/src/golang.org/x/net/publicsuffix/list.go
 gopkg/src/golang.org/x/net/publicsuffix/list_test.go
 gopkg/src/golang.org/x/net/publicsuffix/table.go
 gopkg/src/golang.org/x/net/publicsuffix/table_test.go
-gopkg/src/golang.org/x/net/spdy/dictionary.go
-gopkg/src/golang.org/x/net/spdy/read.go
-gopkg/src/golang.org/x/net/spdy/spdy_test.go
-gopkg/src/golang.org/x/net/spdy/types.go
-gopkg/src/golang.org/x/net/spdy/write.go
+gopkg/src/golang.org/x/net/trace/events.go
+gopkg/src/golang.org/x/net/trace/histogram.go
+gopkg/src/golang.org/x/net/trace/histogram_test.go
+gopkg/src/golang.org/x/net/trace/trace.go
+gopkg/src/golang.org/x/net/trace/trace_test.go
 gopkg/src/golang.org/x/net/webdav/file.go
 gopkg/src/golang.org/x/net/webdav/file_test.go
 gopkg/src/golang.org/x/net/webdav/if.go
 gopkg/src/golang.org/x/net/webdav/if_test.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/README
+gopkg/src/golang.org/x/net/webdav/internal/xml/atom_test.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/example_test.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/marshal.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/marshal_test.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/read.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/read_test.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/typeinfo.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/xml.go
+gopkg/src/golang.org/x/net/webdav/internal/xml/xml_test.go
 gopkg/src/golang.org/x/net/webdav/litmus_test_server.go
 gopkg/src/golang.org/x/net/webdav/lock.go
 gopkg/src/golang.org/x/net/webdav/lock_test.go
+gopkg/src/golang.org/x/net/webdav/prop.go
+gopkg/src/golang.org/x/net/webdav/prop_test.go
 gopkg/src/golang.org/x/net/webdav/webdav.go
+gopkg/src/golang.org/x/net/webdav/webdav_test.go
 gopkg/src/golang.org/x/net/webdav/xml.go
 gopkg/src/golang.org/x/net/webdav/xml_test.go
 gopkg/src/golang.org/x/net/websocket/client.go
@@ -334,3 +424,5 @@ gopkg/src/golang.org/x/net/websocket/hybi_test.go
 gopkg/src/golang.org/x/net/websocket/server.go
 gopkg/src/golang.org/x/net/websocket/websocket.go
 gopkg/src/golang.org/x/net/websocket/websocket_test.go
+gopkg/src/golang.org/x/net/xsrftoken/xsrf.go
+gopkg/src/golang.org/x/net/xsrftoken/xsrf_test.go
diff --git a/net/go-net/buildlink3.mk b/net/go-net/buildlink3.mk
index 3b0b9e4c7e6..fd65bf6af2f 100644
--- a/net/go-net/buildlink3.mk
+++ b/net/go-net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/01/03 20:22:53 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-net
 
@@ -12,6 +12,7 @@ BUILDLINK_API_DEPENDS.go-net+=	go-net>=20150310
 BUILDLINK_PKGSRCDIR.go-net?=	../../net/go-net
 
 .include "../../textproc/go-text/buildlink3.mk"
+.include "../../security/go-crypto/buildlink3.mk"
 .endif	# GO_NET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-net
diff --git a/net/go-net/distinfo b/net/go-net/distinfo
index 3244e41ac48..3d6c2b43550 100644
--- a/net/go-net/distinfo
+++ b/net/go-net/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 00:35:02 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/01/03 20:22:53 bsiegert Exp $
 
-SHA1 (go-net-20150310-6dc0abcce2.tar.gz) = 3fadce9dae347b684bbf6d2209cc68c794eeb5fd
-RMD160 (go-net-20150310-6dc0abcce2.tar.gz) = bf1544c3e00ff11c80308839a06e2bbf2c7ecbbd
-SHA512 (go-net-20150310-6dc0abcce2.tar.gz) = a39aaed6467168ad8be9fec02af0f9919e9c65cbeb92fb8a0680c8695c89578520c90a786469e05ae462d56efb5b8d51f9ac92b36c3b3107fd628f7948e6bdee
-Size (go-net-20150310-6dc0abcce2.tar.gz) = 447714 bytes
+SHA1 (go-net-20151229-0cb26f788d.tar.gz) = 0c1f9ea7aac7c9583f76a4ecb7d48f07d4643b18
+RMD160 (go-net-20151229-0cb26f788d.tar.gz) = c91eb299ff2710d400f98207297359014edeed57
+SHA512 (go-net-20151229-0cb26f788d.tar.gz) = 70872e3d0e909efaa5198e11355d866d2aeddffe238d82a793ad7aba7d6ba2ffd7040b77ac7843a502928fa9c8c4f33eace07d6073ddd3f1cd7fd0b256308dd1
+Size (go-net-20151229-0cb26f788d.tar.gz) = 725351 bytes