From 910062520481d98a1160ac329a1572fa5ec15b4f Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Fri, 15 Apr 2016 17:26:35 +0100
Subject: [PATCH] proxy: move vendor/libproxy to ./libproxy

vendor should be used for things with fully-qualified names,

Signed-off-by: David Scott <dave.scott@docker.com>
---
 .../packages/proxy/{vendor => }/libproxy/network_proxy_test.go  | 0
 alpine/packages/proxy/{vendor => }/libproxy/proxy.go            | 0
 alpine/packages/proxy/{vendor => }/libproxy/stub_proxy.go       | 0
 alpine/packages/proxy/{vendor => }/libproxy/tcp_proxy.go        | 0
 alpine/packages/proxy/{vendor => }/libproxy/udp_proxy.go        | 0
 alpine/packages/proxy/main.go                                   | 2 +-
 alpine/packages/proxy/proxy.go                                  | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename alpine/packages/proxy/{vendor => }/libproxy/network_proxy_test.go (100%)
 rename alpine/packages/proxy/{vendor => }/libproxy/proxy.go (100%)
 rename alpine/packages/proxy/{vendor => }/libproxy/stub_proxy.go (100%)
 rename alpine/packages/proxy/{vendor => }/libproxy/tcp_proxy.go (100%)
 rename alpine/packages/proxy/{vendor => }/libproxy/udp_proxy.go (100%)

diff --git a/alpine/packages/proxy/vendor/libproxy/network_proxy_test.go b/alpine/packages/proxy/libproxy/network_proxy_test.go
similarity index 100%
rename from alpine/packages/proxy/vendor/libproxy/network_proxy_test.go
rename to alpine/packages/proxy/libproxy/network_proxy_test.go
diff --git a/alpine/packages/proxy/vendor/libproxy/proxy.go b/alpine/packages/proxy/libproxy/proxy.go
similarity index 100%
rename from alpine/packages/proxy/vendor/libproxy/proxy.go
rename to alpine/packages/proxy/libproxy/proxy.go
diff --git a/alpine/packages/proxy/vendor/libproxy/stub_proxy.go b/alpine/packages/proxy/libproxy/stub_proxy.go
similarity index 100%
rename from alpine/packages/proxy/vendor/libproxy/stub_proxy.go
rename to alpine/packages/proxy/libproxy/stub_proxy.go
diff --git a/alpine/packages/proxy/vendor/libproxy/tcp_proxy.go b/alpine/packages/proxy/libproxy/tcp_proxy.go
similarity index 100%
rename from alpine/packages/proxy/vendor/libproxy/tcp_proxy.go
rename to alpine/packages/proxy/libproxy/tcp_proxy.go
diff --git a/alpine/packages/proxy/vendor/libproxy/udp_proxy.go b/alpine/packages/proxy/libproxy/udp_proxy.go
similarity index 100%
rename from alpine/packages/proxy/vendor/libproxy/udp_proxy.go
rename to alpine/packages/proxy/libproxy/udp_proxy.go
diff --git a/alpine/packages/proxy/main.go b/alpine/packages/proxy/main.go
index d9787a8f0..5e3c1e742 100644
--- a/alpine/packages/proxy/main.go
+++ b/alpine/packages/proxy/main.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 	"os"
-	"libproxy"
+	"proxy/libproxy"
 	"strings"
 	"vsock"
 )
diff --git a/alpine/packages/proxy/proxy.go b/alpine/packages/proxy/proxy.go
index 3c38b5ceb..ee52bf6b5 100644
--- a/alpine/packages/proxy/proxy.go
+++ b/alpine/packages/proxy/proxy.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"libproxy"
+	"proxy/libproxy"
 )
 
 // sendError signals the error to the parent and quits the process.