From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 28 Aug 2018 16:09:23 +0000 (+0300)
Subject: Update upstream dependencies
X-Git-Tag: 7.5^2
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=672458a3b692635616c23f92659a4254f188b75d

Update upstream dependencies
---

diff --git a/VERSION b/VERSION
index 37722eb..c382960 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.4
+7.5
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 08aa4c7..40a0421 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 7.5
+@subsection Релиз 7.5
+@itemize
+@item Обновлены зависимые криптографические библиотеки для совместимости
+с Go 1.11.
+@end itemize
+
 @node Релиз 7.4
 @subsection Релиз 7.4
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 03d61ef..47639f6 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 7.5
+@section Release 7.5
+@itemize
+@item Dependant cryptographic libraries are updated for compatibility
+with Go 1.11.
+@end itemize
+
 @node Release 7.4
 @section Release 7.4
 @itemize
diff --git a/src/chacha20 b/src/chacha20
index 95f85aa..883eae7 120000
--- a/src/chacha20
+++ b/src/chacha20
@@ -1 +1 @@
-golang.org/x/crypto/chacha20poly1305/internal/chacha20
\ No newline at end of file
+golang.org/x/crypto/internal/chacha20
\ No newline at end of file
diff --git a/src/cypherpunks.ru/govpn/client/proxy.go b/src/cypherpunks.ru/govpn/client/proxy.go
index a1c7804..843381e 100644
--- a/src/cypherpunks.ru/govpn/client/proxy.go
+++ b/src/cypherpunks.ru/govpn/client/proxy.go
@@ -55,6 +55,6 @@ func (c *Client) proxyTCP() {
 		c.Error <- fmt.Errorf("Unexpected response from proxy: %s", err.Error())
 		return
 	}
-	govpn.Printf(`[proxy-connected remote="%s" addr="%s"]`, c.config.RemoteAddress, *proxyAddr)
+	govpn.Printf(`[proxy-connected remote="%s" addr="%s"]`, c.config.RemoteAddress, (*proxyAddr).String())
 	go c.handleTCP(conn)
 }
diff --git a/src/golang.org/x/crypto b/src/golang.org/x/crypto
index 81e9090..614d502 160000
--- a/src/golang.org/x/crypto
+++ b/src/golang.org/x/crypto
@@ -1 +1 @@
-Subproject commit 81e90905daefcd6fd217b62423c0908922eadb30
+Subproject commit 614d502a4dac94afa3a6ce146bd1736da82514c6
diff --git a/src/golang.org/x/sys b/src/golang.org/x/sys
index 2d6f6f8..d99a578 160000
--- a/src/golang.org/x/sys
+++ b/src/golang.org/x/sys
@@ -1 +1 @@
-Subproject commit 2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15
+Subproject commit d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e
diff --git a/src/gopkg.in/yaml.v2 b/src/gopkg.in/yaml.v2
index a5b47d3..5420a8b 160000
--- a/src/gopkg.in/yaml.v2
+++ b/src/gopkg.in/yaml.v2
@@ -1 +1 @@
-Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0
+Subproject commit 5420a8b6744d3b0345ab293f6fcba19c978f1183
diff --git a/utils/makedist.sh b/utils/makedist.sh
index d93ac9b..a79377c 100755
--- a/utils/makedist.sh
+++ b/utils/makedist.sh
@@ -28,15 +28,17 @@ golang.org/x/crypto/LICENSE
 golang.org/x/crypto/PATENTS
 golang.org/x/crypto/README.md
 golang.org/x/crypto/blake2b
-golang.org/x/crypto/chacha20poly1305/internal/chacha20
 golang.org/x/crypto/curve25519
+golang.org/x/crypto/internal/chacha20
+golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
 golang.org/x/crypto/ssh/terminal
 golang.org/x/sys/AUTHORS
 golang.org/x/sys/CONTRIBUTORS
 golang.org/x/sys/LICENSE
 golang.org/x/sys/PATENTS
-golang.org/x/sys/README
+golang.org/x/sys/README.md
+golang.org/x/sys/cpu
 golang.org/x/sys/unix
 EOF
 tar cfCI - src $tmp/includes | tar xfC - $tmp