upgrade water to original maintained repository

diff --git a/.gitmodules b/.gitmodules
index c837a039e17a5ea45e75cc416ebcd3cbe97f1dda..1702c85bc68e6f4bec4b9f027608f265f4f73efd 100644 (file)
--- 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 f12e40ea8baf78ffde4f6cf12a3c246ca1ec54e3..c54e74bf383bf10352dfe7e273d4bb45f7886c59 100644 (file)
--- 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 f3864ef47fef546637e4611d8133c097b0e08331..e8c19f5ef4a5890937c932174dad97b48b06c080 100644 (file)
--- 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 388853d817e58ef2d2726fff707636a4828d4b00..2f901eb773a3286a840f4e2ad03095c0cd1f2a21 100644 (file)
--- 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 (submodule)
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 63bb8f015e34dae29825c620c336e8ab0c92cb2c..dac115d182fb7579dead8b75beaf894c3561ed3a 100755 (executable)
--- 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
 "