From 19bd2dba141fa62778edb04eeaafc83787931885 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 24 Jul 2015 15:50:01 +0200 Subject: cvs update --- src/usr.bin/calendar/calendars/calendar.computer | 4 ++-- src/usr.bin/calendar/calendars/calendar.holiday | 11 +++++++---- src/usr.bin/calendar/calendars/calendar.music | 10 +++++----- src/usr.bin/jot/jot.c | 4 ++-- src/usr.bin/signify/signify.1 | 8 ++++---- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/usr.bin/calendar/calendars/calendar.computer b/src/usr.bin/calendar/calendars/calendar.computer index 59abedc..651e45a 100644 --- a/src/usr.bin/calendar/calendars/calendar.computer +++ b/src/usr.bin/calendar/calendars/calendar.computer @@ -1,7 +1,7 @@ /* * Computer * - * $OpenBSD: calendar.computer,v 1.15 2014/07/08 22:29:29 kirby Exp $ + * $OpenBSD: calendar.computer,v 1.16 2015/07/03 11:07:08 jmc Exp $ */ #ifndef _calendar_computer_ @@ -76,7 +76,7 @@ 10/14 British Computer Society founded, 1957 10/15 First FORTRAN Programmer's Reference Manual published, 1956 10/20 Zurich ALGOL report published, 1958 -10/25 DEC announces VAX-11/780, 1978 +10/25 DEC announces VAX-11/780, 1977 11/04 UNIVAC I program predicts Eisenhower victory based on 7% of votes, 1952 12/08 First Ph.D. awarded by Computer Science Dept, Univ. of Penna, 1965 diff --git a/src/usr.bin/calendar/calendars/calendar.holiday b/src/usr.bin/calendar/calendars/calendar.holiday index a91e8a9..050304a 100644 --- a/src/usr.bin/calendar/calendars/calendar.holiday +++ b/src/usr.bin/calendar/calendars/calendar.holiday @@ -1,12 +1,13 @@ /* * Holiday * - * $OpenBSD: calendar.holiday,v 1.27 2015/01/19 18:07:47 tedu Exp $ + * $OpenBSD: calendar.holiday,v 1.31 2015/05/17 06:37:36 czarkoff Exp $ */ #ifndef _calendar_holiday_ #define _calendar_holiday_ +01/01 New Year's Day 01/01 Independence Day in Haiti, Sudan 01/01 Universal Fraternity Day in Mozambique 01/02 Ancestry Day in Haiti @@ -155,7 +156,7 @@ 05/04 Rhode Island Independence Day 05/05 Children's Day in Japan, South Korea 05/05 Coronation Day in Thailand -05/05 Liberation Day in Netherlands +05/05 Liberation Day in the Netherlands 05/06 Bataan Day in Philippines 05/06* Bank Holiday in UK 05/07 May Day in United Kingdom @@ -180,6 +181,7 @@ 05/20 Mecklenburg Independence Day in North Carolina 05/20 National Day in Cameroon 05/Mon-2 Victoria Day in Canada +05/21 Independence Day in Montenegro 05/22 National Heroes Day in Sri Lanka 05/22 Declaration of the Republic of Yemen, 1990 05/23 Commonwealth Day in Jamaica, Belize @@ -250,6 +252,7 @@ 07/09 Independence Day in Argentina 07/10 Independence Day in Bahamas 07/11 National Holiday in the Mongolian People's Republic +07/13 Statehood Day in Montenegro 07/14 Bastille Day 07/14 National Holiday in Monaco 07/15 St. Swithin's Day @@ -449,7 +452,7 @@ 12/11 Independence Day in Upper Volta 12/12 Independence Day in Kenya 12/13 Republic Day in Malta -12/15 Statue Day in Netherlands Antilles +12/15 Kingdom Day in the Netherlands 12/16 Constitution Day in Nepal 12/16 Day of the Covenant in South Africa 12/16 National Day in Bahrain @@ -472,8 +475,8 @@ 04/21 Tiradentes in Brazil 04/25 Anniversary of the Revolution in Portugal +04/27 King's Day in the Netherlands 04/29 Greenary day in Japan -04/30 Queen's Birthday in Netherlands, Netherlands Antilles 05/01 Boy's day in Japan 05/02 King's Birthday in Lesotho 05/05 Battle of Puebla in Mexico diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music index 67a5dc3..68bb1a7 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.31 2015/03/13 16:38:46 sthen Exp $ + * $OpenBSD: calendar.music,v 1.32 2015/05/21 10:42:30 jmc Exp $ */ #ifndef _calendar_music_ @@ -236,14 +236,14 @@ 06/03 Johann Strauss II dies of pneumonia in Vienna, 1899 06/05 Carl Maria von Weber dies in London, England, 1826 06/05 Orlando Gibbons dies, 1625 +06/05 Dee Dee Ramone dies, 2002 06/06 "Rock Around The Clock" makes Billboard's #1 slot, 1955 -06/06 Dee Dee Ramone dies, 2002 06/06 Hanns Eisler is born in Leipzig, 1898 06/07 Blind Faith debuts in concert at London's Hyde Park, 1969 06/08 Robert Schumann is born in Zwickau, Germany, 1810 06/08 Hans Leo Hassler dies, 1612 06/08 Gordon Jacob dies, 1984 -06/09 Les Paul (Lester Polfus) is born in Waukesha, Wisconsin, 1923 +06/09 Les Paul (Lester Polsfuss) is born in Waukesha, Wisconsin, 1915 06/09 Carl Nielsen is born in Sortelung, Denmark, 1865 06/10 Howlin' Wolf (Chester Burnett) is born in West Point, Mississippi, 1910 06/10 Judy Garland is born, 1922 @@ -373,7 +373,7 @@ 09/16 Hildegard von Bingen is born into family of nobles, 1098 09/17 Hildegard von Bingen dies, 1179 09/17 Franz Xaver Sussmayr dies, 1803 -09/18 Dee Dee Ramone (Douglas Colvin) born in Fort Lee, Virginia, 1952 +09/18 Dee Dee Ramone (Douglas Colvin) born in Fort Lee, Virginia, 1951 09/19 Simon & Garfunkel reunite to play New York's Central Park, 1981 09/20 Jim Croce dies in a plane crash, 1973 09/20 Jean Sibelius dies in Ainola, Finland, 1957 @@ -409,6 +409,7 @@ 10/12 The Jimi Hendrix Experience is formed in London, 1966 10/12 Ray Conniff dies after falling down and hitting his head, 2002 10/12 Ralph Vaughan Williams is born in Down Ampney, Gloucestershire, 1872 +10/13 Paul Simon born, 1941 10/14 Leonard Bernstein dies in New York City, 1990 10/16 Bob Weir (Grateful Dead) is born in San Francisco, 1947 10/17 "Hair" opens at New York's Public Theater, 1967 @@ -453,7 +454,6 @@ 11/12 Neil Young is born in Toronto, 1945 11/12 Walter Piston dies in Belmont, Massachusetts, 1976 11/12 Alexander Borodin is born in St. Petersburg, Russia, 1833 -11/13 Paul Simon born, 1942 11/13 Gioacchino Rossini dies at his summer home in Passy, France, 1868 11/14 Aaron Copland is born in Brooklyn, New York, 1900 11/15 Christoph Willibald Gluck dies in Vienna, Austria, 1787 diff --git a/src/usr.bin/jot/jot.c b/src/usr.bin/jot/jot.c index 23ba16b..df30493 100644 --- a/src/usr.bin/jot/jot.c +++ b/src/usr.bin/jot/jot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jot.c,v 1.23 2013/11/26 13:21:18 deraadt Exp $ */ +/* $OpenBSD: jot.c,v 1.24 2015/07/21 04:04:06 jasper Exp $ */ /* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */ /*- @@ -114,7 +114,7 @@ main(int argc, char *argv[]) case 'p': prec = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr != NULL) - errx(1, "bad precision value, %s: %s", errstr, + errx(1, "bad precision value, %s: %s", errstr, optarg); break; default: diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1 index b2ac679..12fd9be 100644 --- a/src/usr.bin/signify/signify.1 +++ b/src/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.30 2015/01/20 20:50:36 tedu Exp $ +.\" $OpenBSD: signify.1,v 1.31 2015/07/14 23:30:02 florian Exp $ .\" .\"Copyright (c) 2013 Marc Espie .\"Copyright (c) 2013 Ted Unangst @@ -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: January 20 2015 $ +.Dd $Mdocdate: July 14 2015 $ .Dt SIGNIFY 1 .Os .Sh NAME @@ -148,12 +148,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-57-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-58-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-57-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-58-base.pub -x SHA256.sig bsd.rd .Ed .Sh SEE ALSO .Xr fw_update 1 , -- cgit 1.4.1