[gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/, dev-lang/lua/files/5.1/

[David Seifert]

commit:     fab25cc8ac44fa73bb14821560ac1ba1829447df
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 08:19:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 08:19:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab25cc8

dev-lang/lua: add 5.1.6

* add two patches from Debian

Bug: https://bugs.gentoo.org/472230
Bug: https://bugs.gentoo.org/627330
Bug: https://bugs.gentoo.org/689598
Bug: https://bugs.gentoo.org/706378
Bug: https://bugs.gentoo.org/765712
Bug: https://bugs.gentoo.org/791451
Bug: https://bugs.gentoo.org/834911
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-lang/lua/Manifest                              |  1 +
 dev-lang/lua/files/5.1/0001-extern_C.patch         | 20 +++++++++
 ...02-Fix-stack-overflow-in-vararg-functions.patch | 17 ++++++++
 dev-lang/lua/lua-5.1.6.ebuild                      | 49 ++++++++++++++++++++++
 4 files changed, 87 insertions(+)

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index b3f323cb8f89..960ea5685673 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,4 +1,5 @@
 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
+DIST lua-5.1.6.tar.xz 397312 BLAKE2B 3555cd8ae8756205935af26399586719c5ab22da75036e553cf935df6463219f33896d72b91271a2bb9244238bef894d469817c8a7c0c8312ac05ec875b0ecbb SHA512 33365c29b6c3bf7c3b6fe764b1525c806cb41b9391f99ca267ccc2deda163afd76fe3f62719ff7f248467f09de11789dffab3c464f7fee108ab9ccfd38df104c
 DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
 DIST lua-5.4.4-tests.tar.gz 134094 BLAKE2B 63f5888a506f504f849fb2000cf551960df8eca3107601dcc8243e8ea5a1b13a70bff7dea4aebe3ab35b7e9df58c2ca44a7a27aa4de82240877eb8d7a017642e SHA512 08b3d764b3f362a2cddf5a23e71b16eea96a234a970fa0048bab358ebbd77f99d9bd132af12254383c5bb5426516e1ce2107e529e88d3963869255f5a41198ef

diff --git a/dev-lang/lua/files/5.1/0001-extern_C.patch b/dev-lang/lua/files/5.1/0001-extern_C.patch
new file mode 100644
index 000000000000..6e4f711f0ecd
--- /dev/null
+++ b/dev-lang/lua/files/5.1/0001-extern_C.patch
@@ -0,0 +1,20 @@
+https://salsa.debian.org/lua-team/lua5.1/-/blob/master/debian/patches/0003-extern_C.patch
+
+From: "John V. Belmonte" <jbelmonte@××××××.org>
+Date: Tue, 26 Aug 2014 16:20:49 +0200
+Subject: extern_C
+
+--- a/src/luaconf.h.in
++++ b/src/luaconf.h.in
+@@ -168,7 +168,11 @@
+ 
+ #else
+ 
++#ifdef __cplusplus
++#define LUA_API		extern "C"
++#else
+ #define LUA_API		extern
++#endif
+ 
+ #endif
+ 

diff --git a/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch b/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch
new file mode 100644
index 000000000000..a3e4019a4596
--- /dev/null
+++ b/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch
@@ -0,0 +1,17 @@
+https://salsa.debian.org/lua-team/lua5.1/-/blob/master/debian/patches/0004-Fix-stack-overflow-in-vararg-functions.patch
+
+From: Enrico Tassi <gareuselesinge@××××××.org>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;

diff --git a/dev-lang/lua/lua-5.1.6.ebuild b/dev-lang/lua/lua-5.1.6.ebuild
new file mode 100644
index 000000000000..663b24b5579f
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline"
+
+DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:= )
+	!dev-lang/lua:0"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${SLOT} )
+
+src_prepare() {
+	! use deprecated && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.1.4-test.patch
+	)
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable deprecated) \
+		$(use_with readline)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
+}