CVS commit: src/doc

[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/doc

[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.

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

[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.

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

[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, );
   UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+  if (*up1 == *up2)
+return;
   luaC_upvdeccount(L, *up1);
   *up1 = *up2;
   (*up1)->refcount++;

Re: Leak Sanitizer - how to suppress leaks

[Marc Balmer]

Doesn‘t exit clear all resources on posix systems?

> Am 15.09.2019 um 21:42 schrieb David Holland :
> 
>> On Fri, Sep 13, 2019 at 07:03:40PM +0700, Robert Elz wrote:
>> It isn't so much that I think we need to save the cost of doing
>> the free() (though for ps it turns out to be harder than you'd expect
>> to actually get it right) but whether it is worth anyone time and
>> effort to actually work out what is needed (if anything at all).  Since
>> ps simply exits, we know there is no real leak, only the illusion of
>> one very briefly.
> 
> Keep in mind, though, that one of the roles of NetBSD has always been
> to serve as a reference implementation.
> 
> There have been OSes in the past where memory not freed yet at process
> exit is _not_ freed by the system, and there might be again, and in
> cases where it isn't expensive to do so it seems that we may as well
> tidy up properly so that the code will run acceptably on such OSes.
> 
> In cases where it _is_ expensive, or at least where it's expensive to
> figure out, the same argument applies as against garbage collection:
> if you aren't sure what the lifetime of that object is, and the
> program isn't structured in a way that allows being reasomably sure it
> is disposed of exactly once, how can you have confidence in any other
> correctness properties?
> 
> -- 
> David A. Holland
> dholl...@netbsd.org

CVS commit: src/doc

[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/doc

[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.

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

[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.

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

[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, ) != 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

[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.

CVS commit: src/doc

[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

[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/external/mit/lua/dist/src

[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.

CVS commit: src/share/misc

[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/share/misc

[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.

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

[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

[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.

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

[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.

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

[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

[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.

CVS commit: src/doc

[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

[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/share/misc

[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.

CVS commit: src/sys/dev/dm

[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.

CVS commit: src/sys/dev/dm

[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

[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/doc

[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.

CVS commit: src/sys/dev/dm

[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.

CVS commit: src/sys/dev/dm

[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

[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.

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

[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

[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 <mbal...@netbsd.org>.
@@ -514,16 +514,16 @@ lua_require(lua_State *L)
 	if (md != NULL)
 		LIST_FOREACH(s, _states, lua_next)
 			if (s->K->L == L) {
-LIST_FOREACH(m, >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, >lua_modules, mod_next)
+	if (m == md)
+		return 1;
+
 md->refcount++;
 LIST_INSERT_HEAD(>lua_modules, md, mod_next);
 return 1;

CVS commit: src/sys/modules/lua

[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.

CVS commit: src/sys/modules/lua

[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 <mbal...@netbsd.org>.
  * Copyright (c) 2014 by Lourival Vieira Neto <ln...@netbsd.org>.
- * Copyright (c) 2011 - 2014 by Marc Balmer <mbal...@netbsd.org>.
  * 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, _states, lua_next)
 			if (s->K->L == L) {
+LIST_FOREACH(m, >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

[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.

CVS commit: src/sys/modules/lua

[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/sys/modules/lua

[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.

CVS commit: src/share/misc

[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/misc

[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.

CVS commit: src/share/examples/lua

[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.

CVS commit: src/share/examples/lua

[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

[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/share/examples/lua

[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.

CVS commit: src/lib/lua/sqlite

[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 <m...@msys.ch>
+ * Copyright (c) 2011, 2013, 2016, 2017 Marc Balmer <m...@msys.ch>
  * 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/lib/lua/sqlite

[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.

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

[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, );  /* will jump to label if condition is true */
 enterblock(fs, , 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/external/mit/lua/dist/src

[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.

CVS commit: src/doc

[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.

CVS commit: src/doc

[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

[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/doc

[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.

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

[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

[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.

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

[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

[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.

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

[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/src

[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.

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

[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.

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

[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

[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/doc

[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.

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

[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 

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

[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.

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

[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.

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

[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  20152016 Lua.org, PUC-Rio.
+Copyright  20152017 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  19942016 Lua.org, PUC-Rio.
+Copyright  19942017 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  20152016 Lua.org, PUC-Rio.
+Copyright  20152017 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 running 

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

[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

[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

[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: src/external/mit/lua/dist

[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

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

[Marc Balmer]

This went obviously to the wrong place, spz fixed it.  Many thanks, Petra!


Am 23.04.17 um 16:16 schrieb 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 import: external/mit/lua/dist

[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 import: external/mit/lua/dist

[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

[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.

CVS commit: src/doc

[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

[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/share/misc

[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.

CVS commit: src/usr.sbin/wakeonlan

[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 <m...@msys.ch>
+.\" Copyright (c) 2009 - 2017 Marc Balmer <m...@msys.ch>
 .\"
 .\" 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/usr.sbin/wakeonlan

[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.

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

[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

[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.

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

[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.

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

[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

[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.

CVS commit: src/lib/libedit

[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

[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/share/misc

[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.

CVS commit: src/doc

[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/doc

[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.

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

[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.

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

[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(>ms);

CVS commit: src/lib/lua/sqlite

[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.

CVS commit: src/lib/lua/sqlite

[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 <m...@msys.ch>
+ * Copyright (c) 2011, 2013, 2016 Marc Balmer <m...@msys.ch>
  * 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

[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.

CVS commit: src/share/man/man3lua

[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 <mbal...@netbsd.org>. All rights reserved.
+.\" Copyright (c) 2013, 2016 Marc Balmer <mbal...@netbsd.org>.
+.\" 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

Re: CVS commit: src/libexec/httpd

[Marc Balmer]

> Am 03.01.2016 um 23:23 schrieb Kamil Rytarowski <n...@gmx.com>:
> 
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
> 
> It's a good tip.
> 
> I would leave httpd.print as it is right now, to not make a false
> impression that there standard print works. The standard one will
> work, but not for HTTPS.

Oh, I was not suggesting you change the file again, I jsut wanted to note that 
a single line change would have been enough ;)

> 
> On 03.01.2016 11:15, Marc Balmer wrote:
>> Just a note: A better change would have been to just add
>> 
>> print = httpd.print
>> 
>> at the start of the script.  That way the script could still be 
>> used as a normal CGI script with minimal changes.
>> 
>> 
>>> Am 07.12.2015 um 04:11 schrieb Kamil Rytarowski 
>>> <ka...@netbsd.org>:
>>> 
>>> Module Name:src Committed By:   kamil Date: Mon Dec 
>>>  7 03:11:48 
>>> UTC 2015
>>> 
>>> Modified Files: src/libexec/httpd: printenv.lua
>>> 
>>> Log Message: Improve the httpd(8) printenv.lua Lua example
>>> 
>>> Stop using Lua builtin print function and replace them with 
>>> http.* ones. httpd.print and http.write wraps SSL support when 
>>> needed.
>>> 
>>> Print http headers, without them browser may interpret page as 
>>> raw text.
>>> 
>>> No need to hardcode prefix path in the form.
>>> 
>>> Add comments for a user with tips how to use this script.
>>> 
>>> Patch by Travis Paul
>>> 
>>> Closes PR misc/50502
>>> 
>>> 
>>> To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 
>>> src/libexec/httpd/printenv.lua
>>> 
>>> 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/printenv.lua diff -u 
>>> src/libexec/httpd/printenv.lua:1.2 
>>> src/libexec/httpd/printenv.lua:1.3 --- 
>>> src/libexec/httpd/printenv.lua:1.2  Thu Jan  2 08:21:38 2014 +++ 
>>> src/libexec/httpd/printenv.lua  Mon Dec  7 03:11:48 2015 @@ -1,4 
>>> +1,4 @@ --- $NetBSD: printenv.lua,v 1.2 2014/01/02 08:21:38 mrg 
>>> Exp $ +-- $NetBSD: printenv.lua,v 1.3 2015/12/07 03:11:48 kamil 
>>> Exp $
>>> 
>>> -- this small Lua script demonstrates the use of Lua in 
>>> (bozo)httpd -- it will simply output the "environment" @@ -8,6 
>>> +8,10 @@ -- the same value on each invocation.  You can not keep 
>>> state between -- two calls.
>>> 
>>> +-- You can test this example by running the following command: 
>>> +-- /usr/libexec/httpd -b -f -I 8080 -L test printenv.lua . +-- 
>>> and then navigate to: http://127.0.0.1:8080/test/printenv +
>>> local httpd = require 'httpd'
>>> 
>>> function printenv(env, headers, query) @@ -15,12 +19,14 @@ 
>>> function printenv(env, headers, query) -- we get the 
>>> "environment" in the env table, the values are more -- or less 
>>> the same as the variable for a CGI program
>>> 
>>> -   if count == nil then -  count = 1 - end - - -- output a 
>>> header
>>> -   print([[ +  -- output headers using httpd.write() + -- 
>>> httpd.write() will not append newlines +httpd.write("HTTP/1.1 
>>> 200 Ok\r\n") +  httpd.write("Content-Type: text/html\r\n\r\n") +
>>> + -- output html using httpd.print() +  -- you can also use
>>> print() and io.write() but they will not work with SSL +
>>> httpd.print([[   Bozotic Lua
>>> Environment @@ -29,54 +35,58 @@ function printenv(env,
>>> headers, query) Bozotic Lua Environment ]])
>>> 
>>> -   print('module version: ' .. httpd._VERSION .. '') + 
>>> httpd.print('module version: ' .. httpd._VERSION .. '')
>>> 
>>> -   print('Server Environment') +  httpd.print('Server 
>>> Environment') -- print the list of "environment" variables 
>>> for k, v in pairs(env) do - print(k .. '=' .. v .. '') + 
>>> httpd.print(k .. '=' .. v .. '') end
>>> 
>>> -   print('Request Headers') + httpd.print('Request 
>>> Headers') for k, v in pairs(headers) do -  print(k .. '='
>>> .. v .. '') +  httpd.print(k .. '=' .. v .. '') end
>>> 
>>> if query ~= nil then -  print('Query Variables') + 
>>> httpd.print('Query Va

CVS commit: src/share/misc

[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.

CVS commit: src/share/misc

[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

Re: CVS commit: src/usr.sbin/gpioctl

[Marc Balmer]

I suggest that you document these new flags in the gpioctl(8) manual page as 
well.


> Am 06.12.2015 um 08:31 schrieb Michael van Elst <mlel...@netbsd.org>:
> 
> Module Name:  src
> Committed By: mlelstv
> Date: Sun Dec  6 07:31:28 UTC 2015
> 
> Modified Files:
>   src/usr.sbin/gpioctl: gpioctl.c
> 
> Log Message:
> pass new pin configuration flags to driver.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/gpioctl/gpioctl.c
> 
> 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/gpioctl/gpioctl.c
> diff -u src/usr.sbin/gpioctl/gpioctl.c:1.21 
> src/usr.sbin/gpioctl/gpioctl.c:1.22
> --- src/usr.sbin/gpioctl/gpioctl.c:1.21   Thu Jan 29 03:30:06 2015
> +++ src/usr.sbin/gpioctl/gpioctl.cSun Dec  6 07:31:28 2015
> @@ -1,4 +1,4 @@
> -/* $NetBSD: gpioctl.c,v 1.21 2015/01/29 03:30:06 christos Exp $ */
> +/* $NetBSD: gpioctl.c,v 1.22 2015/12/06 07:31:28 mlelstv Exp $ */
> 
> /*
>  * Copyright (c) 2008, 2010, 2011, 2013 Marc Balmer <mbal...@netbsd.org>
> @@ -64,6 +64,18 @@ static const struct bitstr {
>   { GPIO_PIN_INVIN, "iin" },
>   { GPIO_PIN_INVOUT, "iout" },
>   { GPIO_PIN_PULSATE, "pulsate" },
> + { GPIO_PIN_ALT0, "alt0" },
> + { GPIO_PIN_ALT1, "alt1" },
> + { GPIO_PIN_ALT2, "alt2" },
> + { GPIO_PIN_ALT3, "alt3" },
> + { GPIO_PIN_ALT4, "alt4" },
> + { GPIO_PIN_ALT5, "alt5" },
> + { GPIO_PIN_ALT6, "alt6" },
> + { GPIO_PIN_ALT7, "alt7" },
> + { GPIO_PIN_ALT7, "events" },
> + { GPIO_PIN_ALT7, "level" },
> + { GPIO_PIN_ALT7, "falling" },
> + { GPIO_PIN_USER, "user" },
>   { 0, NULL },
> };
> 
> 

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

[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/mit/lua/dist/src

[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.