From f9042035f89b49399e765243120440a2dc4c5e6a Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Wed, 23 Mar 2016 10:56:02 +0000
Subject: [PATCH] Update socks proxy for upstream changes.

---
 socks/main.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/socks/main.go b/socks/main.go
index 6cde493d3..520df27d9 100644
--- a/socks/main.go
+++ b/socks/main.go
@@ -11,6 +11,7 @@ import (
 	socks5 "github.com/armon/go-socks5"
 	"github.com/docker/docker/pkg/mflag"
 	"github.com/weaveworks/weave/common/mflagext"
+	"golang.org/x/net/context"
 )
 
 type pacFileParameters struct {
@@ -72,11 +73,11 @@ type aliasingResolver struct {
 	socks5.NameResolver
 }
 
-func (r aliasingResolver) Resolve(name string) (net.IP, error) {
+func (r aliasingResolver) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
 	if alias, ok := r.aliases[name]; ok {
-		return r.NameResolver.Resolve(alias)
+		return r.NameResolver.Resolve(ctx, alias)
 	}
-	return r.NameResolver.Resolve(name)
+	return r.NameResolver.Resolve(ctx, name)
 }
 
 func socksProxy(aliases map[string]string) {