add new dependency

diff --git a/.gitmodules b/.gitmodules
index 1702c85bc68e6f4bec4b9f027608f265f4f73efd..bfeaebd7179bba166fff811441574c7fc60d5189 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,9 @@
        path = src/gopkg.in/yaml.v2
        url = https://github.com/go-yaml/yaml.git
        branch = v2
+[submodule "src/github.com/pkg/errors"]
+       path = src/github.com/pkg/errors
+       url = https://github.com/pkg/errors.git
+[submodule "src/github.com/Sirupsen/logrus"]
+       path = src/github.com/Sirupsen/logrus
+       url = https://github.com/sirupsen/logrus.git

diff --git a/doc/download.texi b/doc/download.texi
index c54e74bf383bf10352dfe7e273d4bb45f7886c59..b5afbdb9319af9c81157ba805c39a4f4897f21cc 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -13,6 +13,8 @@ Tarballs include all necessary required libraries:
 @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
+@item @code{github.com/pkg/errors} @tab All @tab BSD 2-Clause
+@item @code{github.com/sirupsen/logrus} @tab All @tab MIT
 @end multitable
 
 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}

diff --git a/doc/sources.texi b/doc/sources.texi
index e8c19f5ef4a5890937c932174dad97b48b06c080..3b057d14e30a6aa0d01bf43102ca96b7300010f4 100644 (file)
--- a/doc/sources.texi
+++ b/doc/sources.texi
@@ -27,4 +27,6 @@ repositories will be unavailable (they are seldom updated):
 @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}
+@item @code{github.com/pkg/errors} @tab @url{https://github.com/pkg/errors.git}
+@item @code{github.com/sirupsen/logrus} @tab @url{https://github.com/sirupsen/logrus.git}
 @end multitable

diff --git a/src/github.com/Sirupsen/logrus b/src/github.com/Sirupsen/logrus
new file mode 160000 (submodule)
index 0000000..3f603f4
--- /dev/null
+++ b/src/github.com/Sirupsen/logrus
@@ -0,0 +1 @@
+Subproject commit 3f603f494d61c73457fb234161d8982b9f0f0b71

diff --git a/src/github.com/pkg/errors b/src/github.com/pkg/errors
new file mode 160000 (submodule)
index 0000000..248dadf
--- /dev/null
+++ b/src/github.com/pkg/errors
@@ -0,0 +1 @@
+Subproject commit 248dadf4e9068a0b3e79f02ed0a610d935de5302

diff --git a/utils/makedist.sh b/utils/makedist.sh
index dac115d182fb7579dead8b75beaf894c3561ed3a..b7fad1ac89c7d3fbda501c4ab1be2415e5e3e666 100755 (executable)
--- a/utils/makedist.sh
+++ b/utils/makedist.sh
@@ -12,6 +12,8 @@ repos="
     src/github.com/songgao/water
     src/gopkg.in/yaml.v2
     src/golang.org/x/crypto
+    src/github.com/pkg/errors
+    src/github.com/sirupsen/logrus
 "
 for repo in $repos; do
     git clone $repo $tmp/govpn-$release/$repo
@@ -50,6 +52,7 @@ rm -r doc/.well-known doc/govpn.html/.well-known utils/news.sh
 rm utils/makedist.sh
 find . -name .git -type d | xargs rm -fr
 find . -name .gitignore -delete
+find . -name .travis.yml -delete
 rm .gitmodules
 
 cd ..