from:"Marc Balmer"

CVS commit: src/doc

2020-06-30 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Jun 30 07:37:32 UTC 2020

Modified Files:
src/doc: 3RDPARTY

Log Message:
www.lua.org uses https.


To generate a diff of this commit:
cvs rdiff -u -r1.1732 -r1.1733 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1732 src/doc/3RDPARTY:1.1733
--- src/doc/3RDPARTY:1.1732	Tue Jun 30 05:19:19 2020
+++ src/doc/3RDPARTY	Tue Jun 30 07:37:32 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1732 2020/06/30 05:19:19 sevan Exp $
+#	$NetBSD: 3RDPARTY,v 1.1733 2020/06/30 07:37:32 mbalmer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -834,7 +834,7 @@ Package:	Lua
 Version:	Lua 5.3.5
 Current Vers:	Lua 5.4.0
 Maintainer:	PUC Rio
-Home Page:	http://www.lua.org/
+Home Page:	https://www.lua.org/
 Date:		2020-06-30
 Mailing List:
 Responsible:	mbalmer, lneto, salazar, alnsn

CVS commit: src/external/mit/lua/dist/src

2019-12-12 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Dec 12 12:35:44 UTC 2019

Modified Files:
src/external/mit/lua/dist/src: lapi.c

Log Message:
Apply a fix for the bug "Joining an upvalue with itself can cause a use-after
free", documented on http://www.lua.org/bugs.html


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/lapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.11 src/external/mit/lua/dist/src/lapi.c:1.12
--- src/external/mit/lua/dist/src/lapi.c:1.11	Sat Aug  4 17:30:01 2018
+++ src/external/mit/lua/dist/src/lapi.c	Thu Dec 12 12:35:43 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapi.c,v 1.11 2018/08/04 17:30:01 alnsn Exp $	*/
+/*	$NetBSD: lapi.c,v 1.12 2019/12/12 12:35:43 mbalmer Exp $	*/
 
 /*
 ** Id: lapi.c,v 2.259.1.2 2017/12/06 18:35:12 roberto Exp 
@@ -1297,6 +1297,8 @@ LUA_API void lua_upvaluejoin (lua_State 
   LClosure *f1;
   UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
   UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+  if (*up1 == *up2)
+return;
   luaC_upvdeccount(L, *up1);
   *up1 = *up2;
   (*up1)->refcount++;

CVS commit: src/doc

2018-11-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Nov  9 07:54:25 UTC 2018

Modified Files:
src/doc: RESPONSIBLE

Log Message:
I am responsible for luactl.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/doc/RESPONSIBLE

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/RESPONSIBLE
diff -u src/doc/RESPONSIBLE:1.121 src/doc/RESPONSIBLE:1.122
--- src/doc/RESPONSIBLE:1.121	Thu Sep 27 16:34:08 2018
+++ src/doc/RESPONSIBLE	Fri Nov  9 07:54:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: RESPONSIBLE,v 1.121 2018/09/27 16:34:08 maxv Exp $
+#	$NetBSD: RESPONSIBLE,v 1.122 2018/11/09 07:54:25 mbalmer Exp $
 
 List of sections of the system, and who is responsible for them (or at
 least considered an expert on them).
@@ -41,6 +41,7 @@ less/more	mrg
 lint		christos
 lpr		mrg
 lua/luac	mbalmer, lneto
+luactl		mbalmer
 mail		christos
 make		christos, sjg, dholland
 midirecord	mrg

CVS commit: src/external/mit/lua/dist/src

2018-07-01 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul  1 10:08:38 UTC 2018

Modified Files:
src/external/mit/lua/dist/src: ltable.c

Log Message:
Apply bugfix #7 from lua.org/bugs.html: Memory-allocation error when resizing
a table can leave it in an inconsistent state.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/ltable.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/ltable.c
diff -u src/external/mit/lua/dist/src/ltable.c:1.9 src/external/mit/lua/dist/src/ltable.c:1.10
--- src/external/mit/lua/dist/src/ltable.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/ltable.c	Sun Jul  1 10:08:38 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ltable.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: ltable.c,v 1.10 2018/07/01 10:08:38 mbalmer Exp $	*/
 
 /*
 ** Id: ltable.c,v 2.118 2016/11/07 12:38:35 roberto Exp 
@@ -338,17 +338,34 @@ static void setnodevector (lua_State *L,
 }
 
 
+typedef struct {
+  Table *t;
+  unsigned int nhsize;
+} AuxsetnodeT;
+
+
+static void auxsetnode (lua_State *L, void *ud) {
+  AuxsetnodeT *asn = cast(AuxsetnodeT *, ud);
+  setnodevector(L, asn->t, asn->nhsize);
+}
+
+
 void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
   unsigned int nhsize) {
   unsigned int i;
   int j;
+  AuxsetnodeT asn;
   unsigned int oldasize = t->sizearray;
   int oldhsize = allocsizenode(t);
   Node *nold = t->node;  /* save old hash ... */
   if (nasize > oldasize)  /* array part must grow? */
 setarrayvector(L, t, nasize);
   /* create new hash part with appropriate size */
-  setnodevector(L, t, nhsize);
+  asn.t = t; asn.nhsize = nhsize;
+  if (luaD_rawrunprotected(L, auxsetnode, &asn) != LUA_OK) {  /* mem. error? */
+setarrayvector(L, t, oldasize);  /* array back to its original size */
+luaD_throw(L, LUA_ERRMEM);  /* rethrow memory error */
+  }
   if (nasize < oldasize) {  /* array part must shrink? */
 t->sizearray = nasize;
 /* re-insert elements from vanishing slice */

CVS commit: src/doc

2017-12-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Dec 13 13:03:23 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Note Lua bugfix.


To generate a diff of this commit:
cvs rdiff -u -r1.2338 -r1.2339 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2338 src/doc/CHANGES:1.2339
--- src/doc/CHANGES:1.2338	Sun Dec 10 20:54:05 2017
+++ src/doc/CHANGES	Wed Dec 13 13:03:23 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2338 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2339 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -91,3 +91,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	gdb(1): Updated to 8.0.1.  [christos 20171128]
 	dhcpcd(8): Import dhcpcd-7.0.0-rc4. [roy 20171206]
 	ihidev(4), ims(4): Added drivers for i2c HID mice. [bouyer 20171210]
+	lua: Applied 6th bugfix to Lua 5.3.4 from lua.org/bugs.html.
+		[mbalmer 20171213]
+

CVS commit: src/external/mit/lua/dist/src

2017-12-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Dec 13 13:00:14 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lapi.c

Log Message:
Apply a bugfix from lua.org/bugs,html:
lua_pushcclosure should not call the garbage collector when n is zero.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.9 src/external/mit/lua/dist/src/lapi.c:1.10
--- src/external/mit/lua/dist/src/lapi.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lapi.c	Wed Dec 13 13:00:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapi.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lapi.c,v 1.10 2017/12/13 13:00:14 mbalmer Exp $	*/
 
 /*
 ** Id: lapi.c,v 2.259 2016/02/29 14:27:14 roberto Exp 
@@ -541,6 +541,7 @@ LUA_API void lua_pushcclosure (lua_State
   lua_lock(L);
   if (n == 0) {
 setfvalue(L->top, fn);
+api_incr_top(L);
   }
   else {
 CClosure *cl;
@@ -554,9 +555,9 @@ LUA_API void lua_pushcclosure (lua_State
   /* does not need barrier because closure is white */
 }
 setclCvalue(L, L->top, cl);
+api_incr_top(L);
+luaC_checkGC(L);
   }
-  api_incr_top(L);
-  luaC_checkGC(L);
   lua_unlock(L);
 }

CVS commit: src/share/misc

2017-09-15 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Sep 15 19:20:11 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
Fix COC.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.66 src/share/misc/airport:1.67
--- src/share/misc/airport:1.66	Sun Jun  4 10:58:28 2017
+++ src/share/misc/airport	Fri Sep 15 19:20:11 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.66 2017/06/04 10:58:28 mbalmer Exp $
+#	$NetBSD: airport,v 1.67 2017/09/15 19:20:11 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -1424,7 +1424,7 @@ CNY:Moab (Canyonlands Field), UT, USA
 CNZ:Cangamba, Angola
 COA:Columbia Airport, CA, USA
 COB:Coolibah, Northern Territory, Australia
-COC:Concordia (Comodoro Pierres), Argentina
+COC:Concordia (Comodoro Pierrestegui), Entre Rios, Argentina
 COD:Cody (Yellowstone Regional Airport), WY, USA
 COE:Coeur d'Alene Terminal, ID, USA
 COF:Cocoa Beach (Patrick Air Force), FL, USA

CVS commit: src/external/mit/lua/dist/src

2017-09-07 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Sep  7 12:52:29 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lgc.c

Log Message:
Apply bug fix from lua.org/bugs.html (dead keys with nil values can stay
in weak tables).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lgc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lgc.c
diff -u src/external/mit/lua/dist/src/lgc.c:1.8 src/external/mit/lua/dist/src/lgc.c:1.9
--- src/external/mit/lua/dist/src/lgc.c:1.8	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lgc.c	Thu Sep  7 12:52:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lgc.c,v 1.8 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lgc.c,v 1.9 2017/09/07 12:52:29 mbalmer Exp $	*/
 
 /*
 ** Id: lgc.c,v 2.215 2016/12/22 13:08:50 roberto Exp 
@@ -647,8 +647,9 @@ static void clearkeys (global_State *g, 
 for (n = gnode(h, 0); n < limit; n++) {
   if (!ttisnil(gval(n)) && (iscleared(g, gkey(n {
 setnilvalue(gval(n));  /* remove value ... */
-removeentry(n);  /* and remove entry from table */
   }
+  if (ttisnil(gval(n)))  /* is entry empty? */
+removeentry(n);  /* remove entry from table */
 }
   }
 }

CVS commit: src/external/mit/lua/dist/src

2017-08-03 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Aug  3 13:40:07 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: ldebug.c

Log Message:
Apply a bug fix from lua.org/bugs.html:  Lua does not check GC when creating
error messages.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/ldebug.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/ldebug.c
diff -u src/external/mit/lua/dist/src/ldebug.c:1.9 src/external/mit/lua/dist/src/ldebug.c:1.10
--- src/external/mit/lua/dist/src/ldebug.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/ldebug.c	Thu Aug  3 13:40:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldebug.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: ldebug.c,v 1.10 2017/08/03 13:40:07 mbalmer Exp $	*/
 
 /*
 ** Id: ldebug.c,v 2.121 2016/10/19 12:32:10 roberto Exp 
@@ -661,6 +661,7 @@ l_noret luaG_runerror (lua_State *L, con
   CallInfo *ci = L->ci;
   const char *msg;
   va_list argp;
+  luaC_checkGC(L);  /* error message uses memory */
   va_start(argp, fmt);
   msg = luaO_pushvfstring(L, fmt, argp);  /* format message */
   va_end(argp);

CVS commit: src/doc

2017-06-06 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Jun  6 07:13:06 UTC 2017

Modified Files:
src/doc: CHANGES.prev

Log Message:
Fix a typo, i366 -> i386.
>From PR misc/52274.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/doc/CHANGES.prev

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.132 src/doc/CHANGES.prev:1.133
--- src/doc/CHANGES.prev:1.132	Sun Jun  4 07:18:22 2017
+++ src/doc/CHANGES.prev	Tue Jun  6 07:13:06 2017
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.132 $>
+LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.133 $>
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -11983,7 +11983,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	wpa_supplicant(8): Added interface matching rules [roy 20160323]
 	lua: Applied second and third patch from http://lua.org/bugs.html
 		[mbalmer 20160325]
-	i366: Add a GENERIC_PAE kernel that supports >4GB systems.  [mrg 20160326]
+	i386: Add a GENERIC_PAE kernel that supports >4GB systems.  [mrg 20160326]
 	network: Drop the concept of cloning/cloned routes [ozaki-r 20160404]
 	network: Remove RTF_CLONING, RTF_XRESOLVE, RTF_LLINFO, RTF_CLONED and
 		RTM_RESOLVE [ozaki-r 20160404]

CVS commit: src/share/misc

2017-06-04 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jun  4 10:58:28 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
it's Rorschach, not Rorshach


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.65 src/share/misc/airport:1.66
--- src/share/misc/airport:1.65	Thu May 11 06:46:45 2017
+++ src/share/misc/airport	Sun Jun  4 10:58:28 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.65 2017/05/11 06:46:45 mbalmer Exp $
+#	$NetBSD: airport,v 1.66 2017/06/04 10:58:28 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -59,7 +59,7 @@ ACB:Bellaire (Antrim County Airport), MI
 ACC:Accra (Kotoka), Ghana
 ACD:Acandi, Colombia
 ACE:Arrecife (Lanzarote), Canary Islands, Spain
-ACH:Altenrhein (Rorshach), Switzerland
+ACH:Altenrhein (Rorschach), Switzerland
 ACI:Alderney, Channel Islands
 ACJ:Americus (Souther Field), GA, USA
 ACK:Nantucket Memorial Airport, MA, USA

CVS commit: src/sys/dev/dm

2017-06-04 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jun  4 08:54:38 UTC 2017

Modified Files:
src/sys/dev/dm: dm_target_linear.c dm_target_snapshot.c

Log Message:
more dependiences -> dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_target_snapshot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.15 src/sys/dev/dm/dm_target_linear.c:1.16
--- src/sys/dev/dm/dm_target_linear.c:1.15	Thu Jun  1 02:45:09 2017
+++ src/sys/dev/dm/dm_target_linear.c	Sun Jun  4 08:54:38 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_linear.c,v 1.15 2017/06/01 02:45:09 chs Exp $  */
+/*$NetBSD: dm_target_linear.c,v 1.16 2017/06/04 08:54:38 mbalmer Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -184,7 +184,7 @@ dm_target_linear_destroy(dm_table_entry_
 
 	return 0;
 }
-/* Add this target pdev dependiences to prop_array_t */
+/* Add this target pdev dependencies to prop_array_t */
 int
 dm_target_linear_deps(dm_table_entry_t * table_en, prop_array_t prop_array)
 {

Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.17 src/sys/dev/dm/dm_target_snapshot.c:1.18
--- src/sys/dev/dm/dm_target_snapshot.c:1.17	Mon Aug 18 17:16:19 2014
+++ src/sys/dev/dm/dm_target_snapshot.c	Sun Jun  4 08:54:38 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_snapshot.c,v 1.17 2014/08/18 17:16:19 agc Exp $  */
+/*$NetBSD: dm_target_snapshot.c,v 1.18 2017/06/04 08:54:38 mbalmer Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -343,7 +343,7 @@ dm_target_snapshot_destroy(dm_table_entr
 
 	return 0;
 }
-/* Add this target dependiences to prop_array_t */
+/* Add this target dependencies to prop_array_t */
 int
 dm_target_snapshot_deps(dm_table_entry_t * table_en,
 prop_array_t prop_array)

CVS commit: src/sys/dev/dm/doc

2017-06-04 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jun  4 08:52:42 UTC 2017

Modified Files:
src/sys/dev/dm/doc: design.txt

Log Message:
more dependiences -> dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/dm/doc/design.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/dm/doc/design.txt
diff -u src/sys/dev/dm/doc/design.txt:1.3 src/sys/dev/dm/doc/design.txt:1.4
--- src/sys/dev/dm/doc/design.txt:1.3	Mon Dec  9 09:35:16 2013
+++ src/sys/dev/dm/doc/design.txt	Sun Jun  4 08:52:42 2017
@@ -176,10 +176,10 @@
 
  in: dm-ioctl(name/uuid)
 
- out: list of dependiences devices
+ out: list of dependencies devices
 
  Function: 
-   Return set of device dependiences e.g. mirror device for mirror target etc..
+   Return set of device dependencies e.g. mirror device for mirror target etc..
 
  13) DM_TABLE_STATUS

CVS commit: src/sys/dev/dm

2017-06-04 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jun  4 08:50:27 UTC 2017

Modified Files:
src/sys/dev/dm: netbsd-dm.h

Log Message:
fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/dm/netbsd-dm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/dm/netbsd-dm.h
diff -u src/sys/dev/dm/netbsd-dm.h:1.7 src/sys/dev/dm/netbsd-dm.h:1.8
--- src/sys/dev/dm/netbsd-dm.h:1.7	Sun Sep  6 06:01:00 2015
+++ src/sys/dev/dm/netbsd-dm.h	Sun Jun  4 08:50:27 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: netbsd-dm.h,v 1.7 2015/09/06 06:01:00 dholland Exp $  */
+/*$NetBSD: netbsd-dm.h,v 1.8 2017/06/04 08:50:27 mbalmer Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -172,10 +172,10 @@
 
  /*
   * DM_TABLE_DEPS == "deps" 
-  * Request list active table device dependiences.
+  * Request list active table device dependencies.
   *
   * This command is also run to get dm-device
-  * dependiences for existing real block device.
+  * dependencies for existing real block device.
   *
   * eg. vgcreate calls DM_TABLE_DEPS
   *

CVS commit: src/external/mit/lua/dist/src

2017-05-20 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat May 20 10:12:29 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lua.h

Log Message:
don't spam the console, just output the Lua version information as lua(1) does


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lua.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lua.h
diff -u src/external/mit/lua/dist/src/lua.h:1.9 src/external/mit/lua/dist/src/lua.h:1.10
--- src/external/mit/lua/dist/src/lua.h:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lua.h	Sat May 20 10:12:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.h,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lua.h,v 1.10 2017/05/20 10:12:29 mbalmer Exp $	*/
 
 /*
 ** Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp 
@@ -23,21 +23,11 @@
 #define LUA_VERSION_MAJOR	"5"
 #define LUA_VERSION_MINOR	"3"
 #define LUA_VERSION_NUM		503
-#ifndef _KERNEL
 #define LUA_VERSION_RELEASE	"4"
-#else /* _KERNEL */
-#define LUA_VERSION_RELEASE	"4 (kernel)"
-#endif /* _KERNEL */
 
 #define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
 #define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
-#ifndef _KERNEL
 #define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2017 Lua.org, PUC-Rio"
-#else /* _KERNEL */
-#define LUA_COPYRIGHT	LUA_RELEASE \
-	"  Copyright (c) 2016-2016, Lourival Vieira Neto ." \
-	"  Copyright (C) 1994-2017 Lua.org, PUC-Rio"
-#endif /* _KERNEL */
 #define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"

CVS commit: src/sys/modules/lua

2017-05-20 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat May 20 09:46:17 UTC 2017

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
always put the module on the stack


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.22 src/sys/modules/lua/lua.c:1.23
--- src/sys/modules/lua/lua.c:1.22	Sat May 20 08:31:13 2017
+++ src/sys/modules/lua/lua.c	Sat May 20 09:46:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.22 2017/05/20 08:31:13 mbalmer Exp $ */
+/*	$NetBSD: lua.c,v 1.23 2017/05/20 09:46:17 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2011 - 2017 by Marc Balmer .
@@ -514,16 +514,16 @@ lua_require(lua_State *L)
 	if (md != NULL)
 		LIST_FOREACH(s, &lua_states, lua_next)
 			if (s->K->L == L) {
-LIST_FOREACH(m, &s->lua_modules, mod_next)
-	if (m == md)
-		return 1;
-
 if (lua_verbose)
 	device_printf(sc_self,
 	"require module %s\n",
 	md->mod_name);
 luaL_requiref(L, md->mod_name, md->open, 0);
 
+LIST_FOREACH(m, &s->lua_modules, mod_next)
+	if (m == md)
+		return 1;
+
 md->refcount++;
 LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
 return 1;

CVS commit: src/sys/modules/lua

2017-05-20 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat May 20 08:31:13 UTC 2017

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
Only load a module if it is not already loaded in a state (much like userland
Lua handles require).
Fixes PR kern/52226.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.21 src/sys/modules/lua/lua.c:1.22
--- src/sys/modules/lua/lua.c:1.21	Thu May 11 07:34:27 2017
+++ src/sys/modules/lua/lua.c	Sat May 20 08:31:13 2017
@@ -1,8 +1,8 @@
-/*	$NetBSD: lua.c,v 1.21 2017/05/11 07:34:27 mbalmer Exp $ */
+/*	$NetBSD: lua.c,v 1.22 2017/05/20 08:31:13 mbalmer Exp $ */
 
 /*
+ * Copyright (c) 2011 - 2017 by Marc Balmer .
  * Copyright (c) 2014 by Lourival Vieira Neto .
- * Copyright (c) 2011 - 2014 by Marc Balmer .
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -514,6 +514,10 @@ lua_require(lua_State *L)
 	if (md != NULL)
 		LIST_FOREACH(s, &lua_states, lua_next)
 			if (s->K->L == L) {
+LIST_FOREACH(m, &s->lua_modules, mod_next)
+	if (m == md)
+		return 1;
+
 if (lua_verbose)
 	device_printf(sc_self,
 	"require module %s\n",

CVS commit: src/sys/modules/lua

2017-05-11 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 07:34:27 UTC 2017

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
Avoid possible null pointer dereferencing.
Fixes PR kern/52225.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.20 src/sys/modules/lua/lua.c:1.21
--- src/sys/modules/lua/lua.c:1.20	Sun Apr 16 17:45:12 2017
+++ src/sys/modules/lua/lua.c	Thu May 11 07:34:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.20 2017/04/16 17:45:12 riastradh Exp $ */
+/*	$NetBSD: lua.c,v 1.21 2017/05/11 07:34:27 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2014 by Lourival Vieira Neto .
@@ -335,10 +335,12 @@ luaioctl(dev_t dev, u_long cmd, void *da
 			}
 
 		K = kluaL_newstate(create->name, create->desc, IPL_NONE);
-		K->ks_user = true;
 
 		if (K == NULL)
 			return ENOMEM;
+
+		K->ks_user = true;
+
 		if (lua_verbose)
 			device_printf(sc->sc_dev, "state %s created\n",
 			create->name);

CVS commit: src/share/misc

2017-05-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 06:46:45 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
fix TIA entry


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.64 src/share/misc/airport:1.65
--- src/share/misc/airport:1.64	Thu Apr  6 19:53:36 2017
+++ src/share/misc/airport	Thu May 11 06:46:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.64 2017/04/06 19:53:36 mbalmer Exp $
+#	$NetBSD: airport,v 1.65 2017/05/11 06:46:45 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -7601,7 +7601,7 @@ THV:York Airport, PA, USA
 THX:Turukhansk, Krasnoyarsk Krai, Russia
 THY:Thohoyandou, Venda, South Africa
 THZ:Tahoua, Niger
-TIA:Tirana, Albania
+TIA:Tirana International Airport, Albania
 TIB:Tibu, Colombia
 TIC:Tinak Airport, Marshall Islands
 TID:Tiaret (Bou Chekif), Algeria

CVS commit: src/share/examples/lua

2017-05-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed May 10 07:51:07 UTC 2017

Modified Files:
src/share/examples/lua: gpio.lua

Log Message:
Clarify gpio example.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/examples/lua/gpio.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/examples/lua/gpio.lua
diff -u src/share/examples/lua/gpio.lua:1.3 src/share/examples/lua/gpio.lua:1.4
--- src/share/examples/lua/gpio.lua:1.3	Sat Jul 19 18:38:34 2014
+++ src/share/examples/lua/gpio.lua	Wed May 10 07:51:07 2017
@@ -1,4 +1,8 @@
--- $NetBSD: gpio.lua,v 1.3 2014/07/19 18:38:34 lneto Exp $
+-- $NetBSD: gpio.lua,v 1.4 2017/05/10 07:51:07 mbalmer Exp $
+
+-- This example works only if all pins, starting from pin 0 up to the
+-- number returned by gpio.info() are, readable.  It does _not_ work if
+-- only part of the pins are configured.
 
 local gpio = require 'gpio'

CVS commit: src/share/examples/lua

2017-05-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed May 10 07:37:33 UTC 2017

Modified Files:
src/share/examples/lua: sqlite.lua

Log Message:
Fix flags for DB open.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/examples/lua/sqlite.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/examples/lua/sqlite.lua
diff -u src/share/examples/lua/sqlite.lua:1.3 src/share/examples/lua/sqlite.lua:1.4
--- src/share/examples/lua/sqlite.lua:1.3	Tue Dec  8 23:04:40 2015
+++ src/share/examples/lua/sqlite.lua	Wed May 10 07:37:33 2017
@@ -1,4 +1,4 @@
--- $NetBSD: sqlite.lua,v 1.3 2015/12/08 23:04:40 kamil Exp $
+-- $NetBSD: sqlite.lua,v 1.4 2017/05/10 07:37:33 mbalmer Exp $
 
 local sqlite = require 'sqlite'
 
@@ -13,7 +13,8 @@ print('this is sqlite ' .. sqlite.libver
 sqlite.libversion_number() .. ')')
 print('sourceid ' .. sqlite.sourceid())
 
-db, state = sqlite.open('/tmp/db.sqlite', sqlite.OPEN_CREATE)
+db, state = sqlite.open('/tmp/db.sqlite', sqlite.OPEN_READWRITE |
+sqlite.OPEN_CREATE)
 
 if state ~= sqlite.OK then
 	print('db open failed')

CVS commit: src/lib/lua/sqlite

2017-05-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed May 10 07:36:01 UTC 2017

Modified Files:
src/lib/lua/sqlite: sqlite.c

Log Message:
Guard against double freeing of objects (explicit by the Lua program, then
later by the garbage collector).
This fixes PR bin/52218.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/lua/sqlite/sqlite.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/lua/sqlite/sqlite.c
diff -u src/lib/lua/sqlite/sqlite.c:1.8 src/lib/lua/sqlite/sqlite.c:1.9
--- src/lib/lua/sqlite/sqlite.c:1.8	Mon Feb 15 15:56:33 2016
+++ src/lib/lua/sqlite/sqlite.c	Wed May 10 07:36:01 2017
@@ -1,7 +1,7 @@
-/*	$NetBSD: sqlite.c,v 1.8 2016/02/15 15:56:33 mbalmer Exp $ */
+/*	$NetBSD: sqlite.c,v 1.9 2017/05/10 07:36:01 mbalmer Exp $ */
 
 /*
- * Copyright (c) 2011, 2013, 2016 Marc Balmer 
+ * Copyright (c) 2011, 2013, 2016, 2017 Marc Balmer 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,7 +120,11 @@ db_close(lua_State *L)
 	sqlite3 **db;
 
 	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushinteger(L, sqlite3_close(*db));
+	if (*db) {
+		lua_pushinteger(L, sqlite3_close(*db));
+		*db = NULL;
+	} else
+		lua_pushnil(L);
 	return 1;
 
 }
@@ -342,7 +346,10 @@ stmt_finalize(lua_State *L)
 	sqlite3_stmt **stmt;
 
 	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	sqlite3_finalize(*stmt);
+	if (*stmt) {
+		sqlite3_finalize(*stmt);
+		*stmt = NULL;
+	}
 	return 0;
 }

CVS commit: src/external/mit/lua/dist/src

2017-05-07 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun May  7 08:14:06 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lparser.c

Log Message:
Fix a bug that gerenates wrong code for a goto followed by a label inside an
'if' (see https://www.lua.org/bugs.html).


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lparser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.9 src/external/mit/lua/dist/src/lparser.c:1.10
--- src/external/mit/lua/dist/src/lparser.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lparser.c	Sun May  7 08:14:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lparser.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lparser.c,v 1.10 2017/05/07 08:14:06 mbalmer Exp $	*/
 
 /*
 ** Id: lparser.c,v 2.155 2016/08/01 19:51:24 roberto Exp 
@@ -1406,7 +1406,7 @@ static void test_then_block (LexState *l
 luaK_goiffalse(ls->fs, &v);  /* will jump to label if condition is true */
 enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
 gotostat(ls, v.t);  /* handle goto/break */
-skipnoopstat(ls);  /* skip other no-op statements */
+while (testnext(ls, ';')) {}  /* skip colons */
 if (block_follow(ls, 0)) {  /* 'goto' is the entire block? */
   leaveblock(fs);
   return;  /* and that is it */

CVS commit: src/doc

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:59:56 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Lua updated to versionb 5.3.4


To generate a diff of this commit:
cvs rdiff -u -r1.2277 -r1.2278 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2277 src/doc/CHANGES:1.2278
--- src/doc/CHANGES:1.2277	Tue Apr 25 13:20:41 2017
+++ src/doc/CHANGES	Wed Apr 26 13:59:56 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2277 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2278 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -503,3 +503,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	OpenSSH: Imported 7.5. [christos 20170418]
 	tmux(1): Import of tmux 2.4 [christos 20170423]
 	libc: Update to tzcode2017b. [christos 20170425]
+	lua: Updated to Lua 5.3.4. [mbalmer 20170426]

CVS commit: src/doc

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:58:01 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
Lua is at version 5.3.4 now


To generate a diff of this commit:
cvs rdiff -u -r1.1438 -r1.1439 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1438 src/doc/3RDPARTY:1.1439
--- src/doc/3RDPARTY:1.1438	Tue Apr 25 13:20:41 2017
+++ src/doc/3RDPARTY	Wed Apr 26 13:58:01 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1438 2017/04/25 13:20:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1439 2017/04/26 13:58:01 mbalmer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -807,7 +807,7 @@ under src/usr.sbin). We don't use tcpd; 
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:	Lua
-Version:	Lua 5.3.3
+Version:	Lua 5.3.4
 Current Vers:	Lua 5.3.4
 Maintainer:	PUC Rio
 Home Page:	http://www.lua.org/

CVS commit: src/external/mit/lua/dist/src

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:53:18 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lauxlib.c

Log Message:
kernel mode lua has no floating point available


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lauxlib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lauxlib.c
diff -u src/external/mit/lua/dist/src/lauxlib.c:1.9 src/external/mit/lua/dist/src/lauxlib.c:1.10
--- src/external/mit/lua/dist/src/lauxlib.c:1.9	Wed Apr 26 13:17:33 2017
+++ src/external/mit/lua/dist/src/lauxlib.c	Wed Apr 26 13:53:18 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lauxlib.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
+/*	$NetBSD: lauxlib.c,v 1.10 2017/04/26 13:53:18 mbalmer Exp $	*/
 
 /*
 ** Id: lauxlib.c,v 1.289 2016/12/20 18:37:00 roberto Exp 
@@ -829,10 +829,14 @@ LUALIB_API const char *luaL_tolstring (l
   else {
 switch (lua_type(L, idx)) {
   case LUA_TNUMBER: {
+#ifndef _KERNEL
 if (lua_isinteger(L, idx))
+#endif
   lua_pushfstring(L, "%I", (LUAI_UACINT)lua_tointeger(L, idx));
+#ifndef _KERNEL
 else
   lua_pushfstring(L, "%f", (LUAI_UACNUMBER)lua_tonumber(L, idx));
+#endif
 break;
   }
   case LUA_TSTRING:
@@ -1052,8 +1056,10 @@ LUALIB_API void luaL_checkversion_ (lua_
 luaL_error(L, "core and library have incompatible numeric types");
   if (v != lua_version(NULL))
 luaL_error(L, "multiple Lua VMs detected");
+#ifndef _KERNEL
   else if (*v != ver)
 luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
   (LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)*v);
+#endif
 }

CVS commit: src/external/mit/lua/dist/src

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:17:33 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lapi.c lapi.h lauxlib.c lbaselib.c
lbitlib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c
ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h
linit.c liolib.c llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h
loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c
lparser.c lparser.h lprefix.h lstate.c lstate.h lstring.c lstring.h
lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h
luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c
lvm.h lzio.c lzio.h

Log Message:
import conflict resolution


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lapi.c \
src/external/mit/lua/dist/src/lauxlib.c \
src/external/mit/lua/dist/src/lbaselib.c \
src/external/mit/lua/dist/src/ldebug.c \
src/external/mit/lua/dist/src/llimits.h \
src/external/mit/lua/dist/src/lobject.h \
src/external/mit/lua/dist/src/lparser.c \
src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/lua.h src/external/mit/lua/dist/src/luac.c \
src/external/mit/lua/dist/src/lvm.h
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lapi.h \
src/external/mit/lua/dist/src/ldebug.h \
src/external/mit/lua/dist/src/ldo.c src/external/mit/lua/dist/src/ldo.h \
src/external/mit/lua/dist/src/ldump.c src/external/mit/lua/dist/src/lgc.c \
src/external/mit/lua/dist/src/linit.c \
src/external/mit/lua/dist/src/liolib.c \
src/external/mit/lua/dist/src/lmathlib.c \
src/external/mit/lua/dist/src/lmem.c \
src/external/mit/lua/dist/src/loadlib.c \
src/external/mit/lua/dist/src/lstate.c \
src/external/mit/lua/dist/src/lstate.h \
src/external/mit/lua/dist/src/lstring.c \
src/external/mit/lua/dist/src/lstring.h \
src/external/mit/lua/dist/src/ltablib.c \
src/external/mit/lua/dist/src/ltm.c src/external/mit/lua/dist/src/lua.c
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/lbitlib.c \
src/external/mit/lua/dist/src/lcorolib.c \
src/external/mit/lua/dist/src/lctype.c \
src/external/mit/lua/dist/src/lctype.h \
src/external/mit/lua/dist/src/lprefix.h \
src/external/mit/lua/dist/src/lualib.h \
src/external/mit/lua/dist/src/lundump.h
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lcode.c \
src/external/mit/lua/dist/src/ldblib.c \
src/external/mit/lua/dist/src/loslib.c
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lcode.h \
src/external/mit/lua/dist/src/lfunc.c \
src/external/mit/lua/dist/src/lfunc.h src/external/mit/lua/dist/src/lgc.h \
src/external/mit/lua/dist/src/llex.h src/external/mit/lua/dist/src/lmem.h \
src/external/mit/lua/dist/src/lopcodes.c \
src/external/mit/lua/dist/src/lopcodes.h \
src/external/mit/lua/dist/src/lparser.h \
src/external/mit/lua/dist/src/ltable.h \
src/external/mit/lua/dist/src/ltm.h \
src/external/mit/lua/dist/src/lundump.c \
src/external/mit/lua/dist/src/lutf8lib.c \
src/external/mit/lua/dist/src/lzio.c src/external/mit/lua/dist/src/lzio.h
cvs rdiff -u -r1.10 -r1.11 src/external/mit/lua/dist/src/llex.c \
src/external/mit/lua/dist/src/lobject.c
cvs rdiff -u -r1.16 -r1.17 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.20 -r1.21 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.12 -r1.13 src/external/mit/lua/dist/src/lvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.8 src/external/mit/lua/dist/src/lapi.c:1.9
--- src/external/mit/lua/dist/src/lapi.c:1.8	Wed Apr 26 12:49:34 2017
+++ src/external/mit/lua/dist/src/lapi.c	Wed Apr 26 13:17:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapi.c,v 1.8 2017/04/26 12:49:34 mbalmer Exp $	*/
+/*	$NetBSD: lapi.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
 
 /*
 ** Id: lapi.c,v 2.259 2016/02/29 14:27:14 roberto Exp 
Index: src/external/mit/lua/dist/src/lauxlib.c
diff -u src/external/mit/lua/dist/src/lauxlib.c:1.8 src/external/mit/lua/dist/src/lauxlib.c:1.9
--- src/external/mit/lua/dist/src/lauxlib.c:1.8	Wed Apr 26 12:49:34 2017
+++ src/external/mit/lua/dist/src/lauxlib.c	Wed Apr 26 13:17:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lauxlib.c,v 1.8 2017/04/26 12:49:34 mbalmer Exp $	*/
+/*	$NetBSD: lauxlib.c,v 1.9 2017/04/26 13:17:33 mbalmer Exp $	*/
 
 /*
 ** Id: lauxlib.c,v 1.289 2016/12/20 18:37:00 roberto Exp 
Index: src/external/mit/lua/dist/src/lbaselib.c
diff -u src/external/mit/lua/dist/src/lbaselib.c:1.8 src/external/mit/lua/dist/src/lbaselib.c:1.9
--- src/external/mit/lua/dist/src/lbaselib.c:1.8	Wed Apr 26 12:49:34 2017
+++ src/external/mit/lua/dist/src/lbaselib.c	Wed Apr 26 13:17:33 2017
@@ -1,4 +1,4 @@

CVS commit: src/external/mit/lua/dist/src

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:09:12 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lauxlib.h

Log Message:
import conflict resolution


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lauxlib.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lauxlib.h
diff -u src/external/mit/lua/dist/src/lauxlib.h:1.6 src/external/mit/lua/dist/src/lauxlib.h:1.7
--- src/external/mit/lua/dist/src/lauxlib.h:1.6	Wed Apr 26 12:49:34 2017
+++ src/external/mit/lua/dist/src/lauxlib.h	Wed Apr 26 13:09:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lauxlib.h,v 1.6 2017/04/26 12:49:34 mbalmer Exp $	*/
+/*	$NetBSD: lauxlib.h,v 1.7 2017/04/26 13:09:12 mbalmer Exp $	*/
 
 /*
 ** Id: lauxlib.h,v 1.131 2016/12/06 14:54:31 roberto Exp

CVS commit: src/external/mit/lua/dist

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:06:22 UTC 2017

Modified Files:
src/external/mit/lua/dist: Makefile README

Log Message:
fix import conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/Makefile \
src/external/mit/lua/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/Makefile
diff -u src/external/mit/lua/dist/Makefile:1.6 src/external/mit/lua/dist/Makefile:1.7
--- src/external/mit/lua/dist/Makefile:1.6	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/Makefile	Wed Apr 26 13:06:22 2017
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
 
 # Lua version and release.
 V= 5.3
-R= $V.3
+R= $V.4
 
 # Targets start here.
 all:	$(PLAT)
Index: src/external/mit/lua/dist/README
diff -u src/external/mit/lua/dist/README:1.6 src/external/mit/lua/dist/README:1.7
--- src/external/mit/lua/dist/README:1.6	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/README	Wed Apr 26 13:06:22 2017
@@ -1,5 +1,5 @@
 
-This is Lua 5.3.3, released on 30 May 2016.
+This is Lua 5.3.4, released on 12 Jan 2017.
 
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.

CVS commit: src/external/mit/lua/dist/doc

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 13:00:46 UTC 2017

Modified Files:
src/external/mit/lua/dist/doc: lua.1 luac.1

Log Message:
fix import conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/doc/lua.1
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/doc/luac.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/doc/lua.1
diff -u src/external/mit/lua/dist/doc/lua.1:1.6 src/external/mit/lua/dist/doc/lua.1:1.7
--- src/external/mit/lua/dist/doc/lua.1:1.6	Wed Apr 26 12:36:53 2017
+++ src/external/mit/lua/dist/doc/lua.1	Wed Apr 26 13:00:46 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lua.1,v 1.6 2017/04/26 12:36:53 mbalmer Exp $
+.\"	$NetBSD: lua.1,v 1.7 2017/04/26 13:00:46 mbalmer Exp $
 .\"
 .\" Id: lua.man,v 1.14 2016/10/17 15:43:50 lhf Exp 
 .TH LUA 1 "Date: 2016/10/17 15:43:50 "

Index: src/external/mit/lua/dist/doc/luac.1
diff -u src/external/mit/lua/dist/doc/luac.1:1.5 src/external/mit/lua/dist/doc/luac.1:1.6
--- src/external/mit/lua/dist/doc/luac.1:1.5	Wed Apr 26 12:36:53 2017
+++ src/external/mit/lua/dist/doc/luac.1	Wed Apr 26 13:00:46 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: luac.1,v 1.5 2017/04/26 12:36:53 mbalmer Exp $
+.\"	$NetBSD: luac.1,v 1.6 2017/04/26 13:00:46 mbalmer Exp $
 .\"
 .\" Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp 
 .TH LUAC 1 "Date: 2011/11/16 13:53:40 "

CVS commit: src/external/mit/lua/dist/src

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 12:49:35 UTC 2017

Modified Files:
src/external/mit/lua/dist/src: lapi.c lapi.h lauxlib.c lauxlib.h
lbaselib.c lbitlib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h
ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h
lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h lmathlib.c
lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h
loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h lstring.c
lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c
lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c
lvm.c lvm.h lzio.c lzio.h

Log Message:
resolve import conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lapi.c \
src/external/mit/lua/dist/src/lauxlib.c \
src/external/mit/lua/dist/src/lbaselib.c \
src/external/mit/lua/dist/src/ldebug.c \
src/external/mit/lua/dist/src/llimits.h \
src/external/mit/lua/dist/src/lobject.h \
src/external/mit/lua/dist/src/lparser.c \
src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/lua.h src/external/mit/lua/dist/src/luac.c \
src/external/mit/lua/dist/src/lvm.h
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lapi.h \
src/external/mit/lua/dist/src/ldebug.h \
src/external/mit/lua/dist/src/ldo.c src/external/mit/lua/dist/src/ldo.h \
src/external/mit/lua/dist/src/ldump.c src/external/mit/lua/dist/src/lgc.c \
src/external/mit/lua/dist/src/linit.c \
src/external/mit/lua/dist/src/liolib.c \
src/external/mit/lua/dist/src/lmathlib.c \
src/external/mit/lua/dist/src/lmem.c \
src/external/mit/lua/dist/src/loadlib.c \
src/external/mit/lua/dist/src/lstate.c \
src/external/mit/lua/dist/src/lstate.h \
src/external/mit/lua/dist/src/lstring.c \
src/external/mit/lua/dist/src/lstring.h \
src/external/mit/lua/dist/src/ltablib.c \
src/external/mit/lua/dist/src/ltm.c src/external/mit/lua/dist/src/lua.c
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/lauxlib.h \
src/external/mit/lua/dist/src/lcode.h \
src/external/mit/lua/dist/src/lfunc.c \
src/external/mit/lua/dist/src/lfunc.h src/external/mit/lua/dist/src/lgc.h \
src/external/mit/lua/dist/src/llex.h src/external/mit/lua/dist/src/lmem.h \
src/external/mit/lua/dist/src/lopcodes.c \
src/external/mit/lua/dist/src/lopcodes.h \
src/external/mit/lua/dist/src/lparser.h \
src/external/mit/lua/dist/src/ltable.h \
src/external/mit/lua/dist/src/ltm.h \
src/external/mit/lua/dist/src/lundump.c \
src/external/mit/lua/dist/src/lutf8lib.c \
src/external/mit/lua/dist/src/lzio.c src/external/mit/lua/dist/src/lzio.h
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/lbitlib.c \
src/external/mit/lua/dist/src/lcorolib.c \
src/external/mit/lua/dist/src/lctype.c \
src/external/mit/lua/dist/src/lctype.h \
src/external/mit/lua/dist/src/lprefix.h \
src/external/mit/lua/dist/src/lualib.h \
src/external/mit/lua/dist/src/lundump.h
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lcode.c \
src/external/mit/lua/dist/src/ldblib.c \
src/external/mit/lua/dist/src/loslib.c
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/llex.c \
src/external/mit/lua/dist/src/lobject.c
cvs rdiff -u -r1.15 -r1.16 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.19 -r1.20 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/lvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.7 src/external/mit/lua/dist/src/lapi.c:1.8
--- src/external/mit/lua/dist/src/lapi.c:1.7	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lapi.c	Wed Apr 26 12:49:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lapi.c,v 1.7 2016/09/08 02:21:31 salazar Exp $	*/
+/*	$NetBSD: lapi.c,v 1.8 2017/04/26 12:49:34 mbalmer Exp $	*/
 
 /*
 ** Id: lapi.c,v 2.259 2016/02/29 14:27:14 roberto Exp 
Index: src/external/mit/lua/dist/src/lauxlib.c
diff -u src/external/mit/lua/dist/src/lauxlib.c:1.7 src/external/mit/lua/dist/src/lauxlib.c:1.8
--- src/external/mit/lua/dist/src/lauxlib.c:1.7	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lauxlib.c	Wed Apr 26 12:49:34 2017
@@ -1,7 +1,7 @@
-/*	$NetBSD: lauxlib.c,v 1.7 2016/09/08 02:21:31 salazar Exp $	*/
+/*	$NetBSD: lauxlib.c,v 1.8 2017/04/26 12:49:34 mbalmer Exp $	*/
 
 /*
-** Id: lauxlib.c,v 1.286 2016/01/08 15:33:09 roberto Exp 
+** Id: lauxlib.c,v 1.289 2016/12/20 18:37:00 roberto Exp 
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -75,12 +75,11 @@ static int findfield (lua_State *L, int 
 
 /*
 ** Search for a name for a function in

CVS commit: src/external/mit/lua/dist/doc

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 12:36:53 UTC 2017

Modified Files:
src/external/mit/lua/dist/doc: contents.html lua.1 luac.1 manual.html
readme.html

Log Message:
after-import fixes, conflict resolution


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/doc/contents.html \
src/external/mit/lua/dist/doc/lua.1 \
src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/doc/luac.1
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/doc/manual.html

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/doc/contents.html
diff -u src/external/mit/lua/dist/doc/contents.html:1.5 src/external/mit/lua/dist/doc/contents.html:1.6
--- src/external/mit/lua/dist/doc/contents.html:1.5	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/doc/contents.html	Wed Apr 26 12:36:53 2017
@@ -32,7 +32,7 @@ For a complete introduction to Lua progr
 
 
 
-Copyright © 2015–2016 Lua.org, PUC-Rio.
+Copyright © 2015–2017 Lua.org, PUC-Rio.
 Freely available under the terms of the
 http://www.lua.org/license.html";>Lua license.
 
@@ -512,6 +512,7 @@ Freely available under the terms of the
 luaL_newmetatable
 luaL_newstate
 luaL_openlibs
+luaL_opt
 luaL_optinteger
 luaL_optlstring
 luaL_optnumber
@@ -608,10 +609,10 @@ Freely available under the terms of the
 
 
 Last update:
-Thu Jan 14 10:14:28 BRST 2016
+Thu Dec 22 18:29:39 BRST 2016
 
 
 
 
Index: src/external/mit/lua/dist/doc/lua.1
diff -u src/external/mit/lua/dist/doc/lua.1:1.5 src/external/mit/lua/dist/doc/lua.1:1.6
--- src/external/mit/lua/dist/doc/lua.1:1.5	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/doc/lua.1	Wed Apr 26 12:36:53 2017
@@ -1,6 +1,7 @@
-.\"	$NetBSD: lua.1,v 1.5 2016/09/08 02:21:31 salazar Exp $
+.\"	$NetBSD: lua.1,v 1.6 2017/04/26 12:36:53 mbalmer Exp $
 .\"
-.TH LUA 1 "Date: 2014/12/10 15:55:45 "
+.\" Id: lua.man,v 1.14 2016/10/17 15:43:50 lhf Exp 
+.TH LUA 1 "Date: 2016/10/17 15:43:50 "
 .SH NAME
 lua \- Lua interpreter
 .SH SYNOPSIS
Index: src/external/mit/lua/dist/doc/readme.html
diff -u src/external/mit/lua/dist/doc/readme.html:1.5 src/external/mit/lua/dist/doc/readme.html:1.6
--- src/external/mit/lua/dist/doc/readme.html:1.5	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/doc/readme.html	Wed Apr 26 12:36:53 2017
@@ -328,7 +328,7 @@ For details, see
 http://www.lua.org/license.html";>this.
 
 
-Copyright © 1994–2016 Lua.org, PUC-Rio.
+Copyright © 1994–2017 Lua.org, PUC-Rio.
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -355,10 +355,10 @@ THE SOFTWARE.
 
 
 Last update:
-Tue Feb  2 22:25:27 BRST 2016
+Thu Dec 22 18:22:57 BRST 2016
 
 
 
 

Index: src/external/mit/lua/dist/doc/luac.1
diff -u src/external/mit/lua/dist/doc/luac.1:1.4 src/external/mit/lua/dist/doc/luac.1:1.5
--- src/external/mit/lua/dist/doc/luac.1:1.4	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/doc/luac.1	Wed Apr 26 12:36:53 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: luac.1,v 1.4 2016/09/08 02:21:31 salazar Exp $
+.\"	$NetBSD: luac.1,v 1.5 2017/04/26 12:36:53 mbalmer Exp $
 .\"
 .\" Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp 
 .TH LUAC 1 "Date: 2011/11/16 13:53:40 "

Index: src/external/mit/lua/dist/doc/manual.html
diff -u src/external/mit/lua/dist/doc/manual.html:1.6 src/external/mit/lua/dist/doc/manual.html:1.7
--- src/external/mit/lua/dist/doc/manual.html:1.6	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/doc/manual.html	Wed Apr 26 12:36:53 2017
@@ -19,7 +19,7 @@ by Roberto Ierusalimschy, Luiz Henrique 
 
 
 
-Copyright © 2015–2016 Lua.org, PUC-Rio.
+Copyright © 2015–2017 Lua.org, PUC-Rio.
 Freely available under the terms of the
 http://www.lua.org/license.html";>Lua license.
 
@@ -35,7 +35,7 @@ Freely available under the terms of the
 
 
 
-
+
 
 
 
@@ -216,7 +216,7 @@ an associated value nil.
 
 
 Tables are the sole data-structuring mechanism in Lua;
-they can be used to represent ordinary arrays, sequences,
+they can be used to represent ordinary arrays, lists,
 symbol tables, sets, records, graphs, trees, etc.
 To represent records, Lua uses the field name as an index.
 The language supports this representation by
@@ -226,13 +226,6 @@ There are several convenient ways to cre
 
 
 
-We use the term sequence to denote a table where
-the set of all positive numeric keys is equal to {1..n}
-for some non-negative integer n,
-which is called the length of the sequence (see §3.4.7).
-
-
-
 Like indices,
 the values of table fields can be of any type.
 In particular,
@@ -378,6 +371,9 @@ so, an error inside the message handler
 will call the message handler again.
 If this loop goes on for too long,
 Lua breaks it and returns an appropriate message.
+(The message handler is called only for regular runtime errors.
+It is not called for memory-allocation errors
+nor for errors while runn

CVS import: src/external/mit/lua/dist

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 12:30:34 UTC 2017

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27105

Log Message:
Lua 5.3.4

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_3_4

U src/external/mit/lua/dist/Makefile
U src/external/mit/lua/dist/README
C src/external/mit/lua/dist/doc/manual.html
C src/external/mit/lua/dist/doc/luac.1
U src/external/mit/lua/dist/doc/contents.html
U src/external/mit/lua/dist/doc/manual.css
U src/external/mit/lua/dist/doc/index.css
U src/external/mit/lua/dist/doc/lua.css
U src/external/mit/lua/dist/doc/logo.gif
C src/external/mit/lua/dist/doc/lua.1
U src/external/mit/lua/dist/doc/osi-certified-72x60.png
U src/external/mit/lua/dist/doc/readme.html
C src/external/mit/lua/dist/src/lmathlib.c
C src/external/mit/lua/dist/src/ldblib.c
C src/external/mit/lua/dist/src/loadlib.c
C src/external/mit/lua/dist/src/loslib.c
C src/external/mit/lua/dist/src/lvm.c
C src/external/mit/lua/dist/src/ldo.h
C src/external/mit/lua/dist/src/lua.h
C src/external/mit/lua/dist/src/lgc.h
C src/external/mit/lua/dist/src/ltm.h
C src/external/mit/lua/dist/src/luaconf.h
C src/external/mit/lua/dist/src/lmem.c
C src/external/mit/lua/dist/src/lstate.h
U src/external/mit/lua/dist/src/Makefile
C src/external/mit/lua/dist/src/lzio.h
C src/external/mit/lua/dist/src/lstring.c
C src/external/mit/lua/dist/src/lzio.c
C src/external/mit/lua/dist/src/lopcodes.c
C src/external/mit/lua/dist/src/lua.c
C src/external/mit/lua/dist/src/lundump.h
C src/external/mit/lua/dist/src/lbaselib.c
C src/external/mit/lua/dist/src/ltable.c
C src/external/mit/lua/dist/src/ldump.c
C src/external/mit/lua/dist/src/liolib.c
C src/external/mit/lua/dist/src/llimits.h
C src/external/mit/lua/dist/src/lfunc.h
C src/external/mit/lua/dist/src/lualib.h
C src/external/mit/lua/dist/src/lctype.c
C src/external/mit/lua/dist/src/lmem.h
C src/external/mit/lua/dist/src/llex.h
C src/external/mit/lua/dist/src/ltable.h
C src/external/mit/lua/dist/src/lbitlib.c
C src/external/mit/lua/dist/src/ldebug.h
C src/external/mit/lua/dist/src/lprefix.h
C src/external/mit/lua/dist/src/llex.c
C src/external/mit/lua/dist/src/linit.c
C src/external/mit/lua/dist/src/lobject.h
C src/external/mit/lua/dist/src/lapi.h
C src/external/mit/lua/dist/src/ldebug.c
C src/external/mit/lua/dist/src/ldo.c
C src/external/mit/lua/dist/src/lvm.h
C src/external/mit/lua/dist/src/lauxlib.c
C src/external/mit/lua/dist/src/luac.c
C src/external/mit/lua/dist/src/lctype.h
C src/external/mit/lua/dist/src/lstring.h
C src/external/mit/lua/dist/src/lcorolib.c
C src/external/mit/lua/dist/src/lutf8lib.c
C src/external/mit/lua/dist/src/lgc.c
C src/external/mit/lua/dist/src/lstate.c
C src/external/mit/lua/dist/src/lundump.c
C src/external/mit/lua/dist/src/ltablib.c
C src/external/mit/lua/dist/src/lauxlib.h
C src/external/mit/lua/dist/src/ltm.c
C src/external/mit/lua/dist/src/lparser.c
C src/external/mit/lua/dist/src/lcode.h
C src/external/mit/lua/dist/src/lobject.c
C src/external/mit/lua/dist/src/lcode.c
C src/external/mit/lua/dist/src/lopcodes.h
C src/external/mit/lua/dist/src/lfunc.c
C src/external/mit/lua/dist/src/lapi.c
C src/external/mit/lua/dist/src/lparser.h
C src/external/mit/lua/dist/src/lstrlib.c
U src/external/mit/lua/dist/src/lua.hpp

63 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist

CVS import: src/external/mit/lua/dist

2017-04-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Apr 26 11:38:38 UTC 2017

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19640

Log Message:
Lua 5.3.4

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_3_4

C src/external/mit/lua/dist/Makefile
C src/external/mit/lua/dist/README
C src/external/mit/lua/dist/doc/manual.html
C src/external/mit/lua/dist/doc/luac.1
C src/external/mit/lua/dist/doc/contents.html
U src/external/mit/lua/dist/doc/manual.css
U src/external/mit/lua/dist/doc/index.css
U src/external/mit/lua/dist/doc/lua.css
U src/external/mit/lua/dist/doc/logo.gif
C src/external/mit/lua/dist/doc/lua.1
U src/external/mit/lua/dist/doc/osi-certified-72x60.png
C src/external/mit/lua/dist/doc/readme.html
C src/external/mit/lua/dist/src/lmathlib.c
C src/external/mit/lua/dist/src/ldblib.c
C src/external/mit/lua/dist/src/loadlib.c
C src/external/mit/lua/dist/src/loslib.c
C src/external/mit/lua/dist/src/lvm.c
C src/external/mit/lua/dist/src/ldo.h
C src/external/mit/lua/dist/src/lua.h
C src/external/mit/lua/dist/src/lgc.h
C src/external/mit/lua/dist/src/ltm.h
C src/external/mit/lua/dist/src/luaconf.h
C src/external/mit/lua/dist/src/lmem.c
C src/external/mit/lua/dist/src/lstate.h
U src/external/mit/lua/dist/src/Makefile
C src/external/mit/lua/dist/src/lzio.h
C src/external/mit/lua/dist/src/lstring.c
C src/external/mit/lua/dist/src/lzio.c
C src/external/mit/lua/dist/src/lopcodes.c
C src/external/mit/lua/dist/src/lua.c
C src/external/mit/lua/dist/src/lundump.h
C src/external/mit/lua/dist/src/lbaselib.c
C src/external/mit/lua/dist/src/ltable.c
C src/external/mit/lua/dist/src/ldump.c
C src/external/mit/lua/dist/src/liolib.c
C src/external/mit/lua/dist/src/llimits.h
C src/external/mit/lua/dist/src/lfunc.h
C src/external/mit/lua/dist/src/lualib.h
C src/external/mit/lua/dist/src/lctype.c
C src/external/mit/lua/dist/src/lmem.h
C src/external/mit/lua/dist/src/llex.h
C src/external/mit/lua/dist/src/ltable.h
C src/external/mit/lua/dist/src/lbitlib.c
C src/external/mit/lua/dist/src/ldebug.h
C src/external/mit/lua/dist/src/lprefix.h
C src/external/mit/lua/dist/src/llex.c
C src/external/mit/lua/dist/src/linit.c
C src/external/mit/lua/dist/src/lobject.h
C src/external/mit/lua/dist/src/lapi.h
C src/external/mit/lua/dist/src/ldebug.c
C src/external/mit/lua/dist/src/ldo.c
C src/external/mit/lua/dist/src/lvm.h
C src/external/mit/lua/dist/src/lauxlib.c
C src/external/mit/lua/dist/src/luac.c
C src/external/mit/lua/dist/src/lctype.h
C src/external/mit/lua/dist/src/lstring.h
C src/external/mit/lua/dist/src/lcorolib.c
C src/external/mit/lua/dist/src/lutf8lib.c
C src/external/mit/lua/dist/src/lgc.c
C src/external/mit/lua/dist/src/lstate.c
C src/external/mit/lua/dist/src/lundump.c
C src/external/mit/lua/dist/src/ltablib.c
C src/external/mit/lua/dist/src/lauxlib.h
C src/external/mit/lua/dist/src/ltm.c
C src/external/mit/lua/dist/src/lparser.c
C src/external/mit/lua/dist/src/lcode.h
C src/external/mit/lua/dist/src/lobject.c
C src/external/mit/lua/dist/src/lcode.c
C src/external/mit/lua/dist/src/lopcodes.h
C src/external/mit/lua/dist/src/lfunc.c
C src/external/mit/lua/dist/src/lapi.c
C src/external/mit/lua/dist/src/lparser.h
U src/external/mit/lua/dist/src/lua.hpp
C src/external/mit/lua/dist/src/lstrlib.c

67 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist

CVS import: external/mit/lua/dist

2017-04-23 Thread Marc Balmer

Module Name:external
Committed By:   mbalmer
Date:   Sun Apr 23 14:16:17 UTC 2017

Update of /cvsroot/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29339

Log Message:
Lua 5.3.4

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_3_4

N external/mit/lua/dist/Makefile
N external/mit/lua/dist/README
N external/mit/lua/dist/doc/manual.html
N external/mit/lua/dist/doc/luac.1
N external/mit/lua/dist/doc/contents.html
N external/mit/lua/dist/doc/manual.css
N external/mit/lua/dist/doc/index.css
N external/mit/lua/dist/doc/lua.css
N external/mit/lua/dist/doc/logo.gif
N external/mit/lua/dist/doc/lua.1
N external/mit/lua/dist/doc/osi-certified-72x60.png
N external/mit/lua/dist/doc/readme.html
N external/mit/lua/dist/src/lmathlib.c
N external/mit/lua/dist/src/ldblib.c
N external/mit/lua/dist/src/loadlib.c
N external/mit/lua/dist/src/loslib.c
N external/mit/lua/dist/src/lvm.c
N external/mit/lua/dist/src/ldo.h
N external/mit/lua/dist/src/lua.h
N external/mit/lua/dist/src/lgc.h
N external/mit/lua/dist/src/ltm.h
N external/mit/lua/dist/src/luaconf.h
N external/mit/lua/dist/src/lmem.c
N external/mit/lua/dist/src/lstate.h
N external/mit/lua/dist/src/Makefile
N external/mit/lua/dist/src/lzio.h
N external/mit/lua/dist/src/lstring.c
N external/mit/lua/dist/src/lzio.c
N external/mit/lua/dist/src/lopcodes.c
N external/mit/lua/dist/src/lua.c
N external/mit/lua/dist/src/lundump.h
N external/mit/lua/dist/src/lbaselib.c
N external/mit/lua/dist/src/ltable.c
N external/mit/lua/dist/src/ldump.c
N external/mit/lua/dist/src/liolib.c
N external/mit/lua/dist/src/llimits.h
N external/mit/lua/dist/src/lfunc.h
N external/mit/lua/dist/src/lualib.h
N external/mit/lua/dist/src/lctype.c
N external/mit/lua/dist/src/lmem.h
N external/mit/lua/dist/src/llex.h
N external/mit/lua/dist/src/ltable.h
N external/mit/lua/dist/src/lbitlib.c
N external/mit/lua/dist/src/ldebug.h
N external/mit/lua/dist/src/lprefix.h
N external/mit/lua/dist/src/llex.c
N external/mit/lua/dist/src/linit.c
N external/mit/lua/dist/src/lobject.h
N external/mit/lua/dist/src/lapi.h
N external/mit/lua/dist/src/ldebug.c
N external/mit/lua/dist/src/ldo.c
N external/mit/lua/dist/src/lvm.h
N external/mit/lua/dist/src/lauxlib.c
N external/mit/lua/dist/src/luac.c
N external/mit/lua/dist/src/lctype.h
N external/mit/lua/dist/src/lstring.h
N external/mit/lua/dist/src/lcorolib.c
N external/mit/lua/dist/src/lutf8lib.c
N external/mit/lua/dist/src/lgc.c
N external/mit/lua/dist/src/lstate.c
N external/mit/lua/dist/src/lundump.c
N external/mit/lua/dist/src/ltablib.c
N external/mit/lua/dist/src/lauxlib.h
N external/mit/lua/dist/src/ltm.c
N external/mit/lua/dist/src/lparser.c
N external/mit/lua/dist/src/lcode.h
N external/mit/lua/dist/src/lobject.c
N external/mit/lua/dist/src/lcode.c
N external/mit/lua/dist/src/lopcodes.h
N external/mit/lua/dist/src/lfunc.c
N external/mit/lua/dist/src/lapi.c
N external/mit/lua/dist/src/lparser.h
N external/mit/lua/dist/src/lua.hpp
N external/mit/lua/dist/src/lstrlib.c

No conflicts created by this import

CVS commit: src/doc

2017-04-23 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Apr 23 10:46:55 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
Upstream Lua is at version 5.3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1435 -r1.1436 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1435 src/doc/3RDPARTY:1.1436
--- src/doc/3RDPARTY:1.1435	Fri Apr 21 12:20:25 2017
+++ src/doc/3RDPARTY	Sun Apr 23 10:46:54 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1435 2017/04/21 12:20:25 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1436 2017/04/23 10:46:54 mbalmer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -808,7 +808,7 @@ into inetd. The provided libwrap2netbsd 
 
 Package:	Lua
 Version:	Lua 5.3.3
-Current Vers:	Lua 5.3.3
+Current Vers:	Lua 5.3.4
 Maintainer:	PUC Rio
 Home Page:	http://www.lua.org/
 Mailing List:

CVS commit: src/share/misc

2017-04-06 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Apr  6 19:53:36 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
add Turukhansk airport


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.63 src/share/misc/airport:1.64
--- src/share/misc/airport:1.63	Wed Jun  8 04:25:31 2016
+++ src/share/misc/airport	Thu Apr  6 19:53:36 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.63 2016/06/08 04:25:31 kre Exp $
+#	$NetBSD: airport,v 1.64 2017/04/06 19:53:36 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -7598,6 +7598,7 @@ THR:Theran (Qualeh Morgeh Airport), Iran
 THT:Tamchakett, Mauritania
 THU:Thule (Air Base), Greenland
 THV:York Airport, PA, USA
+THX:Turukhansk, Krasnoyarsk Krai, Russia
 THY:Thohoyandou, Venda, South Africa
 THZ:Tahoua, Niger
 TIA:Tirana, Albania

CVS commit: src/usr.sbin/wakeonlan

2017-02-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Feb 26 19:58:38 UTC 2017

Modified Files:
src/usr.sbin/wakeonlan: wakeonlan.8

Log Message:
shorten hardware address wording


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/wakeonlan/wakeonlan.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/wakeonlan/wakeonlan.8
diff -u src/usr.sbin/wakeonlan/wakeonlan.8:1.1 src/usr.sbin/wakeonlan/wakeonlan.8:1.2
--- src/usr.sbin/wakeonlan/wakeonlan.8:1.1	Sat May 26 01:58:20 2012
+++ src/usr.sbin/wakeonlan/wakeonlan.8	Sun Feb 26 19:58:38 2017
@@ -1,6 +1,6 @@
-.\" $NetBSD: wakeonlan.8,v 1.1 2012/05/26 01:58:20 uebayasi Exp $
+.\" $NetBSD: wakeonlan.8,v 1.2 2017/02/26 19:58:38 mbalmer Exp $
 .\"
-.\" Copyright (c) 2009, 2010 Marc Balmer 
+.\" Copyright (c) 2009 - 2017 Marc Balmer 
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd May 25, 2012
+.Dd Feb 26, 2017
 .Dt WAKEONLAN 8
 .Os
 .Sh NAME
@@ -43,8 +43,7 @@ If there is only one Ethernet device ava
 argument can be omitted.
 .Ar lladdr
 is the link layer address of the remote machine.
-This can be specified as the actual hardware address
-(six hexadecimal numbers separated by colons)
+This can be specified as a hardware address
 or as a hostname entry in
 .Pa /etc/ethers .
 .Nm

CVS commit: src/external/mit/lua/dist/src

2016-09-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Sep 10 09:31:24 UTC 2016

Modified Files:
src/external/mit/lua/dist/src: luaconf.h

Log Message:
Remove a typo, %i is not conversion specification.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/lua/dist/src/luaconf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/luaconf.h
diff -u src/external/mit/lua/dist/src/luaconf.h:1.18 src/external/mit/lua/dist/src/luaconf.h:1.19
--- src/external/mit/lua/dist/src/luaconf.h:1.18	Sat Sep 10 09:29:13 2016
+++ src/external/mit/lua/dist/src/luaconf.h	Sat Sep 10 09:31:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: luaconf.h,v 1.18 2016/09/10 09:29:13 mbalmer Exp $	*/
+/*	$NetBSD: luaconf.h,v 1.19 2016/09/10 09:31:24 mbalmer Exp $	*/
 
 /*
 ** Id: luaconf.h,v 1.255 2016/05/01 20:06:09 roberto Exp 
@@ -770,7 +770,7 @@
 
 #ifdef __NetBSD__
 
-#define LUA_STRFTIMEOPTIONS "aAbBcCdDeFgGhHIjklmMnprRsStTuUvVwWxXyYzZi%"
+#define LUA_STRFTIMEOPTIONS "aAbBcCdDeFgGhHIjklmMnprRsStTuUvVwWxXyYzZ%"
 
 /* Integer types */
 #undef LUA_INTEGER

CVS commit: src/external/mit/lua/dist/src

2016-09-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Sep 10 09:29:14 UTC 2016

Modified Files:
src/external/mit/lua/dist/src: luaconf.h

Log Message:
Define LUA_STRFTIMEOPTIONS so that the conversion specifications of the Lua
os.date() function match the conversion specifications of the underlying
strftime() function.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/lua/dist/src/luaconf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/luaconf.h
diff -u src/external/mit/lua/dist/src/luaconf.h:1.17 src/external/mit/lua/dist/src/luaconf.h:1.18
--- src/external/mit/lua/dist/src/luaconf.h:1.17	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/src/luaconf.h	Sat Sep 10 09:29:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: luaconf.h,v 1.17 2016/09/08 02:21:31 salazar Exp $	*/
+/*	$NetBSD: luaconf.h,v 1.18 2016/09/10 09:29:13 mbalmer Exp $	*/
 
 /*
 ** Id: luaconf.h,v 1.255 2016/05/01 20:06:09 roberto Exp 
@@ -770,6 +770,8 @@
 
 #ifdef __NetBSD__
 
+#define LUA_STRFTIMEOPTIONS "aAbBcCdDeFgGhHIjklmMnprRsStTuUvVwWxXyYzZi%"
+
 /* Integer types */
 #undef LUA_INTEGER
 #undef LUA_INTEGER_FRMLEN

CVS commit: src/lib/libedit

2016-09-01 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Sep  1 13:23:44 UTC 2016

Modified Files:
src/lib/libedit: readline.c

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/lib/libedit/readline.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.137 src/lib/libedit/readline.c:1.138
--- src/lib/libedit/readline.c:1.137	Wed Aug 24 13:10:59 2016
+++ src/lib/libedit/readline.c	Thu Sep  1 13:23:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.137 2016/08/24 13:10:59 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.138 2016/09/01 13:23:44 mbalmer Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.137 2016/08/24 13:10:59 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.138 2016/09/01 13:23:44 mbalmer Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -371,7 +371,7 @@ rl_initialize(void)
 	el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
 	el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
 	el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
-	el_set(e, EL_BIND, "\\e[5D", "ed-erev-word", NULL);
+	el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
 	el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
 	el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);

CVS commit: src/share/misc

2016-06-07 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Jun  7 19:42:47 UTC 2016

Modified Files:
src/share/misc: airport

Log Message:
BER is not an operational airport


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.61 src/share/misc/airport:1.62
--- src/share/misc/airport:1.61	Sun Jan  3 15:25:31 2016
+++ src/share/misc/airport	Tue Jun  7 19:42:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.61 2016/01/03 15:25:31 mbalmer Exp $
+#	$NetBSD: airport,v 1.62 2016/06/07 19:42:47 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -625,7 +625,6 @@ BEN:Benghazi (Benina), Libya
 BEO:Newcastle (Belmont Airport), NSW, Australia
 BEP:Bellary, India
 BEQ:Bury St. Edmunds, England, UK
-BER:All Airports around Berlin, Germany
 BES:Brest (Guipavas), France
 BET:Bethel Airport, AK, USA
 BEU:Bedourie, Queensland, Australia

CVS commit: src/doc

2016-03-25 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Mar 25 08:16:57 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
Note Lua patch level.


To generate a diff of this commit:
cvs rdiff -u -r1.2143 -r1.2144 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2143 src/doc/CHANGES:1.2144
--- src/doc/CHANGES:1.2143	Wed Mar 23 09:56:40 2016
+++ src/doc/CHANGES	Fri Mar 25 08:16:57 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2143 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2144 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -258,3 +258,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	libc: Update to tzcode2016b. [christos 20160315]
 	zoneinfo: Import tzdata2016b. [christos 20160315]
 	wpa_supplicant(8): Added interface matching rules [roy 20160323]
+	lua: Applied second and third patch from http://lua.org/bugs.html
+		[mbalmer 20160325]

CVS commit: src/external/mit/lua/dist/src

2016-03-25 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Mar 25 08:15:20 UTC 2016

Modified Files:
src/external/mit/lua/dist/src: lparser.c lstrlib.c

Log Message:
Apply second and third patch from http://lua.org/bugs.html.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/lparser.c
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/lstrlib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.4 src/external/mit/lua/dist/src/lparser.c:1.5
--- src/external/mit/lua/dist/src/lparser.c:1.4	Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lparser.c	Fri Mar 25 08:15:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lparser.c,v 1.4 2016/01/28 14:41:39 lneto Exp $	*/
+/*	$NetBSD: lparser.c,v 1.5 2016/03/25 08:15:20 mbalmer Exp $	*/
 
 /*
 ** Id: lparser.c,v 2.149 2015/11/02 16:09:30 roberto Exp 
@@ -1240,7 +1240,7 @@ static void labelstat (LexState *ls, TSt
   checkrepeated(fs, ll, label);  /* check for repeated labels */
   checknext(ls, TK_DBCOLON);  /* skip double colon */
   /* create new entry for this label */
-  l = newlabelentry(ls, ll, label, line, fs->pc);
+  l = newlabelentry(ls, ll, label, line, luaK_getlabel(fs));
   skipnoopstat(ls);  /* skip other no-op statements */
   if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
 /* assume that locals are already out of scope */

Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.11 src/external/mit/lua/dist/src/lstrlib.c:1.12
--- src/external/mit/lua/dist/src/lstrlib.c:1.11	Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lstrlib.c	Fri Mar 25 08:15:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lstrlib.c,v 1.11 2016/01/28 14:41:39 lneto Exp $	*/
+/*	$NetBSD: lstrlib.c,v 1.12 2016/03/25 08:15:20 mbalmer Exp $	*/
 
 /*
 ** Id: lstrlib.c,v 1.239 2015/11/25 16:28:17 roberto Exp 
@@ -692,6 +692,7 @@ typedef struct GMatchState {
 static int gmatch_aux (lua_State *L) {
   GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
   const char *src;
+  gm->ms.L = L;
   for (src = gm->src; src <= gm->ms.src_end; src++) {
 const char *e;
 reprepstate(&gm->ms);

CVS commit: src/lib/lua/sqlite

2016-02-15 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Feb 15 15:56:33 UTC 2016

Modified Files:
src/lib/lua/sqlite: sqlite.c

Log Message:
Fix function name, no functional change.
Found by Travis Paul, (see PR/50786), thanks for reporting!


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/lua/sqlite/sqlite.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/lua/sqlite/sqlite.c
diff -u src/lib/lua/sqlite/sqlite.c:1.7 src/lib/lua/sqlite/sqlite.c:1.8
--- src/lib/lua/sqlite/sqlite.c:1.7	Sat Jul 19 18:38:34 2014
+++ src/lib/lua/sqlite/sqlite.c	Mon Feb 15 15:56:33 2016
@@ -1,7 +1,7 @@
-/*	$NetBSD: sqlite.c,v 1.7 2014/07/19 18:38:34 lneto Exp $ */
+/*	$NetBSD: sqlite.c,v 1.8 2016/02/15 15:56:33 mbalmer Exp $ */
 
 /*
- * Copyright (c) 2011, 2013 Marc Balmer 
+ * Copyright (c) 2011, 2013, 2016 Marc Balmer 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -392,7 +392,7 @@ static const struct constant sqlite_cons
 };
 
 static void
-gpio_set_info(lua_State *L)
+sqlite_set_info(lua_State *L)
 {
 	lua_pushliteral(L, "_COPYRIGHT");
 	lua_pushliteral(L, "Copyright (C) 2011, 2012, 2013 by "
@@ -449,7 +449,7 @@ luaopen_sqlite(lua_State* L)
 	luaL_newlib(L, sqlite_methods);
 	luaL_setfuncs(L, db_methods, 0);
 	luaL_setfuncs(L, stmt_methods, 0);
-	gpio_set_info(L);
+	sqlite_set_info(L);
 
 	/* The database connection metatable */
 	if (luaL_newmetatable(L, SQLITE_DB_METATABLE)) {

CVS commit: src/share/man/man3lua

2016-01-19 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 10:11:02 UTC 2016

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
fix typo, bump date


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man3lua/intro.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man3lua/intro.3lua
diff -u src/share/man/man3lua/intro.3lua:1.5 src/share/man/man3lua/intro.3lua:1.6
--- src/share/man/man3lua/intro.3lua:1.5	Mon Jan  6 09:23:18 2014
+++ src/share/man/man3lua/intro.3lua	Tue Jan 19 10:11:02 2016
@@ -1,6 +1,7 @@
-.\"	$NetBSD: intro.3lua,v 1.5 2014/01/06 09:23:18 wiz Exp $
+.\"	$NetBSD: intro.3lua,v 1.6 2016/01/19 10:11:02 mbalmer Exp $
 .\"
-.\" Copyright (c) 2013 Marc Balmer . All rights reserved.
+.\" Copyright (c) 2013, 2016 Marc Balmer .
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd November 13, 2013
+.Dd January 19, 2016
 .Dt INTRO 3lua
 .Os
 .Sh NAME
@@ -51,7 +52,7 @@ Access
 .Xr sqlite3 1
 files.
 .It Em syslog
-Acces
+Access
 .Xr syslog 3
 functionality.
 .El

CVS commit: src/share/misc

2016-01-03 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jan  3 15:25:31 UTC 2016

Modified Files:
src/share/misc: airport

Log Message:
add tehran airport


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.60 src/share/misc/airport:1.61
--- src/share/misc/airport:1.60	Fri Oct  2 09:01:23 2015
+++ src/share/misc/airport	Sun Jan  3 15:25:31 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.60 2015/10/02 09:01:23 mbalmer Exp $
+#	$NetBSD: airport,v 1.61 2016/01/03 15:25:31 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -3198,6 +3198,7 @@ IJD:Willimantic (Windham Airport), CT, U
 IJK:Izhevsk, Udmurtia, Russia
 IJU:Ijui, RS, Brazil
 IJX:Jacksonville Municipal Airport, IL, USA
+IKA:Imam Khomeini International Airport, Ahmadabad, Tehran, Iran
 IKB:Wilkesboro (Wilkes County Airport), NC, USA
 IKI:Iki, Japan
 IKK:Kankakee (Greater Kankakee Airport), IL, USA

CVS commit: src/share/misc

2015-10-11 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 11 10:02:15 UTC 2015

Modified Files:
src/share/misc: acronyms.comp

Log Message:
add LUA


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.151 src/share/misc/acronyms.comp:1.152
--- src/share/misc/acronyms.comp:1.151	Sun Oct 11 00:58:24 2015
+++ src/share/misc/acronyms.comp	Sun Oct 11 10:02:15 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.151 2015/10/11 00:58:24 dholland Exp $
+$NetBSD: acronyms.comp,v 1.152 2015/10/11 10:02:15 mbalmer Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -688,6 +688,7 @@ LTO	link time optimization
 LTR	left to right
 LTR	load task register
 LTR	letter(-sized paper)
+LUA	Lua Uppercase Accident
 LUN	logical unit number
 LV	logical volume
 LVM	logical volume management

CVS commit: src/external/mit/lua/dist/src

2015-10-11 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 11 09:21:15 UTC 2015

Modified Files:
src/external/mit/lua/dist/src: lvm.c

Log Message:
no floating point in the kernel, also make sure we always return an int


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lvm.c
diff -u src/external/mit/lua/dist/src/lvm.c:1.7 src/external/mit/lua/dist/src/lvm.c:1.8
--- src/external/mit/lua/dist/src/lvm.c:1.7	Thu Oct  8 13:40:16 2015
+++ src/external/mit/lua/dist/src/lvm.c	Sun Oct 11 09:21:15 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lvm.c,v 1.7 2015/10/08 13:40:16 mbalmer Exp $	*/
+/*	$NetBSD: lvm.c,v 1.8 2015/10/11 09:21:15 mbalmer Exp $	*/
 
 /*
 ** Id: lvm.c,v 2.245 2015/06/09 15:53:35 roberto Exp 
@@ -315,16 +315,17 @@ static int LEintfloat (lua_Integer i, lu
 ** Return 'l < r', for numbers.
 */
 static int LTnum (const TValue *l, const TValue *r) {
+#ifdef _KERNEL
+lua_Integer li = ivalue(l);
+return li < ivalue(r);  /* both must be integers */
+#else
   if (ttisinteger(l)) {
 lua_Integer li = ivalue(l);
 if (ttisinteger(r))
   return li < ivalue(r);  /* both are integers */
-#ifndef _KERNEL
 else  /* 'l' is int and 'r' is float */
   return LTintfloat(li, fltvalue(r));  /* l < r ? */
-#endif
   }
-#ifndef _KERNEL
   else {
 lua_Number lf = fltvalue(l);  /* 'l' must be float */
 if (ttisfloat(r))
@@ -342,16 +343,17 @@ static int LTnum (const TValue *l, const
 ** Return 'l <= r', for numbers.
 */
 static int LEnum (const TValue *l, const TValue *r) {
+#ifdef _KERNEL
+lua_Integer li = ivalue(l);
+return li <= ivalue(r);  /* both must be integers */
+#else
   if (ttisinteger(l)) {
 lua_Integer li = ivalue(l);
 if (ttisinteger(r))
   return li <= ivalue(r);  /* both are integers */
-#ifndef _KERNEL
 else  /* 'l' is int and 'r' is float */
   return LEintfloat(li, fltvalue(r));  /* l <= r ? */
-#endif
   }
-#ifndef _KERNEL
   else {
 lua_Number lf = fltvalue(l);  /* 'l' must be float */
 if (ttisfloat(r))

CVS commit: src/external/mit/lua/dist/src

2015-10-11 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 11 09:06:21 UTC 2015

Modified Files:
src/external/mit/lua/dist/src: lobject.c

Log Message:
fix macro usage


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lobject.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/lobject.c
diff -u src/external/mit/lua/dist/src/lobject.c:1.6 src/external/mit/lua/dist/src/lobject.c:1.7
--- src/external/mit/lua/dist/src/lobject.c:1.6	Sun Oct 11 01:01:45 2015
+++ src/external/mit/lua/dist/src/lobject.c	Sun Oct 11 09:06:21 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lobject.c,v 1.6 2015/10/11 01:01:45 christos Exp $	*/
+/*	$NetBSD: lobject.c,v 1.7 2015/10/11 09:06:21 mbalmer Exp $	*/
 
 /*
 ** Id: lobject.c,v 2.104 2015/04/11 18:30:08 roberto Exp 
@@ -370,7 +370,7 @@ void luaO_tostring (lua_State *L, StkId 
   }
 #else /* _KERNEL */
   lua_assert(ttisinteger(obj));
-  len = lua_integer2str(buff, ivalue(obj));
+  len = lua_integer2str(buff, sizeof(buff), ivalue(obj));
 #endif
   setsvalue2s(L, obj, luaS_newlstr(L, buff, len));
 }

CVS commit: src/external/bsd/pkg_install/dist/create

2015-10-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Oct 10 10:08:12 UTC 2015

Modified Files:
src/external/bsd/pkg_install/dist/create: pkg_create.1

Log Message:
use a verb in the authors section for all entries


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/bsd/pkg_install/dist/create/pkg_create.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/pkg_install/dist/create/pkg_create.1
diff -u src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8 src/external/bsd/pkg_install/dist/create/pkg_create.1:1.2
--- src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8	Fri Apr 23 20:54:08 2010
+++ src/external/bsd/pkg_install/dist/create/pkg_create.1	Sat Oct 10 10:08:12 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.1.1.8 2010/04/23 20:54:08 joerg Exp $
+.\" $NetBSD: pkg_create.1,v 1.2 2015/10/10 10:08:12 mbalmer Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -24,7 +24,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd January 20, 2010
+.Dd October 10, 2015
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -494,11 +494,12 @@ command first appeared in
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It Jordan Hubbard
-most of the work
+did most of the work.
 .It John Kohl
 refined it for
-.Nx
+.Nx .
 .It Hubert Feyrer
+added
 .Nx
 wildcard dependency processing, pkgdb, pkg size recording etc.
 .El

CVS commit: xsrc/external/mit/ctwm/dist

2015-10-10 Thread Marc Balmer

Module Name:xsrc
Committed By:   mbalmer
Date:   Sat Oct 10 09:08:11 UTC 2015

Modified Files:
xsrc/external/mit/ctwm/dist: README

Log Message:
fox wording and typos


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/README
diff -u xsrc/external/mit/ctwm/dist/README:1.1 xsrc/external/mit/ctwm/dist/README:1.2
--- xsrc/external/mit/ctwm/dist/README:1.1	Thu Sep  3 22:16:33 2015
+++ xsrc/external/mit/ctwm/dist/README	Sat Oct 10 09:08:11 2015
@@ -2,20 +2,20 @@

 
 
-CTWM is an extension to twm, originally written by Claude Lecommandeur
-that support multiple virtual screens, and a lot of other goodies.
+CTWM is an extension to twm, originally written by Claude Lecommandeur,
+that supports multiple virtual screens, and a lot of other goodies.
 
 You can use and manage up to 32 virtual screens called workspaces.
 You swap from one workspace to another by clicking on a button in an
-optionnal panel of buttons (the workspace manager) or by invoking a
+optional panel of buttons (the workspace manager) or by invoking a
 function.
 
-You can custom each workspace by choosing different colors, names and
+You can customize each workspace by choosing different colors, names and
 pixmaps for the buttons and background root windows.
 
 Main features are :
 
- - Optional 3D window titles and border (ala Motif).
+ - Optional 3D window titles and borders (ala Motif).
  - Shaped, colored icons.
  - Multiple icons for clients based on the icon name.
  - Windows can belong to several workspaces.
@@ -25,7 +25,7 @@ Main features are :
  - Pinnable and sticky menus.
  - etc...
 
-The sources files were once the twm ones with only workmgr.[ch] added
+The source files were once the twm ones with only workmgr.[ch] added
 (written from scratch by Claude Lecommandeur).  There were also some
 modifications to some twm files.  This was back in CTWM version 1, by
 now, there are a bit more changes and a few more additions.  It's
@@ -40,7 +40,7 @@ please send a report to the mailing list
 
 Configuration:
 
-Ctwm is built using xmkmf, which read Imakefile.  That file includes
+Ctwm is built using xmkmf, which reads Imakefile.  That file includes
 Imakefile.local, which is meant for local configuration, and *WHICH YOU
 MUST CREATE*.  For your comfort, the file Imakefile.local-template can
 simply be copied to Imakefile.local, then changed.

CVS commit: src/doc

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 13:43:16 UTC 2015

Modified Files:
src/doc: CHANGES

Log Message:
note Lua update


To generate a diff of this commit:
cvs rdiff -u -r1.2106 -r1.2107 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2106 src/doc/CHANGES:1.2107
--- src/doc/CHANGES:1.2106	Fri Oct  2 05:33:07 2015
+++ src/doc/CHANGES	Thu Oct  8 13:43:16 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2106 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2107 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -205,3 +205,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	x86: Add PCI Extended Configuration Space support [nonaka 20151002]
 	pci(3): Decode Extended Capability in PCI Extended Configuration Space.
 		[nonaka 20151002]
+	lua: Updated to Lua 5.3.1 [mbalmer 20151008]
+

CVS commit: src/doc

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 13:42:26 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
Lua is at 5.3.1 now


To generate a diff of this commit:
cvs rdiff -u -r1.1258 -r1.1259 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1258 src/doc/3RDPARTY:1.1259
--- src/doc/3RDPARTY:1.1258	Thu Oct  8 08:22:54 2015
+++ src/doc/3RDPARTY	Thu Oct  8 13:42:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1258 2015/10/08 08:22:54 mbalmer Exp $
+#	$NetBSD: 3RDPARTY,v 1.1259 2015/10/08 13:42:26 mbalmer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -774,7 +774,7 @@ under src/usr.sbin). We don't use tcpd; 
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:	Lua
-Version:	Lua 5.3.0
+Version:	Lua 5.3.1
 Current Vers:	Lua 5.3.1
 Maintainer:	PUC Rio
 Home Page:	http://www.lua.org/

CVS commit: src/external/mit/lua/dist/src

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 13:40:16 UTC 2015

Modified Files:
src/external/mit/lua/dist/src: llex.c lstrlib.c ltable.c lvm.c lvm.h

Log Message:
fix kernel module build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/llex.c
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/lvm.h
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/llex.c
diff -u src/external/mit/lua/dist/src/llex.c:1.5 src/external/mit/lua/dist/src/llex.c:1.6
--- src/external/mit/lua/dist/src/llex.c:1.5	Thu Oct  8 13:21:00 2015
+++ src/external/mit/lua/dist/src/llex.c	Thu Oct  8 13:40:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: llex.c,v 1.5 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: llex.c,v 1.6 2015/10/08 13:40:16 mbalmer Exp $	*/
 
 /*
 ** Id: llex.c,v 2.93 2015/05/22 17:45:56 roberto Exp 
@@ -227,7 +227,7 @@ static void buffreplace (LexState *ls, c
   if (p[n] == from) p[n] = to;
   }
 }
-
+#endif
 
 #define buff2num(b,o)	(luaO_str2num(luaZ_buffer(b), o) != 0)
 

Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.8 src/external/mit/lua/dist/src/lstrlib.c:1.9
--- src/external/mit/lua/dist/src/lstrlib.c:1.8	Thu Oct  8 13:21:00 2015
+++ src/external/mit/lua/dist/src/lstrlib.c	Thu Oct  8 13:40:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lstrlib.c,v 1.8 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: lstrlib.c,v 1.9 2015/10/08 13:40:16 mbalmer Exp $	*/
 
 /*
 ** Id: lstrlib.c,v 1.229 2015/05/20 17:39:23 roberto Exp 
@@ -886,8 +886,11 @@ static int lua_number2strx (lua_State *L
 ** by format('%.99f', minfloat), and is equal to 99 + 2 ('-' and '.') +
 ** number of decimal digits to represent minfloat.
 */
+#ifndef _KERNEL
 #define MAX_ITEM	(120 + l_mathlim(MAX_10_EXP))
-
+#else
+#define MAX_ITEM	(120)
+#endif
 
 /* valid flags in a format specification */
 #define FLAGS	"-+ #0"

Index: src/external/mit/lua/dist/src/ltable.c
diff -u src/external/mit/lua/dist/src/ltable.c:1.4 src/external/mit/lua/dist/src/ltable.c:1.5
--- src/external/mit/lua/dist/src/ltable.c:1.4	Thu Oct  8 13:21:00 2015
+++ src/external/mit/lua/dist/src/ltable.c	Thu Oct  8 13:40:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ltable.c,v 1.4 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: ltable.c,v 1.5 2015/10/08 13:40:16 mbalmer Exp $	*/
 
 /*
 ** Id: ltable.c,v 2.111 2015/06/09 14:21:13 roberto Exp 
@@ -116,7 +116,7 @@ static int l_hashfloat (lua_Number n) {
   }
 }
 #endif
-
+#endif /*_KERNEL */
 
 /*
 ** returns the 'main' position of an element in a table (that is, the index
Index: src/external/mit/lua/dist/src/lvm.h
diff -u src/external/mit/lua/dist/src/lvm.h:1.4 src/external/mit/lua/dist/src/lvm.h:1.5
--- src/external/mit/lua/dist/src/lvm.h:1.4	Thu Oct  8 13:21:00 2015
+++ src/external/mit/lua/dist/src/lvm.h	Thu Oct  8 13:40:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lvm.h,v 1.4 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: lvm.h,v 1.5 2015/10/08 13:40:16 mbalmer Exp $	*/
 
 /*
 ** Id: lvm.h,v 2.35 2015/02/20 14:27:53 roberto Exp 
@@ -29,7 +29,6 @@
 #endif
 
 
-#ifndef _KERNEL
 /*
 ** You can define LUA_FLOORN2I if you want to convert floats to integers
 ** by flooring them (instead of raising an error if they are not
@@ -40,6 +39,7 @@
 #endif
 
 
+#ifndef _KERNEL
 #define tonumber(o,n) \
 	(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
 #else /* _KERNEL */

Index: src/external/mit/lua/dist/src/lvm.c
diff -u src/external/mit/lua/dist/src/lvm.c:1.6 src/external/mit/lua/dist/src/lvm.c:1.7
--- src/external/mit/lua/dist/src/lvm.c:1.6	Thu Oct  8 13:21:00 2015
+++ src/external/mit/lua/dist/src/lvm.c	Thu Oct  8 13:40:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lvm.c,v 1.6 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: lvm.c,v 1.7 2015/10/08 13:40:16 mbalmer Exp $	*/
 
 /*
 ** Id: lvm.c,v 2.245 2015/06/09 15:53:35 roberto Exp 
@@ -39,7 +39,7 @@
 #define MAXTAGLOOP	2000
 
 
-
+#ifndef _KERNEL
 /*
 ** 'l_intfitsf' checks whether a given integer can be converted to a
 ** float without rounding. Used in comparisons. Left undefined if
@@ -66,6 +66,7 @@
 #endif
 
 #endif
+#endif /*_KERNEL */
 
 #ifndef _KERNEL
 /*
@@ -126,8 +127,8 @@ int luaV_tointeger (const TValue *obj, l
 }
 
 
-/*
 #ifndef _KERNEL
+/*
 ** Try to convert a 'for' limit to an integer, preserving the
 ** semantics of the loop.
 ** (The following explanation assumes a non-negative step; it is valid
@@ -318,9 +319,12 @@ static int LTnum (const TValue *l, const
 lua_Integer li = ivalue(l);
 if (ttisinteger(r))
   return li < ivalue(r);  /* both are integers */
+#ifndef _KERNEL
 else  /* 'l' is int and 'r' is float */
   return LTintfloat(li, fltvalue(r));  /* l < r ? */
+#endi

CVS commit: src/external/mit/lua/dist/doc

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 12:46:20 UTC 2015

Modified Files:
src/external/mit/lua/dist/doc: contents.html lua.css manual.css
manual.html readme.html

Log Message:
update docs after conflict resolution


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/doc/contents.html \
src/external/mit/lua/dist/doc/lua.css \
src/external/mit/lua/dist/doc/manual.html \
src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/dist/doc/manual.css

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/doc/contents.html
diff -u src/external/mit/lua/dist/doc/contents.html:1.3 src/external/mit/lua/dist/doc/contents.html:1.4
--- src/external/mit/lua/dist/doc/contents.html:1.3	Mon Feb  2 14:03:05 2015
+++ src/external/mit/lua/dist/doc/contents.html	Thu Oct  8 12:46:20 2015
@@ -3,35 +3,34 @@
 
 Lua 5.3 Reference Manual - contents
 
+
 
-
-ul {
-	list-style-type: none ;
-	list-style-position: outside ;
-}
-
 
 
 
 
-
 
-http://www.lua.org/";>
+http://www.lua.org/";>
 Lua 5.3 Reference Manual
 
 
 
 The reference manual is the official definition of the Lua language.
+
 For a complete introduction to Lua programming, see the book
 http://www.lua.org/pil/";>Programming in Lua.
 
-
+
 start
 ·
 contents
 ·
 index
-
+·
+http://www.lua.org/manual/";>other versions
+
+
+
 
 Copyright © 2015 Lua.org, PUC-Rio.
 Freely available under the terms of the
@@ -39,7 +38,7 @@ Freely available under the terms of the
 
 
 Contents
-
+
 1 – Introduction
 
 2 – Basic Concepts
@@ -136,15 +135,14 @@ Freely available under the terms of the
 
 
 Index
-
-
+
+
 
 Lua functions
 
 basic
 _G
 _VERSION
-
 assert
 collectgarbage
 dofile
@@ -321,6 +319,7 @@ Freely available under the terms of the
 utf8.offset
 
 environmentvariables
+
 LUA_CPATH
 LUA_CPATH_5_3
 LUA_INIT
@@ -546,6 +545,7 @@ Freely available under the terms of the
 luaopen_utf8
 
 constants
+
 LUA_ERRERR
 LUA_ERRFILE
 LUA_ERRGCMM
@@ -606,13 +606,12 @@ Freely available under the terms of the
 
 
 
-
-
+
 Last update:
-Tue Dec  9 21:26:07 BRST 2014
-
+Wed Jun  3 08:27:30 BRT 2015
+
 
 
 
Index: src/external/mit/lua/dist/doc/lua.css
diff -u src/external/mit/lua/dist/doc/lua.css:1.3 src/external/mit/lua/dist/doc/lua.css:1.4
--- src/external/mit/lua/dist/doc/lua.css:1.3	Mon Feb  2 14:03:05 2015
+++ src/external/mit/lua/dist/doc/lua.css	Thu Oct  8 12:46:20 2015
@@ -3,84 +3,90 @@ html {
 }
 
 body {
-	border: solid #a0a0a0 1px ;
-	border-radius: 20px ;
-	padding: 26px ;
-	margin: 16px ;
-	color: #00 ;
 	background-color: #FF ;
+	color: #00 ;
 	font-family: Helvetica, Arial, sans-serif ;
 	text-align: justify ;
+	line-height: 1.25 ;
+	margin: 16px auto ;
+	padding: 32px ;
+	border: solid #a0a0a0 1px ;
+	border-radius: 20px ;
+	max-width: 70em ;
+	width: 90% ;
 }
 
 h1, h2, h3, h4 {
+	color: #80 ;
 	font-family: Verdana, Geneva, sans-serif ;
 	font-weight: normal ;
 	font-style: normal ;
+	text-align: left ;
 }
 
-h2 {
-	padding-top: 0.4em ;
-	padding-bottom: 0.4em ;
-	padding-left: 0.8em ;
-	padding-right: 0.8em ;
-	background-color: #D0D0FF ;
-	border-radius: 8px ;
-	border: solid #a0a0a0 1px ;
+h1 {
+	font-size: 28pt ;
 }
 
-h3 {
-	padding-left: 0.5em ;
-	border-left: solid #D0D0FF 1em ;
+h1 img {
+	vertical-align: text-bottom ;
 }
 
-table h3 {
-	padding-left: 0px ;
-	border-left: none ;
+h2:before {
+	content: "\2756" ;
+	padding-right: 0.5em ;
 }
 
-a:link {
-	color: #80 ;
-	background-color: inherit ;
+a {
 	text-decoration: none ;
 }
 
-a:visited {
-	background-color: inherit ;
-	text-decoration: none ;
+a:link {
+	color: #80 ;
 }
 
 a:link:hover, a:visited:hover {
-	color: #80 ;
 	background-color: #D0D0FF ;
-	border-radius: 4px;
+	color: #80 ;
+	border-radius: 4px ;
 }
 
 a:link:active, a:visited:active {
 	color: #FF ;
 }
 
-h1 a img {
-	vertical-align: text-bottom ;
+div.menubar {
+	padding-bottom: 0.5em ;
 }
 
-hr {
-	border: 0 ;
-	height: 1px ;
-	color: #a0a0a0 ;
-	background-color: #a0a0a0 ;
-	display: none ;
+p.menubar {
+	margin-left: 2.5em ;
 }
 
-table hr {
-	display: block ;
+.menubar a:hover  {
+	margin: -3px -3px -3px -3px ;
+	padding: 3px  3px  3px  3px ;
+	border-radius: 4px ;
 }
 
 :target {
-	background-color: #F8F8F8 ;
+	background-color: #F0F0F0 ;
+	margin: -8px ;
 	padding: 8px ;
-	border: solid #a0a0a0 2px ;
 	border-radius: 8px ;
+	outline: none ;
+}
+
+hr {
+	display: none ;
+}
+
+table hr {
+	background-color: #a0a0a0 ;
+	color: #a0a0a0 ;
+	border: 0 ;
+	height: 1px ;
+	display: block ;
 }
 
 .footer {
@@ -103,3 +109,25 @@ pre.session {
 	padding: 1em ;
 	border-radius: 8px ;
 }
+
+td.gutter {
+	width: 4% ;
+}
+
+table.columns {
+	border: none ;
+	border-spacing: 0 ;
+	border-collapse: collapse ;
+}
+
+table.columns td {
+	vertical-align: top ;
+	padding: 0 ;
+	padding-bottom: 1em ;
+	text

CVS commit: src/external/mit/lua/dist

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 12:42:30 UTC 2015

Modified Files:
src/external/mit/lua/dist: Makefile README

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/Makefile \
src/external/mit/lua/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/Makefile
diff -u src/external/mit/lua/dist/Makefile:1.3 src/external/mit/lua/dist/Makefile:1.4
--- src/external/mit/lua/dist/Makefile:1.3	Mon Feb  2 14:03:05 2015
+++ src/external/mit/lua/dist/Makefile	Thu Oct  8 12:42:30 2015
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
 
 # Lua version and release.
 V= 5.3
-R= $V.0
+R= $V.1
 
 # Targets start here.
 all:	$(PLAT)
Index: src/external/mit/lua/dist/README
diff -u src/external/mit/lua/dist/README:1.3 src/external/mit/lua/dist/README:1.4
--- src/external/mit/lua/dist/README:1.3	Mon Feb  2 14:03:05 2015
+++ src/external/mit/lua/dist/README	Thu Oct  8 12:42:30 2015
@@ -1,5 +1,5 @@
 
-This is Lua 5.3.0, released on 06 Jan 2015.
+This is Lua 5.3.1, released on 10 Jun 2015.
 
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.

CVS commit: src/external/mit/lua/dist/src

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 12:40:05 UTC 2015

Modified Files:
src/external/mit/lua/dist/src: ldblib.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/ldblib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/lua/dist/src/ldblib.c
diff -u src/external/mit/lua/dist/src/ldblib.c:1.5 src/external/mit/lua/dist/src/ldblib.c:1.6
--- src/external/mit/lua/dist/src/ldblib.c:1.5	Mon Feb  2 14:03:05 2015
+++ src/external/mit/lua/dist/src/ldblib.c	Thu Oct  8 12:40:05 2015
@@ -1,7 +1,7 @@
-/*	$NetBSD: ldblib.c,v 1.5 2015/02/02 14:03:05 lneto Exp $	*/
+/*	$NetBSD: ldblib.c,v 1.6 2015/10/08 12:40:05 mbalmer Exp $	*/
 
 /*
-** Id: ldblib.c,v 1.148 2015/01/02 12:52:22 roberto Exp 
+** Id: ldblib.c,v 1.149 2015/02/19 17:06:21 roberto Exp 
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
@@ -31,6 +31,17 @@
 static const int HOOKKEY = 0;
 
 
+/*
+** If L1 != L, L1 can be in any state, and therefore there is no
+** garanties about its stack space; any push in L1 must be
+** checked.
+*/
+static void checkstack (lua_State *L, lua_State *L1, int n) {
+  if (L != L1 && !lua_checkstack(L1, n))
+luaL_error(L, "stack overflow");
+}
+
+
 static int db_getregistry (lua_State *L) {
   lua_pushvalue(L, LUA_REGISTRYINDEX);
   return 1;
@@ -131,12 +142,16 @@ static void treatstackoption (lua_State 
 
 /*
 ** Calls 'lua_getinfo' and collects all results in a new table.
+** L1 needs stack space for an optional input (function) plus
+** two optional outputs (function and line table) from function
+** 'lua_getinfo'.
 */
 static int db_getinfo (lua_State *L) {
   lua_Debug ar;
   int arg;
   lua_State *L1 = getthread(L, &arg);
   const char *options = luaL_optstring(L, arg+2, "flnStu");
+  checkstack(L, L1, 3);
   if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
 options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
 lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
@@ -194,6 +209,7 @@ static int db_getlocal (lua_State *L) {
 int level = (int)luaL_checkinteger(L, arg + 1);
 if (!lua_getstack(L1, level, &ar))  /* out of range? */
   return luaL_argerror(L, arg+1, "level out of range");
+checkstack(L, L1, 1);
 name = lua_getlocal(L1, &ar, nvar);
 if (name) {
   lua_xmove(L1, L, 1);  /* move local value */
@@ -220,6 +236,7 @@ static int db_setlocal (lua_State *L) {
 return luaL_argerror(L, arg+1, "level out of range");
   luaL_checkany(L, arg+3);
   lua_settop(L, arg+3);
+  checkstack(L, L1, 1);
   lua_xmove(L, L1, 1);
   name = lua_setlocal(L1, &ar, nvar);
   if (name == NULL)
@@ -354,6 +371,7 @@ static int db_sethook (lua_State *L) {
 lua_pushvalue(L, -1);
 lua_setmetatable(L, -2);  /* setmetatable(hooktable) = hooktable */
   }
+  checkstack(L, L1, 1);
   lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
   lua_pushvalue(L, arg + 1);  /* value (hook function) */
   lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
@@ -374,6 +392,7 @@ static int db_gethook (lua_State *L) {
 lua_pushliteral(L, "external hook");
   else {  /* hook table must exist */
 lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY);
+checkstack(L, L1, 1);
 lua_pushthread(L1); lua_xmove(L1, L, 1);
 lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
 lua_remove(L, -2);  /* remove hook table */

CVS import: src/external/mit/lua/dist

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 12:25:23 UTC 2015

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16176

Log Message:
Lua 5.3.1

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_3_1

C src/external/mit/lua/dist/README
C src/external/mit/lua/dist/Makefile
C src/external/mit/lua/dist/src/lobject.h
C src/external/mit/lua/dist/src/liolib.c
U src/external/mit/lua/dist/src/lctype.h
U src/external/mit/lua/dist/src/ltm.h
C src/external/mit/lua/dist/src/ldump.c
U src/external/mit/lua/dist/src/lopcodes.h
C src/external/mit/lua/dist/src/luac.c
U src/external/mit/lua/dist/src/lbitlib.c
C src/external/mit/lua/dist/src/llimits.h
C src/external/mit/lua/dist/src/luaconf.h
U src/external/mit/lua/dist/src/lgc.h
C src/external/mit/lua/dist/src/lauxlib.c
C src/external/mit/lua/dist/src/lstate.h
C src/external/mit/lua/dist/src/llex.c
C src/external/mit/lua/dist/src/ldblib.c
U src/external/mit/lua/dist/src/lcode.h
C src/external/mit/lua/dist/src/lstate.c
C src/external/mit/lua/dist/src/lua.c
U src/external/mit/lua/dist/src/lzio.c
C src/external/mit/lua/dist/src/lcode.c
U src/external/mit/lua/dist/src/llex.h
U src/external/mit/lua/dist/src/lparser.c
U src/external/mit/lua/dist/src/linit.c
C src/external/mit/lua/dist/src/ldebug.h
U src/external/mit/lua/dist/src/lcorolib.c
C src/external/mit/lua/dist/src/lbaselib.c
C src/external/mit/lua/dist/src/ldebug.c
C src/external/mit/lua/dist/src/lutf8lib.c
C src/external/mit/lua/dist/src/lapi.c
C src/external/mit/lua/dist/src/lua.h
U src/external/mit/lua/dist/src/lauxlib.h
C src/external/mit/lua/dist/src/lobject.c
C src/external/mit/lua/dist/src/lstrlib.c
C src/external/mit/lua/dist/src/ltm.c
C src/external/mit/lua/dist/src/ltablib.c
U src/external/mit/lua/dist/src/lualib.h
C src/external/mit/lua/dist/src/lfunc.h
C src/external/mit/lua/dist/src/ldo.c
U src/external/mit/lua/dist/src/lfunc.c
U src/external/mit/lua/dist/src/lctype.c
C src/external/mit/lua/dist/src/lvm.c
C src/external/mit/lua/dist/src/loadlib.c
U src/external/mit/lua/dist/src/ltable.h
C src/external/mit/lua/dist/src/lstring.h
C src/external/mit/lua/dist/src/ltable.c
U src/external/mit/lua/dist/src/lua.hpp
U src/external/mit/lua/dist/src/lopcodes.c
C src/external/mit/lua/dist/src/lapi.h
U src/external/mit/lua/dist/src/lparser.h
C src/external/mit/lua/dist/src/Makefile
U src/external/mit/lua/dist/src/lundump.c
U src/external/mit/lua/dist/src/lmem.h
U src/external/mit/lua/dist/src/lundump.h
U src/external/mit/lua/dist/src/lprefix.h
C src/external/mit/lua/dist/src/lstring.c
C src/external/mit/lua/dist/src/lmathlib.c
C src/external/mit/lua/dist/src/lvm.h
C src/external/mit/lua/dist/src/lgc.c
C src/external/mit/lua/dist/src/ldo.h
U src/external/mit/lua/dist/src/lzio.h
C src/external/mit/lua/dist/src/loslib.c
C src/external/mit/lua/dist/src/lmem.c
C src/external/mit/lua/dist/doc/manual.css
U src/external/mit/lua/dist/doc/luac.1
U src/external/mit/lua/dist/doc/lua.1
U src/external/mit/lua/dist/doc/osi-certified-72x60.png
C src/external/mit/lua/dist/doc/readme.html
U src/external/mit/lua/dist/doc/logo.gif
N src/external/mit/lua/dist/doc/index.css
C src/external/mit/lua/dist/doc/contents.html
C src/external/mit/lua/dist/doc/manual.html
C src/external/mit/lua/dist/doc/lua.css

45 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist

CVS commit: src/doc

2015-10-08 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  8 08:22:54 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
Fix Lua version, add lneto as responsible person, too.


To generate a diff of this commit:
cvs rdiff -u -r1.1257 -r1.1258 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1257 src/doc/3RDPARTY:1.1258
--- src/doc/3RDPARTY:1.1257	Tue Sep 29 09:14:11 2015
+++ src/doc/3RDPARTY	Thu Oct  8 08:22:54 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1257 2015/09/29 09:14:11 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1258 2015/10/08 08:22:54 mbalmer Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -774,12 +774,12 @@ under src/usr.sbin). We don't use tcpd; 
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:	Lua
-Version:	Lua 5.1.5
-Current Vers:	Lua 5.2.2
+Version:	Lua 5.3.0
+Current Vers:	Lua 5.3.1
 Maintainer:	PUC Rio
 Home Page:	http://www.lua.org/
 Mailing List:
-Responsible:	mbalmer
+Responsible:	mbalmer, lneto
 License:	MIT
 Location:	external/mit/lua/dist
 Notes:

CVS commit: src/share/misc

2015-10-02 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Oct  2 09:01:23 UTC 2015

Modified Files:
src/share/misc: airport

Log Message:
Fix case.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.59 src/share/misc/airport:1.60
--- src/share/misc/airport:1.59	Sun Sep 13 09:21:51 2015
+++ src/share/misc/airport	Fri Oct  2 09:01:23 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.59 2015/09/13 09:21:51 mbalmer Exp $
+#	$NetBSD: airport,v 1.60 2015/10/02 09:01:23 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -7304,7 +7304,7 @@ STK:Sterling (Crosson Field), CO, USA
 STL:St. Louis/Lambert International, Missouri, USA
 STM:Santarem, PA, Brazil
 STN:London (Stansted), UK
-STO:All Airports around Stockholm, Sweden
+STO:All airports around Stockholm, Sweden
 STP:St. Paul (Holman Field), MN, USA
 STQ:St. Marys Municipal Airport, PA, USA
 STR:Stuttgart (Echterdingen), Germany

CVS commit: src/share/misc

2015-09-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Sep 13 09:21:51 UTC 2015

Modified Files:
src/share/misc: airport

Log Message:
Fix a few entries, add a not about IATA vs. ICAO codes.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.58 src/share/misc/airport:1.59
--- src/share/misc/airport:1.58	Sun Sep 21 08:38:03 2014
+++ src/share/misc/airport	Sun Sep 13 09:21:51 2015
@@ -1,8 +1,11 @@
-#	$NetBSD: airport,v 1.58 2014/09/21 08:38:03 mbalmer Exp $
+#	$NetBSD: airport,v 1.59 2015/09/13 09:21:51 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
 #
+# Note that these are three letter IATA codes, most airports also have a
+# four letter ICAO code, e.g. Bern is BRN (IATA) and LSZB (ICAO).
+#
 # Airport Code : Airport
 AAA:Anaa, French Polynesia
 AAB:Arrabury, Queensland, Australia
@@ -918,7 +921,7 @@ BRJ:Bright, Victoria, Australia
 BRK:Bourke, New South Wales, Australia
 BRL:Burlington Municipal Airport, IA, USA
 BRM:Barquisimeto, Venezuela
-BRN:Bern-Belp, Switzerland
+BRN:Bern Airport, Bern-Belp, Switzerland
 BRO:Brownsville/South Padre Island, TX, USA
 BRP:Biaru, Papua New Guinea
 BRQ:Brno, Czech Republic
@@ -9167,9 +9170,7 @@ ZBX:Branson (Table Rock Heliport), MO, U
 ZBY:Sayaboury, Laos
 ZCC:Baden Baden (Railway Station), Germany
 ZCL:Zacatecas (General Leobardo Ruiz), Mexico
-ZCO:Temuco, Chile
-ZDJ:Bern, Switzerland
-ZDT:Chur, Switzerland
+ZCO:Maquehue Airport, Temuco, Chile
 ZEC:Seconda, South Africa
 ZEF:Elkin Municipal Airport, NC, USA
 ZEG:Senggo, Indonesia

CVS commit: src/share/man/man7

2015-05-25 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon May 25 08:57:31 UTC 2015

Modified Files:
src/share/man/man7: hier.7

Log Message:
Lua 5.1 -> Lua 5.3
>From Kamil Rytarowski.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/share/man/man7/hier.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.109 src/share/man/man7/hier.7:1.110
--- src/share/man/man7/hier.7:1.109	Mon Mar 31 11:25:48 2014
+++ src/share/man/man7/hier.7	Mon May 25 08:57:31 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.109 2014/03/31 11:25:48 martin Exp $
+.\"	$NetBSD: hier.7,v 1.110 2015/05/25 08:57:31 mbalmer Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)hier.7	8.5 (Berkeley) 6/1/94
 .\"
-.Dd December 23, 2013
+.Dd May 25, 2015
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -463,9 +463,9 @@ archive, profiled, position independent 
 .Pp
 .Bl -tag -width "lua/" -compact
 .It Sy lua/
-.Bl -tag -width "5.1/" -compact
-.It Sy 5.1/
-Lua 5.1 modules
+.Bl -tag -width "5.3/" -compact
+.It Sy 5.3/
+Lua 5.3 modules
 .El
 .El
 .Pp

CVS commit: src/usr.sbin/sysinst

2015-04-03 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Apr  3 14:57:41 UTC 2015

Modified Files:
src/usr.sbin/sysinst: msg.mi.en msg.mi.pl

Log Message:
IPv4 number -> IPv4 address


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/msg.mi.en \
src/usr.sbin/sysinst/msg.mi.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.6 src/usr.sbin/sysinst/msg.mi.en:1.7
--- src/usr.sbin/sysinst/msg.mi.en:1.6	Mon Nov 10 01:05:10 2014
+++ src/usr.sbin/sysinst/msg.mi.en	Fri Apr  3 14:57:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.en,v 1.6 2014/11/10 01:05:10 snj Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.7 2015/04/03 14:57:41 mbalmer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -521,10 +521,10 @@ message net_host
 {Your host name}
 
 message net_ip
-{Your IPv4 number}
+{Your IPv4 address}
 
 message net_srv_ip
-{Server IPv4 number}
+{Server IPv4 address}
 
 message net_mask
 {IPv4 Netmask}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.6 src/usr.sbin/sysinst/msg.mi.pl:1.7
--- src/usr.sbin/sysinst/msg.mi.pl:1.6	Mon Nov 10 01:05:10 2014
+++ src/usr.sbin/sysinst/msg.mi.pl	Fri Apr  3 14:57:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.pl,v 1.6 2014/11/10 01:05:10 snj Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.7 2015/04/03 14:57:41 mbalmer Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp   */
 
@@ -518,7 +518,7 @@ message net_ip
 {Twoj adres IPv4}
 
 message net_srv_ip
-{Server IPv4 number}
+{Server IPv4 address}
 
 message net_mask
 {Maska podsieci IPv4}

CVS commit: src/sbin/mount

2014-12-06 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Dec  6 12:12:17 UTC 2014

Modified Files:
src/sbin/mount: mount.8

Log Message:
Add reference to mount_chfs, bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sbin/mount/mount.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.79 src/sbin/mount/mount.8:1.80
--- src/sbin/mount/mount.8:1.79	Thu Oct 31 07:37:06 2013
+++ src/sbin/mount/mount.8	Sat Dec  6 12:12:17 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount.8,v 1.79 2013/10/31 07:37:06 apb Exp $
+.\"	$NetBSD: mount.8,v 1.80 2014/12/06 12:12:17 mbalmer Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\"
-.Dd October 31, 2013
+.Dd December 6, 2014
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -523,6 +523,7 @@ mount -t cd9660 -o nodev,nosuid /dev/cd0
 .Xr fsck 8 ,
 .Xr mount_ados 8 ,
 .Xr mount_cd9660 8 ,
+.Xr mount_chfs 8 ,
 .Xr mount_ext2fs 8 ,
 .Xr mount_fdesc 8 ,
 .Xr mount_ffs 8 ,

Re: CVS commit: src/lib/librumpuser

2014-10-07 Thread Marc Balmer


Am 29.09.2014 um 17:54 schrieb Justin Cormack :

> Module Name:  src
> Committed By: justin
> Date: Mon Sep 29 15:54:28 UTC 2014
> 
> Modified Files:
>   src/lib/librumpuser: rumpuser_port.h
> 
> Log Message:
> Minix also has getenv_r support
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.34 -r1.35 src/lib/librumpuser/rumpuser_port.h
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: src/lib/librumpuser/rumpuser_port.h
> diff -u src/lib/librumpuser/rumpuser_port.h:1.34 
> src/lib/librumpuser/rumpuser_port.h:1.35
> --- src/lib/librumpuser/rumpuser_port.h:1.34  Tue Jul 22 22:41:58 2014
> +++ src/lib/librumpuser/rumpuser_port.h   Mon Sep 29 15:54:28 2014
> @@ -1,4 +1,4 @@
> -/*   $NetBSD: rumpuser_port.h,v 1.34 2014/07/22 22:41:58 justin Exp $
> */
> +/*   $NetBSD: rumpuser_port.h,v 1.35 2014/09/29 15:54:28 justin Exp $
> */
> 
> /*
>  * Portability header for non-NetBSD platforms.
> @@ -112,8 +112,8 @@ clock_gettime(clockid_t clk, struct time
> #include 
> #include 
> 
> -/* NetBSD is the only(?) platform with getenv_r() */
> -#if !defined(__NetBSD__)
> +/* NetBSD is almost the only platform with getenv_r() */
> +#if !(defined(__NetBSD__) || defined(__minix__))

Minix defines __minix, not __minix__, though.

> #include 
> #include 
> #include 
>

CVS commit: src/etc

2014-09-25 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Sep 25 11:33:33 UTC 2014

Modified Files:
src/etc: login.conf

Log Message:
unfold comment and fix spelling


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/login.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/login.conf
diff -u src/etc/login.conf:1.5 src/etc/login.conf:1.6
--- src/etc/login.conf:1.5	Tue Apr 30 21:03:43 2013
+++ src/etc/login.conf	Thu Sep 25 11:33:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: login.conf,v 1.5 2013/04/30 21:03:43 mbalmer Exp $
+# $NetBSD: login.conf,v 1.6 2014/09/25 11:33:33 mbalmer Exp $
 
 # Based on:
 # OpenBSD: login.conf,v 1.22 2005/08/12 18:48:20 millert Exp 
@@ -9,8 +9,7 @@
 
 #
 # The default values
-# Any value changed in the daemon class should be reset in default
-# class.
+# Any value changed in the daemon class should be reset in the default class.
 #
 #default:\
 #	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R7/bin /usr/X11R6/bin /usr/pkg/bin /usr/pkg/sbin /usr/local/bin:\

CVS commit: src/sys/modules/lua

2014-09-24 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Sep 24 14:55:48 UTC 2014

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
whitespace, knf, comments, but no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.13 src/sys/modules/lua/lua.c:1.14
--- src/sys/modules/lua/lua.c:1.13	Fri Jul 25 08:10:40 2014
+++ src/sys/modules/lua/lua.c	Wed Sep 24 14:55:48 2014
@@ -1,8 +1,8 @@
-/*	$NetBSD: lua.c,v 1.13 2014/07/25 08:10:40 dholland Exp $ */
+/*	$NetBSD: lua.c,v 1.14 2014/09/24 14:55:48 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2014 by Lourival Vieira Neto .
- * Copyright (c) 2011, 2013 by Marc Balmer .
+ * Copyright (c) 2011 - 2014 by Marc Balmer .
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -629,7 +629,7 @@ klua_mod_unregister(const char *name)
 
 klua_State *
 klua_newstate(lua_Alloc f, void *ud, const char *name, const char *desc,
-		int ipl)
+int ipl)
 {
 	klua_State *K;
 	struct lua_state *s;
@@ -694,6 +694,7 @@ klua_close(klua_State *K)
 	struct lua_module *m;
 	int error = 0;
 
+	/* XXX consider registering a handler instead of a fixed name. */
 	lua_getglobal(K->L, "onClose");
 	if (lua_isfunction(K->L, -1))
 		lua_pcall(K->L, -1, 0, 0);
@@ -784,9 +785,11 @@ MODULE(MODULE_CLASS_MISC, lua, NULL);
 static const struct cfiattrdata luabus_iattrdata = {
 	"luabus", 0, { { NULL, NULL, 0 },}
 };
+
 static const struct cfiattrdata *const lua_attrs[] = {
 	&luabus_iattrdata, NULL
 };
+
 CFDRIVER_DECL(lua, DV_DULL, lua_attrs);
 extern struct cfattach lua_ca;
 static int lualoc[] = {
@@ -794,6 +797,7 @@ static int lualoc[] = {
 	-1,
 	-1
 };
+
 static struct cfdata lua_cfdata[] = {
 	{
 		.cf_name = "lua",

CVS commit: src/share/misc

2014-09-21 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Sep 21 08:38:03 UTC 2014

Modified Files:
src/share/misc: airport

Log Message:
add Kukes


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.57 src/share/misc/airport:1.58
--- src/share/misc/airport:1.57	Sun Jul 20 19:19:49 2014
+++ src/share/misc/airport	Sun Sep 21 08:38:03 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.57 2014/07/20 19:19:49 mbalmer Exp $
+#	$NetBSD: airport,v 1.58 2014/09/21 08:38:03 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -4081,6 +4081,7 @@ LAH:Labuha, Indonesia
 LAI:Lannion, France
 LAJ:Lages, SC, Brazil
 LAK:Aklavik Airport, NT, Canada
+LAKU:Shaikh Zayed International Airport, Kukes, Albania
 LAL:Lakeland Regional Airport, FL, USA
 LAM:Los Alamos Airport, NM, USA
 LAN:Lansing Capital City, Michigan, USA

CVS commit: src/libexec/httpd

2014-08-15 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Fri Aug 15 19:35:28 UTC 2014

Modified Files:
src/libexec/httpd: lua-bozo.c

Log Message:
NUL terminate a string.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/libexec/httpd/lua-bozo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/httpd/lua-bozo.c
diff -u src/libexec/httpd/lua-bozo.c:1.10 src/libexec/httpd/lua-bozo.c:1.11
--- src/libexec/httpd/lua-bozo.c:1.10	Sat Jul 19 18:38:34 2014
+++ src/libexec/httpd/lua-bozo.c	Fri Aug 15 19:35:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua-bozo.c,v 1.10 2014/07/19 18:38:34 lneto Exp $	*/
+/*	$NetBSD: lua-bozo.c,v 1.11 2014/08/15 19:35:28 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2013 Marc Balmer 
@@ -276,6 +276,7 @@ lua_url_decode(lua_State *L, char *s)
 			*q++ = *p;
 		}
 	}
+	*q = '\0';
 	lua_pushstring(L, val);
 	lua_setfield(L, -2, s);
 	free(val);

CVS commit: src/share/misc

2014-07-20 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 20 19:19:49 UTC 2014

Modified Files:
src/share/misc: airport

Log Message:
Keep countries in sync with IATA listings.  NetBSD is not in the business
of defining in which country an airport is.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.56 src/share/misc/airport:1.57
--- src/share/misc/airport:1.56	Sun Jul 13 18:08:33 2014
+++ src/share/misc/airport	Sun Jul 20 19:19:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.56 2014/07/13 18:08:33 asau Exp $
+#	$NetBSD: airport,v 1.57 2014/07/20 19:19:49 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -3730,7 +3730,7 @@ KGX:Grayling Airport, AK, USA
 KGY:Kingaroy, Queensland, Australia
 KGZ:Glacier Creek Airport, AK, USA
 KHA:Khaneh, Iran
-KHC:Kerch, Krym (Crimea), Russia
+KHC:Kerch, Ukraine
 KHE:Kherson, Mykolayiv, Ukraine
 KHG:Kashi, China
 KHH:Kaohsiung International, Taiwan
@@ -7029,7 +7029,7 @@ SIL:Sila, Papua New Guinea
 SIM:Simbai, Papua New Guinea
 SIN:Singapore
 SIO:Smithton, Tasmania, Australia
-SIP:Simferopol, Krym (Crimea), Russia
+SIP:Simferopol, Ukraine
 SIQ:Singkep (Dabo Airport), Indonesia
 SIR:Sion (Sitten), Switzerland
 SIS:Sishen, South Africa

CVS commit: src/doc

2014-07-14 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Jul 14 12:38:00 UTC 2014

Modified Files:
src/doc: CHANGES

Log Message:
wskbd(4) has a belgian keyboard layout now.


To generate a diff of this commit:
cvs rdiff -u -r1.1945 -r1.1946 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1945 src/doc/CHANGES:1.1946
--- src/doc/CHANGES:1.1945	Mon Jul 14 11:51:08 2014
+++ src/doc/CHANGES	Mon Jul 14 12:38:00 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1945 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1946 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -441,3 +441,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	bind: Import version 9.10.0-P2 [spz 20140708]
 	dhcp: Import version 4.3.0 [spz 20140712]
 	dhcpcd(8): Import dhcpcd-6.4.1 [roy 20140714]
+	wskbd(4): Added belgian keyboard layouts (KB_BE) to pckbd(4) and
+		ukbd(4). [mbalmer 20140714]

CVS commit: src/etc

2014-07-14 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Jul 14 12:29:48 UTC 2014

Modified Files:
src/etc: rc.conf

Log Message:
Consistency changes only.  Start sentences with a capital letter and end
them with a full stop.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/etc/rc.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.conf
diff -u src/etc/rc.conf:1.96 src/etc/rc.conf:1.97
--- src/etc/rc.conf:1.96	Sat Oct 14 17:01:29 2000
+++ src/etc/rc.conf	Mon Jul 14 12:29:48 2014
@@ -1,6 +1,6 @@
-#	$NetBSD: rc.conf,v 1.96 2000/10/14 17:01:29 wiz Exp $
+#	$NetBSD: rc.conf,v 1.97 2014/07/14 12:29:48 mbalmer Exp $
 #
-# see rc.conf(5) for more information.
+# See rc.conf(5) for more information.
 #
 # Use program=YES to enable program, NO to disable it. program_flags are
 # passed to the program on the command line.
@@ -17,5 +17,5 @@ fi
 #
 rc_configured=NO
 
-# Add local overrides below
+# Add local overrides below.
 #

CVS commit: src/share/wscons/keymaps

2014-07-14 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Jul 14 12:21:56 UTC 2014

Modified Files:
src/share/wscons/keymaps: Makefile

Log Message:
Put them one file per line.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/wscons/keymaps/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/wscons/keymaps/Makefile
diff -u src/share/wscons/keymaps/Makefile:1.19 src/share/wscons/keymaps/Makefile:1.20
--- src/share/wscons/keymaps/Makefile:1.19	Sun Jul 13 15:12:27 2014
+++ src/share/wscons/keymaps/Makefile	Mon Jul 14 12:21:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/07/13 15:12:27 martin Exp $
+# $NetBSD: Makefile,v 1.20 2014/07/14 12:21:56 mbalmer Exp $
 
 NOOBJ=	# defined
 
@@ -6,8 +6,10 @@ FILES=	\
 	amikbd.pl.qwertz.iso8859-2 \
 	mkbd.pt.iso8859-1 \
 	pckbd.be.azerty pckbd.br.abnt2 \
-	pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5 \
-	pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5 \
+	pckbd.bg.bds.cp1251 \
+	pckbd.bg.bds.iso8859-5 \
+	pckbd.bg.qwerty.cp1251 \
+	pckbd.bg.qwerty.iso8859-5 \
 	pckbd.bg.qwerty.koi8-r \
 	pckbd.de_CH.iso8859-1 \
 	pckbd.fr_CA.iso8859-1 \

CVS commit: src/sys/dev

2014-07-14 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Jul 14 10:05:24 UTC 2014

Modified Files:
src/sys/dev/pckbport: wskbdmap_mfii.c
src/sys/dev/usb: ukbdmap.c

Log Message:
Add a belgian keyboard layout, based on the french keyboard layout.
Fixes PR install/46871.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/ukbdmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.24 src/sys/dev/pckbport/wskbdmap_mfii.c:1.25
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.24	Wed Jun 11 20:09:17 2014
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	Mon Jul 14 10:05:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $");
 
 #include "opt_wskbdmap.h"
 #include 
@@ -419,6 +419,28 @@ static const keysym_t pckbd_keydesc_fr[]
 KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
+static const keysym_t pckbd_keydesc_be[] = {
+/*  pos	 normal		shifted		altgr		shift-altgr */
+KC(2),   KS_ampersand,	KS_1,		KS_bar,
+KC(3),   KS_eacute,		KS_2,		KS_at,
+KC(5),   KS_apostrophe,	KS_4,
+KC(6),   KS_parenleft,	KS_5,
+KC(7),   KS_section,	KS_6,		KS_asciicircum,
+KC(8),   KS_egrave,		KS_7,
+KC(9),   KS_exclam,		KS_8,
+KC(10),  KS_ccedilla,	KS_9,		KS_braceleft,
+KC(11),  KS_agrave,		KS_0,		KS_braceright,
+KC(12),  KS_parenright,	KS_degree,
+KC(13),  KS_minus,		KS_underscore,
+KC(26),  KS_dead_circumflex, KS_dead_diaeresis,	KS_bracketleft,
+KC(27),  KS_dollar,		KS_asterisk,	KS_bracketright,
+KC(43),  KS_mu,		KS_sterling,	KS_grave,
+KC(40),  KS_ugrave,		KS_percent,	KS_acute,
+KC(41),  KS_twosuperior,	KS_threesuperior,
+KC(53),  KS_equal,		KS_plus,	KS_asciitilde,
+KC(86),  KS_less,		KS_greater,	KS_backslash,
+};
+
 static const keysym_t pckbd_keydesc_it[] = {
 /*  pos  normal		shifted		altgr		shift-altgr */
 KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
@@ -788,6 +810,7 @@ const struct wscons_keydesc pckbd_keydes
 	KBD_MAP(KB_SF,			KB_SG,	pckbd_keydesc_sf),
 	KBD_MAP(KB_SF | KB_NODEAD,	KB_SF,	pckbd_keydesc_sg_nodead),
 	KBD_MAP(KB_FR,  KB_US,  pckbd_keydesc_fr),
+	KBD_MAP(KB_BE,  KB_FR,  pckbd_keydesc_be),
 	KBD_MAP(KB_DK,			KB_US,	pckbd_keydesc_dk),
 	KBD_MAP(KB_DK | KB_NODEAD,	KB_DK,	pckbd_keydesc_dk_nodead),
 	KBD_MAP(KB_IT,			KB_US,	pckbd_keydesc_it),

Index: src/sys/dev/usb/ukbdmap.c
diff -u src/sys/dev/usb/ukbdmap.c:1.28 src/sys/dev/usb/ukbdmap.c:1.29
--- src/sys/dev/usb/ukbdmap.c:1.28	Fri Apr 16 11:29:06 2010
+++ src/sys/dev/usb/ukbdmap.c	Mon Jul 14 10:05:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $	*/
+/*	$NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $");
 
 #include 
 #include 
@@ -416,6 +416,28 @@ Static const keysym_t ukbd_keydesc_fr[] 
 KC(230), KS_Mode_switch,	KS_Multi_key,
 };
 
+Static const keysym_t ukbd_keydesc_be[] = {
+/*  pos	 normal		shifted		altgr		shift-altgr */
+KC(30),  KS_ampersand,	KS_1,		KS_bar,
+KC(31),  KS_eacute,		KS_2,		KS_at,
+KC(33),  KS_apostrophe,	KS_4,
+KC(34),  KS_parenleft,	KS_5,
+KC(35),  KS_section,	KS_6,		KS_asciicircum,
+KC(36),  KS_egrave,		KS_7,
+KC(37),  KS_exclam,		KS_8,
+KC(38),  KS_ccedilla,	KS_9,		KS_braceleft,
+KC(39),  KS_agrave,		KS_0,		KS_braceright,
+KC(45),  KS_parenright,	KS_degree,
+KC(46),  KS_minus,		KS_underscore,
+KC(47),  KS_dead_circumflex, KS_dead_diaeresis,	KS_bracketleft,
+KC(48),  KS_dollar,		KS_asterisk,	KS_bracketright,
+KC(50),  KS_mu,		KS_sterling,	KS_grave,
+KC(52),  KS_ugrave,		KS_percent,	KS_acute,
+KC(53),  KS_twosuperior,	KS_threesuperior,
+KC(56),  KS_equal,		KS_plus,	KS_asciitilde,
+KC(100), KS_less,		KS_greater,	KS_backslash,
+};
+
 Static const keysym_t ukbd_keydesc_it[] = {
 /*  pos  normal		shifted		altgr		shift-altgr */
 KC(31),  KS_2,		KS_quotedbl,	KS_twosuperior,
@@ -611,6 +633,7 @@ const struct wscons_keydesc ukbd_keydesc
 	KBD_MAP(KB_DE | KB_NODEAD,	KB_DE,	ukbd_keydesc_de_nodead),
 	KBD_MAP(KB_FR,  KB_US,  ukbd_keydesc_fr),
 	KBD_MAP(KB_FR | KB_SWAPCTRLCAPS,KB_FR,	ukb

CVS commit: src/share/man/man4

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 12:47:14 UTC 2014

Modified Files:
src/share/man/man4: netintro.4

Log Message:
Add a description of SIOCGIFALIAS.  From Jens A Nilsson via PR misc/6880.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/netintro.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/netintro.4
diff -u src/share/man/man4/netintro.4:1.27 src/share/man/man4/netintro.4:1.28
--- src/share/man/man4/netintro.4:1.27	Sun Oct  6 08:27:00 2013
+++ src/share/man/man4/netintro.4	Sun Jul 13 12:47:13 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: netintro.4,v 1.27 2013/10/06 08:27:00 wiz Exp $
+.\"	$NetBSD: netintro.4,v 1.28 2014/07/13 12:47:13 mbalmer Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)netintro.4	8.2 (Berkeley) 11/30/93
 .\"
-.Dd October 5, 2013
+.Dd July 13, 2014
 .Dt NETINTRO 4
 .Os
 .Sh NAME
@@ -285,6 +285,12 @@ multiple masks or destination addresses,
 convention that specification of the default address means
 to delete the first address for the interface belonging to
 the address family in which the original socket was opened.
+.It Dv SIOCGIFALIAS
+This request provides means to get additional addresses together
+with netmask and broadcast/destination from an interface.
+It also uses the
+.Ar ifaliasreq
+structure.
 .El
 .Pp
 Request making use of the

CVS commit: src

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 12:29:01 UTC 2014

Modified Files:
src/distrib/sets/lists/base: mi
Added Files:
src/share/wscons/keymaps: pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5
pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5
pckbd.bg.qwerty.koi8-r

Log Message:
Add the five bulgarian keymaps we got via PR misc/37713 from mark...@gmail.com.


To generate a diff of this commit:
cvs rdiff -u -r1.1072 -r1.1073 src/distrib/sets/lists/base/mi
cvs rdiff -u -r0 -r1.1 src/share/wscons/keymaps/pckbd.bg.bds.cp1251 \
src/share/wscons/keymaps/pckbd.bg.bds.iso8859-5 \
src/share/wscons/keymaps/pckbd.bg.qwerty.cp1251 \
src/share/wscons/keymaps/pckbd.bg.qwerty.iso8859-5 \
src/share/wscons/keymaps/pckbd.bg.qwerty.koi8-r

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1072 src/distrib/sets/lists/base/mi:1.1073
--- src/distrib/sets/lists/base/mi:1.1072	Tue Jul  8 05:55:33 2014
+++ src/distrib/sets/lists/base/mi	Sun Jul 13 12:29:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1072 2014/07/08 05:55:33 spz Exp $
+# $NetBSD: mi,v 1.1073 2014/07/13 12:29:01 mbalmer Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -4827,6 +4827,11 @@
 ./usr/share/wscons/keymaps/mkbd.pt.iso8859-1	base-util-share		share
 ./usr/share/wscons/keymaps/mkbd.pt.iso8859-2	base-obsolete		obsolete
 ./usr/share/wscons/keymaps/pckbd.be.azerty	base-util-share		share
+./usr/share/wscons/keymaps/pckbd.bg.bds.cp1251	base-util-share		share
+./usr/share/wscons/keymaps/pckbd.bg.bds.iso8859-5	base-util-share		share
+./usr/share/wscons/keymaps/pckbd.bg.qwerty.cp1251	base-util-share		share
+./usr/share/wscons/keymaps/pckbd.bg.qwerty.iso8859-5	base-util-share		share
+./usr/share/wscons/keymaps/pckbd.bg.qwerty.koi8-r	base-util-share		share
 ./usr/share/wscons/keymaps/pckbd.br.abnt2	base-util-share		share
 ./usr/share/wscons/keymaps/pckbd.de_CH.iso8859-1	base-util-share		share
 ./usr/share/wscons/keymaps/pckbd.de_CH.iso8859-2	base-obsolete	obsolete

Added files:

Index: src/share/wscons/keymaps/pckbd.bg.bds.cp1251
diff -u /dev/null src/share/wscons/keymaps/pckbd.bg.bds.cp1251:1.1
--- /dev/null	Sun Jul 13 12:29:01 2014
+++ src/share/wscons/keymaps/pckbd.bg.bds.cp1251	Sun Jul 13 12:29:01 2014
@@ -0,0 +1,111 @@
+# $NetBSD: pckbd.bg.bds.cp1251,v 1.1 2014/07/13 12:29:01 mbalmer Exp $
+#
+# This is a BDS (typewriter) CP1251 keymap. Cyrillic input is toggled
+# by pressing the AltGr key.
+# From M. K.  per PR misc/37713.
+
+keycode 1 = Cmd_Debugger Escape
+keycode 2 = 1 exclam 1 exclam
+keycode 3 = 2 at 2 question
+keycode 4 = 3 numbersign 3 plus
+keycode 5 = 4 dollar 4 quotedbl
+keycode 6 = 5 percent 5 percent
+keycode 7 = 6 asciicircum 6 equal
+keycode 8 = 7 ampersand 7 colon
+keycode 9 = 8 asterisk 8 slash
+keycode 10 = 9 parenleft 9 minus
+keycode 11 = 0 parenright 0 onesuperior
+keycode 12 = minus underscore minus I
+keycode 13 = equal plus period V
+keycode 14 = Cmd_ResetEmul Delete
+keycode 15 = Tab
+keycode 16 = q Q comma ucircumflex
+keycode 17 = w W oacute Oacute
+keycode 18 = e E aring Aring
+keycode 19 = r R egrave Egrave
+keycode 20 = t T oslash Ooblique
+keycode 21 = y Y ugrave Ugrave
+keycode 22 = u U ecircumflex Ecircumflex
+keycode 23 = i I ntilde Ntilde
+keycode 24 = o O adiaeresis Adiaeresis
+keycode 25 = p P ccedilla Ccedilla
+keycode 26 = bracketleft braceleft odiaeresis Odiaeresis
+keycode 27 = bracketright braceright semicolon section
+keycode 28 = Return
+keycode 29 = Cmd1 Control_L
+keycode 30 = a A udiaeresis Udiaeresis
+keycode 31 = s S ydiaeresis ssharp
+keycode 32 = d D agrave Agrave
+keycode 33 = f F icircumflex Icircumflex
+keycode 34 = g G ae AE
+keycode 35 = h H atilde Atilde
+keycode 36 = j J ograve Ograve
+keycode 37 = k K iacute Iacute
+keycode 38 = l L acircumflex Acircumflex
+keycode 39 = semicolon colon igrave Igrave
+keycode 40 = apostrophe quotedbl division multiply
+keycode 41 = grave asciitilde
+keycode 42 = Shift_L
+keycode 43 = backslash bar parenleft parenright
+keycode 44 = z Z thorn THORN
+keycode 45 = x X eacute Eacute
+keycode 46 = c C uacute Uacute
+keycode 47 = v V yacute Yacute
+keycode 48 = b B ocircumflex Ocircumflex
+keycode 49 = n N otilde Otilde
+keycode 50 = m M idiaeresis Idiaeresis
+keycode 51 = comma less eth ETH
+keycode 52 = period greater ediaeresis Ediaeresis
+keycode 53 = slash question aacute Aacute
+keycode 54 = Shift_R
+keycode 55 = KP_Multiply
+keycode 56 = Cmd2 Alt_L
+keycode 57 = space
+keycode 58 = Caps_Lock
+keycode 59 = Cmd_Screen0 f1 F1
+keycode 60 = Cmd_Screen1 f2 F2
+keycode 61 = Cmd_Screen2 f3 F3
+keycode 62 = Cmd_Screen3 f4 F4
+keycode 63 = Cmd_Screen4 f5 F5
+keycode 64 = Cmd_Screen5 f6 F6
+keycode 65 = Cmd_Screen6 f7 F7
+keycode 66 = Cmd_Screen7 f8 F8
+keycode 67 = Cmd_Screen8 f

CVS commit: src/share/man/man9

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 11:08:46 UTC 2014

Modified Files:
src/share/man/man9: audio.9

Log Message:
Fix a typo in a function name.  Found by Nat Sloss, thanks.
Fixes PR misc/46446.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/audio.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/audio.9
diff -u src/share/man/man9/audio.9:1.43 src/share/man/man9/audio.9:1.44
--- src/share/man/man9/audio.9:1.43	Wed Nov 23 23:11:56 2011
+++ src/share/man/man9/audio.9	Sun Jul 13 11:08:46 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.9,v 1.43 2011/11/23 23:11:56 jmcneill Exp $
+.\"	$NetBSD: audio.9,v 1.44 2014/07/13 11:08:46 mbalmer Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 23, 2011
+.Dd July 13, 2014
 .Dt AUDIO 9
 .Os
 .Sh NAME
@@ -207,7 +207,7 @@ support 8bit mu-law, but 16bit slinear_l
 .Dv pfil-\*[Gt]append()
 with
 .Va pfil ,
-.Va mulaw_to_slinear16 ,
+.Va mulaw_to_linear16 ,
 and audio_params_t representing [8000Hz, slinear_le, 16/16bit, 2ch].
 If the driver needs multiple conversions, a conversion nearest to the
 hardware should be set to the head of

CVS commit: src/share/man/man9

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 11:03:26 UTC 2014

Modified Files:
src/share/man/man9: cardbus.9

Log Message:
Don't lie about the CardBus device database.  Diff from Jukka Ruohonen.
Fixes PR misc/39625.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/cardbus.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/cardbus.9
diff -u src/share/man/man9/cardbus.9:1.18 src/share/man/man9/cardbus.9:1.19
--- src/share/man/man9/cardbus.9:1.18	Mon Jan  6 14:57:10 2014
+++ src/share/man/man9/cardbus.9	Sun Jul 13 11:03:26 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: cardbus.9,v 1.18 2014/01/06 14:57:10 njoly Exp $
+.\" $NetBSD: cardbus.9,v 1.19 2014/07/13 11:03:26 mbalmer Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 15, 2010
+.Dd July 13, 2014
 .Dt CARDBUS 9
 .Os
 .Sh NAME
@@ -309,13 +309,9 @@ The CardBus subsystem itself is implemen
 .Pa sys/dev/cardbus/cardbus_map.c
 and
 .Pa sys/dev/cardbus/cardslot.c .
-The database of known devices exists within the file
-.Pa sys/dev/cardbus/cardbus_data.h
-and is generated automatically from the file
-.Pa sys/dev/cardbus/cardbusdevs .
-New vendor and product identifiers should be added to this file.
-The database can be regenerated using the Makefile
-.Pa sys/dev/cardbus/Makefile.cardbusdevs .
+The database for PCI devices is also used for known CardBus devices.
+For more details see
+.Xr pci 9 .
 .Sh SEE ALSO
 .Xr cardbus 4 ,
 .Xr pcmcia 4 ,

CVS commit: src/share/man/man7

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 09:32:05 UTC 2014

Modified Files:
src/share/man/man7: tests.atf.7

Log Message:
Add a missing word; found by Maxime Villard, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man7/tests.atf.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man7/tests.atf.7
diff -u src/share/man/man7/tests.atf.7:1.5 src/share/man/man7/tests.atf.7:1.6
--- src/share/man/man7/tests.atf.7:1.5	Wed May 21 12:13:18 2014
+++ src/share/man/man7/tests.atf.7	Sun Jul 13 09:32:05 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: tests.atf.7,v 1.5 2014/05/21 12:13:18 wiz Exp $
+.\"	$NetBSD: tests.atf.7,v 1.6 2014/07/13 09:32:05 mbalmer Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 20, 2014
+.Dd July 13, 2014
 .Dt TESTS 7
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@ The
 test suite provides a collection of automated tests for two major purposes.
 On the one hand, the test suite aids
 .Em developers
-in catching bugs and regressions in the code when they performing modifications
-to the source tree.
+in catching bugs and regressions in the code when they are performing
+modifications to the source tree.
 On the other hand, the test suite allows
 .Em end users
 (and, in particular, system administrators) to verify that fresh installations

CVS commit: src/share/man/man4

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 08:43:29 UTC 2014

Modified Files:
src/share/man/man4: acpi.4

Log Message:
Fix asus(4) entry.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/share/man/man4/acpi.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/acpi.4
diff -u src/share/man/man4/acpi.4:1.75 src/share/man/man4/acpi.4:1.76
--- src/share/man/man4/acpi.4:1.75	Tue Apr 10 13:48:24 2012
+++ src/share/man/man4/acpi.4	Sun Jul 13 08:43:29 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.75 2012/04/10 13:48:24 jruoho Exp $
+.\" $NetBSD: acpi.4,v 1.76 2014/07/13 08:43:29 mbalmer Exp $
 .\"
 .\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 10, 2012
+.Dd July 13, 2014
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -266,7 +266,7 @@ support for Windows Management Instrumen
 watchdogs.
 .It Xr aibs 4
 ASUSTeK voltage, temperature and fan sensors.
-.It asus
+.It asus 4
 ASUS laptop hotkeys.
 .It Xr attimer 4
 AT Timer.

CVS commit: src

2014-07-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Jul 13 08:37:13 UTC 2014

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
Added Files:
src/share/man/man4: asus.4

Log Message:
Add a man page for asus(4), written by Leonardo Taccari as part of PR/39932.


To generate a diff of this commit:
cvs rdiff -u -r1.1478 -r1.1479 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.614 -r1.615 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/asus.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1478 src/distrib/sets/lists/man/mi:1.1479
--- src/distrib/sets/lists/man/mi:1.1478	Tue Jul  8 05:55:34 2014
+++ src/distrib/sets/lists/man/mi	Sun Jul 13 08:37:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1478 2014/07/08 05:55:34 spz Exp $
+# $NetBSD: mi,v 1.1479 2014/07/13 08:37:13 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -862,6 +862,7 @@
 ./usr/share/man/cat4/arp.0			man-sys-catman		.cat
 ./usr/share/man/cat4/artsata.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ast.0			man-sys-catman		.cat
+./usr/share/man/cat4/asus.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ata.0			man-sys-catman		.cat
 ./usr/share/man/cat4/atabus.0			man-sys-catman		.cat
 ./usr/share/man/cat4/atalk.0			man-sys-catman		.cat
@@ -3908,6 +3909,7 @@
 ./usr/share/man/html4/arp.html			man-sys-htmlman		html
 ./usr/share/man/html4/artsata.html		man-sys-htmlman		html
 ./usr/share/man/html4/ast.html			man-sys-htmlman		html
+./usr/share/man/html4/asus.html			man-sys-htmlman		html
 ./usr/share/man/html4/ata.html			man-sys-htmlman		html
 ./usr/share/man/html4/atabus.html		man-sys-htmlman		html
 ./usr/share/man/html4/atalk.html		man-sys-htmlman		html
@@ -6717,6 +6719,7 @@
 ./usr/share/man/man4/arp.4			man-sys-man		.man
 ./usr/share/man/man4/artsata.4			man-sys-man		.man
 ./usr/share/man/man4/ast.4			man-sys-man		.man
+./usr/share/man/man4/asus.4			man-sys-man		.man
 ./usr/share/man/man4/ata.4			man-sys-man		.man
 ./usr/share/man/man4/atabus.4			man-sys-man		.man
 ./usr/share/man/man4/atalk.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.614 src/share/man/man4/Makefile:1.615
--- src/share/man/man4/Makefile:1.614	Sun May 18 11:46:23 2014
+++ src/share/man/man4/Makefile	Sun Jul 13 08:37:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.614 2014/05/18 11:46:23 kardel Exp $
+#	$NetBSD: Makefile,v 1.615 2014/07/13 08:37:13 mbalmer Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -6,7 +6,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	adc.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \
 	ahcisata.4 ahd.4 \
 	aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 amdpm.4 amdtemp.4 amhphy.4 \
-	amr.4 aps.4 \
+	amr.4 aps.4 asus.4 \
 	an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
 	ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \
 	auacer.4 audio.4 audiocs.4 auich.4 \

Added files:

Index: src/share/man/man4/asus.4
diff -u /dev/null src/share/man/man4/asus.4:1.1
--- /dev/null	Sun Jul 13 08:37:13 2014
+++ src/share/man/man4/asus.4	Sun Jul 13 08:37:13 2014
@@ -0,0 +1,76 @@
+.\" $NetBSD: asus.4,v 1.1 2014/07/13 08:37:13 mbalmer Exp $
+.\"
+.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd November 15, 2008
+.Dt ASUS 4
+.Os
+.Sh NAME
+.Nm asus
+.Nd ASUS hotkeys
+.Sh SYNOPSIS
+.Cd "asus*  at acpi?"
+.Sh DESCRIPTION
+The
+.Nm
+dr

CVS commit: src/share/misc

2014-07-12 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Jul 12 15:19:47 UTC 2014

Modified Files:
src/share/misc: airport

Log Message:
Add HCJ. About a dozen mountain tops where nuked to make place for the runway,
see http://cdn2.spiegel.de/images/image-723855-galleryV9-jjgv.jpg


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/share/misc/airport

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.52 src/share/misc/airport:1.53
--- src/share/misc/airport:1.52	Fri Mar 28 10:16:28 2014
+++ src/share/misc/airport	Sat Jul 12 15:19:47 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.52 2014/03/28 10:16:28 apb Exp $
+#	$NetBSD: airport,v 1.53 2014/07/12 15:19:47 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -2837,6 +2837,7 @@ HBZ:Heber Springs Municipal Airport, AR,
 HCA:Big Spring, TX, USA
 HCB:Shoal Cove, AK, USA
 HCD:Hutchinson (Butler Field), MN, USA
+HCJ:Hechi Jinchengjiang Airport, China
 HCM:Ell, Somalia
 HCQ:Halls Creek, Western Australia, Australia
 HCR:Holy Cross Airport, AK, USA

CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:45:44 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
add a nice CVS marker


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/misc/world.phone

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/world.phone
diff -u src/share/misc/world.phone:1.2 src/share/misc/world.phone:1.3
--- src/share/misc/world.phone:1.2	Mon Mar 10 18:44:29 2014
+++ src/share/misc/world.phone	Mon Mar 10 18:45:44 2014
@@ -1,3 +1,4 @@
+# $NetBSD: world.phone,v 1.3 2014/03/10 18:45:44 mbalmer Exp $
 # Country Name:Country code:IDD International prefix:NDD national prefix
 Afghanistan:93:00:0:
 Albania:355:00:0:

CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:44:29 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
note that kropla.com/dialcode.htm redirects to countrycode.org


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/misc/world.phone

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/world.phone
diff -u src/share/misc/world.phone:1.1 src/share/misc/world.phone:1.2
--- src/share/misc/world.phone:1.1	Sat Jul  7 21:35:27 2001
+++ src/share/misc/world.phone	Mon Mar 10 18:44:29 2014
@@ -258,4 +258,4 @@ Zimbabwe:263:00:0
 #   is 1; the numbers that follow function similar to area codes in
 #   the U.S. and Canada.
 # ~ Await a second tone at this stage 
-# From: http://kropla.com/dialcode.htm
+# From: http://kropla.com/dialcode.htm (redirects to http://countrycode.org)

CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:22:54 UTC 2014

Modified Files:
src/share/misc: language

Log Message:
reformat comment


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/misc/language

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/language
diff -u src/share/misc/language:1.3 src/share/misc/language:1.4
--- src/share/misc/language:1.3	Sat Sep 13 21:53:19 2003
+++ src/share/misc/language	Mon Mar 10 18:22:54 2014
@@ -1,13 +1,13 @@
-# $NetBSD: language,v 1.3 2003/09/13 21:53:19 kleink Exp $
+# $NetBSD: language,v 1.4 2014/03/10 18:22:54 mbalmer Exp $
 #
 # ISO 639-1 and 639-2 Language Codes
 #
 # The format of an entry is:
 # 
 #
-# Further information can be found at the ISO 639/Joint Advisory Committee
-# (ISO 639/JAC) web site,
-# .
+# Further information can be found at the ISO 639/Joint Advisory Committee (JAC)
+# web site, http://lcweb.loc.gov/standards/iso639-2/iso639jac.html.
+#
 # This list is up-to-date as of 2003-08-04.
 #
 Abkhazian	abk	ab

CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 17:56:21 UTC 2014

Modified Files:
src/share/misc: acronyms

Log Message:
add UGT


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/share/misc/acronyms

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.222 src/share/misc/acronyms:1.223
--- src/share/misc/acronyms:1.222	Wed Mar  5 03:51:25 2014
+++ src/share/misc/acronyms	Mon Mar 10 17:56:21 2014
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.222 2014/03/05 03:51:25 ginsbach Exp $
+$NetBSD: acronyms,v 1.223 2014/03/10 17:56:21 mbalmer Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -521,6 +521,7 @@ TWIAVBP	the world is a very big place
 TY	thank you
 TYVM	thank you very much
 U/L	upload
+UGT	universal greeting time
 UTSL	use the source, Luke
 VCR	video cassette recorder
 VEG	very evil grin

CVS commit: xsrc/external/mit/xf86-input-elographics/dist/src

2014-01-08 Thread Marc Balmer

Module Name:xsrc
Committed By:   mbalmer
Date:   Wed Jan  8 12:48:41 UTC 2014

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c

Log Message:
Add support for touchscreens that don't frame the packets (usually USB devices
like e.g. the IBM SurePos touchscreens).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.5 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.6
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.5	Wed Jan  8 12:46:48 2014
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c	Wed Jan  8 12:48:41 2014
@@ -103,6 +103,7 @@ static Model SupportedModels[] =
  ***
  */
 #define ELO_PACKET_SIZE		10
+#define ELO_UNFRAMED_SIZE	8
 
 #define ELO_SYNC_BYTE		'U'	/* Sync byte. First of a packet.	*/
 #define ELO_TOUCH		'T'	/* Report of touchs and motions. Not	*
@@ -196,6 +197,8 @@ typedef struct _EloPrivateRec {
   int		swap_axes;		/* Swap X an Y axes if != 0 */
   unsigned char	packet_buf[ELO_PACKET_SIZE]; /* Assembly buffer*/
   int		model;			/* one of MODEL_...*/
+  Bool		no_framing;		/* Whether packets are framed */
+
 } EloPrivateRec, *EloPrivatePtr;
 
 /*
@@ -303,6 +306,45 @@ xf86EloGetPacket(unsigned char	*buffer,
   }
 }
 
+/*
+ ***
+ *
+ * xf86EloGetUnframedPacket --
+ *	Read an unframed packet from the port
+ *  The packet structure read by this function is as follow:
+ *		Byte 0 : ELO_TOUCH
+ *		Byte 1
+ *		...
+ *		Byte 8 : packet data
+ *
+ *	This function returns if a valid packet has been assembled in
+ *	buffer or if no more data is available.
+ *
+ *
+ ***
+ */
+static Bool
+xf86EloGetUnframedPacket(unsigned char	*buffer,
+		 int		fd)
+{
+  int	num_bytes;
+  Bool	ok;
+
+  SYSCALL(num_bytes = read(fd,
+			   (char *) (buffer),
+			   ELO_UNFRAMED_SIZE));
+
+  /*
+   * Okay, give up.
+   */
+  if (num_bytes != ELO_UNFRAMED_SIZE) {
+Error("System error while reading from Elographics touchscreen.");
+return !Success;
+  }
+  DBG(4, ErrorF("Read %d bytes\n", num_bytes));
+
+  return Success;
+}
 
 /*
  ***
@@ -343,12 +385,17 @@ xf86EloReadInput(InputInfoPtr	pInfo)
* one packet worth of data in the OS buffer.
*/
   do {
-  if(xf86EloGetPacket(priv->packet_buf,
+  if (priv->no_framing) {
+if(xf86EloGetUnframedPacket(&priv->packet_buf[1],
+   pInfo->fd) != Success)
+continue;
+  } else {
+if(xf86EloGetPacket(priv->packet_buf,
 		   &priv->packet_buf_p,
 		   &priv->checksum,
 		   pInfo->fd) != Success)
   continue;
-
+  }
   /*
* Process only ELO_TOUCHs here.
*/
@@ -917,7 +964,7 @@ xf86EloAllocate(InputDriverPtr drv, Inpu
   priv->checksum = ELO_INIT_CHECKSUM;
   priv->packet_buf_p = 0;
   priv->swap_axes = 0;
-
+  priv->no_framing = 0;
   pInfo->device_control = xf86EloControl;
   pInfo->read_input   = xf86EloReadInput;
   pInfo->control_proc = NULL;
@@ -1023,6 +1070,8 @@ xf86EloInit(InputDriverPtr	drv,
   if (priv->swap_axes) {
 xf86Msg(X_CONFIG, "Elographics device will work with X and Y axes swapped\n");
   }
+  priv->no_framing = xf86SetIntOption(pInfo->options, "NoFraming", 0);
+  xf86Msg(X_CONFIG, "Elographics no framing: %d\n", priv->no_framing);
   debug_level = xf86SetIntOption(pInfo->options, "DebugLevel", 0);
   if (debug_level) {
 #if DEBUG

CVS commit: xsrc/external/mit/xf86-input-elographics/dist/src

2014-01-08 Thread Marc Balmer

Module Name:xsrc
Committed By:   mbalmer
Date:   Wed Jan  8 12:46:48 UTC 2014

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c

Log Message:
Add support for inverted axis, from upstream repository.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.4 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.5
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.4	Fri Jul 26 13:37:37 2013
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c	Wed Jan  8 12:46:48 2014
@@ -360,6 +360,22 @@ xf86EloReadInput(InputInfoPtr	pInfo)
   cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
   state = priv->packet_buf[2] & 0x07;
 
+  DBG(5, ErrorF("ELO got: x(%d), y(%d), %s\n",
+  cur_x, cur_y,
+  (state == ELO_PRESS) ? "Press" :
+			((state == ELO_RELEASE) ? "Release" : "Stream")));
+
+  if (priv->min_y > priv->max_y) {
+/* inverted y axis */
+cur_y = priv->max_y - cur_y + priv->min_y;
+  }
+
+  if (priv->min_x > priv->max_x) {
+/* inverted x axis */
+cur_x = priv->max_x - cur_x + priv->min_x;
+  }
+
+
   /*
* Send events.
*
@@ -676,6 +692,7 @@ xf86EloControl(DeviceIntPtr	dev,
   unsigned char		reply[ELO_PACKET_SIZE];
   Atom btn_label;
   Atom axis_labels[2] = { 0, 0 };
+  int x0, x1, y0, y1;
 
   switch(mode) {
 
@@ -719,17 +736,27 @@ xf86EloControl(DeviceIntPtr	dev,
 	return !Success;
   }
   else {
+
+	/* Correct the coordinates for possibly inverted axis.
+	   Leave priv->variables untouched so we can check for
+	   inversion on incoming events.
+	 */
+	y0 = min(priv->min_y, priv->max_y);
+	y1 = max(priv->min_y, priv->max_y);
+	x0 = min(priv->min_x, priv->max_x);
+	x1 = max(priv->min_x, priv->max_x);
+
 	/* I will map coordinates myself */
 	InitValuatorAxisStruct(dev, 0,
 			   axis_labels[0],
-			   priv->min_x, priv->max_x,
+			   x0, x1,
 			   9500,
 			   0 /* min_res */,
 			   9500  /* max_res */,
 			   Absolute);
 	InitValuatorAxisStruct(dev, 1,
 			   axis_labels[1],
-			   priv->min_y, priv->max_y,
+			   y0, y1,
 			   10500,
 			   0 /* min_res */,
 			   10500 /* max_res */,
@@ -848,6 +875,11 @@ xf86EloControl(DeviceIntPtr	dev,
 DBG(2, ErrorF("Done\n"));
 return Success;
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+  case DEVICE_ABORT:
+return Success;
+#endif
+
   default:
   ErrorF("unsupported mode=%d\n", mode);
   return BadValue;

CVS commit: src/share/man/man3lua

2014-01-07 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Jan  7 21:54:17 UTC 2014

Modified Files:
src/share/man/man3lua: gpio.3lua syslog.3lua

Log Message:
Use 5.2 usage pattern in the synopsis.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man3lua/gpio.3lua
cvs rdiff -u -r1.2 -r1.3 src/share/man/man3lua/syslog.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man3lua/gpio.3lua
diff -u src/share/man/man3lua/gpio.3lua:1.3 src/share/man/man3lua/gpio.3lua:1.4
--- src/share/man/man3lua/gpio.3lua:1.3	Mon Jan  6 09:25:08 2014
+++ src/share/man/man3lua/gpio.3lua	Tue Jan  7 21:54:17 2014
@@ -1,6 +1,7 @@
-.\"	$NetBSD: gpio.3lua,v 1.3 2014/01/06 09:25:08 wiz Exp $
+.\"	$NetBSD: gpio.3lua,v 1.4 2014/01/07 21:54:17 mbalmer Exp $
 .\"
-.\" Copyright (c) 2013 Marc Balmer . All rights reserved.
+.\" Copyright (c) 2013, 2014 Marc Balmer .
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd October 27, 2013
+.Dd Januar 7, 2014
 .Dt GPIO 3lua
 .Os
 .Sh NAME
@@ -36,7 +37,7 @@
 .Xr gpio 4
 pins from Lua
 .Sh SYNOPSIS
-.Cd "require 'gpio'"
+.Cd "local gpio = require 'gpio'"
 .Pp
 .Bl -tag -width  -compact
 .It Dv gpiodev = gpio.open(path)

Index: src/share/man/man3lua/syslog.3lua
diff -u src/share/man/man3lua/syslog.3lua:1.2 src/share/man/man3lua/syslog.3lua:1.3
--- src/share/man/man3lua/syslog.3lua:1.2	Mon Jan  6 09:23:18 2014
+++ src/share/man/man3lua/syslog.3lua	Tue Jan  7 21:54:17 2014
@@ -1,6 +1,7 @@
-.\"	$NetBSD: syslog.3lua,v 1.2 2014/01/06 09:23:18 wiz Exp $
+.\"	$NetBSD: syslog.3lua,v 1.3 2014/01/07 21:54:17 mbalmer Exp $
 .\"
-.\" Copyright (c) 2013 Marc Balmer . All rights reserved.
+.\" Copyright (c) 2013, 2014 Marc Balmer .
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd November 13, 2013
+.Dd January 7, 2014
 .Dt SYSLOG 3lua
 .Os
 .Sh NAME
@@ -36,7 +37,7 @@
 .Xr syslog 3
 functionality from Lua
 .Sh SYNOPSIS
-.Cd "require 'syslog'"
+.Cd "local syslog = require 'syslog'"
 .Pp
 .Bl -tag -width  -compact
 .It Dv syslog.openlog(ident, logopt, facility)

CVS commit: src/sys/dev/ic

2013-12-15 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sun Dec 15 15:55:39 UTC 2013

Modified Files:
src/sys/dev/ic: com.c

Log Message:
lcr is only used when COM_16650 is defined; unbreak the build


To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 src/sys/dev/ic/com.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.318 src/sys/dev/ic/com.c:1.319
--- src/sys/dev/ic/com.c:1.318	Sun Dec 15 11:06:57 2013
+++ src/sys/dev/ic/com.c	Sun Dec 15 15:55:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.318 2013/12/15 11:06:57 skrll Exp $ */
+/* $NetBSD: com.c,v 1.319 2013/12/15 15:55:39 mbalmer Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.318 2013/12/15 11:06:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.319 2013/12/15 15:55:39 mbalmer Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -385,7 +385,9 @@ com_attach_subr(struct com_softc *sc)
 {
 	struct com_regs *regsp = &sc->sc_regs;
 	struct tty *tp;
+#ifdef COM_16650
 	u_int8_t lcr;
+#endif
 	const char *fifo_msg = NULL;
 	prop_dictionary_t	dict;
 	bool is_console = true;

CVS commit: src/usr.bin/calendar/calendars

2013-12-05 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Thu Dec  5 22:06:13 UTC 2013

Modified Files:
src/usr.bin/calendar/calendars: calendar.history

Log Message:
Nelson Mandela died today, aged 95. I whish farewell to a great statesman.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/calendar/calendars/calendar.history

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/calendar/calendars/calendar.history
diff -u src/usr.bin/calendar/calendars/calendar.history:1.29 src/usr.bin/calendar/calendars/calendar.history:1.30
--- src/usr.bin/calendar/calendars/calendar.history:1.29	Sun Nov 11 20:25:19 2012
+++ src/usr.bin/calendar/calendars/calendar.history	Thu Dec  5 22:06:13 2013
@@ -502,6 +502,7 @@
 12/05	End of Prohibition, 1933 (at least the alcohol part)
 12/05	Phi Beta Kappa founded, 1776
 12/05	The Eighteenth Amendment repealed, ending Prohibition, 1933
+12/05	Nelson Mandela dies aged 95, 2013
 12/07	Japan bombs Pearl Harbor, 1941
 12/09	Ball-bearing roller skates patented, 1884
 12/10	Metric system established in France, 1799

CVS commit: src/distrib/sets/lists/comp

2013-11-26 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Nov 26 09:35:33 UTC 2013

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
obsolete CIRCLEQ man pages


To generate a diff of this commit:
cvs rdiff -u -r1.1863 -r1.1864 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1863 src/distrib/sets/lists/comp/mi:1.1864
--- src/distrib/sets/lists/comp/mi:1.1863	Tue Nov 26 01:36:07 2013
+++ src/distrib/sets/lists/comp/mi	Tue Nov 26 09:35:32 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1863 2013/11/26 01:36:07 christos Exp $
+#	$NetBSD: mi,v 1.1864 2013/11/26 09:35:32 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -11249,24 +11249,24 @@
 ./usr/share/man/html3/BN_set_bit.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/BN_swap.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/BN_zero.html		comp-c-htmlman		crypto,html
-./usr/share/man/html3/CIRCLEQ_EMPTY.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_ENTRY.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_FIRST.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_FOREACH.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_FOREACH_REVERSE.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_HEAD.html		comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_HEAD_INITIALIZER.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_INIT.html		comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_INSERT_AFTER.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_INSERT_BEFORE.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_INSERT_HEAD.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_INSERT_TAIL.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_LAST.html		comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_LOOP_NEXT.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_LOOP_PREV.html	comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_NEXT.html		comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_PREV.html		comp-c-htmlman		html
-./usr/share/man/html3/CIRCLEQ_REMOVE.html	comp-c-htmlman		html
+./usr/share/man/html3/CIRCLEQ_EMPTY.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_ENTRY.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_FIRST.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_FOREACH.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_FOREACH_REVERSE.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_HEAD.html		comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_HEAD_INITIALIZER.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_INIT.html		comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_INSERT_AFTER.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_INSERT_BEFORE.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_INSERT_HEAD.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_INSERT_TAIL.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_LAST.html		comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_LOOP_NEXT.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_LOOP_PREV.html	comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_NEXT.html		comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_PREV.html		comp-obsolete		obsolete
+./usr/share/man/html3/CIRCLEQ_REMOVE.html	comp-obsolete		obsolete
 ./usr/share/man/html3/CMSG_DATA.html		comp-c-htmlman		html
 ./usr/share/man/html3/CMSG_FIRSTHDR.html	comp-c-htmlman		html
 ./usr/share/man/html3/CMSG_LEN.html		comp-c-htmlman		html
@@ -17665,24 +17665,24 @@
 ./usr/share/man/man3/BN_set_bit.3		comp-c-man		crypto,.man
 ./usr/share/man/man3/BN_swap.3			comp-c-man		crypto,.man
 ./usr/share/man/man3/BN_zero.3			comp-c-man		crypto,.man
-./usr/share/man/man3/CIRCLEQ_EMPTY.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_ENTRY.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_FIRST.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_FOREACH.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_FOREACH_REVERSE.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_HEAD.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_HEAD_INITIALIZER.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_INIT.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_INSERT_AFTER.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_INSERT_BEFORE.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_INSERT_HEAD.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_INSERT_TAIL.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_LAST.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_LOOP_NEXT.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_LOOP_PREV.3	comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_NEXT.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_PREV.3		comp-c-man		.man
-./usr/share/man/man3/CIRCLEQ_REMOVE.3		comp-c-man		.man
+./usr/share/man/m

CVS commit: src/sys/modules/lua

2013-11-23 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Nov 23 15:53:37 UTC 2013

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
switch from malloc(9) to kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.4 src/sys/modules/lua/lua.c:1.5
--- src/sys/modules/lua/lua.c:1.4	Tue Oct 29 17:35:04 2013
+++ src/sys/modules/lua/lua.c	Sat Nov 23 15:53:37 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.4 2013/10/29 17:35:04 mbalmer Exp $ */
+/*	$NetBSD: lua.c,v 1.5 2013/11/23 15:53:37 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2011, 2013 by Marc Balmer .
@@ -36,9 +36,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -212,7 +212,7 @@ lua_detach(device_t self, int flags)
 		if (lua_verbose)
 			device_printf(self, "state %s destroyed\n",
 			s->lua_name);
-		free(s, NULL);
+		kmem_free(s, sizeof(struct lua_state));
 	}
 	mutex_destroy(&sc->sc_lock);
 	cv_destroy(&sc->sc_inuse_cv);
@@ -506,12 +506,20 @@ lua_require(lua_State *L)
 void *
 lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 {
+	void *nptr;
+
 	if (nsize == 0) {
+		nptr = NULL;
 		if (ptr != NULL)
-			free(ptr, NULL);
-		return NULL;
-	} else
-		return realloc(ptr, nsize, ud, 0);
+			kmem_free(ptr, osize);
+	} else {
+		nptr = kmem_alloc(nsize, KM_SLEEP);
+		if (ptr != NULL) {
+			memcpy(nptr, ptr, osize);
+			kmem_free(ptr, osize);
+		}
+	}
+	return nptr;
 }
 
 static const char *
@@ -556,9 +564,7 @@ lua_mod_register(const char *name, int (
 	LIST_FOREACH(m, &lua_modules, mod_next)
 		if (!strcmp(m->mod_name, name))
 			return EBUSY;
-	m = malloc(sizeof(struct lua_module), NULL, M_ZERO);
-	if (m == NULL)
-		return ENOMEM;
+	m = kmem_zalloc(sizeof(struct lua_module), KM_SLEEP);
 	strlcpy(m->mod_name, name, LUA_MAX_MODNAME);
 	m->open = open;
 	m->refcount = 0;
@@ -577,7 +583,7 @@ lua_mod_unregister(const char *name)
 		if (!strcmp(m->mod_name, name)) {
 			if (m->refcount == 0) {
 LIST_REMOVE(m, mod_next);
-free(m, NULL);
+kmem_free(m, sizeof(struct lua_module));
 if (lua_verbose)
 	device_printf(sc_self,
 	"unregistered lua module %s\n",
@@ -597,10 +603,7 @@ klua_newstate(lua_Alloc f, void *ud, con
 	struct lua_softc *sc;
 	int error = 0;
 
-	s = malloc(sizeof(struct lua_state), NULL, M_ZERO);
-	if (s == NULL)
-		return NULL;
-
+	s = kmem_zalloc(sizeof(struct lua_state), KM_SLEEP);
 	sc = device_private(sc_self);
 	mutex_enter(&sc->sc_state_lock);
 	while (sc->sc_state == true) {
@@ -615,13 +618,11 @@ klua_newstate(lua_Alloc f, void *ud, con
 	if (error)
 		return NULL;
 
-	K = malloc(sizeof(klua_State), NULL, M_ZERO);
-	if (K == NULL)
-		goto finish;
+	K = kmem_zalloc(sizeof(klua_State), KM_SLEEP);
 	K->L = lua_newstate(f, ud);
 	K->ks_user = false;
 	if (K->L == NULL) {
-		free(K, NULL);
+		kmem_free(K, sizeof(klua_State));
 		K = NULL;
 		goto finish;
 	}
@@ -687,13 +688,13 @@ klua_close(klua_State *K)
 			LIST_REMOVE(s, lua_next);
 			LIST_FOREACH(m, &s->lua_modules, mod_next)
 m->refcount--;
-			free(s, NULL);
+			kmem_free(s, sizeof(struct lua_state));
 		}
 
 	lua_close(K->L);
 	cv_destroy(&K->ks_inuse_cv);
 	mutex_destroy(&K->ks_lock);
-	free(K, NULL);
+	kmem_free(K, sizeof(klua_State));
 
 	mutex_enter(&sc->sc_state_lock);
 	sc->sc_state = false;

CVS commit: src/libexec/httpd

2013-11-18 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Nov 19 07:51:56 UTC 2013

Modified Files:
src/libexec/httpd: lua-bozo.c

Log Message:
fix bad free


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/libexec/httpd/lua-bozo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/httpd/lua-bozo.c
diff -u src/libexec/httpd/lua-bozo.c:1.7 src/libexec/httpd/lua-bozo.c:1.8
--- src/libexec/httpd/lua-bozo.c:1.7	Wed Nov 13 21:46:22 2013
+++ src/libexec/httpd/lua-bozo.c	Tue Nov 19 07:51:56 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua-bozo.c,v 1.7 2013/11/13 21:46:22 christos Exp $	*/
+/*	$NetBSD: lua-bozo.c,v 1.8 2013/11/19 07:51:56 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2013 Marc Balmer 
@@ -445,7 +445,6 @@ out:
 	free(uri);
 	free(info);
 	free(query);
-	free(command);
 	free(file);
 	return rv;
 }

CVS commit: src

2013-11-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Nov 13 20:55:08 UTC 2013

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man3lua: Makefile intro.3lua
Added Files:
src/share/man/man3lua: syslog.3lua

Log Message:
Document syslog(3lua).


To generate a diff of this commit:
cvs rdiff -u -r1.1449 -r1.1450 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.3 -r1.4 src/share/man/man3lua/Makefile \
src/share/man/man3lua/intro.3lua
cvs rdiff -u -r0 -r1.1 src/share/man/man3lua/syslog.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1449 src/distrib/sets/lists/man/mi:1.1450
--- src/distrib/sets/lists/man/mi:1.1449	Tue Nov 12 21:58:37 2013
+++ src/distrib/sets/lists/man/mi	Wed Nov 13 20:55:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1449 2013/11/12 21:58:37 pettai Exp $
+# $NetBSD: mi,v 1.1450 2013/11/13 20:55:08 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -650,6 +650,7 @@
 ./usr/share/man/cat3lua/gpio.write.0		man-sys-catman		.cat
 ./usr/share/man/cat3lua/intro.0			man-sys-catman		.cat
 ./usr/share/man/cat3lua/sqlite.0		man-sys-catman		.cat
+./usr/share/man/cat3lua/syslog.0		man-sys-catman		.cat
 ./usr/share/man/cat4/aac.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ac97.0			man-sys-catman		.cat
 ./usr/share/man/cat4/acardide.0			man-sys-catman		.cat
@@ -3698,6 +3699,7 @@
 ./usr/share/man/html3lua/gpio.write.html	man-sys-htmlman		html
 ./usr/share/man/html3lua/intro.html		man-sys-htmlman		html
 ./usr/share/man/html3lua/sqlite.html		man-sys-htmlman		html
+./usr/share/man/html3lua/syslog.html		man-sys-htmlman		html
 ./usr/share/man/html4/aac.html			man-sys-htmlman		html
 ./usr/share/man/html4/ac97.html			man-sys-htmlman		html
 ./usr/share/man/html4/acardide.html		man-sys-htmlman		html
@@ -6420,6 +6422,7 @@
 ./usr/share/man/man3lua/gpio.write.3lua		man-sys-man		.man
 ./usr/share/man/man3lua/intro.3lua		man-sys-man		.man
 ./usr/share/man/man3lua/sqlite.3lua		man-sys-man		.man
+./usr/share/man/man3lua/syslog.3lua		man-sys-man		.man
 ./usr/share/man/man4/aac.4			man-sys-man		.man
 ./usr/share/man/man4/ac97.4			man-sys-man		.man
 ./usr/share/man/man4/acardide.4			man-sys-man		.man

Index: src/share/man/man3lua/Makefile
diff -u src/share/man/man3lua/Makefile:1.3 src/share/man/man3lua/Makefile:1.4
--- src/share/man/man3lua/Makefile:1.3	Sun Oct 27 12:47:54 2013
+++ src/share/man/man3lua/Makefile	Wed Nov 13 20:55:08 2013
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2013/10/27 12:47:54 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.4 2013/11/13 20:55:08 mbalmer Exp $
 
-MAN=	gpio.3lua intro.3lua sqlite.3lua
+MAN=	gpio.3lua intro.3lua sqlite.3lua syslog.3lua
 
 MLINKS+=gpio.3lua gpio.open.3lua \
 	gpio.3lua gpio.info.3lua \
Index: src/share/man/man3lua/intro.3lua
diff -u src/share/man/man3lua/intro.3lua:1.3 src/share/man/man3lua/intro.3lua:1.4
--- src/share/man/man3lua/intro.3lua:1.3	Mon Nov  4 08:04:18 2013
+++ src/share/man/man3lua/intro.3lua	Wed Nov 13 20:55:08 2013
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.3lua,v 1.3 2013/11/04 08:04:18 mbalmer Exp $
+.\"	$NetBSD: intro.3lua,v 1.4 2013/11/13 20:55:08 mbalmer Exp $
 .\"
 .\" Copyright (c) 2013 Marc Balmer . All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd November 4, 2013
+.Dd November 13, 2013
 .Dt INTRO 3lua
 .Os
 .Sh NAME
@@ -49,6 +49,10 @@ pins.
 Access
 .Xr sqlite3 1
 files.
+.It Em syslog
+Acces
+.Xr syslog 3
+functionality.
 .El
 .Sh SEE ALSO
 .Xr lua 1 ,

Added files:

Index: src/share/man/man3lua/syslog.3lua
diff -u /dev/null src/share/man/man3lua/syslog.3lua:1.1
--- /dev/null	Wed Nov 13 20:55:08 2013
+++ src/share/man/man3lua/syslog.3lua	Wed Nov 13 20:55:08 2013
@@ -0,0 +1,216 @@
+.\"	$NetBSD: syslog.3lua,v 1.1 2013/11/13 20:55:08 mbalmer Exp $
+.\"
+.\" Copyright (c) 2013 Marc Balmer . All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\"may be used to endorse or promote products derived from this software
+.\"without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPL

CVS commit: src

2013-11-13 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Wed Nov 13 09:49:08 UTC 2013

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips md.amd64 md.sparc64 shl.mi
src/lib/lua: Makefile

Log Message:
Add the syslog(3) Lua binding to the build.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.217 -r1.218 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.204 -r1.205 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.678 -r1.679 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/lib/lua/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.27 src/distrib/sets/lists/base/ad.arm:1.28
--- src/distrib/sets/lists/base/ad.arm:1.27	Fri Nov  8 19:21:01 2013
+++ src/distrib/sets/lists/base/ad.arm	Wed Nov 13 09:49:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.27 2013/11/08 19:21:01 christos Exp $
+# $NetBSD: ad.arm,v 1.28 2013/11/13 09:49:08 mbalmer Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -333,6 +333,7 @@
 ./usr/lib/oabi/lua/5.1base-compat-shlib	compat
 ./usr/lib/oabi/lua/5.1/gpio.so			base-compat-shlib	compat,pic
 ./usr/lib/oabi/lua/5.1/sqlite.so		base-compat-shlib	compat,pic
+./usr/lib/oabi/lua/5.1/syslog.so		base-compat-shlib	compat,pic
 ./usr/lib/oabi/npfbase-obsolete		obsolete
 ./usr/lib/oabi/npf/ext_log.so			base-obsolete		obsolete
 ./usr/lib/oabi/npf/ext_log.so.0			base-obsolete		obsolete

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.22 src/distrib/sets/lists/base/ad.mips:1.23
--- src/distrib/sets/lists/base/ad.mips:1.22	Fri Nov  8 19:21:01 2013
+++ src/distrib/sets/lists/base/ad.mips	Wed Nov 13 09:49:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.22 2013/11/08 19:21:01 christos Exp $
+# $NetBSD: ad.mips,v 1.23 2013/11/13 09:49:08 mbalmer Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -329,6 +329,7 @@
 ./usr/lib/64/lua/5.1base-compat-shlib	compat,arch64
 ./usr/lib/64/lua/5.1/gpio.so			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/lua/5.1/sqlite.so			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/lua/5.1/syslog.so			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/npfbase-obsolete		obsolete
 ./usr/lib/64/npf/ext_log.so			base-obsolete		obsolete
 ./usr/lib/64/npf/ext_log.so.0			base-obsolete		obsolete
@@ -660,6 +661,7 @@
 ./usr/lib/o32/lua/5.1base-compat-shlib	compat,arch64
 ./usr/lib/o32/lua/5.1/gpio.so			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/lua/5.1/sqlite.so			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/lua/5.1/syslog.so			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/npfbase-obsolete		obsolete
 ./usr/lib/o32/npf/ext_log.so			base-obsolete		obsolete
 ./usr/lib/o32/npf/ext_log.so.0			base-obsolete		obsolete

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.217 src/distrib/sets/lists/base/md.amd64:1.218
--- src/distrib/sets/lists/base/md.amd64:1.217	Fri Nov  8 19:21:01 2013
+++ src/distrib/sets/lists/base/md.amd64	Wed Nov 13 09:49:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.217 2013/11/08 19:21:01 christos Exp $
+# $NetBSD: md.amd64,v 1.218 2013/11/13 09:49:08 mbalmer Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./lib/i386	base-compat-shlib		compat
@@ -327,6 +327,7 @@
 ./usr/lib/i386/lua/5.1base-compat-shlib	compat
 ./usr/lib/i386/lua/5.1/gpio.so			base-compat-shlib	compat,pic
 ./usr/lib/i386/lua/5.1/sqlite.so		base-compat-shlib	compat,pic
+./usr/lib/i386/lua/5.1/syslog.so		base-compat-shlib	compat,pic
 ./usr/lib/i386/npfbase-obsolete		obsolete
 ./usr/lib/i386/npf/ext_log.so			base-obsolete		obsolete
 ./usr/lib/i386/npf/ext_log.so.0			base-obsolete		obsolete

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.204 src/distrib/sets/lists/base/md.sparc64:1.205
--- src/distrib/sets/lists/base/md.sparc64:1.204	Fri Nov  8 19:21:01 2013
+++ src/distrib/sets/lists/base/md.sparc64	Wed Nov 13 09:49:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.204 2013/11/08 19:21:01 christos Exp $
+# $NetBSD: md.sparc64,v 1.205 2013/11/13 09:49:08 mbalmer Exp $
 ./lib/sparc	base-npf-shlib		compat
 ./lib/sparc/npf	base-npf-shlib		compat
 ./lib/sparc/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -320,6 +320,7 @@
 ./usr/lib/sparc/lua/5.1base-compat-shlib	compat
 ./usr/lib/sparc/lua/5.1/gpio.so			base-compat-shlib	compat,pic
 ./usr/lib/sparc/lua/5.1/sqlite.so		base-compat-shlib	compat,pic
+./usr/lib/sparc/lua/5.1

CVS commit: src

2013-11-12 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Nov 12 17:46:21 UTC 2013

Modified Files:
src/distrib/sets/lists/games: mi
src/games: Makefile
Added Files:
src/games/hals_end: Makefile hals_end.6 hals_end.c

Log Message:
hals_end(6) outputs the last words of the supercomputer HAL 9000 aboard
the spaceship in Stanley Kubrick's famous film "2001 - A Space Odissey".
The source code and output of this program were used to illustrate
an article in the book "Total Interaction".  How this looks in print can
be at http://www.netbsd.org/~mbalmer/hals_end.jpg.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/games/mi
cvs rdiff -u -r1.28 -r1.29 src/games/Makefile
cvs rdiff -u -r0 -r1.1 src/games/hals_end/Makefile \
src/games/hals_end/hals_end.6 src/games/hals_end/hals_end.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/games/mi
diff -u src/distrib/sets/lists/games/mi:1.48 src/distrib/sets/lists/games/mi:1.49
--- src/distrib/sets/lists/games/mi:1.48	Sun Sep  1 18:37:23 2013
+++ src/distrib/sets/lists/games/mi	Tue Nov 12 17:46:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.48 2013/09/01 18:37:23 dholland Exp $
+# $NetBSD: mi,v 1.49 2013/11/12 17:46:21 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -27,6 +27,7 @@
 ./usr/games/fortunegames-utils-bin
 ./usr/games/gomokugames-games-bin
 ./usr/games/hackgames-games-bin
+./usr/games/hals_endgames-games-bin
 ./usr/games/hangmangames-games-bin
 ./usr/games/hide/adventure			games-obsolete		obsolete
 ./usr/games/hide/arithmetic			games-obsolete		obsolete
@@ -214,6 +215,7 @@
 ./usr/share/man/cat6/fortune.0			games-utils-catman	.cat
 ./usr/share/man/cat6/gomoku.0			games-games-catman	.cat
 ./usr/share/man/cat6/hack.0			games-games-catman	.cat
+./usr/share/man/cat6/hals_end.0			games-games-catman	.cat
 ./usr/share/man/cat6/hangman.0			games-games-catman	.cat
 ./usr/share/man/cat6/hunt.0			games-games-catman	.cat
 ./usr/share/man/cat6/huntd.0			games-games-catman	.cat
@@ -268,6 +270,7 @@
 ./usr/share/man/html6/fortune.html		games-utils-htmlman	html
 ./usr/share/man/html6/gomoku.html		games-games-htmlman	html
 ./usr/share/man/html6/hack.html			games-games-htmlman	html
+./usr/share/man/html6/hals_end.html		games-games-htmlman	html
 ./usr/share/man/html6/hangman.html		games-games-htmlman	html
 ./usr/share/man/html6/hunt.html			games-games-htmlman	html
 ./usr/share/man/html6/huntd.html		games-games-htmlman	html
@@ -323,6 +326,7 @@
 ./usr/share/man/man6/fortune.6			games-utils-man		.man
 ./usr/share/man/man6/gomoku.6			games-games-man		.man
 ./usr/share/man/man6/hack.6			games-games-man		.man
+./usr/share/man/man6/hals_end.6			games-games-man		.man
 ./usr/share/man/man6/hangman.6			games-games-man		.man
 ./usr/share/man/man6/hunt.6			games-games-man		.man
 ./usr/share/man/man6/huntd.6			games-games-man		.man

Index: src/games/Makefile
diff -u src/games/Makefile:1.28 src/games/Makefile:1.29
--- src/games/Makefile:1.28	Sun Sep  1 18:37:06 2013
+++ src/games/Makefile	Tue Nov 12 17:46:20 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2013/09/01 18:37:06 dholland Exp $
+#	$NetBSD: Makefile,v 1.29 2013/11/12 17:46:20 mbalmer Exp $
 #	@(#)Makefile	8.3 (Berkeley) 7/24/94
 
 # Missing: dungeon warp
@@ -11,7 +11,7 @@ SUBDIR=	adventure arithmetic atc \
 	backgammon banner battlestar bcd boggle \
 	caesar canfield cgram ching colorbars countmail cribbage \
 	dm factor fish fortune gomoku \
-	hack hangman hunt larn mille monop morse number \
+	hack hals_end hangman hunt larn mille monop morse number \
 	phantasia pig pom ppt primes quiz \
 	rain random robots rogue sail snake tetris trek \
 	wargames worm worms wtf wump

Added files:

Index: src/games/hals_end/Makefile
diff -u /dev/null src/games/hals_end/Makefile:1.1
--- /dev/null	Tue Nov 12 17:46:21 2013
+++ src/games/hals_end/Makefile	Tue Nov 12 17:46:21 2013
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2013/11/12 17:46:21 mbalmer Exp $
+
+PROG=	hals_end
+
+BINDIR=	/usr/games
+
+MAN=	hals_end.6
+
+.include  
Index: src/games/hals_end/hals_end.6
diff -u /dev/null src/games/hals_end/hals_end.6:1.1
--- /dev/null	Tue Nov 12 17:46:21 2013
+++ src/games/hals_end/hals_end.6	Tue Nov 12 17:46:21 2013
@@ -0,0 +1,66 @@
+.\"	$NetBSD: hals_end.6,v 1.1 2013/11/12 17:46:21 mbalmer Exp $
+.\"
+.\" Copyright (c) 2003 - 2013 Marc Balmer .
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reprod

CVS commit: src/lib/lua/syslog

2013-11-12 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Tue Nov 12 14:32:03 UTC 2013

Added Files:
src/lib/lua/syslog: Makefile syslog.c

Log Message:
Add a syslog(3) binding for Lua (not yet linked to the build.)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/lua/syslog/Makefile \
src/lib/lua/syslog/syslog.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/lib/lua/syslog/Makefile
diff -u /dev/null src/lib/lua/syslog/Makefile:1.1
--- /dev/null	Tue Nov 12 14:32:03 2013
+++ src/lib/lua/syslog/Makefile	Tue Nov 12 14:32:03 2013
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2013/11/12 14:32:03 mbalmer Exp $
+
+LUA_MODULES=		syslog
+LUA_SRCS.syslog=	syslog.c
+
+.include 
Index: src/lib/lua/syslog/syslog.c
diff -u /dev/null src/lib/lua/syslog/syslog.c:1.1
--- /dev/null	Tue Nov 12 14:32:03 2013
+++ src/lib/lua/syslog/syslog.c	Tue Nov 12 14:32:03 2013
@@ -0,0 +1,165 @@
+/*	$NetBSD: syslog.c,v 1.1 2013/11/12 14:32:03 mbalmer Exp $ */
+
+/*
+ * Copyright (c) 2013 Marc Balmer 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Lua binding for syslog */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+int luaopen_syslog(lua_State *);
+
+static int
+syslog_openlog(lua_State *L)
+{
+	const char *ident;
+	int option;
+	int facility;
+
+	ident = luaL_checkstring(L, 1);
+	option = luaL_checkinteger(L, 2);
+	facility = luaL_checkinteger(L, 3);
+	openlog(ident, option, facility);
+	return 0;
+}
+
+static int
+syslog_syslog(lua_State *L)
+{
+	syslog(luaL_checkint(L, 1), "%s", luaL_checkstring(L, 2));
+	return 0;
+}
+
+static int
+syslog_closelog(lua_State *L)
+{
+	closelog();
+	return 0;
+}
+
+static int
+syslog_setlogmask(lua_State *L)
+{
+	lua_pushinteger(L, setlogmask(luaL_checkint(L, 1)));
+	return 1;
+}
+
+static void
+syslog_set_info(lua_State *L)
+{
+	lua_pushliteral(L, "_COPYRIGHT");
+	lua_pushliteral(L, "Copyright (C) 2013 by "
+	"Marc Balmer ");
+	lua_settable(L, -3);
+	lua_pushliteral(L, "_DESCRIPTION");
+	lua_pushliteral(L, "syslog binding for Lua");
+	lua_settable(L, -3);
+	lua_pushliteral(L, "_VERSION");
+	lua_pushliteral(L, "syslog 1.0.0");
+	lua_settable(L, -3);
+}
+
+struct constant {
+	const char *name;
+	int value;
+};
+
+#define CONSTANT(NAME)		{ #NAME, NAME }
+
+static struct constant syslog_constant[] = {
+	/* syslog options */
+	CONSTANT(LOG_CONS),
+	CONSTANT(LOG_NDELAY),
+	CONSTANT(LOG_NOWAIT),
+	CONSTANT(LOG_ODELAY),
+	CONSTANT(LOG_PERROR),
+	CONSTANT(LOG_PID),
+
+	/* syslog facilities */
+	CONSTANT(LOG_AUTH),
+	CONSTANT(LOG_AUTHPRIV),
+	CONSTANT(LOG_CRON),
+	CONSTANT(LOG_DAEMON),
+	CONSTANT(LOG_FTP),
+	CONSTANT(LOG_KERN),
+	CONSTANT(LOG_LOCAL0),
+	CONSTANT(LOG_LOCAL1),
+	CONSTANT(LOG_LOCAL2),
+	CONSTANT(LOG_LOCAL3),
+	CONSTANT(LOG_LOCAL4),
+	CONSTANT(LOG_LOCAL5),
+	CONSTANT(LOG_LOCAL6),
+	CONSTANT(LOG_LOCAL7),
+	CONSTANT(LOG_LPR),
+	CONSTANT(LOG_MAIL),
+	CONSTANT(LOG_NEWS),
+	CONSTANT(LOG_SYSLOG),
+	CONSTANT(LOG_USER),
+	CONSTANT(LOG_UUCP),
+
+	/* syslog levels */
+	CONSTANT(LOG_EMERG),
+	CONSTANT(LOG_ALERT),
+	CONSTANT(LOG_CRIT),
+	CONSTANT(LOG_ERR),
+	CONSTANT(LOG_WARNING),
+	CONSTANT(LOG_NOTICE),
+	CONSTANT(LOG_INFO),
+	CONSTANT(LOG_DEBUG),
+
+	{ NULL, 0 }
+};
+
+int
+luaopen_syslog(lua_State *L)
+{
+	int n;
+	struct luaL_Reg luasyslog[] = {
+		{ "openlog",	syslog_openlog },
+		{ "syslog",	syslog_syslog },
+		{ "closelog",	syslog_closelog },
+		{ "setlogmask",	syslog_setlogmask },
+		{ NULL, NULL }
+	};
+
+#if LUA_VERSION_NUM >= 502
+	luaL_newlib(L, luasy

CVS commit: src/share/man/man3lua

2013-11-04 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Mon Nov  4 08:04:18 UTC 2013

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
Use the term "Lua modules" instead of "Lua libraries", list the modules
available.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man3lua/intro.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man3lua/intro.3lua
diff -u src/share/man/man3lua/intro.3lua:1.2 src/share/man/man3lua/intro.3lua:1.3
--- src/share/man/man3lua/intro.3lua:1.2	Sat Oct 26 17:46:48 2013
+++ src/share/man/man3lua/intro.3lua	Mon Nov  4 08:04:18 2013
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.3lua,v 1.2 2013/10/26 17:46:48 mbalmer Exp $
+.\"	$NetBSD: intro.3lua,v 1.3 2013/11/04 08:04:18 mbalmer Exp $
 .\"
 .\" Copyright (c) 2013 Marc Balmer . All rights reserved.
 .\"
@@ -27,15 +27,29 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd October 25, 2013
+.Dd November 4, 2013
 .Dt INTRO 3lua
 .Os
 .Sh NAME
 .Nm intro
-.Nd introduction to the Lua libraries
+.Nd introduction to the Lua modules
 .Sh DESCRIPTION
-This section provides an overview of the Lua libraries, their
+This section provides an overview of the Lua modules, their
 functions, error returns and other common definitions and concepts.
+.Pp
+The Lua modules provided by NetBSD are:
+.Pp
+.Bl -tag -width  -compact
+.It Em gpio
+Access
+.Xr gpio 4
+pins.
+.Pp
+.It Em sqlite
+Access
+.Xr sqlite3 1
+files.
+.El
 .Sh SEE ALSO
 .Xr lua 1 ,
 .Xr luac 1 ,
@@ -43,5 +57,5 @@ functions, error returns and other commo
 .Sh HISTORY
 An
 .Nm
-manual for Lua libraries appeared in
+manual for Lua modules appeared in
 .Nx 7.0 .

1 2 3 4 5 6 >

1 - 100 of 543 matches

Mail list logo