summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2022-06-20 11:21:24 -0500
committerWilliam Hubbs <williamh@gentoo.org>2022-06-20 11:22:10 -0500
commit1f080d6c4203ad72cfaa6b71abdc7c6f0b223321 (patch)
tree0b4924045e422c7f68870cb5c49f608c44e2fedb /dev-lang/luajit
parentdev-lang/luajit: drop 2.0.5-r3, 2.1.0_beta3-r2 (diff)
downloadgentoo-1f080d6c4203ad72cfaa6b71abdc7c6f0b223321.tar.gz
gentoo-1f080d6c4203ad72cfaa6b71abdc7c6f0b223321.tar.bz2
gentoo-1f080d6c4203ad72cfaa6b71abdc7c6f0b223321.zip
dev-lang/luajit: drop old patches
Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'dev-lang/luajit')
-rw-r--r--dev-lang/luajit/files/CVE-2020-15890.patch22
-rw-r--r--dev-lang/luajit/files/luajit-2-ldconfig.patch31
2 files changed, 0 insertions, 53 deletions
diff --git a/dev-lang/luajit/files/CVE-2020-15890.patch b/dev-lang/luajit/files/CVE-2020-15890.patch
deleted file mode 100644
index 751726571a05..000000000000
--- a/dev-lang/luajit/files/CVE-2020-15890.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/luajit-2-ldconfig.patch b/dev-lang/luajit/files/luajit-2-ldconfig.patch
deleted file mode 100644
index add449a60381..000000000000
--- a/dev-lang/luajit/files/luajit-2-ldconfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001
-From: Mike Pall <mike>
-Date: Sat, 25 Jan 2020 17:37:12 +0100
-Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig.
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07bc70faf..bff53f286 100644
---- a/Makefile
-+++ b/Makefile
-@@ -74,7 +74,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
--LDCONFIG= ldconfig -n
-+LDCONFIG= ldconfig -n 2>/dev/null
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
- -e "s|^multilib=.*|multilib=$(MULTILIB)|"
-
-@@ -118,7 +118,7 @@ install: $(INSTALL_DEP)
- $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
- cd src && test -f $(FILE_SO) && \
- $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-- $(LDCONFIG) $(INSTALL_LIB) && \
-+ ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)