From nobody Wed Dec 22 23:01:21 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2CBD918F2A9F; Wed, 22 Dec 2021 23:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JK82T6Wxwz3Ggj; Wed, 22 Dec 2021 23:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C18802587D; Wed, 22 Dec 2021 23:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMN1LhR032438; Wed, 22 Dec 2021 23:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMN1LFH032437; Wed, 22 Dec 2021 23:01:21 GMT (envelope-from git) Date: Wed, 22 Dec 2021 23:01:21 GMT Message-Id: <202112222301.1BMN1LFH032437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Martin Matuska Subject: git: efa9fe9654f4 - main - lang/luajit-openresty: 2.1-20210510 -> 2.1-20211210 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efa9fe9654f48d930d38e32a7b656ff5ac81c322 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640214081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQCWbSMP8PVof0pY0hRC7tRd1298M5BVSYXlLYpfE6w=; b=csOrDDsguhCdLmv2op9lF+EbxyybPsg9K437oHyZeA/ByQ7jU9BlMDr2msa/YRitd0i2qV PAdC3nFs5MTafmcAPLIyubzXpVTnum/bFXHg6s03anq8PtNrDlaoTz4eHnHnCgCZRL0xi/ bL+2SB7bCvlg9JDLPrqHe/aLbXgcyOBwmm8si5SSgi1QKNM1LSw+Y7QhvJaLS35TvWtF91 vWZKfDIstUqCKaOhmTB+GcWP7eP0RSyyy0pHYpWdwvvQZwvA6ojHYymdYa40w/rSSgy3yQ ny3gh+2Ul7XS6BwHIDQw0RfJTT0hFau28GcsTzjzLAnvVs9sXySgd4W7LZwfcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640214081; a=rsa-sha256; cv=none; b=QFmQAqA/G/Ukm2DmAZtUDV8f231UjyPutjL8LOBisGNvg0BxCS74MK75wqHp4bjX+n9u+l 0AJaYWV5Cyed2l28UQ7VNyn/434kljxST6a/rXv0JyAoWyi39rhQ0gY9C78YlsX01z5SIV SdoryOYs4R8a3pjZyR0SvbqxmWdepl73dyaGjjyMGIbijywaQ8wtDRqpc3D8Kf8ACJTWer DCNJsTMCAksxqV/ZQdMqHOyQflmUN6ztLozeUi7e7V4muxWNeAIUDBwcydXDxt8MOBkq5C sMG5bpcI1FR4yFYRNuMq1cxi/zZ7fi3Wu7vn7m2FmicjCgMD2Dwtj9AKxxXaNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=efa9fe9654f48d930d38e32a7b656ff5ac81c322 commit efa9fe9654f48d930d38e32a7b656ff5ac81c322 Author: Martin Matuska AuthorDate: 2021-12-22 23:00:26 +0000 Commit: Martin Matuska CommitDate: 2021-12-22 23:00:26 +0000 lang/luajit-openresty: 2.1-20210510 -> 2.1-20211210 --- lang/luajit-openresty/Makefile | 2 +- lang/luajit-openresty/distinfo | 6 +++--- lang/luajit-openresty/files/patch-src_lj__ccallback.c | 6 +++--- lang/luajit-openresty/files/patch-src_lj__prng.c | 12 ++++++------ 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 #else +#ifndef LJ_TARGET_HAS_GETENTROPY - #if LJ_TARGET_OSX - #include - #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