[Pkg-privacy-commits] [obfs4proxy] 145/151: Refresh patches

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 12:59:49 UTC 2015


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

infinity0 pushed a commit to branch master
in repository obfs4proxy.

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

    Refresh patches
---
 .../0001-Revert-Change-the-import-path-for-go.crypto.patch        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
index f316473..71b55fd 100644
--- 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
@@ -11,7 +11,7 @@ This was suggested by upstream in order to build with Go < 1.4.
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/README.md b/README.md
-index 31c9e2b..a510287 100644
+index 3f1f6b9..0b32127 100644
 --- a/README.md
 +++ b/README.md
 @@ -34,7 +34,7 @@ listed for clarity.
@@ -20,11 +20,11 @@ index 31c9e2b..a510287 100644
     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)
+  * 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 f17e464..d123f38 100644
+index 4f6ab27..36a5e10 100644
 --- a/common/ntor/ntor.go
 +++ b/common/ntor/ntor.go
 @@ -43,8 +43,8 @@ import (
@@ -39,7 +39,7 @@ index f17e464..d123f38 100644
  	"github.com/agl/ed25519/extra25519"
  
 diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
-index 879765d..04e788f 100644
+index 815a990..41cb52b 100644
 --- a/transports/obfs4/framing/framing.go
 +++ b/transports/obfs4/framing/framing.go
 @@ -67,7 +67,7 @@ import (

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



More information about the Pkg-privacy-commits mailing list