cvs update

5 files changed, 28 insertions, 27 deletions

diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1
index e973745..e538583 100644
--- a/src/usr.bin/signify/signify.1
+++ b/src/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.55 2022/02/20 17:11:05 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.56 2022/07/20 15:12:39 deraadt Exp $
 .\"
 .\"Copyright (c) 2013 Marc Espie <espie@openbsd.org>
 .\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
@@ -14,7 +14,7 @@
 .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: February 20 2022 $
+.Dd $Mdocdate: July 20 2022 $
 .Dt SIGNIFY 1
 .Os
 .Sh NAME
@@ -171,12 +171,12 @@ Verify a release directory containing
 .Pa SHA256.sig
 and a full set of release files:
 .Bd -literal -offset indent -compact
-$ signify -C -p /etc/signify/openbsd-72-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-73-base.pub -x SHA256.sig
 .Ed
 .Pp
 Verify a bsd.rd before an upgrade:
 .Bd -literal -offset indent -compact
-$ signify -C -p /etc/signify/openbsd-72-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-73-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive:
diff --git a/src/usr.bin/signify/signify.c b/src/usr.bin/signify/signify.c
index 3a6d476..0178063 100644
--- a/src/usr.bin/signify/signify.c
+++ b/src/usr.bin/signify/signify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signify.c,v 1.135 2020/01/21 12:13:21 tb Exp $ */
+/* $OpenBSD: signify.c,v 1.136 2022/08/26 00:24:56 kn Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -764,13 +764,14 @@ verifyzdata(uint8_t *zdata, unsigned long long zdatalen,
 int
 main(int argc, char **argv)
 {
-	const char *pubkeyfile = NULL, *seckeyfile = NULL, *msgfile = NULL,
-	    *sigfile = NULL;
+	const char *pubkeyfile = NULL, *msgfile = NULL, *sigfile = NULL;
 	char sigfilebuf[PATH_MAX];
-	const char *comment = "signify";
 	char *keytype = NULL;
-	int ch;
+#ifndef VERIFYONLY
+	const char *seckeyfile = NULL, *comment = "signify";
 	int none = 0;
+#endif
+	int ch;
 	int embedded = 0;
 	int quiet = 0;
 	int gzip = 0;
@@ -803,6 +804,15 @@ main(int argc, char **argv)
 				usage(NULL);
 			verb = SIGN;
 			break;
+		case 'c':
+			comment = optarg;
+			break;
+		case 'n':
+			none = 1;
+			break;
+		case 's':
+			seckeyfile = optarg;
+			break;
 		case 'z':
 			gzip = 1;
 			break;
@@ -812,27 +822,18 @@ main(int argc, char **argv)
 				usage(NULL);
 			verb = VERIFY;
 			break;
-		case 'c':
-			comment = optarg;
-			break;
 		case 'e':
 			embedded = 1;
 			break;
 		case 'm':
 			msgfile = optarg;
 			break;
-		case 'n':
-			none = 1;
-			break;
 		case 'p':
 			pubkeyfile = optarg;
 			break;
 		case 'q':
 			quiet = 1;
 			break;
-		case 's':
-			seckeyfile = optarg;
-			break;
 		case 't':
 			keytype = optarg;
 			break;
diff --git a/src/usr.bin/unvis/unvis.1 b/src/usr.bin/unvis/unvis.1
index c112dbf..cadde3f 100644
--- a/src/usr.bin/unvis/unvis.1
+++ b/src/usr.bin/unvis/unvis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unvis.1,v 1.8 2013/08/12 14:19:53 jmc Exp $
+.\"	$OpenBSD: unvis.1,v 1.9 2022/07/30 07:19:31 jsg Exp $
 .\"	$NetBSD: unvis.1,v 1.3 1994/12/06 07:36:08 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: August 12 2013 $
+.Dd $Mdocdate: July 30 2022 $
 .Dt UNVIS 1
 .Os
 .Sh NAME
@@ -53,4 +53,4 @@ a visual representation of data back to its original form on standard output.
 The
 .Nm
 command appeared in
-.Bx 4.4 .
+.Bx 4.3 Reno .
diff --git a/src/usr.bin/vis/vis.1 b/src/usr.bin/vis/vis.1
index 1083d47..f3d692c 100644
--- a/src/usr.bin/vis/vis.1
+++ b/src/usr.bin/vis/vis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.1,v 1.15 2010/08/24 23:49:06 djm Exp $
+.\"	$OpenBSD: vis.1,v 1.16 2022/07/30 07:19:31 jsg Exp $
 .\"	$NetBSD: vis.1,v 1.5 1994/11/17 07:56:00 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vis.1	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: August 24 2010 $
+.Dd $Mdocdate: July 30 2022 $
 .Dt VIS 1
 .Os
 .Sh NAME
@@ -135,4 +135,4 @@ White space (space-tab-newline) is also encoded.
 The
 .Nm
 command appeared in
-.Bx 4.4 .
+.Bx 4.3 Reno .
diff --git a/src/usr.bin/what/what.1 b/src/usr.bin/what/what.1
index d03bef3..96e9e1e 100644
--- a/src/usr.bin/what/what.1
+++ b/src/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: what.1,v 1.20 2019/01/20 14:03:19 schwarze Exp $
+.\"	$OpenBSD: what.1,v 1.21 2022/03/31 17:27:28 naddy Exp $
 .\"	$NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 20 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt WHAT 1
 .Os
 .Sh NAME
@@ -54,7 +54,7 @@ as inserted by the source code control system (SCCS).
 .Pp
 When
 .Sq $
-followed by the system name is encountered
+followed by the system name is encountered,
 .Nm
 prints the remainder of the string up to a
 .Sq $