diff options
Diffstat (limited to 'dev-lang/lua')
| -rw-r--r-- | dev-lang/lua/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/lua/files/lua-5.4.6-sparc-tests.patch | 44 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.4.6.ebuild | 5 |
3 files changed, 51 insertions, 1 deletions
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index e0d3b60e4388..57a3658d4adf 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -2,6 +2,7 @@ AUX 5.1/0001-extern_C.patch 375 BLAKE2B 0895a21a49accbcba7efad34aa4fae6648085962 AUX 5.1/0002-Fix-stack-overflow-in-vararg-functions.patch 650 BLAKE2B 6d29d902110b903b8354b52d721a61f64216fd6b9b81bf11fe0117c7533724af147dc4de1895b017174a5e0385c2a44a6ef9f2d76cb71e517a83d2b32f31de71 SHA512 feefcda0982bcd03988fbaa95b50a33eca9f26ea39c1db5292f5b1ff240cf0a8124c185207b534e4b8ac777fde97d11405c3278c7382365ad9d6e7cdc7868a23 AUX lua-5.1.4-test.patch 271 BLAKE2B 1b8d2fd524d34fce99315d03232984a3cd1ad74fb23a7794a9886613bc96cdd1d48c82913c5b1ebf0765b3e51d5fcba2dfedd8eb9cf62e63e6998036447319fd SHA512 963bd2c53714eb067a55ee4d84b465ee96b2d3de71498bc83ecb4f8de70d59d6574703b36c621b9969d3f595a2c794095aae0d9c59cc02d5778ce0e7a1da8247 AUX lua-5.4.4-lparser-overread.patch 1096 BLAKE2B 5d00f81304fbd2097e83ca3c8ba774972db4d4f2524a842667e94a930bf4dcaba4311b292adfd929d116da9fddf3458db2f89e1ee582fe1074ca6cfcd0ce79a6 SHA512 b31c15f6dbef77b5ed78ce43fd9d0a3b702f5fdb7eb542719651f7054c939b5f0b8171551cb1edddc1abe4c36b670be3b118a893b56b28354c9c1a35903bdefa +AUX lua-5.4.6-sparc-tests.patch 1444 BLAKE2B 46ae9fa66d87301f29ae05db9ac4e39eaca8a970c0839923838cb852cb6f0295bee4b73060625d51489b1f70580d0e7179a88a4c93c68fdb9cb63941b7916a80 SHA512 2694fc8e2915d07bbba4fdf70a929afe124f409d2c0a4b74569cf8d71802173b8f02c9c44cc37172fa5c0ef7b971fec07b97991c8321c0fb90e71350c5137200 DIST lua-5.1.5.tar.xz 397416 BLAKE2B ef3880d78be1def383a9db6753b7aec4160f6fa8719529c2ea6266015771a23a1be81424520de10bb087a86081f1ec48c58c36eb8b24bff53adb6bd8d791e31b SHA512 bd827cb2e63cd71d15d846eb29c8745bf869e7b70e12c565ce173623d1fcd29dabf4d33a99c48f294151bb580d830c112cf178e2d80a5a5c36acc7b3bfcd7d24 DIST lua-5.3.6.tar.xz 541220 BLAKE2B c356cec06b14cdcbb29e382c951491432a3189618f9fd8c8832bdc8c831640fbcb9e212db05b61a577633c5fe9831e75a158cb97720c1e51cab27544526c9e24 SHA512 9a632a90806fa71398d70be7d38769065c1258fd94709cef72236753b42131b8d30da2a5dd28c74211ef8d04b0c30f52d0c593d49c2e8686568c8896b69577d7 DIST lua-5.4.4.tar.xz 606456 BLAKE2B ba6cad647c0171e5e737151b189b5b404948c08182e9f17d7974a6c6c3b7d99b03cf930add863188db22674b8613fc600d771f62f9dfc99232aab9caea9b073c SHA512 8f3950ed5972a29d7c79e72af617526f6b9f6be7ab268e66206d7e453acc2564541c9d01e2de08a7e9046ab24c66b02167e48a0d5764753befd95dc922b61219 @@ -9,5 +10,5 @@ DIST lua-5.4.6.tar.xz 608376 BLAKE2B bec47685a24be429fa930ac02e6930300ad77105c56 EBUILD lua-5.1.5-r200.ebuild 1169 BLAKE2B eb6959855c20535a0187960a6490d7bcb3a667f6a8ac0a1cbf0e9104d2ad9d97add2684529a24dec24c70975b2a5a0b4e8b690b2f9a4ea216df254516f4d3c27 SHA512 5f3b4a000b50a601b20c5e31bdef9c6df3b8dbf7f07689cc8fb6ac89561c7f8883b89daea8ba7bfeb88ffb0cac290c1ec007aa430835ec291d7ca7c5437cb1e8 EBUILD lua-5.3.6-r102.ebuild 1355 BLAKE2B 211f8ad0f2f0313c70881e0af8f22e82810abadd18adb93bf8f035f0c6d3b258cbc69ed9fb831f62986d5c5c7e2192125d397adf1daf843daa6193c791d26d63 SHA512 71a376e1cb1562cc832d4c1c01788f8e3b381ed7dcadd3e5e9d033dc9fdc269e49994ba3656a18cbf75e8692d2e7e29b5874ec71ffc666629036db351abdca8b EBUILD lua-5.4.4-r103.ebuild 1394 BLAKE2B 8fa293bd028381813b82f96b994b4317ae0a98ace338afdecbec4bc6da5d98cf8a674ec2d7b3d5c8e752abbc31fff7d4970a540c4002b47b78ff3229371a1675 SHA512 76981085660284d7d49749440e4e9048b80f42450f8bcee0fa42c81523d5d57a7d6e8c6b61cae667b5a6afaccbda634e2f73260750621e85b8af0f65d382645b -EBUILD lua-5.4.6.ebuild 1341 BLAKE2B c2b94ba28af1acc17bd18f3d3a2cd7c78639fa91a490f98b99241a2dbd4c1f4f77b0064ff3d82c9e77c06b28d7671cd42309a91491652ca7b36427673a459e08 SHA512 78ba32dadfd16570d153aee43aee482d2c5c8db0441772da41725a3892b1c0c396300c510e9fa1574e9f7eccc82c3fc06c9d71ffb39313c64e6f0ae268912ee3 +EBUILD lua-5.4.6.ebuild 1471 BLAKE2B a35c0e41f9d1ede20ba9655d0442c8e994ebe0c3a75273aca1e6e224fdd9048d6a6d22e3d2e3cf3484fb10a14c2188d3058fcce1b13fe81672368530ba5d9563 SHA512 465eca9c2ab13a3fef0e54b3667276e646875100ca6f5ea3ae6576ebd9017c61e916f9ae5cf75c4e4ca3da8f5078ee14334a13caa726886d9038dcfd2df3eccd MISC metadata.xml 531 BLAKE2B 19b9857f40565977f08d20b76cc444f2e736b040d68afc50b8697ca771345a7393aad5dc0d27251c59ea3a47840465ce76fad315d91b63758cb969bbfdc94fce SHA512 fef206f3d804206a8f0941767e27a46b0237d528125512b49a368ae15ab90750ad40a1261699f22e8f53274a1ea129b392becada0f4757d712b9197733093793 diff --git a/dev-lang/lua/files/lua-5.4.6-sparc-tests.patch b/dev-lang/lua/files/lua-5.4.6-sparc-tests.patch new file mode 100644 index 000000000000..29515aad1639 --- /dev/null +++ b/dev-lang/lua/files/lua-5.4.6-sparc-tests.patch @@ -0,0 +1,44 @@ +https://github.com/lua/lua/commit/6baee9ef9d5657ab582c8a4b9f885ec58ed502d0 +https://bugs.gentoo.org/914562 + +From 6baee9ef9d5657ab582c8a4b9f885ec58ed502d0 Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy <roberto@inf.puc-rio.br> +Date: Fri, 8 Sep 2023 16:19:21 -0300 +Subject: [PATCH] Removed test for "corrupted binary dump" + +Test is too non portable. (For instance, it does not work for +different number types.) +--- a/src/lundump.c ++++ b/src/lundump.c +@@ -81,7 +81,7 @@ static size_t loadUnsigned (LoadState *S, size_t limit) { + + + static size_t loadSize (LoadState *S) { +- return loadUnsigned(S, ~(size_t)0); ++ return loadUnsigned(S, MAX_SIZET); + } + + +--- a/tests/calls.lua ++++ b/tests/calls.lua +@@ -342,20 +342,6 @@ do -- another bug (in 5.4.0) + end + + +-do -- another bug (since 5.2) +- -- corrupted binary dump: list of upvalue names is larger than number +- -- of upvalues, overflowing the array of upvalues. +- local code = +- "\x1b\x4c\x75\x61\x54\x00\x19\x93\x0d\x0a\x1a\x0a\x04\x08\x08\x78\x56\z +- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x77\x40\x00\x86\x40\z +- \x74\x65\x6d\x70\x81\x81\x01\x00\x02\x82\x48\x00\x02\x00\xc7\x00\x01\z +- \x00\x80\x80\x80\x82\x00\x00\x80\x81\x82\x78\x80\x82\x81\x86\x40\x74\z +- \x65\x6d\x70" +- +- assert(load(code)) -- segfaults in previous versions +-end +- +- + x = string.dump(load("x = 1; return x")) + a = assert(load(read1(x), nil, "b")) + assert(a() == 1 and _G.x == 1) diff --git a/dev-lang/lua/lua-5.4.6.ebuild b/dev-lang/lua/lua-5.4.6.ebuild index c7fd11588774..c5d1c9109b73 100644 --- a/dev-lang/lua/lua-5.4.6.ebuild +++ b/dev-lang/lua/lua-5.4.6.ebuild @@ -22,6 +22,11 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + # Backported variant of upstream patch to fix sparc tests, bug #914562 + "${FILESDIR}"/${PN}-5.4.6-sparc-tests.patch +) + src_prepare() { default |