[Pkg-privacy-commits] [obfs4proxy] 148/151: go.crypto has been updated, drop obsolete patch and tighten build-dep

[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 b2583f57f9c7504e7caa3023f6551aca5ef19d32
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Jun 27 23:39:09 2015 +0200

    go.crypto has been updated, drop obsolete patch and tighten build-dep
---
 debian/control                                     |  2 +-
 ...vert-Change-the-import-path-for-go.crypto.patch | 53 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/debian/control b/debian/control
index 5878625..6ed00c2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
                golang-ed25519-dev,
                golang-go,
                golang-goptlib-dev,
-               golang-go.crypto-dev,
+               golang-go.crypto-dev (>= 1:0.0~git20150608),
                golang-go.net-dev,
                golang-siphash-dev
 Standards-Version: 3.9.6
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
deleted file mode 100644
index 71b55fd..0000000
--- a/debian/patches/0001-Revert-Change-the-import-path-for-go.crypto.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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 3f1f6b9..0b32127 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://golang.org/x/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 4f6ab27..36a5e10 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 815a990..41cb52b 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
index 158d1f7..f341028 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-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