From 0348b54d1c83feca398182e9a86a2a92ed428447 Mon Sep 17 00:00:00 2001
From: Bruno Clermont <bruno@robotinfra.com>
Date: Wed, 8 Feb 2017 16:57:54 +0800
Subject: [PATCH] upgrade water to original maintained repository

---
 .gitmodules                           | 6 +++---
 doc/download.texi                     | 2 +-
 doc/sources.texi                      | 2 +-
 src/cypherpunks.ru/govpn/tap_linux.go | 2 +-
 src/github.com/bigeagle/water         | 1 -
 utils/makedist.sh                     | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 160000 src/github.com/bigeagle/water

diff --git a/.gitmodules b/.gitmodules
index c837a03..1702c85 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "src/github.com/bigeagle/water"]
-	path = src/github.com/bigeagle/water
-	url = https://github.com/bigeagle/water.git
+[submodule "src/github.com/songgao/water"]
+	path = src/github.com/songgao/water
+	url = https://github.com/songgao/water.git
 [submodule "src/github.com/agl/ed25519"]
 	path = src/github.com/agl/ed25519
 	url = https://github.com/agl/ed25519.git
diff --git a/doc/download.texi b/doc/download.texi
index f12e40e..c54e74b 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -10,7 +10,7 @@ Tarballs include all necessary required libraries:
 @multitable @columnfractions .40 .20 .40
 @headitem Library @tab Platform @tab Licence
 @item @code{github.com/agl/ed25519} @tab All @tab BSD 3-Clause
-@item @code{github.com/bigeagle/water} @tab GNU/Linux @tab BSD 3-Clause
+@item @code{github.com/songgao/water} @tab GNU/Linux @tab BSD 3-Clause
 @item @code{github.com/go-yaml/yaml} @tab All @tab Apache License 2.0 and MIT
 @item @code{golang.org/x/crypto} @tab All @tab BSD 3-Clause
 @end multitable
diff --git a/doc/sources.texi b/doc/sources.texi
index f3864ef..e8c19f5 100644
--- a/doc/sources.texi
+++ b/doc/sources.texi
@@ -24,7 +24,7 @@ repositories will be unavailable (they are seldom updated):
 @headitem Software/library @tab Mirror
 @item @code{cypherpunks.ru/govpn} @tab @url{https://github.com/stargrave/govpn.git}
 @item @code{github.com/agl/ed25519} @tab @url{git://git.cypherpunks.ru/ed25519.git}
-@item @code{github.com/bigeagle/water} @tab @url{git://git.cypherpunks.ru/water.git}
+@item @code{github.com/songgao/water} @tab @url{https://github.com/songgao/water.git}
 @item @code{github.com/go-yaml/yaml} @tab @url{git://git.cypherpunks.ru/yaml.git}
 @item @code{golang.org/x/crypto} @tab @url{git://git.cypherpunks.ru/crypto.git}
 @end multitable
diff --git a/src/cypherpunks.ru/govpn/tap_linux.go b/src/cypherpunks.ru/govpn/tap_linux.go
index 388853d..2f901eb 100644
--- a/src/cypherpunks.ru/govpn/tap_linux.go
+++ b/src/cypherpunks.ru/govpn/tap_linux.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/bigeagle/water"
+	"github.com/songgao/water"
 )
 
 func newTAPer(ifaceName string) (io.ReadWriter, error) {
diff --git a/src/github.com/bigeagle/water b/src/github.com/bigeagle/water
deleted file mode 160000
index 36aebfe..0000000
--- a/src/github.com/bigeagle/water
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36aebfeb35da4f1f6a975726716c6fc563c5c495
diff --git a/utils/makedist.sh b/utils/makedist.sh
index 63bb8f0..dac115d 100755
--- a/utils/makedist.sh
+++ b/utils/makedist.sh
@@ -9,7 +9,7 @@ git clone . $tmp/govpn-$release
 repos="
     src/cypherpunks.ru/balloon
     src/github.com/agl/ed25519
-    src/github.com/bigeagle/water
+    src/github.com/songgao/water
     src/gopkg.in/yaml.v2
     src/golang.org/x/crypto
 "
-- 
2.44.0