lang/luajit: USE_NOBTCFI=Yes

Hi,

Cc maintainers of ports using luajit.

I give up to try patching luajit for IBT.

Below a diff to mark all ports linked with luajit with USE_NOBTCFI=Yes :
- benchmarks/wrk
- games/love/0.10
- games/love/11
- games/solarus/solarus
- lang/luajit
- mail/rspamd
- net/hexchat
- net/snort
- www/luakit
- x11/kde-applications/cantor

Maybe math/labplot should be marked too ? it is using cantor and cantor is using
luajit.

Comments or OK ?
--
Sebastien Marie

Index: benchmarks/wrk/Makefile
===================================================================
RCS file: /cvs/ports/benchmarks/wrk/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- benchmarks/wrk/Makefile 10 Jan 2023 17:41:15 -0000 1.5
+++ benchmarks/wrk/Makefile 23 Jun 2023 13:37:37 -0000
@@ -3,11 +3,15 @@ COMMENT = modern HTTP benchmarking tool
GH_ACCOUNT = wg
GH_PROJECT = wrk
GH_TAGNAME = 4.2.0
+REVISION = 0

CATEGORIES = benchmarks

# Apache 2.0, BSD, MIT
PERMIT_PACKAGE = Yes
+
+# luajit
+USE_NOBTCFI = Yes

WANTLIB += c crypto luajit-5.1 m pthread ssl

Index: games/love/Makefile.inc
===================================================================
RCS file: /cvs/ports/games/love/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- games/love/Makefile.inc 27 Feb 2023 10:57:28 -0000 1.1
+++ games/love/Makefile.inc 23 Jun 2023 13:37:37 -0000
@@ -34,6 +34,7 @@ USE_LUAJIT ?= Yes
WANTLIB += luajit-5.1
LIB_DEPENDS += lang/luajit
CONFIGURE_ARGS += --with-lua=luajit
+USE_NOBTCFI = Yes
.else
WANTLIB += ${MODLUA_WANTLIB}
LIB_DEPENDS += ${MODLUA_LIB_DEPENDS}
Index: games/love/0.10/Makefile
===================================================================
RCS file: /cvs/ports/games/love/0.10/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- games/love/0.10/Makefile 27 Feb 2023 10:52:18 -0000 1.1.1.1
+++ games/love/0.10/Makefile 23 Jun 2023 13:37:37 -0000
@@ -1,4 +1,5 @@
VERSION = 0.10.2
+REVISION = 0

SHARED_LIBS= love-${VERSION} 0.0

Index: games/love/11/Makefile
===================================================================
RCS file: /cvs/ports/games/love/11/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- games/love/11/Makefile 17 Mar 2023 14:43:51 -0000 1.2
+++ games/love/11/Makefile 23 Jun 2023 13:37:37 -0000
@@ -3,6 +3,7 @@
NOT_FOR_ARCHS = ${BE_ARCHS}

VERSION = 11.4
+REVISION = 0

SHARED_LIBS = love-${VERSION} 0.0

Index: games/solarus/solarus/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/solarus/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- games/solarus/solarus/Makefile 24 Apr 2023 11:40:42 -0000 1.30
+++ games/solarus/solarus/Makefile 23 Jun 2023 13:37:37 -0000
@@ -2,7 +2,7 @@ V = 1.6.0
COMMENT = open-source Zelda-like 2D game engine
DISTNAME = solarus-${V}-src
PKGNAME = solarus-${V}
-REVISION = 2
+REVISION = 3

SHARED_LIBS += solarus 0.0 # 1.5

@@ -10,6 +10,9 @@ HOMEPAGE = https://www.solarus-games.org

# GPLv3+
PERMIT_PACKAGE = Yes
+
+# luajit
+USE_NOBTCFI = Yes

WANTLIB += Qt5Core Qt5Gui Qt5Widgets SDL2 SDL2_image SDL2_ttf
WANTLIB += c luajit-5.1 m modplug ogg openal physfs pthread vorbis
Index: lang/luajit/Makefile
===================================================================
RCS file: /cvs/ports/lang/luajit/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- lang/luajit/Makefile 11 Mar 2022 19:29:06 -0000 1.33
+++ lang/luajit/Makefile 23 Jun 2023 13:37:37 -0000
@@ -18,6 +18,7 @@ COMMENT = just-in-time compiler for Lua
V = 2.0.5
DISTNAME = LuaJIT-${V}pl20210608
PKGNAME = ${DISTNAME:L}
+REVISION = 0

CATEGORIES = lang

@@ -25,6 +26,8 @@ HOMEPAGE = https://luajit.org/

# MIT
PERMIT_PACKAGE = Yes
+
+USE_NOBTCFI = Yes

WANTLIB = c m

Index: mail/rspamd/Makefile
===================================================================
RCS file: /cvs/ports/mail/rspamd/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- mail/rspamd/Makefile 30 Mar 2023 10:33:38 -0000 1.114
+++ mail/rspamd/Makefile 23 Jun 2023 13:37:37 -0000
@@ -3,6 +3,7 @@ COMMENT= event-driven spam filtering sys
GH_ACCOUNT= vstakhov
GH_PROJECT= rspamd
GH_TAGNAME= 3.5
+REVISION= 0

CATEGORIES= mail

@@ -90,6 +91,7 @@ WANTLIB+= ${MODLUA_WANTLIB}
.else
LIB_DEPENDS+= lang/luajit
WANTLIB+= luajit-5.1
+USE_NOBTCFI= Yes
.endif

.if ${FLAVOR:Mhyperscan}
Index: net/hexchat/Makefile
===================================================================
RCS file: /cvs/ports/net/hexchat/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- net/hexchat/Makefile 24 Apr 2023 11:41:24 -0000 1.37
+++ net/hexchat/Makefile 23 Jun 2023 13:37:37 -0000
@@ -2,11 +2,14 @@ COMMENT = GTK+2 IRC Client
DISTNAME = hexchat-2.16.1
EXTRACT_SUFX = .tar.xz
CATEGORIES = net x11
-REVISION = 0
+REVISION = 1

HOMEPAGE = https://hexchat.github.io/
# GPLv2+
PERMIT_PACKAGE = Yes
+
+# luajit
+USE_NOBTCFI = Yes

WANTLIB += X11 c canberra crypto dbus-glib-1 gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
Index: net/snort/Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- net/snort/Makefile 8 Nov 2022 11:17:01 -0000 1.116
+++ net/snort/Makefile 23 Jun 2023 13:37:37 -0000
@@ -1,7 +1,7 @@
COMMENT = highly flexible sniffer/NIDS

DISTNAME = snort-2.9.20
-REVISION = 1
+REVISION = 2
RULESV = 29200
SUBST_VARS = RULESV APPID_COMMENT

@@ -48,6 +48,7 @@ APPID_COMMENT = "@comment "
LIB_DEPENDS += lang/luajit
WANTLIB += c++abi luajit-5.1
APPID_COMMENT =
+USE_NOBTCFI = Yes
.endif

CONFIGS = classification.config gen-msg.map reference.config \
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- www/luakit/Makefile 19 Feb 2023 14:32:40 -0000 1.41
+++ www/luakit/Makefile 23 Jun 2023 13:37:37 -0000
@@ -2,7 +2,7 @@ COMMENT = fast, small, webkit based brow

V = 2.3.3
DISTNAME = luakit-${V}
-REVISION = 1
+REVISION = 2

EPOCH = 1

@@ -34,6 +34,7 @@ WANTLIB += soup-2.4 sqlite3 webkit2gtk-4
WANTLIB += luajit-5.1
LIB_DEPENDS += lang/luajit
MAKE_FLAGS += USE_LUAJIT=1
+USE_NOBTCFI = Yes
.else
WANTLIB += ${MODLUA_WANTLIB}
MAKE_FLAGS += USE_LUAJIT=0
Index: x11/kde-applications/cantor/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/cantor/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- x11/kde-applications/cantor/Makefile 13 Jun 2023 19:14:02 -0000 1.35
+++ x11/kde-applications/cantor/Makefile 23 Jun 2023 13:37:37 -0000
@@ -1,8 +1,12 @@
USE_WXNEEDED = Yes

+# luajit
+USE_NOBTCFI = Yes
+
COMMENT = KDE mathematical applications
DISTNAME = cantor-${VERSION}
CATEGORIES = education math
+REVISION = 0

SHARED_LIBS += cantorlibs 54.1 # 17.08