From 2d4ddd8252794426bd05480b1594f9bfa6ea41c0 Mon Sep 17 00:00:00 2001
From: Josh Dolitsky <jdolitsky@gmail.com>
Date: Thu, 31 Jan 2019 15:55:56 -0600
Subject: [PATCH] fix dependency mess

Signed-off-by: Josh Dolitsky <jdolitsky@gmail.com>
---
 Gopkg.lock |  7 ++++---
 Gopkg.toml | 19 ++++---------------
 Makefile   |  7 +------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index e79bc7a91..cb8118e7b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1559,12 +1559,13 @@
   revision = "8a16e7dd8fb6d97d1331b0c79a16722f934b00b1"
 
 [[projects]]
-  digest = "1:3253435bcec387270fe70c39a4ffcb8bdc9bcc82c32d320b5546ec02a0808007"
+  branch = "master"
+  digest = "1:15fbb9f95a13abe2be748b1159b491369d46a2ccc3f378e0f93c391f89608929"
   name = "rsc.io/letsencrypt"
   packages = ["."]
   pruneopts = "UT"
-  revision = "33926faef6d434b854ea994228f11d0185faa0c1"
-  version = "v0.0.1"
+  revision = "1847a81d2087eba73081db43989e54dabe0768cd"
+  source = "https://github.com/dmcgowan/letsencrypt.git"
 
 [[projects]]
   digest = "1:443f6048f55fc9e389e8f7fa20b25bc30ef565953dd5c6425c9032432a677301"
diff --git a/Gopkg.toml b/Gopkg.toml
index e835158e0..d74b27f10 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -70,19 +70,8 @@
 [[constraint]]
   name = "github.com/stretchr/testify"
 
-# These overrides below necessary for using docker/distribution as a test dependency
+# This override below necessary for using docker/distribution as a test dependency
 [[override]]
-  name = "github.com/yvasiyarov/newrelic_platform_go"
-  revision = "b21fdbd4370f3717f3bbd2bf41c223bc273068e6"
-
-[[override]]
-  name = "github.com/miekg/dns"
-  revision = "0d29b283ac0f967dd3a02739bf26a22702210d7a"
-
-[[override]]
-  name = "github.com/xenolf/lego"
-  revision = "a9d8cec0e6563575e5868a005359ac97911b5985"
-
-[[override]]
-  name = "github.com/bugsnag/bugsnag-go"
-  revision = "109a9d63f2b57c4623f4912b256bac4a7a63517d"
\ No newline at end of file
+  name = "rsc.io/letsencrypt"
+  branch = "master"
+  source = "https://github.com/dmcgowan/letsencrypt.git"
diff --git a/Makefile b/Makefile
index df582695f..7ab2e485b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,12 +85,7 @@ coverage:
 #  dependencies
 
 .PHONY: bootstrap
-bootstrap: vendor fix-vendor
-
-# fix dependecies that are incorrect
-.PHONY: fix-vendor
-fix-vendor:
-	wget -O vendor/rsc.io/letsencrypt/lets.go https://raw.githubusercontent.com/dmcgowan/letsencrypt/e770c10b0f1a64775ae91d240407ce00d1a5bdeb/lets.go
+bootstrap: vendor
 
 $(DEP):
 	go get -u github.com/golang/dep/cmd/dep