summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-12-23 00:00:26 +0100
committerMartin Matuska <mm@FreeBSD.org>2021-12-23 00:00:26 +0100
commitefa9fe9654f48d930d38e32a7b656ff5ac81c322 (patch)
treeac514b8f4710d70c929593d2713508ecdf55ca26 /lang
parentx11/wvkbd: add new port (diff)
lang/luajit-openresty: 2.1-20210510 -> 2.1-20211210
Diffstat (limited to 'lang')
-rw-r--r--lang/luajit-openresty/Makefile2
-rw-r--r--lang/luajit-openresty/distinfo6
-rw-r--r--lang/luajit-openresty/files/patch-src_lj__ccallback.c6
-rw-r--r--lang/luajit-openresty/files/patch-src_lj__prng.c12
4 files changed, 13 insertions, 13 deletions
diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile
index b99e28d6a618..029e13d5774f 100644
--- a/lang/luajit-openresty/Makefile
+++ b/lang/luajit-openresty/Makefile
@@ -2,7 +2,7 @@
PORTNAME= luajit
DISTVERSIONPREFIX= v
-DISTVERSION= 2.1-20210510
+DISTVERSION= 2.1-20211210
CATEGORIES= lang
PKGNAMESUFFIX= -openresty
diff --git a/lang/luajit-openresty/distinfo b/lang/luajit-openresty/distinfo
index 849b715c13c9..6b5b85829bff 100644
--- a/lang/luajit-openresty/distinfo
+++ b/lang/luajit-openresty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623459677
-SHA256 (openresty-luajit2-v2.1-20210510_GH0.tar.gz) = 1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f
-SIZE (openresty-luajit2-v2.1-20210510_GH0.tar.gz) = 1106201
+TIMESTAMP = 1640213067
+SHA256 (openresty-luajit2-v2.1-20211210_GH0.tar.gz) = 605a8ac048ce8fcb872286abf674491467c3483d759e071721cea9a50e5bd220
+SIZE (openresty-luajit2-v2.1-20211210_GH0.tar.gz) = 1141394
diff --git a/lang/luajit-openresty/files/patch-src_lj__ccallback.c b/lang/luajit-openresty/files/patch-src_lj__ccallback.c
index 40d0cc76b15b..353581f09488 100644
--- a/lang/luajit-openresty/files/patch-src_lj__ccallback.c
+++ b/lang/luajit-openresty/files/patch-src_lj__ccallback.c
@@ -1,4 +1,4 @@
---- src/lj_ccallback.c.orig 2020-10-28 11:55:44 UTC
+--- src/lj_ccallback.c.orig 2021-11-17 04:07:33 UTC
+++ src/lj_ccallback.c
@@ -20,6 +20,7 @@
#include "lj_mcode.h"
@@ -6,5 +6,5 @@
#include "lj_vm.h"
+#include "lualib.h"
- /* -- Target-specific handling of callback slots -------------------------- */
-
+ #if LJ_ARCH_PPC_ELFV2
+ #include "lualib.h"
diff --git a/lang/luajit-openresty/files/patch-src_lj__prng.c b/lang/luajit-openresty/files/patch-src_lj__prng.c
index bdd845b6d3c9..970911b069f3 100644
--- a/lang/luajit-openresty/files/patch-src_lj__prng.c
+++ b/lang/luajit-openresty/files/patch-src_lj__prng.c
@@ -1,16 +1,16 @@
---- src/lj_prng.c.orig 2020-10-02 19:16:39 UTC
+--- src/lj_prng.c.orig 2021-11-17 04:07:33 UTC
+++ src/lj_prng.c
@@ -109,6 +109,7 @@ static PRGR libfunc_rgr;
#include <sys/syscall.h>
#else
+#ifndef LJ_TARGET_HAS_GETENTROPY
- #if LJ_TARGET_OSX
- #include <Availability.h>
- #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 || \
-@@ -117,6 +118,7 @@ static PRGR libfunc_rgr;
+ #if LJ_TARGET_OSX && !LJ_TARGET_IOS
+ /*
+ ** In their infinite wisdom Apple decided to disallow getentropy() in the
+@@ -123,6 +124,7 @@ static PRGR libfunc_rgr;
#endif
- #elif LJ_TARGET_BSD || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN
+ #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN
#define LJ_TARGET_HAS_GETENTROPY 1
+#endif
#endif