diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-12-09 11:38:56 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-12-09 14:50:40 +0100 |
commit | c8313072bf072d9e2b0f5481aa07ec069cc812da (patch) | |
tree | 90f63b78d9b1ed8dd1139847f7c16d9df830004a /patches/lua-5.1.4 | |
parent | 0d0498774abe6b2789d019a1c5b86b7bb21ac860 (diff) | |
download | ptxdist-c8313072bf072d9e2b0f5481aa07ec069cc812da.tar.gz ptxdist-c8313072bf072d9e2b0f5481aa07ec069cc812da.tar.xz |
lua: regenerate patches
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/lua-5.1.4')
15 files changed, 153 insertions, 122 deletions
diff --git a/patches/lua-5.1.4/0001-Maliciously-crafted-precompiled-code-can-crash-Lua.patch b/patches/lua-5.1.4/0001-Maliciously-crafted-precompiled-code-can-crash-Lua.patch index afd36d296..848fe30c5 100644 --- a/patches/lua-5.1.4/0001-Maliciously-crafted-precompiled-code-can-crash-Lua.patch +++ b/patches/lua-5.1.4/0001-Maliciously-crafted-precompiled-code-can-crash-Lua.patch @@ -1,7 +1,9 @@ -From 293f82d33cd67b7f48e078788af6a4b2887c16bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:05:35 +0100 -Subject: [PATCH 01/11] Maliciously crafted precompiled code can crash Lua +Subject: [PATCH] Maliciously crafted precompiled code can crash Lua +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-1 diff --git a/patches/lua-5.1.4/0002-It-is-possible-to-create-functions-that-return-too-m.patch b/patches/lua-5.1.4/0002-It-is-possible-to-create-functions-that-return-too-m.patch index 428dcfd4e..280fee3db 100644 --- a/patches/lua-5.1.4/0002-It-is-possible-to-create-functions-that-return-too-m.patch +++ b/patches/lua-5.1.4/0002-It-is-possible-to-create-functions-that-return-too-m.patch @@ -1,8 +1,10 @@ -From e5973b1ca3ad83d500f0c85abb78b2a0bf5fbdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:07:18 +0100 -Subject: [PATCH 02/11] It is possible to create functions that return too many arguments and - overflow the stack of C functions. +Subject: [PATCH] It is possible to create functions that return too many + arguments and overflow the stack of C functions. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-2 diff --git a/patches/lua-5.1.4/0003-Wrong-code-generation-for-some-particular-boolean-ex.patch b/patches/lua-5.1.4/0003-Wrong-code-generation-for-some-particular-boolean-ex.patch index 894258719..c599cc6f3 100644 --- a/patches/lua-5.1.4/0003-Wrong-code-generation-for-some-particular-boolean-ex.patch +++ b/patches/lua-5.1.4/0003-Wrong-code-generation-for-some-particular-boolean-ex.patch @@ -1,8 +1,10 @@ -From b40f5fc4341153fc53fa2d0e839223944b022e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:10:56 +0100 -Subject: [PATCH 03/11] Wrong code generation for some particular boolean expressions. (see also - 9) +Subject: [PATCH] Wrong code generation for some particular boolean + expressions. (see also 9) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-3 @@ -15,8 +17,9 @@ Comes from http://www.lua.org/bugs.html#5.1.4-3 Patch: (partial solution; see also 9) Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lcode.c | 22 ++++++++++++++-------- + 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lcode.c b/src/lcode.c index cff626b..84f286b 100644 @@ -67,6 +70,3 @@ index cff626b..84f286b 100644 default: { pc = jumponcond(fs, e, 1); break; --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0004-luaV_settable-may-invalidate-a-reference-to-a-table-.patch b/patches/lua-5.1.4/0004-luaV_settable-may-invalidate-a-reference-to-a-table-.patch index 7fa62f89b..fe118921e 100644 --- a/patches/lua-5.1.4/0004-luaV_settable-may-invalidate-a-reference-to-a-table-.patch +++ b/patches/lua-5.1.4/0004-luaV_settable-may-invalidate-a-reference-to-a-table-.patch @@ -1,7 +1,10 @@ -From 41f746c9be4330bac1466ab994f147aeef88675d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:13:59 +0100 -Subject: [PATCH 04/11] luaV_settable may invalidate a reference to a table and try to reuse it +Subject: [PATCH] luaV_settable may invalidate a reference to a table and try + to reuse it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-4 @@ -10,18 +13,19 @@ Example: -- grandparent = {} grandparent.__newindex = function(s,_,_) print(s) end - + parent = {} parent.__newindex = parent setmetatable(parent, grandparent) - + child = setmetatable({}, parent) child.foo = 10 --> (crash on some machines) -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lvm.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/lvm.c b/src/lvm.c index ee3256a..4ac2e71 100644 @@ -46,6 +50,3 @@ index ee3256a..4ac2e71 100644 } luaG_runerror(L, "loop in settable"); } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0005-debug.getfenv-does-not-check-whether-it-has-an-argum.patch b/patches/lua-5.1.4/0005-debug.getfenv-does-not-check-whether-it-has-an-argum.patch index 02052fdad..40c0e3f51 100644 --- a/patches/lua-5.1.4/0005-debug.getfenv-does-not-check-whether-it-has-an-argum.patch +++ b/patches/lua-5.1.4/0005-debug.getfenv-does-not-check-whether-it-has-an-argum.patch @@ -1,7 +1,9 @@ -From a0e82265587327b15635b61517601cb7c74de07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:18:20 +0100 -Subject: [PATCH 05/11] debug.getfenv does not check whether it has an argument. +Subject: [PATCH] debug.getfenv does not check whether it has an argument. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-5 @@ -12,8 +14,9 @@ Example: -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/ldblib.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ldblib.c b/src/ldblib.c index 67de122..21116ac 100644 @@ -27,6 +30,3 @@ index 67de122..21116ac 100644 lua_getfenv(L, 1); return 1; } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0006-GC-may-get-stuck-during-parsing-and-avoids-proper-re.patch b/patches/lua-5.1.4/0006-GC-may-get-stuck-during-parsing-and-avoids-proper-re.patch index 841a917e4..f748372da 100644 --- a/patches/lua-5.1.4/0006-GC-may-get-stuck-during-parsing-and-avoids-proper-re.patch +++ b/patches/lua-5.1.4/0006-GC-may-get-stuck-during-parsing-and-avoids-proper-re.patch @@ -1,8 +1,11 @@ -From 4a37f37706e3f89d379a827c8da646d34d136c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:20:15 +0100 -Subject: [PATCH 06/11] GC may get stuck during parsing and avoids proper resizing of the string - table, making its lists grow too much and degrading performance. +Subject: [PATCH] GC may get stuck during parsing and avoids proper resizing + of the string table, making its lists grow too much and + degrading performance. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-6 @@ -10,8 +13,9 @@ Comes from http://www.lua.org/bugs.html#5.1.4-6 Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/llex.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/llex.c b/src/llex.c index 6dc3193..92d6575 100644 @@ -29,6 +33,3 @@ index 6dc3193..92d6575 100644 return ts; } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0007-string.format-may-get-buffer-as-an-argument-when-the.patch b/patches/lua-5.1.4/0007-string.format-may-get-buffer-as-an-argument-when-the.patch index 122528e98..cc0c3103b 100644 --- a/patches/lua-5.1.4/0007-string.format-may-get-buffer-as-an-argument-when-the.patch +++ b/patches/lua-5.1.4/0007-string.format-may-get-buffer-as-an-argument-when-the.patch @@ -1,8 +1,10 @@ -From ce47c22d52dcc4996c03e073ddf94398aa42411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:21:46 +0100 -Subject: [PATCH 07/11] string.format may get buffer as an argument when there are missing - arguments and format string is too long. +Subject: [PATCH] string.format may get buffer as an argument when there are + missing arguments and format string is too long. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-7 @@ -14,8 +16,9 @@ Example: -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lstrlib.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/lstrlib.c b/src/lstrlib.c index 1b4763d..fe452ce 100644 @@ -39,6 +42,3 @@ index 1b4763d..fe452ce 100644 strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0008-io.read-n-n-may-return-garbage-if-second-read-fails.patch b/patches/lua-5.1.4/0008-io.read-n-n-may-return-garbage-if-second-read-fails.patch index 080c18f60..5a5d0f27f 100644 --- a/patches/lua-5.1.4/0008-io.read-n-n-may-return-garbage-if-second-read-fails.patch +++ b/patches/lua-5.1.4/0008-io.read-n-n-may-return-garbage-if-second-read-fails.patch @@ -1,7 +1,9 @@ -From 224bbe29a295851544712b4470f7a48f338cddaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:23:53 +0100 -Subject: [PATCH 08/11] io.read("*n", "*n") may return garbage if second read fails. +Subject: [PATCH] io.read("*n", "*n") may return garbage if second read fails. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-8 @@ -13,8 +15,9 @@ Example: -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/liolib.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/liolib.c b/src/liolib.c index e79ed1c..8de2547 100644 @@ -32,6 +35,3 @@ index e79ed1c..8de2547 100644 } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0009-Wrong-code-generation-for-some-particular-boolean-ex.patch b/patches/lua-5.1.4/0009-Wrong-code-generation-for-some-particular-boolean-ex.patch index 0ebb3d732..20c0b1123 100644 --- a/patches/lua-5.1.4/0009-Wrong-code-generation-for-some-particular-boolean-ex.patch +++ b/patches/lua-5.1.4/0009-Wrong-code-generation-for-some-particular-boolean-ex.patch @@ -1,7 +1,10 @@ -From 14c92823c5877a458ddcfa2c90d0b03ea873baa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:25:18 +0100 -Subject: [PATCH 09/11] Wrong code generation for some particular boolean expressions. +Subject: [PATCH] Wrong code generation for some particular boolean + expressions. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-9 @@ -15,8 +18,9 @@ Example: -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lcode.c | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/src/lcode.c b/src/lcode.c index 84f286b..c13066e 100644 @@ -50,6 +54,3 @@ index 84f286b..c13066e 100644 default: { pc = jumponcond(fs, e, 1); break; --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0010-__newindex-metamethod-may-not-work-if-metatable-is-i.patch b/patches/lua-5.1.4/0010-__newindex-metamethod-may-not-work-if-metatable-is-i.patch index c6ce00186..6c9f7e1df 100644 --- a/patches/lua-5.1.4/0010-__newindex-metamethod-may-not-work-if-metatable-is-i.patch +++ b/patches/lua-5.1.4/0010-__newindex-metamethod-may-not-work-if-metatable-is-i.patch @@ -1,7 +1,10 @@ -From 81ff350a91cb1c248e96366eed3049386c5f2cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:27:04 +0100 -Subject: [PATCH 10/11] __newindex metamethod may not work if metatable is its own metatable. +Subject: [PATCH] __newindex metamethod may not work if metatable is its own + metatable. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-10 @@ -16,8 +19,9 @@ Example: -- Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lvm.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/lvm.c b/src/lvm.c index 4ac2e71..ca7bea0 100644 @@ -31,6 +35,3 @@ index 4ac2e71..ca7bea0 100644 luaC_barriert(L, h, val); return; } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/0011-Parser-may-collect-a-prototype-while-building-it.patch b/patches/lua-5.1.4/0011-Parser-may-collect-a-prototype-while-building-it.patch index e3785c990..94ee2e480 100644 --- a/patches/lua-5.1.4/0011-Parser-may-collect-a-prototype-while-building-it.patch +++ b/patches/lua-5.1.4/0011-Parser-may-collect-a-prototype-while-building-it.patch @@ -1,15 +1,18 @@ -From 23449ee61f062a18926f11a216f9906155f259b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <benoit.burnichon@airtag.com> Date: Tue, 6 Dec 2011 14:28:19 +0100 -Subject: [PATCH 11/11] Parser may collect a prototype while building it. +Subject: [PATCH] Parser may collect a prototype while building it. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Comes from http://www.lua.org/bugs.html#5.1.4-11 reported by Ingo van Lil on 13 Oct 2011. Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com> - --- + src/lparser.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lparser.c b/src/lparser.c index 1e2a9a8..a2721d2 100644 @@ -26,6 +29,3 @@ index 1e2a9a8..a2721d2 100644 } --- -1.7.2.5 - diff --git a/patches/lua-5.1.4/remove-Makefile.diff b/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch index 172e31ea0..ebc551739 100644 --- a/patches/lua-5.1.4/remove-Makefile.diff +++ b/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch @@ -1,5 +1,6 @@ -Subject: Add lua support to ptxdist 1.99: remove old Makefile From: Erwin Rol <erwin@erwinrol.com> +Date: Fri, 9 Dec 2011 11:32:11 +0100 +Subject: [PATCH] Add lua support to ptxdist 1.99: remove old Makefile This patch add lua support to ptxdist 1.99. It has a menu entry under scripting languages. And a patch that makes it possible to use autoconf @@ -9,14 +10,15 @@ This part of the patch removes the old Makefile. Signed-off-by: Erwin Rol <erwin@erwinrol.com> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - --- - Makefile | 128 --------------------------------------------------------------- - 1 file changed, 128 deletions(-) + Makefile | 128 -------------------------------------------------------------- + 1 files changed, 0 insertions(+), 128 deletions(-) + delete mode 100644 Makefile -Index: lua-5.1.4/Makefile -=================================================================== ---- lua-5.1.4.orig/Makefile +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index 6e78f66..0000000 +--- a/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# makefile for installing Lua diff --git a/patches/lua-5.1.4/autoconfize.diff b/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch index 4682f3e2d..40ca10742 100644 --- a/patches/lua-5.1.4/autoconfize.diff +++ b/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch @@ -1,5 +1,6 @@ -Subject: Add lua support to ptxdist 1.99: add autoconf files From: Erwin Rol <erwin@erwinrol.com> +Date: Fri, 9 Dec 2011 11:32:12 +0100 +Subject: [PATCH] Add lua support to ptxdist 1.99: add autoconf files This patch add lua support to ptxdist 1.99. It has a menu entry under scripting languages. And a patch that makes it possible to use autoconf @@ -9,17 +10,20 @@ This part of the patch adds the autoconf files. Signed-off-by: Erwin Rol <erwin@erwinrol.com> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - --- - configure.ac | 68 ++++ - etc/lua.pc.in | 32 + - src/luaconf.h.template.in | 777 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 877 insertions(+) + configure.ac | 70 ++++ + etc/lua.pc.in | 32 ++ + src/luaconf.h.template.in | 777 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 879 insertions(+), 0 deletions(-) + create mode 100644 configure.ac + create mode 100644 etc/lua.pc.in + create mode 100644 src/luaconf.h.template.in -Index: lua-5.1.4/configure.ac -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/configure.ac 2011-12-06 11:47:49.675076314 +0100 +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..d879a86 +--- /dev/null ++++ b/configure.ac @@ -0,0 +1,70 @@ +AC_PREREQ([2.67]) +AC_INIT([Autotoolized Lua],[5.1.4],[],[lua-at]) @@ -91,10 +95,11 @@ Index: lua-5.1.4/configure.ac + doc/Makefile + test/Makefile]) +AC_OUTPUT -Index: lua-5.1.4/etc/lua.pc.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/etc/lua.pc.in 2011-12-06 11:44:52.103826880 +0100 +diff --git a/etc/lua.pc.in b/etc/lua.pc.in +new file mode 100644 +index 0000000..7f33cff +--- /dev/null ++++ b/etc/lua.pc.in @@ -0,0 +1,32 @@ +# lua.pc -- pkg-config data for Lua + @@ -128,10 +133,11 @@ Index: lua-5.1.4/etc/lua.pc.in +Cflags: -I${includedir} + +# (end of lua.pc) -Index: lua-5.1.4/src/luaconf.h.template.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/src/luaconf.h.template.in 2011-12-06 11:44:52.103826880 +0100 +diff --git a/src/luaconf.h.template.in b/src/luaconf.h.template.in +new file mode 100644 +index 0000000..41b234d +--- /dev/null ++++ b/src/luaconf.h.template.in @@ -0,0 +1,777 @@ +/* +** $Id: luaconf.h,v 1.82a 2006/04/10 18:27:23 roberto Exp $ diff --git a/patches/lua-5.1.4/automakize.diff b/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch index 0dae7247d..6e9d6b179 100644 --- a/patches/lua-5.1.4/automakize.diff +++ b/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch @@ -1,5 +1,6 @@ -Subject: Add lua support to ptxdist 1.99: add automake files From: Erwin Rol <erwin@erwinrol.com> +Date: Fri, 9 Dec 2011 11:32:12 +0100 +Subject: [PATCH] Add lua support to ptxdist 1.99: add automake files This patch add lua support to ptxdist 1.99. It has a menu entry under scripting languages. And a patch that makes it possible to use autoconf @@ -9,29 +10,46 @@ This part of the patch adds the automake files. Signed-off-by: Erwin Rol <erwin@erwinrol.com> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - --- - Makefile.am | 3 +++ + Makefile.am | 5 +++++ doc/Makefile.am | 5 +++++ etc/Makefile.am | 8 ++++++++ src/Makefile.am | 45 +++++++++++++++++++++++++++++++++++++++++++++ test/Makefile.am | 5 +++++ - 5 files changed, 66 insertions(+) + 5 files changed, 68 insertions(+), 0 deletions(-) + create mode 100644 Makefile.am + create mode 100644 doc/Makefile.am + create mode 100644 etc/Makefile.am + create mode 100644 src/Makefile.am + create mode 100644 test/Makefile.am -Index: lua-5.1.4/doc/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/doc/Makefile.am 2011-12-06 11:49:03.491826945 +0100 +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..de78a24 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ ++SUBDIRS = src doc etc test ++ ++EXTRA_DIST = autogen.sh COPYRIGHT HISTORY INSTALL README +diff --git a/doc/Makefile.am b/doc/Makefile.am +new file mode 100644 +index 0000000..574b6f8 +--- /dev/null ++++ b/doc/Makefile.am @@ -0,0 +1,5 @@ +man1_MANS = lua.1 luac.1 + +EXTRA_DIST = \ + contents.html lua.1 luac.html lua.html manual.html \ + logo.gif luac.1 lua.css readme.html -Index: lua-5.1.4/etc/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/etc/Makefile.am 2011-12-06 11:49:03.491826945 +0100 +diff --git a/etc/Makefile.am b/etc/Makefile.am +new file mode 100644 +index 0000000..23edd92 +--- /dev/null ++++ b/etc/Makefile.am @@ -0,0 +1,8 @@ +include_HEADERS = lua.hpp + @@ -41,20 +59,11 @@ Index: lua-5.1.4/etc/Makefile.am +EXTRA_DIST = \ + all.c lua.ico lua.pc.in noparser.c strict.lua \ + luavs.bat min.c README -Index: lua-5.1.4/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/Makefile.am 2011-12-06 11:50:14.559076265 +0100 -@@ -0,0 +1,5 @@ -+ACLOCAL_AMFLAGS = -I m4 -+ -+SUBDIRS = src doc etc test -+ -+EXTRA_DIST = autogen.sh COPYRIGHT HISTORY INSTALL README -Index: lua-5.1.4/src/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/src/Makefile.am 2011-12-06 11:49:03.491826945 +0100 +diff --git a/src/Makefile.am b/src/Makefile.am +new file mode 100644 +index 0000000..81dfde9 +--- /dev/null ++++ b/src/Makefile.am @@ -0,0 +1,45 @@ +AM_CFLAGS = -Wall + @@ -101,10 +110,11 @@ Index: lua-5.1.4/src/Makefile.am + rm -f luaconf.h luaconf.h.tmp + $(edit) luaconf.h.template > luaconf.h.tmp + mv luaconf.h.tmp luaconf.h -Index: lua-5.1.4/test/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lua-5.1.4/test/Makefile.am 2011-12-06 11:49:03.491826945 +0100 +diff --git a/test/Makefile.am b/test/Makefile.am +new file mode 100644 +index 0000000..bab7eac +--- /dev/null ++++ b/test/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + bisect.lua env.lua fib.lua life.lua printf.lua \ diff --git a/patches/lua-5.1.4/series b/patches/lua-5.1.4/series index 5f3e6b417..746e81918 100644 --- a/patches/lua-5.1.4/series +++ b/patches/lua-5.1.4/series @@ -1,8 +1,8 @@ -remove-Makefile.diff -autoconfize.diff -automakize.diff +# generated by git-ptx-patches +# upstream issues with no content #0001-Maliciously-crafted-precompiled-code-can-crash-Lua.patch #0002-It-is-possible-to-create-functions-that-return-too-m.patch +#tag:upstream --start-number 3 0003-Wrong-code-generation-for-some-particular-boolean-ex.patch 0004-luaV_settable-may-invalidate-a-reference-to-a-table-.patch 0005-debug.getfenv-does-not-check-whether-it-has-an-argum.patch @@ -12,3 +12,8 @@ automakize.diff 0009-Wrong-code-generation-for-some-particular-boolean-ex.patch 0010-__newindex-metamethod-may-not-work-if-metatable-is-i.patch 0011-Parser-may-collect-a-prototype-while-building-it.patch +#tag:autotools --start-number 100 +0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch +0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch +0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch +# 8b90904b0a592303343a57bd635e2ef8 - git-ptx-patches magic |