gentoo resync : 25.08.2020

4 files changed, 33 insertions, 4 deletions

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index b97e649aa007..fb0469851823 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,6 +1,7 @@
+AUX CVE-2020-15890.patch 660 BLAKE2B ac615accba8c2d914ff9db2bd2306e1f37df6b35f95c524d592952e52134a9c5ea7adcb11edabe95c35a7cb1a1b66f887095ae95f715714fcda5a642876c8e31 SHA512 d227f22f1b7776f36b8a1e1471e6fcb3a2442037e09fcd0f4d489c3853a5cb2916b02cd6ab0194105989502b76bcb03e97ea1825d21212a534344afe96e3448c
 AUX luajit-2-ldconfig.patch 1099 BLAKE2B f18beb00b703aa4fd5c6d959b72469c34fb67ba9dd1513831c36d5bdd21144457d70a58948bfc47660eadb130bb4f77d55858cd4e4b7c33860df749b22b727bd SHA512 a86be88b8cf65c5a11defeeb16dab92c7d3fe774b2ecd289d9485342236e14c99b78700082c024b703179b55aedeee98bef43d624af23673cfa7ac68a492c6b1
 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085 SHA512 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
 DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
-EBUILD luajit-2.0.5-r1.ebuild 1466 BLAKE2B ff14fc4cd92ee20c04c6ab4e1f812c463e787ba1f6936ef5c5b36008a27dda3e6fb1d306a2b3249d6dac7ef3e3ecdf00bf5be8c321d75634eb9b31b54c3965c6 SHA512 e7420eb3de6a28aacb43fc2d7f237e587205296c3ec4252e52b0b09945cd8966ed6602d77e30453dabcf44c41809a3c2018398c21bdc3d3f20c3416ed8a8e4d2
-EBUILD luajit-2.1.0_beta3.ebuild 1204 BLAKE2B a58f841f8dd6d7dcf82752ba231080183b49494480c6532555e8b33bb4a0ab19716a96321ae0a1bbc4eb8cff52bbcbfb55a8e9963fbc4e1764d98fcf2fa40ba1 SHA512 3701ba4433fe293786c092f2ad958867aa367a6158db5451a75989643dcd7994205606c4b225cd8e85f5c6d0902c09014342d64f1aa865fe68f3260b6b2dd7a5
+EBUILD luajit-2.0.5-r2.ebuild 1503 BLAKE2B ae88e870209a2887ec07b67f6494d9ef35df9bb1e03f4dab7df2fe6dbac1403d3db022427d8d51d24db86e4a89f3eccc3bb42e61fbf976029353fdff4ca3b395 SHA512 5efb5f0fb79c2ad3caa627c5b98916b8d572deed99ecaa34e41e7a257dd13e5bd5708f8499358b409e1d096dec3b1adc5fd3899a36195cd638934d6dc8bcf496
+EBUILD luajit-2.1.0_beta3-r1.ebuild 1241 BLAKE2B 672f3bbec3b3c150a0edbdc10eaf2ca715bef40b6142788218df5b43dc9ee6940f2275821a17e2e25b655eb10d6d476f25e5afdb119ac3533aa49351c45d795a SHA512 198f99e9c261563cbab3800753c01d7588515bdf20ad5b12d57b30f0681fd950fe0f8e90116f5d24b72df243ffa0d212aa1045f48a6ab07627d325670b512e61
 MISC metadata.xml 552 BLAKE2B 50666bd08bb7c06c52a28652c0a87988e815c1d3c10cc1425cc7979689fd4738f56aaa6478aaa616a0b76122e42f790b3b415a60078dcc256499019912f0c4d4 SHA512 9d6ef1cb9acf52db52ec192bc51cbab6a7aa198dbf108ed76b25b0e258491b2f8d5ec0981c538546cc96de490c8c1ac852e337ef09ab5898ad4f2c48f5670f07
diff --git a/dev-lang/luajit/files/CVE-2020-15890.patch b/dev-lang/luajit/files/CVE-2020-15890.patch
new file mode 100644
index 000000000000..751726571a05
--- /dev/null
+++ b/dev-lang/luajit/files/CVE-2020-15890.patch
@@ -0,0 +1,22 @@
+From 53f82e6e2e858a0a62fd1a2ff47e9866693382e6 Mon Sep 17 00:00:00 2001
+From: Mike Pall <mike>
+Date: Sun, 12 Jul 2020 14:30:34 +0200
+Subject: [PATCH] Fix frame traversal for __gc handler frames.
+
+Reported by Changochen.
+---
+ src/lj_err.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lj_err.c b/src/lj_err.c
+index caa7487f2..e3e0c2eb7 100644
+--- a/src/lj_err.c
++++ b/src/lj_err.c
+@@ -529,6 +529,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
+       if (cframe_canyield(cf)) return 0;
+       if (cframe_errfunc(cf) >= 0)
+ 	return cframe_errfunc(cf);
++      cf = cframe_prev(cf);
+       frame = frame_prevd(frame);
+       break;
+     case FRAME_PCALL:
diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 0e4dc83ff928..d9fa1d7fbc36 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -23,7 +23,10 @@ SLOT="2"
 KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
-PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2-ldconfig.patch"
+	"${FILESDIR}/CVE-2020-15890.patch"
+)
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index b38bb2b260d7..a959393a5d76 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -19,7 +19,10 @@ SLOT="2"
 KEYWORDS=""
 IUSE="lua52compat static-libs"
 
-PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2-ldconfig.patch"
+	"${FILESDIR}/CVE-2020-15890.patch"
+)
 
 S="${WORKDIR}/${MY_P}"