cvs update

7 files changed, 29 insertions, 16 deletions

diff --git a/src/usr.bin/calendar/calendar.c b/src/usr.bin/calendar/calendar.c
index e5add3d..b5da818 100644
--- a/src/usr.bin/calendar/calendar.c
+++ b/src/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.c,v 1.28 2012/01/31 08:29:25 otto Exp $	*/
+/*	$OpenBSD: calendar.c,v 1.29 2015/02/08 23:40:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
 			break;
 
 		case 'b':
-			bodun_always++;
+			bodun_always = 1;
 			break;
 
 		case 'f': /* other calendar file */
diff --git a/src/usr.bin/calendar/calendars/calendar.holiday b/src/usr.bin/calendar/calendars/calendar.holiday
index 952bdc7..a91e8a9 100644
--- a/src/usr.bin/calendar/calendars/calendar.holiday
+++ b/src/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $OpenBSD: calendar.holiday,v 1.25 2013/11/26 15:25:56 sobrado Exp $
+ * $OpenBSD: calendar.holiday,v 1.27 2015/01/19 18:07:47 tedu Exp $
  */
 
 #ifndef _calendar_holiday_
@@ -32,7 +32,6 @@
 01/19	Nameday of Archbishop Makarios in Cyprus
 01/20	Army Day in Mali
 01/20	National Heroes Day in Guinea-Bissau
-01/SunThird	Martin Luther King Day in New York (3rd Sunday)
 01/MonThird	Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday)
 01/MonThird	Lee-Jackson Day in Virginia (3rd Monday)
 01/21	Our Lady of Altagracia in Dominican Republic
@@ -298,7 +297,7 @@
 08/15	Independence Day in India
 08/15	Liberation Day in South Korea
 08/15	National Day in Congo
-08/FriThird	Admission Day in Hawaii, 1984 (3rd Friday)
+08/FriThird	Admission Day in Hawaii, 1959 (3rd Friday)
 08/16	Bennington Battle Day in Vermont
 08/16	Independence Days (3 days) in Gabon
 08/16	Restoration Day in Dominican Republic
diff --git a/src/usr.bin/calendar/calendars/calendar.openbsd b/src/usr.bin/calendar/calendars/calendar.openbsd
index 2a871c4..09f3dbd 100644
--- a/src/usr.bin/calendar/calendars/calendar.openbsd
+++ b/src/usr.bin/calendar/calendars/calendar.openbsd
@@ -1,7 +1,7 @@
 /*
  * OpenBSD-related dates to celebrate
  *
- * $OpenBSD: calendar.openbsd,v 1.35 2012/09/18 17:41:13 yasuoka Exp $
+ * $OpenBSD: calendar.openbsd,v 1.36 2014/08/17 09:00:44 jsg Exp $
  */
 
 #ifndef _calendar_openbsd_
@@ -10,6 +10,8 @@
 Jan 06	IPF gets integrated into the OpenBSD kernel, 1996
 Jan 06	NRL IPv6 addition to OpenBSD, 1999
 Jan 09	n2k10: Network hackathon, Melbourne, Australia, 17 developers, 2010
+Jan 13	n2k13: Network hackathon, Dunedin, New Zealand, 17 developers, 2013
+Jan 18	n2k14: Mini-hackathon, Dunedin, New Zealand, 15 developers, 2014
 Jan 20	Bind 9 goes into the tree, 2003
 Jan 26	Anoncvs service inaugurated, 1996
 Jan 26	n2k9: Network hackathon, Basel, Switzerland, 19 developers, 2009
@@ -27,7 +29,9 @@ Mar 10	OpenBSD/WWW translation started -- German, Spanish, Dutch, 2000
 Apr 01	OpenBSD/hppa64 port is added, 2005
 Apr 01	k2k11: Kernel hackathon, Hafnarfjordur, Iceland, 15 developers, 2011
 Apr 10	f2k7: First filesystem hackathon, Vienna, Austria, 14 developers, 2007
+Apr 10	r2k12: rthreads hackathon, Paris, France, 16 developers, 2012
 Apr 16	OpenBSD/i386 is ELF, 2003
+Apr 17	m2k14: Mini-hackathon, Marrakech, Morocco, 12 developers, 2014
 Apr 19	OpenBSD/solbourne port is added, 2005
 Apr 21	OpenBSD/luna88k port is added, 2004
 Apr 24	pf2k4: PF hackathon, Sechelt, BC, 12 developers, 2004
@@ -44,6 +48,7 @@ May 24	OpenBSD gets a trunk(4), 2005
 May 25	c2k7: General hackathon, Calgary, Alberta, 50 developers, 2007
 May 29	IPF is removed for license incompatibility, 2001
 May 29	OpenBSD/armish port is added, 2006
+May 29	t2k13: General hackathon, Toronto, Canada, 43 developers, 2013
 May 30	c2k9: General hackathon, Edmonton, Alberta, 46 developers, 2009
 May 31	Initial cut at OpenNTP, 2004
 Jun 01	OpenBSD 2.1 released, first time on CD (double set), 1997
@@ -61,6 +66,8 @@ Jun 25	c2k10: General hackathon, Edmonton, Alberta, 46 developers, 2010
 Jul 01	OpenBSD 1.2 released on ftp, 1996
 Jul 01	add strlcpy/strlcat, safe and sensible string copy/append, 1998
 Jul 02	c2k11: General hackathon, Edmonton, Alberta, Canada, 36 developers, 2011
+Jul 07	g2k12: General hackathon, Budapest, Hungary, 41 developers, 2012
+Jul 08	g2k14: General hackathon, Ljubljana, Slovenia, 49 developers, 2014
 Jul 11	OpenBSD goes wireless w/ if_wi addition, 1999
 Jul 23	OpenBSD goes multimedia with Brooktree 848 support, 1998
 Jul 24	Non-executable stack on most architectures, 2002
@@ -73,12 +80,15 @@ Aug 17	c2k1-2: Sparc64 hackathon, Washington D.C., 12 developers, 2001
 Aug 17	OpenBSD/sparc64 port is added, from NetBSD, 2001
 Aug 28	k2k6: IPSec hackathon, Schloss Kransberg, Germany, 14 developers, 2006
 Sep 16	s2k11: General hackathon, Ljubljana, Slovenia, 25 developers, 2011
+Sep 17	n2k12: Network hackathon, Starnberg, Germany, 23 developers, 2012
 Sep 19	j2k10: Mini-hackathon, Sakae Mura, Nagano, Japan, 19 developers, 2010
 Sep 26	OpenSSH born, Sunday 11:56 MST, 1999
 Sep 29	OpenBSD/hppa gets PCI bus support, 2003
 Oct 06	OpenBSD/landisk port added, 2006
+Oct 08	p2k12: Ports hackathon, Budapest, Hungary, 9 developers, 2012
 Oct 09	p2k9: Ports hackathon, Budapest, Hungary, 14 developers, 2009
 Oct 17	CARP added, introducing OpenBSD into High Availability market, 2003
+Oct 17	b2k13: Mini-hackathon, Berlin, Germany, 21 developers, 2013
 Oct 18	OpenBSD born, Wednesday 08:37:01 GMT, 1995
 Oct 18	OpenBSD/mvme88k port added, from nivas, based on MACH/luna88k, 1995
 Oct 18	p2k6: Ports hackathon, Budapest, Hungary, 14 developers, 2006
@@ -89,7 +99,10 @@ Oct 29	OpenBSD 3.6 released, featuring i386 and amd64 SMP, 2004
 Oct 30	OpenBSD 3.4 released, implementing W^X on i386 and AES in VIA C3, 2003
 Nov 01	OpenBSD 3.2 released, ftp mirrors preload for the first time, 2002
 Nov 01	v2k5: First ports hackathon, Venice, Italy, 12 developers, 2005
+Nov 05	a2k11: ARM hackathon, Coimbra, Portugal, 8 developers, 2011
 Nov 11	want.html added to OpenBSD/www, 1998
+Nov 12	p2k11: Ports hackathon, Budapest, Hungary, 15 developers, 2011
+Nov 14	c2k12: Coimbra hackathon, Coimbra, Portugal, 10 developers, 2012
 Nov 18	altq merged into pf, 2002
 Nov 20	h2k8: Hardware hackathon, Coimbra, Portugal, 18 developers, 2008
 Nov 21	h2k9: Hardware hackathon, Coimbra, Portugal, 15 developers, 2009
diff --git a/src/usr.bin/calendar/calendars/calendar.ushistory b/src/usr.bin/calendar/calendars/calendar.ushistory
index 71b657a..92dab40 100644
--- a/src/usr.bin/calendar/calendars/calendar.ushistory
+++ b/src/usr.bin/calendar/calendars/calendar.ushistory
@@ -1,7 +1,7 @@
 /*
  * USA history
  *
- * $OpenBSD: calendar.ushistory,v 1.4 2010/01/12 08:11:46 jmc Exp $
+ * $OpenBSD: calendar.ushistory,v 1.5 2015/01/02 08:02:20 jmc Exp $
  */
 
 #ifndef _calendar_ushistory_
@@ -9,7 +9,7 @@
 
 01/01	First Rose Bowl; Michigan 49 - Stanford 0, 1902
 01/02	First military deployment of helicopters (VS-300 by Igor Sikorsky),
-	with a brittish american convoy, 1944
+	with a British American convoy, 1944
 01/03	After 218 years since discovery by europeans and 92 years after
 	it was purchased from Russian Empire, Alaska becomes 49th state, 1959
 01/05	-50 degrees F, Strawberry UT, 1913
diff --git a/src/usr.bin/calendar/calendars/calendar.usholiday b/src/usr.bin/calendar/calendars/calendar.usholiday
index 3b8aa25..a437819 100644
--- a/src/usr.bin/calendar/calendars/calendar.usholiday
+++ b/src/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,13 +1,14 @@
 /*
  * USA holiday
  *
- * $OpenBSD: calendar.usholiday,v 1.8 2013/03/16 07:52:29 jmc Exp $
+ * $OpenBSD: calendar.usholiday,v 1.9 2015/01/19 18:07:47 tedu Exp $
  */
 
 #ifndef _calendar_usholiday_
 #define _calendar_usholiday_
 
 01/01	New Year's Day
+01/MonThird	Martin Luther King Jr. Day (3rd Monday of January)
 02/02	Groundhog Day
 02/14	St. Valentine's Day
 02/MonThird	President's Day (3rd Monday of February)
diff --git a/src/usr.bin/calendar/io.c b/src/usr.bin/calendar/io.c
index 1d6ef58..31c413b 100644
--- a/src/usr.bin/calendar/io.c
+++ b/src/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.36 2013/11/26 13:18:53 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.37 2015/01/16 06:40:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -47,6 +46,7 @@
 #include <string.h>
 #include <tzfile.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "pathnames.h"
 #include "calendar.h"
diff --git a/src/usr.bin/vis/vis.c b/src/usr.bin/vis/vis.c
index 0ccba27..b32ccef 100644
--- a/src/usr.bin/vis/vis.c
+++ b/src/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vis.c,v 1.15 2013/11/27 13:32:02 okan Exp $	*/
+/*	$OpenBSD: vis.c,v 1.16 2015/02/08 23:40:34 deraadt Exp $	*/
 /*	$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $	*/
 
 /*-
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
 			eflags |= VIS_ALL;
 			break;
 		case 'n':
-			none++;
+			none = 1;
 			break;
 		case 'w':
 			eflags |= VIS_WHITE;
@@ -86,14 +86,14 @@ main(int argc, char *argv[])
 			}
 			/*FALLTHROUGH*/
 		case 'f':
-			fold++;		/* fold output lines to 80 cols */
+			fold = 1;	/* fold output lines to 80 cols */
 			break;		/* using hidden newline */
 		case 'l':
-			markeol++;	/* mark end of line with \$ */
+			markeol = 1;	/* mark end of line with \$ */
 			break;
 #ifdef DEBUG
 		case 'd':
-			debug++;
+			debug = 1;
 			break;
 #endif
 		case '?':