[Pkg-privacy-commits] [obfs4proxy] 146/151: Fix go.net import path

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit 738e60e6adcecf287f481db65a8a64cb39397c65
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 30 19:52:32 2015 +0200

    Fix go.net import path
---
 ...-Revert-Change-the-import-path-for-go.net.patch | 68 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 69 insertions(+)

diff --git a/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch b/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch
new file mode 100644
index 0000000..20d25b9
--- /dev/null
+++ b/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch
@@ -0,0 +1,68 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Thu, 30 Apr 2015 19:50:49 +0200
+Subject: Revert "Change the import path for go.net."
+
+This reverts commit aed4b723891db1be34eb866a03c62806b58ac148.
+
+Conflicts:
+	ChangeLog
+	README.md
+---
+ README.md                  | 2 +-
+ obfs4proxy/obfs4proxy.go   | 2 +-
+ obfs4proxy/proxy_http.go   | 2 +-
+ obfs4proxy/proxy_socks4.go | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/README.md b/README.md
+index 0b32127..a510287 100644
+--- a/README.md
++++ b/README.md
+@@ -35,7 +35,7 @@ listed for clarity.
+  * Go 1.2.0 or later.   Prior versions of Go (Eg: 1.0.2) are missing certain
+    important parts of the runtime library like a SHA256 implementation.
+  * go.crypto (https://code.google.com/p/go.crypto)
+- * go.net (https://golang.org/x/net)
++ * go.net (https://code.google.com/p/go.net)
+  * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519)
+  * SipHash-2-4 (https://github.com/dchest/siphash)
+  * goptlib (https://git.torproject.org/pluggable-transports/goptlib.git)
+diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
+index 5d13b32..8848dda 100644
+--- a/obfs4proxy/obfs4proxy.go
++++ b/obfs4proxy/obfs4proxy.go
+@@ -41,7 +41,7 @@ import (
+ 	"sync"
+ 	"syscall"
+ 
+-	"golang.org/x/net/proxy"
++	"code.google.com/p/go.net/proxy"
+ 
+ 	"git.torproject.org/pluggable-transports/goptlib.git"
+ 	"git.torproject.org/pluggable-transports/obfs4.git/common/log"
+diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go
+index 6f11790..2db6ca0 100644
+--- a/obfs4proxy/proxy_http.go
++++ b/obfs4proxy/proxy_http.go
+@@ -36,7 +36,7 @@ import (
+ 	"net/url"
+ 	"time"
+ 
+-	"golang.org/x/net/proxy"
++	"code.google.com/p/go.net/proxy"
+ )
+ 
+ // httpProxy is a HTTP connect proxy.
+diff --git a/obfs4proxy/proxy_socks4.go b/obfs4proxy/proxy_socks4.go
+index 536dd96..9d6bd4d 100644
+--- a/obfs4proxy/proxy_socks4.go
++++ b/obfs4proxy/proxy_socks4.go
+@@ -41,7 +41,7 @@ import (
+ 	"net/url"
+ 	"strconv"
+ 
+-	"golang.org/x/net/proxy"
++	"code.google.com/p/go.net/proxy"
+ )
+ 
+ // socks4Proxy is a SOCKS4 proxy.
diff --git a/debian/patches/series b/debian/patches/series
index cb279a5..158d1f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Revert-Change-the-import-path-for-go.crypto.patch
+0002-Revert-Change-the-import-path-for-go.net.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfs4proxy.git