cvs update

10 files changed, 21 insertions, 19 deletions

diff --git a/src/usr.bin/calendar/calendars/calendar.canada b/src/usr.bin/calendar/calendars/calendar.canada
index 33acf01..602eabf 100644
--- a/src/usr.bin/calendar/calendars/calendar.canada
+++ b/src/usr.bin/calendar/calendars/calendar.canada
@@ -1,7 +1,7 @@
 /*
  * Canada holiday
  *
- * $OpenBSD: calendar.canada,v 1.2 2013/03/16 07:52:29 jmc Exp $
+ * $OpenBSD: calendar.canada,v 1.3 2023/05/15 16:22:07 jmc Exp $
  */
 
 #ifndef _calendar_canada_
@@ -19,7 +19,7 @@ Easter-2	Good Friday (Statutory holiday)
 Easter+1	Easter Monday
 05/SunSecond	Mother's Day (2nd Sunday of May)
 /* Holds up to and including 2015 */
-05/MonThird*	Victoria Day (Monday on or immediately before May 24)
+05/Mon-2	Victoria Day (Monday on or immediately before May 24)
 06/SunThird	Father's Day (3rd Sunday of June)
 06/21*	Summer Solstice
 06/24	St-Jean Baptiste
diff --git a/src/usr.bin/calendar/calendars/calendar.christian b/src/usr.bin/calendar/calendars/calendar.christian
index 177baac..4f70016 100644
--- a/src/usr.bin/calendar/calendars/calendar.christian
+++ b/src/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $OpenBSD: calendar.christian,v 1.4 1998/11/08 04:38:00 pjanzen Exp $
+ * $OpenBSD: calendar.christian,v 1.5 2022/12/13 07:08:17 jmc Exp $
  */
 
 #ifndef _calendar_christian_
@@ -21,7 +21,6 @@ Easter+50	Whitmonday
 Easter+56	Trinity Sunday (7 days after Pentecost)
 Easter+60	Corpus Christi (11 days after Pentecost)
 10/18	Feast Day of St. Luke
-11/SunLast	First Sunday of Advent (4th Sunday before Christmas)
 12/SunFirst	First Sunday of Advent (4th Sunday before Christmas)
 12/06	St. Nicholas' Day
 12/25	Christmas
diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music
index be92720..d272521 100644
--- a/src/usr.bin/calendar/calendars/calendar.music
+++ b/src/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $OpenBSD: calendar.music,v 1.41 2021/08/29 21:10:31 sthen Exp $
+ * $OpenBSD: calendar.music,v 1.42 2023/04/02 16:43:42 sthen Exp $
  */
 
 #ifndef _calendar_music_
@@ -31,6 +31,7 @@
 01/13	Eric Clapton plays the "Rainbow Concert" in London, 1973
 01/13	Daevid Allen (Gong) is born in Melbourne, 1938
 01/17	Led Zeppelin's first album is released, 1969
+01/17	Ryuichi Sakamoto, electronic music maestro, is born in Tokyo, 1952
 01/19	Janis Joplin is born in Port Arthur, Texas, 1943
 01/20	Walter Piston is born in Rockland, Maine, 1894
 01/20	Ernest Chausson is born in Paris, 1855
@@ -147,6 +148,7 @@
 03/27	Ferde Grofe is born in New York City, 1892
 03/28	Sergei Rachmaninov dies in Beverly Hills, California, 1943
 03/28	Modest Mussorgsky dies, 1881
+03/28	Ryuichi Sakamoto dies, 2023
 03/29	Dr. Hook gets a group picture on the cover of "Rolling Stone", 1973
 03/29	Carl Orff dies in Munich, Germany, 1982
 03/30	Eric Clapton is born in Surrey, England, 1945
diff --git a/src/usr.bin/calendar/calendars/calendar.uk b/src/usr.bin/calendar/calendars/calendar.uk
index d8aff28..55d0cc6 100644
--- a/src/usr.bin/calendar/calendars/calendar.uk
+++ b/src/usr.bin/calendar/calendars/calendar.uk
@@ -1,7 +1,7 @@
 /*
  * United Kingdom (UK) calendar
  *
- * $OpenBSD: calendar.uk,v 1.2 2018/11/21 14:50:28 jmc Exp $
+ * $OpenBSD: calendar.uk,v 1.3 2023/05/15 16:22:07 jmc Exp $
  */
 
 #ifndef _calendar_uk_
@@ -21,7 +21,6 @@ Easter-21	Mothering Sunday (Sunday 3 weeks before Easter Sunday)
 Easter-2	Good Friday (bank holiday)
 Easter+1	Easter Monday (bank holiday - except Scotland)
 05/MonFirst	Early May bank holiday
-05/MonThird*	Victoria Day in Scotland (Monday on or immediately before 24th May)
 05/MonLast	Spring Bank Holiday
 06/SunThird	Father's Day (3rd Sunday of June)
 06/21*	Summer Solstice
diff --git a/src/usr.bin/calendar/calendars/calendar.usholiday b/src/usr.bin/calendar/calendars/calendar.usholiday
index a437819..138205b 100644
--- a/src/usr.bin/calendar/calendars/calendar.usholiday
+++ b/src/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $OpenBSD: calendar.usholiday,v 1.9 2015/01/19 18:07:47 tedu Exp $
+ * $OpenBSD: calendar.usholiday,v 1.10 2023/05/15 10:36:08 bentley Exp $
  */
 
 #ifndef _calendar_usholiday_
@@ -22,6 +22,7 @@
 05/SatThird	Armed Forces Day (3rd Saturday of May)
 05/MonLast	Memorial Day (Last Monday of May)
 06/SunThird	Father's Day (3rd Sunday of June)
+06/19	Juneteenth
 06/21*	Summer Solstice
 07/04	Independence Day
 09/MonFirst	Labor Day (1st Monday of September)
diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1
index e538583..6795d22 100644
--- a/src/usr.bin/signify/signify.1
+++ b/src/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.56 2022/07/20 15:12:39 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.57 2023/09/18 13:16:13 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: July 20 2022 $
+.Dd $Mdocdate: September 18 2023 $
 .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-73-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-74-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-73-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-74-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive:
diff --git a/src/usr.bin/signify/zsig.c b/src/usr.bin/signify/zsig.c
index e3533fd..ca76b5c 100644
--- a/src/usr.bin/signify/zsig.c
+++ b/src/usr.bin/signify/zsig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zsig.c,v 1.18 2019/12/22 06:37:25 espie Exp $ */
+/* $OpenBSD: zsig.c,v 1.19 2023/04/29 10:08:18 espie Exp $ */
 /*
  * Copyright (c) 2016 Marc Espie <espie@openbsd.org>
  *
@@ -160,6 +160,8 @@ copy_blocks(int fdout, int fdin, const char *sha, const char *endsha,
 			if (more == 0)
 				break;
 		}
+		if (n == 0)
+			break;
 		SHA512_256Data(buffer, n, output);
 		if (endsha - sha < SHA512_256_DIGEST_STRING_LENGTH-1)
 			errx(4, "signature truncated");
@@ -172,6 +174,8 @@ copy_blocks(int fdout, int fdin, const char *sha, const char *endsha,
 		if (n != bufsize)
 			break;
 	}
+	if (endsha != sha)
+		errx(4, "file truncated");
 	free(buffer);
 }
 
diff --git a/src/usr.bin/unvis/unvis.c b/src/usr.bin/unvis/unvis.c
index 22566d9..3841ed9 100644
--- a/src/usr.bin/unvis/unvis.c
+++ b/src/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unvis.c,v 1.14 2015/10/09 01:37:09 deraadt Exp $	*/
+/*	$OpenBSD: unvis.c,v 1.15 2022/12/04 23:50:50 cheloha Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -48,7 +48,6 @@ main(int argc, char *argv[])
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
-		case '?':
 		default:
 			(void) fprintf(stderr, "usage: unvis [file ...]\n");
 			exit(1);
diff --git a/src/usr.bin/vis/vis.c b/src/usr.bin/vis/vis.c
index 56c25a5..c114d7b 100644
--- a/src/usr.bin/vis/vis.c
+++ b/src/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vis.c,v 1.21 2020/08/03 01:08:37 deraadt Exp $	*/
+/*	$OpenBSD: vis.c,v 1.22 2022/12/04 23:50:50 cheloha Exp $	*/
 /*	$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $	*/
 
 /*-
@@ -102,7 +102,6 @@ main(int argc, char *argv[])
 			debug = 1;
 			break;
 #endif
-		case '?':
 		default:
 			usage();
 		}
diff --git a/src/usr.bin/what/what.c b/src/usr.bin/what/what.c
index 54917ff..226b03c 100644
--- a/src/usr.bin/what/what.c
+++ b/src/usr.bin/what/what.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: what.c,v 1.16 2020/04/18 15:10:06 martijn Exp $	*/
+/*	$OpenBSD: what.c,v 1.17 2023/03/08 04:43:13 guenther Exp $	*/
 /*	$NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $	*/
 
 /*
@@ -50,7 +50,6 @@ extern char *__progname;
 /*
  * what
  */
-/* ARGSUSED */
 int
 main(int argc, char *argv[])
 {