net/go-grpc: Update to 1.15.0

Recent new features:

- client: Add ClientConn.ResetConnectBackoff to force reconnections on
  demand
- channelz: stage 4 - add security and socket option info with
  appengine build tags
- ClientConn: add Target() returning target string
- balancer: add rpc method to PickOptions
- transport: set and respect HTTP/2 SETTINGS_MAX_HEADER_LIST_SIZE
- client: Implement gRFC A6: configurable client-side retry support
- grpc: update dial/server buffer options to support a "disable"
  setting
- credentials/alts: Add AuthInfoFromContext utility API
- status: Introduce FromContextError convenience function
- server: export ServerTransportStreamFromContext for unary
  interceptors to control headers/trailers
- metadata: Add Get, Set, and Append methods to metadata.MD
- server: add grpc.Method function for extracting method from context
- grpclb: cache SubConns for 10 seconds after it is removed from the
  backendlist
- clientconn: add support for unix network in DialContext
- client: introduce WithDisableServiceConfig DialOption
- stickiness: add stickiness support
- channelz: provide channel level info for live program network issue
  diagnosis/debugging

5 files changed, 260 insertions, 86 deletions

diff --git a/net/go-grpc/Makefile b/net/go-grpc/Makefile
index b068b451aff..941dd84676d 100644
--- a/net/go-grpc/Makefile
+++ b/net/go-grpc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2018/06/12 17:50:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2018/09/11 20:03:27 minskim Exp $
 
-DISTNAME=		go-grpc-1.0.1
-PKGREVISION=		8
+DISTNAME=		go-grpc-1.15.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_PROJECT=		grpc-go
-GITHUB_TAG=		v1.0.1-GA
+GITHUB_TAG=		v${PKGVERSION_NOREV}
 
 HOMEPAGE=		http://${GO_SRCPATH}
 COMMENT=		Go language implementation of gRPC, HTTP/2 based RPC
@@ -13,30 +12,25 @@ LICENSE=		modified-bsd
 
 GO_SRCPATH=		google.golang.org/grpc
 GO_DIST_BASE=		${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
-GO_BUILD_PATTERN=	${GO_SRCPATH}
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/codes/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/credentials/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/grpclog/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/health/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/metadata/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/naming/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/peer/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/reflection/...
-GO_BUILD_PATTERN+=	${GO_SRCPATH}/transport/...
-
-REPLACE_SH+=		codegen.sh
-REPLACE_SH+=		coverage.sh
 
-#pre-patch:
-#	${RM} -rf ${WRKSRC}/test
+GO_BUILD_PATTERN=	${GO_SRCPATH}
+.for godir in channelz codes connectivity credentials encoding \
+	go_vet grpclog health internal interop keepalive metadata \
+	naming peer reflection resolver stats status stress tap
+GO_BUILD_PATTERN+=	${GO_SRCPATH}/${godir}/...
+.endfor
 
-# due to patch
-post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/gopkg/src/google.golang.org/grpc/coverage.sh.orig
-	${RM} -f ${DESTDIR}${PREFIX}/gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal.a
+REPLACE_SH+=	balancer/grpclb/regenerate.sh
+REPLACE_SH+=	channelz/service/regenerate.sh
+REPLACE_SH+=	codegen.sh
+REPLACE_SH+=	balancer/grpclb/regenerate.sh
+REPLACE_SH+=	health/regenereate.sh
+REPLACE_SH+=	install_gae.sh
+REPLACE_SH+=	vet.sh
 
 .include "../../devel/go-glog/buildlink3.mk"
 .include "../../devel/go-protobuf/buildlink3.mk"
+.include "../../misc/go-genproto-googleapis-rpc/buildlink3.mk"
 .include "../../net/go-net/buildlink3.mk"
 .include "../../security/go-oauth2/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
diff --git a/net/go-grpc/PLIST b/net/go-grpc/PLIST
index fe115790801..379791e4a6c 100644
--- a/net/go-grpc/PLIST
+++ b/net/go-grpc/PLIST
@@ -1,32 +1,98 @@
-@comment $NetBSD: PLIST,v 1.2 2018/03/11 20:04:16 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/09/11 20:03:27 minskim Exp $
+bin/client
+bin/go_vet
+bin/http2
+bin/metrics_client
+bin/server
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/channelz/grpc_channelz_v1.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/channelz/service.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/codes.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/connectivity.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/authinfo.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/conn.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/handshaker.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/handshaker/service.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/alts/internal/testutil.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials/oauth.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/encoding.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/encoding/gzip.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/encoding/proto.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/grpclog.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/grpclog/glogger.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/health.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/health/grpc_health_v1.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/backoff.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/channelz.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/envconfig.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/grpcrand.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/grpcsync.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/leakcheck.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/syscall.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal/transport.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/interop.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/interop/grpc_testing.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/keepalive.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/metadata.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/naming.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/peer.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/reflection.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/reflection/grpc_reflection_v1alpha.a
 gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/reflection/grpc_testing.a
-gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/transport.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/reflection/grpc_testingv3.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/resolver.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/resolver/dns.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/resolver/manual.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/resolver/passthrough.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/stats.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/stats/grpc_testing.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/status.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/stress/grpc_testing.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/tap.a
+gopkg/src/google.golang.org/grpc/AUTHORS
 gopkg/src/google.golang.org/grpc/CONTRIBUTING.md
+gopkg/src/google.golang.org/grpc/Documentation/compression.md
+gopkg/src/google.golang.org/grpc/Documentation/concurrency.md
+gopkg/src/google.golang.org/grpc/Documentation/encoding.md
+gopkg/src/google.golang.org/grpc/Documentation/gomock-example.md
 gopkg/src/google.golang.org/grpc/Documentation/grpc-auth-support.md
 gopkg/src/google.golang.org/grpc/Documentation/grpc-metadata.md
+gopkg/src/google.golang.org/grpc/Documentation/log_levels.md
+gopkg/src/google.golang.org/grpc/Documentation/rpc-errors.md
+gopkg/src/google.golang.org/grpc/Documentation/server-reflection-tutorial.md
+gopkg/src/google.golang.org/grpc/Documentation/versioning.md
 gopkg/src/google.golang.org/grpc/LICENSE
 gopkg/src/google.golang.org/grpc/Makefile
-gopkg/src/google.golang.org/grpc/PATENTS
 gopkg/src/google.golang.org/grpc/README.md
 gopkg/src/google.golang.org/grpc/backoff.go
-gopkg/src/google.golang.org/grpc/backoff_test.go
 gopkg/src/google.golang.org/grpc/balancer.go
+gopkg/src/google.golang.org/grpc/balancer/balancer.go
+gopkg/src/google.golang.org/grpc/balancer/base/balancer.go
+gopkg/src/google.golang.org/grpc/balancer/base/base.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb_picker.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb_test.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb_util.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/grpclb_util_test.go
+gopkg/src/google.golang.org/grpc/balancer/grpclb/regenerate.sh
+gopkg/src/google.golang.org/grpc/balancer/roundrobin/roundrobin.go
+gopkg/src/google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go
+gopkg/src/google.golang.org/grpc/balancer_conn_wrappers.go
+gopkg/src/google.golang.org/grpc/balancer_switching_test.go
 gopkg/src/google.golang.org/grpc/balancer_test.go
+gopkg/src/google.golang.org/grpc/balancer_v1_wrapper.go
+gopkg/src/google.golang.org/grpc/benchmark/benchmain/main.go
 gopkg/src/google.golang.org/grpc/benchmark/benchmark.go
-gopkg/src/google.golang.org/grpc/benchmark/benchmark_test.go
+gopkg/src/google.golang.org/grpc/benchmark/benchmark16_test.go
+gopkg/src/google.golang.org/grpc/benchmark/benchmark17_test.go
+gopkg/src/google.golang.org/grpc/benchmark/benchresult/main.go
 gopkg/src/google.golang.org/grpc/benchmark/client/main.go
 gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go
 gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/control.proto
@@ -38,67 +104,174 @@ gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/services.pb.go
 gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/services.proto
 gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/stats.pb.go
 gopkg/src/google.golang.org/grpc/benchmark/grpc_testing/stats.proto
+gopkg/src/google.golang.org/grpc/benchmark/latency/latency.go
+gopkg/src/google.golang.org/grpc/benchmark/latency/latency_test.go
+gopkg/src/google.golang.org/grpc/benchmark/primitives/code_string_test.go
+gopkg/src/google.golang.org/grpc/benchmark/primitives/context_test.go
+gopkg/src/google.golang.org/grpc/benchmark/primitives/primitives_test.go
+gopkg/src/google.golang.org/grpc/benchmark/run_bench.sh
 gopkg/src/google.golang.org/grpc/benchmark/server/main.go
-gopkg/src/google.golang.org/grpc/benchmark/server/testdata/ca.pem
-gopkg/src/google.golang.org/grpc/benchmark/server/testdata/server1.key
-gopkg/src/google.golang.org/grpc/benchmark/server/testdata/server1.pem
 gopkg/src/google.golang.org/grpc/benchmark/stats/histogram.go
 gopkg/src/google.golang.org/grpc/benchmark/stats/stats.go
 gopkg/src/google.golang.org/grpc/benchmark/stats/util.go
 gopkg/src/google.golang.org/grpc/benchmark/worker/benchmark_client.go
 gopkg/src/google.golang.org/grpc/benchmark/worker/benchmark_server.go
 gopkg/src/google.golang.org/grpc/benchmark/worker/main.go
-gopkg/src/google.golang.org/grpc/benchmark/worker/util.go
 gopkg/src/google.golang.org/grpc/call.go
 gopkg/src/google.golang.org/grpc/call_test.go
+gopkg/src/google.golang.org/grpc/channelz/grpc_channelz_v1/channelz.pb.go
+gopkg/src/google.golang.org/grpc/channelz/service/func_linux.go
+gopkg/src/google.golang.org/grpc/channelz/service/func_nonlinux.go
+gopkg/src/google.golang.org/grpc/channelz/service/regenerate.sh
+gopkg/src/google.golang.org/grpc/channelz/service/service.go
+gopkg/src/google.golang.org/grpc/channelz/service/service_sktopt_test.go
+gopkg/src/google.golang.org/grpc/channelz/service/service_test.go
+gopkg/src/google.golang.org/grpc/channelz/service/util_sktopt_386_test.go
+gopkg/src/google.golang.org/grpc/channelz/service/util_sktopt_amd64_test.go
 gopkg/src/google.golang.org/grpc/clientconn.go
 gopkg/src/google.golang.org/grpc/clientconn_test.go
+gopkg/src/google.golang.org/grpc/codec.go
+gopkg/src/google.golang.org/grpc/codec_test.go
 gopkg/src/google.golang.org/grpc/codegen.sh
 gopkg/src/google.golang.org/grpc/codes/code_string.go
 gopkg/src/google.golang.org/grpc/codes/codes.go
-gopkg/src/google.golang.org/grpc/coverage.sh
+gopkg/src/google.golang.org/grpc/codes/codes_test.go
+gopkg/src/google.golang.org/grpc/connectivity/connectivity.go
+gopkg/src/google.golang.org/grpc/credentials/alts/alts.go
+gopkg/src/google.golang.org/grpc/credentials/alts/alts_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/authinfo/authinfo.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/authinfo/authinfo_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/common.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aeadrekey.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aeadrekey_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aes128gcm.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aes128gcm_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aes128gcmrekey.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/aes128gcmrekey_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/common.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/counter.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/counter_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/record.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/record_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/conn/utils.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/handshaker/handshaker.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/handshaker/handshaker_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/handshaker/service/service.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/handshaker/service/service_test.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/regenerate.sh
+gopkg/src/google.golang.org/grpc/credentials/alts/internal/testutil/testutil.go
+gopkg/src/google.golang.org/grpc/credentials/alts/utils.go
+gopkg/src/google.golang.org/grpc/credentials/alts/utils_test.go
 gopkg/src/google.golang.org/grpc/credentials/credentials.go
-gopkg/src/google.golang.org/grpc/credentials/credentials_util_go17.go
-gopkg/src/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
+gopkg/src/google.golang.org/grpc/credentials/credentials_test.go
+gopkg/src/google.golang.org/grpc/credentials/go16.go
+gopkg/src/google.golang.org/grpc/credentials/go17.go
+gopkg/src/google.golang.org/grpc/credentials/go18.go
+gopkg/src/google.golang.org/grpc/credentials/go19.go
 gopkg/src/google.golang.org/grpc/credentials/oauth/oauth.go
+gopkg/src/google.golang.org/grpc/dialoptions.go
 gopkg/src/google.golang.org/grpc/doc.go
+gopkg/src/google.golang.org/grpc/encoding/encoding.go
+gopkg/src/google.golang.org/grpc/encoding/gzip/gzip.go
+gopkg/src/google.golang.org/grpc/encoding/proto/proto.go
+gopkg/src/google.golang.org/grpc/encoding/proto/proto_benchmark_test.go
+gopkg/src/google.golang.org/grpc/encoding/proto/proto_test.go
 gopkg/src/google.golang.org/grpc/examples/README.md
 gopkg/src/google.golang.org/grpc/examples/gotutorial.md
 gopkg/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
 gopkg/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
 gopkg/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
 gopkg/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
+gopkg/src/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock.go
+gopkg/src/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock_test.go
+gopkg/src/google.golang.org/grpc/examples/oauth/client/main.go
+gopkg/src/google.golang.org/grpc/examples/oauth/server/main.go
 gopkg/src/google.golang.org/grpc/examples/route_guide/README.md
 gopkg/src/google.golang.org/grpc/examples/route_guide/client/client.go
+gopkg/src/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock.go
+gopkg/src/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock_test.go
 gopkg/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
 gopkg/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
 gopkg/src/google.golang.org/grpc/examples/route_guide/server/server.go
-gopkg/src/google.golang.org/grpc/examples/route_guide/testdata/ca.pem
 gopkg/src/google.golang.org/grpc/examples/route_guide/testdata/route_guide_db.json
-gopkg/src/google.golang.org/grpc/examples/route_guide/testdata/server1.key
-gopkg/src/google.golang.org/grpc/examples/route_guide/testdata/server1.pem
+gopkg/src/google.golang.org/grpc/examples/rpc_errors/client/main.go
+gopkg/src/google.golang.org/grpc/examples/rpc_errors/server/main.go
+gopkg/src/google.golang.org/grpc/go.mod
+gopkg/src/google.golang.org/grpc/go.sum
+gopkg/src/google.golang.org/grpc/go16.go
+gopkg/src/google.golang.org/grpc/go17.go
+gopkg/src/google.golang.org/grpc/go_vet/vet.go
 gopkg/src/google.golang.org/grpc/grpclog/glogger/glogger.go
+gopkg/src/google.golang.org/grpc/grpclog/grpclog.go
 gopkg/src/google.golang.org/grpc/grpclog/logger.go
+gopkg/src/google.golang.org/grpc/grpclog/loggerv2.go
+gopkg/src/google.golang.org/grpc/grpclog/loggerv2_test.go
 gopkg/src/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
-gopkg/src/google.golang.org/grpc/health/grpc_health_v1/health.proto
 gopkg/src/google.golang.org/grpc/health/health.go
+gopkg/src/google.golang.org/grpc/health/health_test.go
+gopkg/src/google.golang.org/grpc/health/regenerate.sh
+gopkg/src/google.golang.org/grpc/install_gae.sh
 gopkg/src/google.golang.org/grpc/interceptor.go
+gopkg/src/google.golang.org/grpc/internal/backoff/backoff.go
+gopkg/src/google.golang.org/grpc/internal/channelz/funcs.go
+gopkg/src/google.golang.org/grpc/internal/channelz/types.go
+gopkg/src/google.golang.org/grpc/internal/channelz/types_linux.go
+gopkg/src/google.golang.org/grpc/internal/channelz/types_nonlinux.go
+gopkg/src/google.golang.org/grpc/internal/channelz/util_linux_go19.go
+gopkg/src/google.golang.org/grpc/internal/channelz/util_nonlinux_pre_go19.go
+gopkg/src/google.golang.org/grpc/internal/channelz/util_test.go
+gopkg/src/google.golang.org/grpc/internal/envconfig/envconfig.go
+gopkg/src/google.golang.org/grpc/internal/grpcrand/grpcrand.go
+gopkg/src/google.golang.org/grpc/internal/grpcsync/event.go
+gopkg/src/google.golang.org/grpc/internal/grpcsync/event_test.go
 gopkg/src/google.golang.org/grpc/internal/internal.go
+gopkg/src/google.golang.org/grpc/internal/leakcheck/leakcheck.go
+gopkg/src/google.golang.org/grpc/internal/leakcheck/leakcheck_test.go
+gopkg/src/google.golang.org/grpc/internal/syscall/syscall_linux.go
+gopkg/src/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go
+gopkg/src/google.golang.org/grpc/internal/transport/bdp_estimator.go
+gopkg/src/google.golang.org/grpc/internal/transport/controlbuf.go
+gopkg/src/google.golang.org/grpc/internal/transport/defaults.go
+gopkg/src/google.golang.org/grpc/internal/transport/flowcontrol.go
+gopkg/src/google.golang.org/grpc/internal/transport/go16.go
+gopkg/src/google.golang.org/grpc/internal/transport/go17.go
+gopkg/src/google.golang.org/grpc/internal/transport/handler_server.go
+gopkg/src/google.golang.org/grpc/internal/transport/handler_server_test.go
+gopkg/src/google.golang.org/grpc/internal/transport/http2_client.go
+gopkg/src/google.golang.org/grpc/internal/transport/http2_server.go
+gopkg/src/google.golang.org/grpc/internal/transport/http_util.go
+gopkg/src/google.golang.org/grpc/internal/transport/http_util_test.go
+gopkg/src/google.golang.org/grpc/internal/transport/log.go
+gopkg/src/google.golang.org/grpc/internal/transport/transport.go
+gopkg/src/google.golang.org/grpc/internal/transport/transport_test.go
+gopkg/src/google.golang.org/grpc/interop/alts/client/client.go
+gopkg/src/google.golang.org/grpc/interop/alts/server/server.go
 gopkg/src/google.golang.org/grpc/interop/client/client.go
-gopkg/src/google.golang.org/grpc/interop/client/testdata/ca.pem
-gopkg/src/google.golang.org/grpc/interop/client/testdata/server1.key
-gopkg/src/google.golang.org/grpc/interop/client/testdata/server1.pem
 gopkg/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go
 gopkg/src/google.golang.org/grpc/interop/grpc_testing/test.proto
+gopkg/src/google.golang.org/grpc/interop/http2/negative_http2_client.go
 gopkg/src/google.golang.org/grpc/interop/server/server.go
-gopkg/src/google.golang.org/grpc/interop/server/testdata/ca.pem
-gopkg/src/google.golang.org/grpc/interop/server/testdata/server1.key
-gopkg/src/google.golang.org/grpc/interop/server/testdata/server1.pem
 gopkg/src/google.golang.org/grpc/interop/test_utils.go
+gopkg/src/google.golang.org/grpc/keepalive/keepalive.go
 gopkg/src/google.golang.org/grpc/metadata/metadata.go
 gopkg/src/google.golang.org/grpc/metadata/metadata_test.go
+gopkg/src/google.golang.org/grpc/naming/dns_resolver.go
+gopkg/src/google.golang.org/grpc/naming/dns_resolver_test.go
+gopkg/src/google.golang.org/grpc/naming/go17.go
+gopkg/src/google.golang.org/grpc/naming/go17_test.go
+gopkg/src/google.golang.org/grpc/naming/go18.go
+gopkg/src/google.golang.org/grpc/naming/go18_test.go
 gopkg/src/google.golang.org/grpc/naming/naming.go
 gopkg/src/google.golang.org/grpc/peer/peer.go
+gopkg/src/google.golang.org/grpc/picker_wrapper.go
+gopkg/src/google.golang.org/grpc/picker_wrapper_test.go
+gopkg/src/google.golang.org/grpc/pickfirst.go
+gopkg/src/google.golang.org/grpc/pickfirst_test.go
+gopkg/src/google.golang.org/grpc/proxy.go
+gopkg/src/google.golang.org/grpc/proxy_test.go
 gopkg/src/google.golang.org/grpc/reflection/README.md
 gopkg/src/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.pb.go
 gopkg/src/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto
@@ -106,46 +279,66 @@ gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2.pb.go
 gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2.proto
 gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.pb.go
 gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.proto
+gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.pb.go
+gopkg/src/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.proto
 gopkg/src/google.golang.org/grpc/reflection/grpc_testing/test.pb.go
 gopkg/src/google.golang.org/grpc/reflection/grpc_testing/test.proto
+gopkg/src/google.golang.org/grpc/reflection/grpc_testingv3/testv3.pb.go
+gopkg/src/google.golang.org/grpc/reflection/grpc_testingv3/testv3.proto
 gopkg/src/google.golang.org/grpc/reflection/serverreflection.go
 gopkg/src/google.golang.org/grpc/reflection/serverreflection_test.go
+gopkg/src/google.golang.org/grpc/resolver/dns/dns_resolver.go
+gopkg/src/google.golang.org/grpc/resolver/dns/dns_resolver_test.go
+gopkg/src/google.golang.org/grpc/resolver/dns/go17.go
+gopkg/src/google.golang.org/grpc/resolver/dns/go17_test.go
+gopkg/src/google.golang.org/grpc/resolver/dns/go18.go
+gopkg/src/google.golang.org/grpc/resolver/dns/go18_test.go
+gopkg/src/google.golang.org/grpc/resolver/manual/manual.go
+gopkg/src/google.golang.org/grpc/resolver/passthrough/passthrough.go
+gopkg/src/google.golang.org/grpc/resolver/resolver.go
+gopkg/src/google.golang.org/grpc/resolver_conn_wrapper.go
+gopkg/src/google.golang.org/grpc/resolver_conn_wrapper_test.go
 gopkg/src/google.golang.org/grpc/rpc_util.go
 gopkg/src/google.golang.org/grpc/rpc_util_test.go
 gopkg/src/google.golang.org/grpc/server.go
 gopkg/src/google.golang.org/grpc/server_test.go
+gopkg/src/google.golang.org/grpc/service_config.go
+gopkg/src/google.golang.org/grpc/service_config_test.go
+gopkg/src/google.golang.org/grpc/stats/grpc_testing/test.pb.go
+gopkg/src/google.golang.org/grpc/stats/grpc_testing/test.proto
+gopkg/src/google.golang.org/grpc/stats/handlers.go
+gopkg/src/google.golang.org/grpc/stats/stats.go
+gopkg/src/google.golang.org/grpc/stats/stats_test.go
+gopkg/src/google.golang.org/grpc/status/go16.go
+gopkg/src/google.golang.org/grpc/status/go17.go
+gopkg/src/google.golang.org/grpc/status/go17_test.go
+gopkg/src/google.golang.org/grpc/status/status.go
+gopkg/src/google.golang.org/grpc/status/status_test.go
 gopkg/src/google.golang.org/grpc/stream.go
 gopkg/src/google.golang.org/grpc/stress/client/main.go
 gopkg/src/google.golang.org/grpc/stress/grpc_testing/metrics.pb.go
 gopkg/src/google.golang.org/grpc/stress/grpc_testing/metrics.proto
 gopkg/src/google.golang.org/grpc/stress/metrics_client/main.go
+gopkg/src/google.golang.org/grpc/tap/tap.go
+gopkg/src/google.golang.org/grpc/test/bufconn/bufconn.go
+gopkg/src/google.golang.org/grpc/test/bufconn/bufconn_test.go
+gopkg/src/google.golang.org/grpc/test/channelz_linux_go110_test.go
+gopkg/src/google.golang.org/grpc/test/channelz_test.go
 gopkg/src/google.golang.org/grpc/test/codec_perf/perf.pb.go
 gopkg/src/google.golang.org/grpc/test/codec_perf/perf.proto
 gopkg/src/google.golang.org/grpc/test/end2end_test.go
+gopkg/src/google.golang.org/grpc/test/gracefulstop_test.go
 gopkg/src/google.golang.org/grpc/test/grpc_testing/test.pb.go
 gopkg/src/google.golang.org/grpc/test/grpc_testing/test.proto
-gopkg/src/google.golang.org/grpc/test/race_test.go
-gopkg/src/google.golang.org/grpc/test/servertester_test.go
-gopkg/src/google.golang.org/grpc/test/testdata/ca.pem
-gopkg/src/google.golang.org/grpc/test/testdata/server1.key
-gopkg/src/google.golang.org/grpc/test/testdata/server1.pem
+gopkg/src/google.golang.org/grpc/test/race.go
+gopkg/src/google.golang.org/grpc/test/rawConnWrapper.go
+gopkg/src/google.golang.org/grpc/test/retry_test.go
+gopkg/src/google.golang.org/grpc/test/servertester.go
+gopkg/src/google.golang.org/grpc/test/tools/tools.go
 gopkg/src/google.golang.org/grpc/testdata/ca.pem
 gopkg/src/google.golang.org/grpc/testdata/server1.key
 gopkg/src/google.golang.org/grpc/testdata/server1.pem
+gopkg/src/google.golang.org/grpc/testdata/testdata.go
 gopkg/src/google.golang.org/grpc/trace.go
-gopkg/src/google.golang.org/grpc/transport/control.go
-gopkg/src/google.golang.org/grpc/transport/go16.go
-gopkg/src/google.golang.org/grpc/transport/go17.go
-gopkg/src/google.golang.org/grpc/transport/handler_server.go
-gopkg/src/google.golang.org/grpc/transport/handler_server_test.go
-gopkg/src/google.golang.org/grpc/transport/http2_client.go
-gopkg/src/google.golang.org/grpc/transport/http2_server.go
-gopkg/src/google.golang.org/grpc/transport/http_util.go
-gopkg/src/google.golang.org/grpc/transport/http_util_test.go
-gopkg/src/google.golang.org/grpc/transport/pre_go16.go
-gopkg/src/google.golang.org/grpc/transport/testdata/ca.pem
-gopkg/src/google.golang.org/grpc/transport/testdata/server1.key
-gopkg/src/google.golang.org/grpc/transport/testdata/server1.pem
-gopkg/src/google.golang.org/grpc/transport/transport.go
-gopkg/src/google.golang.org/grpc/transport/transport_test.go
-@pkgdir bin
+gopkg/src/google.golang.org/grpc/version.go
+gopkg/src/google.golang.org/grpc/vet.sh
diff --git a/net/go-grpc/buildlink3.mk b/net/go-grpc/buildlink3.mk
index 260d4a98030..7a74473f142 100644
--- a/net/go-grpc/buildlink3.mk
+++ b/net/go-grpc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/11 09:52:41 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/09/11 20:03:27 minskim Exp $
 
 BUILDLINK_TREE+=	go-grpc
 
@@ -13,6 +13,7 @@ BUILDLINK_PKGSRCDIR.go-grpc?=	../../net/go-grpc
 
 .include "../../devel/go-glog/buildlink3.mk"
 .include "../../devel/go-protobuf/buildlink3.mk"
+.include "../../misc/go-genproto-googleapis-rpc/buildlink3.mk"
 .include "../../net/go-net/buildlink3.mk"
 .include "../../security/go-oauth2/buildlink3.mk"
 .endif	# GO_GRPC_BUILDLINK3_MK
diff --git a/net/go-grpc/distinfo b/net/go-grpc/distinfo
index 2f4dfd86fe9..74ed5e2c7ab 100644
--- a/net/go-grpc/distinfo
+++ b/net/go-grpc/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/09/14 21:53:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2018/09/11 20:03:27 minskim Exp $
 
-SHA1 (go-grpc-1.0.1.tar.gz) = 94226a3f8c024eb1972a6c2f9c5af316d486542f
-RMD160 (go-grpc-1.0.1.tar.gz) = e0e85abcde8705af7dce033229645990259a3d5b
-SHA512 (go-grpc-1.0.1.tar.gz) = 2492b0f1a98a872ddb42cd72de3d251122e8b25f60d4349555ee2c3da9c0ca0aeefbe3fcfe3b088e07d6ec897d3e7f286510ebc8b8cb98d7dbb45ee7472cb5a4
-Size (go-grpc-1.0.1.tar.gz) = 202220 bytes
-SHA1 (patch-coverage.sh) = 54cbbd992014535f3ed69f518b99bf14de8000aa
+SHA1 (go-grpc-1.15.0.tar.gz) = 24440149534b34364847675825b88fa95533ee5a
+RMD160 (go-grpc-1.15.0.tar.gz) = 0efe507aa6a0d6917622b632151c5c84dd3ae3de
+SHA512 (go-grpc-1.15.0.tar.gz) = b8cc7c32d52e3a05ccf9ac962c6a1ec436f217d098930d84908ca0c4df54adf4dc595b6779896b80f79458c13029dd5c44fd6c67d07a889037a8e28317687247
+Size (go-grpc-1.15.0.tar.gz) = 506400 bytes
diff --git a/net/go-grpc/patches/patch-coverage.sh b/net/go-grpc/patches/patch-coverage.sh
deleted file mode 100644
index 0a6f05b6ea4..00000000000
--- a/net/go-grpc/patches/patch-coverage.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-coverage.sh,v 1.1 2016/09/14 21:53:17 wiz Exp $
-
---- coverage.sh.orig	2016-09-14 21:51:03.427200228 +0000
-+++ coverage.sh
-@@ -12,7 +12,7 @@ generate_cover_data() {
-     mkdir "$workdir"
- 
-     for pkg in "$@"; do
--        if [ $pkg == "google.golang.org/grpc" -o $pkg == "google.golang.org/grpc/transport" -o $pkg == "google.golang.org/grpc/metadata" -o $pkg == "google.golang.org/grpc/credentials" ]
-+        if [ $pkg = "google.golang.org/grpc" -o $pkg = "google.golang.org/grpc/transport" -o $pkg = "google.golang.org/grpc/metadata" -o $pkg = "google.golang.org/grpc/credentials" ]
-             then
-                 f="$workdir/$(echo $pkg | tr / -)"
-                 go test -covermode="$mode" -coverprofile="$f.cover" "$pkg"