[Pkg-privacy-commits] [obfs4proxy] 126/151: Add a patch to restore old go.crypto 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 85a83654e5ef6c89d65bdc7d02e84c00b13ddfd9
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Feb 26 13:22:12 2015 +0100

    Add a patch to restore old go.crypto path
---
 ...vert-Change-the-import-path-for-go.crypto.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 54 insertions(+)

diff --git a/debian/patches/0001-Revert-Change-the-import-path-for-go.crypto.patch b/debian/patches/0001-Revert-Change-the-import-path-for-go.crypto.patch
new file mode 100644
index 0000000..f316473
--- /dev/null
+++ b/debian/patches/0001-Revert-Change-the-import-path-for-go.crypto.patch
@@ -0,0 +1,53 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Thu, 26 Feb 2015 13:21:28 +0100
+Subject: Revert "Change the import path for go.crypto."
+
+This reverts commit cdeda5724124ca393c87be6d01c84fe4f906d612.
+This was suggested by upstream in order to build with Go < 1.4.
+---
+ README.md                           | 2 +-
+ common/ntor/ntor.go                 | 4 ++--
+ transports/obfs4/framing/framing.go | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/README.md b/README.md
+index 31c9e2b..a510287 100644
+--- a/README.md
++++ b/README.md
+@@ -34,7 +34,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://golang.org/x/crypto)
++ * go.crypto (https://code.google.com/p/go.crypto)
+  * 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)
+diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
+index f17e464..d123f38 100644
+--- a/common/ntor/ntor.go
++++ b/common/ntor/ntor.go
+@@ -43,8 +43,8 @@ import (
+ 	"fmt"
+ 	"io"
+ 
+-	"golang.org/x/crypto/curve25519"
+-	"golang.org/x/crypto/hkdf"
++	"code.google.com/p/go.crypto/curve25519"
++	"code.google.com/p/go.crypto/hkdf"
+ 
+ 	"github.com/agl/ed25519/extra25519"
+ 
+diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
+index 879765d..04e788f 100644
+--- a/transports/obfs4/framing/framing.go
++++ b/transports/obfs4/framing/framing.go
+@@ -67,7 +67,7 @@ import (
+ 	"fmt"
+ 	"io"
+ 
+-	"golang.org/x/crypto/nacl/secretbox"
++	"code.google.com/p/go.crypto/nacl/secretbox"
+ 
+ 	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
+ 	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cb279a5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Revert-Change-the-import-path-for-go.crypto.patch

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