Add an -V option to show the version of rpki-client. For the base version

it will show just OpenBSD while -portable will show the portable version.
OK sthen@, tb@, kn@

diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h
index e6d6305..0fa14e1 100644 (file)
--- a/usr.sbin/rpki-client/extern.h
+++ b/usr.sbin/rpki-client/extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: extern.h,v 1.54 2021/03/18 14:03:42 claudio Exp $ */
+/*     $OpenBSD: extern.h,v 1.55 2021/03/19 13:56:10 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -458,5 +458,6 @@ int mkpath(const char *);
 
 #define                RPKI_PATH_OUT_DIR       "/var/db/rpki-client"
 #define                RPKI_PATH_BASE_DIR      "/var/cache/rpki-client"
+#define                RPKI_VERSION            "OpenBSD"
 
 #endif /* ! EXTERN_H */

diff --git a/usr.sbin/rpki-client/main.c b/usr.sbin/rpki-client/main.c
index d586b11..e922b7f 100644 (file)
--- a/usr.sbin/rpki-client/main.c
+++ b/usr.sbin/rpki-client/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.121 2021/03/19 09:43:59 claudio Exp $ */
+/*     $OpenBSD: main.c,v 1.122 2021/03/19 13:56:10 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -880,7 +880,7 @@ main(int argc, char *argv[])
            "proc exec unveil", NULL) == -1)
                err(1, "pledge");
 
-       while ((c = getopt(argc, argv, "b:Bcd:e:jnos:t:T:v")) != -1)
+       while ((c = getopt(argc, argv, "b:Bcd:e:jnos:t:T:vV")) != -1)
                switch (c) {
                case 'b':
                        bind_addr = optarg;
@@ -923,6 +923,8 @@ main(int argc, char *argv[])
                case 'v':
                        verbose++;
                        break;
+               case 'V':
+                       errx(0, "version: %s", RPKI_VERSION);
                default:
                        goto usage;
                }
@@ -1294,7 +1296,7 @@ main(int argc, char *argv[])
 
 usage:
        fprintf(stderr,
-           "usage: rpki-client [-Bcjnov] [-b sourceaddr] [-d cachedir]"
+           "usage: rpki-client [-BcjnoVv] [-b sourceaddr] [-d cachedir]"
            " [-e rsync_prog]\n"
            "                   [-s timeout] [-T table] [-t tal]"
            " [outputdir]\n");

diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8
index c5bdbc8..5403505 100644 (file)
--- a/usr.sbin/rpki-client/rpki-client.8
+++ b/usr.sbin/rpki-client/rpki-client.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: rpki-client.8,v 1.33 2020/12/09 11:33:10 claudio Exp $
+.\"    $OpenBSD: rpki-client.8,v 1.34 2021/03/19 13:56:10 claudio Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 9 2020 $
+.Dd $Mdocdate: March 19 2021 $
 .Dt RPKI-CLIENT 8
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nd RPKI validator to support BGP Origin Validation
 .Sh SYNOPSIS
 .Nm
-.Op Fl Bcjnov
+.Op Fl BcjnoVv
 .Op Fl b Ar sourceaddr
 .Op Fl d Ar cachedir
 .Op Fl e Ar rsync_prog
@@ -122,6 +122,8 @@ By default
 .Nm
 will load all TAL files in
 .Pa /etc/rpki .
+.It Fl V
+Show the version and exit.
 .It Fl v
 Specified once, prints information about status.
 Twice, prints each filename as it's processed.