cvs update

4 files changed, 16 insertions, 15 deletions

diff --git a/src/usr.bin/calendar/calendars/calendar.birthday b/src/usr.bin/calendar/calendars/calendar.birthday
index 785d9a9..1ce3f7b 100644
--- a/src/usr.bin/calendar/calendars/calendar.birthday
+++ b/src/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $OpenBSD: calendar.birthday,v 1.64 2016/08/31 12:33:03 schwarze Exp $
+ * $OpenBSD: calendar.birthday,v 1.65 2020/04/13 13:28:26 jmc Exp $
  */
 
 #ifndef _calendar_birthday_
@@ -73,7 +73,7 @@
 02/15	Galileo Galilei born in Pisa, Italy, 1564
 02/15	Susan B. Anthony born, 1820
 02/16	Pierre Bouguer born, 1698, founder of photometry
-02/17	Federic Eugene Ives born, 1856, pioneer of halftone process
+02/17	Frederic Eugene Ives born, 1856, pioneer of halftone process
 02/17	T. J. Watson, Sr. born, 1874
 02/17	Marion Anderson born, 1902
 02/18	Ernst Mach born, 1838, philosopher & optics pioneer
diff --git a/src/usr.bin/lndir/lndir.c b/src/usr.bin/lndir/lndir.c
index e1828db..15ee0b9 100644
--- a/src/usr.bin/lndir/lndir.c
+++ b/src/usr.bin/lndir/lndir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lndir.c,v 1.23 2019/06/28 13:35:01 deraadt Exp $	*/
+/*	$OpenBSD: lndir.c,v 1.24 2020/03/06 15:17:05 mestre Exp $	*/
 /* $XConsortium: lndir.c /main/15 1995/08/30 10:56:18 gildea $ */
 
 /*
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
 	struct stat fs, ts;
 	char *fn, *tn;
 
-	if (pledge("stdio rpath wpath cpath", NULL) == -1)
+	if (pledge("stdio rpath cpath", NULL) == -1)
 		err(1, "pledge");
 
 	while (++argv, --argc) {
diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1
index fc76fa5..ab612d5 100644
--- a/src/usr.bin/signify/signify.1
+++ b/src/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.48 2019/08/10 03:56:02 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.50 2020/04/05 06:34:20 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: August 10 2019 $
+.Dd $Mdocdate: April 5 2020 $
 .Dt SIGNIFY 1
 .Os
 .Sh NAME
@@ -24,7 +24,8 @@
 .Nm signify
 .Fl C
 .Op Fl q
-.Fl p Ar pubkey
+.Op Fl p Ar pubkey
+.Op Fl t Ar keytype
 .Fl x Ar sigfile
 .Op Ar
 .Nm signify
@@ -170,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-67-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-68-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-67-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-68-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 5c577e8..3a6d476 100644
--- a/src/usr.bin/signify/signify.c
+++ b/src/usr.bin/signify/signify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signify.c,v 1.134 2019/12/22 06:37:25 espie Exp $ */
+/* $OpenBSD: signify.c,v 1.135 2020/01/21 12:13:21 tb Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -80,7 +80,7 @@ usage(const char *error)
 		fprintf(stderr, "%s\n", error);
 	fprintf(stderr, "usage:"
 #ifndef VERIFYONLY
-	    "\t%1$s -C [-q] -p pubkey -x sigfile [file ...]\n"
+	    "\t%1$s -C [-q] [-p pubkey] [-t keytype] -x sigfile [file ...]\n"
 	    "\t%1$s -G [-n] [-c comment] -p pubkey -s seckey\n"
 	    "\t%1$s -S [-enz] [-x sigfile] -s seckey -m message\n"
 #endif
@@ -728,13 +728,13 @@ verifychecksums(char *msg, int argc, char **argv, int quiet)
 }
 
 static void
-check(const char *pubkeyfile, const char *sigfile, int quiet, int argc,
-    char **argv)
+check(const char *pubkeyfile, const char *sigfile, const char *keytype,
+    int quiet, int argc, char **argv)
 {
 	unsigned long long msglen;
 	uint8_t *msg;
 
-	msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, NULL);
+	msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, keytype);
 	verifychecksums((char *)msg, argc, argv, quiet);
 
 	free(msg);
@@ -859,7 +859,7 @@ main(int argc, char **argv)
 			err(1, "pledge");
 		if (!sigfile)
 			usage("must specify sigfile");
-		check(pubkeyfile, sigfile, quiet, argc, argv);
+		check(pubkeyfile, sigfile, keytype, quiet, argc, argv);
 		return 0;
 	}
 #endif