From 0cdad04d71e2bbaa182cf2cc98c6425c98bd2b6e Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 7 Jul 2016 23:16:07 +0300
Subject: [PATCH] -version command line option

---
 VERSION                                             | 2 +-
 doc/news.ru.texi                                    | 6 ++++++
 doc/news.texi                                       | 6 ++++++
 src/cypherpunks.ru/govpn/cmd/govpn-client/main.go   | 5 +++++
 src/cypherpunks.ru/govpn/cmd/govpn-server/main.go   | 5 +++++
 src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go | 5 +++++
 6 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 95ee81a..f9ce5a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.9
+5.10
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index a3981d3..38d0336 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,12 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.10
+@subsection Релиз 5.10
+@itemize
+@item Добавлена @option{-version} опция, выводящая версию программы.
+@end itemize
+
 @node Релиз 5.9
 @subsection Релиз 5.9
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 3fa2169..58b6d12 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,12 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.10
+@section Release 5.10
+@itemize
+@item @option{-version} option added, printing program version.
+@end itemize
+
 @node Release 5.9
 @section Release 5.9
 @itemize
diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index 98a5b21..c7b04a7 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -51,6 +51,7 @@ var (
 	cpr         = flag.Int("cpr", 0, "Enable constant KiB/sec out traffic rate")
 	egdPath     = flag.String("egd", "", "Optional path to EGD socket")
 	syslog      = flag.Bool("syslog", false, "Enable logging to syslog")
+	version     = flag.Bool("version", false, "Print version information")
 	warranty    = flag.Bool("warranty", false, "Print warranty information")
 
 	conf        *govpn.PeerConf
@@ -67,6 +68,10 @@ func main() {
 		fmt.Println(govpn.Warranty)
 		return
 	}
+	if *version {
+		fmt.Println(govpn.VersionGet())
+		return
+	}
 	timeout = *timeoutP
 	var err error
 	log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index c70e82a..68a0172 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -39,6 +39,7 @@ var (
 	proxy    = flag.String("proxy", "", "Enable HTTP proxy on host:port")
 	egdPath  = flag.String("egd", "", "Optional path to EGD socket")
 	syslog   = flag.Bool("syslog", false, "Enable logging to syslog")
+	version  = flag.Bool("version", false, "Print version information")
 	warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -48,6 +49,10 @@ func main() {
 		fmt.Println(govpn.Warranty)
 		return
 	}
+	if *version {
+		fmt.Println(govpn.VersionGet())
+		return
+	}
 	timeout := time.Second * time.Duration(govpn.TimeoutDefault)
 	log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 	log.Println(govpn.VersionGet())
diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
index d5dcfa5..16f7847 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
@@ -36,6 +36,7 @@ var (
 	tOpt     = flag.Int("t", govpn.DefaultT, "Argon2d iteration parameter")
 	pOpt     = flag.Int("p", govpn.DefaultP, "Argon2d parallelizm parameter")
 	egdPath  = flag.String("egd", "", "Optional path to EGD socket")
+	version  = flag.Bool("version", false, "Print version information")
 	warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -45,6 +46,10 @@ func main() {
 		fmt.Println(govpn.Warranty)
 		return
 	}
+	if *version {
+		fmt.Println(govpn.VersionGet())
+		return
+	}
 	if *egdPath != "" {
 		govpn.EGDInit(*egdPath)
 	}
-- 
2.44.0