From 34d0e1b2c32d1bfe3aaa8519cf760ce499315ad5 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Feb 2015 12:04:02 +0100
Subject: p2p: fix ecies dependency in tests

We forgot to update this reference when moving ecies into the
go-ethereum repo.
---
 Godeps/Godeps.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Godeps/Godeps.json')

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 831140690..9fa7373c8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/ethereum/go-ethereum",
-	"GoVersion": "go1.4",
+	"GoVersion": "go1.4.1",
 	"Packages": [
 		"./..."
 	],
@@ -57,10 +57,6 @@
 			"ImportPath": "github.com/jackpal/go-nat-pmp",
 			"Rev": "a45aa3d54aef73b504e15eb71bea0e5565b5e6e1"
 		},
-		{
-			"ImportPath": "github.com/obscuren/ecies",
-			"Rev": "d899334bba7bf4a157cab19d8ad836dcb1de0c34"
-		},
 		{
 			"ImportPath": "github.com/obscuren/otto",
 			"Rev": "cf13cc4228c5e5ce0fe27a7aea90bc10091c4f19"
-- 
cgit v1.2.3


From bb346a3ae1b6c250fdcb28b97280d3512a7fe219 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Feb 2015 12:37:09 +0100
Subject: rpc/ws: switch to golang.org/x/net

code.google.com/p/go.net is deprecated and will cause
problems in future versions of Go.
---
 Godeps/Godeps.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Godeps/Godeps.json')

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9fa7373c8..37176ddba 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -30,11 +30,6 @@
 			"Comment": "null-236",
 			"Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e"
 		},
-		{
-			"ImportPath": "code.google.com/p/go.net/websocket",
-			"Comment": "null-173",
-			"Rev": "4231557d7c726df4cf9a4e8cdd8a417c8c200bdb"
-		},
 		{
 			"ImportPath": "code.google.com/p/snappy-go/snappy",
 			"Comment": "null-15",
@@ -105,6 +100,10 @@
 			"ImportPath": "golang.org/x/crypto/pbkdf2",
 			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
 		},
+		{
+			"ImportPath": "golang.org/x/net/websocket",
+			"Rev": "59b0df9b1f7abda5aab0495ee54f408daf182ce7"
+		},
 		{
 			"ImportPath": "gopkg.in/check.v1",
 			"Rev": "64131543e7896d5bcc6bd5a76287eb75ea96c673"
-- 
cgit v1.2.3


From 119bea22aaf061d5b3e6a9abee9b1b95655b9fbe Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Feb 2015 13:05:58 +0100
Subject: crypto: switch to golang.org/x/crypto

code.google.com/p/go.crypto is deprecated and will cause
problems in future versions of Go.
---
 Godeps/Godeps.json | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'Godeps/Godeps.json')

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 37176ddba..d91269c1d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -15,21 +15,6 @@
 			"Comment": "null-12",
 			"Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9"
 		},
-		{
-			"ImportPath": "code.google.com/p/go.crypto/pbkdf2",
-			"Comment": "null-236",
-			"Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e"
-		},
-		{
-			"ImportPath": "code.google.com/p/go.crypto/ripemd160",
-			"Comment": "null-236",
-			"Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e"
-		},
-		{
-			"ImportPath": "code.google.com/p/go.crypto/scrypt",
-			"Comment": "null-236",
-			"Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e"
-		},
 		{
 			"ImportPath": "code.google.com/p/snappy-go/snappy",
 			"Comment": "null-15",
@@ -100,6 +85,14 @@
 			"ImportPath": "golang.org/x/crypto/pbkdf2",
 			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
 		},
+		{
+			"ImportPath": "golang.org/x/crypto/ripemd160",
+			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/scrypt",
+			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
+		},
 		{
 			"ImportPath": "golang.org/x/net/websocket",
 			"Rev": "59b0df9b1f7abda5aab0495ee54f408daf182ce7"
-- 
cgit v1.2.3


From f965f41b6e8d177f4f06a8421ee071350813a1ac Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Feb 2015 13:10:11 +0100
Subject: p2p/nat: switch to github.com/huin/goupnp

My temporary fix was merged upstream.
---
 Godeps/Godeps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Godeps/Godeps.json')

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d91269c1d..9b7306530 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -24,15 +24,15 @@
 			"ImportPath": "github.com/ethereum/serpent-go",
 			"Rev": "5767a0dbd759d313df3f404dadb7f98d7ab51443"
 		},
-		{
-			"ImportPath": "github.com/fjl/goupnp",
-			"Rev": "fa95df6feb61e136b499d01711fcd410ccaf20c1"
-		},
 		{
 			"ImportPath": "github.com/howeyc/fsnotify",
 			"Comment": "v0.9.0-11-g6b1ef89",
 			"Rev": "6b1ef893dc11e0447abda6da20a5203481878dda"
 		},
+		{
+			"ImportPath": "github.com/huin/goupnp",
+			"Rev": "4191d8a85005844ea202fde52799681971b12dfe"
+		},
 		{
 			"ImportPath": "github.com/jackpal/go-nat-pmp",
 			"Rev": "a45aa3d54aef73b504e15eb71bea0e5565b5e6e1"
-- 
cgit v1.2.3