From: Jo Johnson <pyrojoe314@gmail.com>
Date: Thu, 11 Jan 2024 00:20:31 +0000 (-0800)
Subject: lua: require lua 5.4
X-Git-Tag: suricata-8.0.0-beta1~1269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586c92d9d5cc95ba94b4157cd718eb10301c9834;p=thirdparty%2Fsuricata.git

lua: require lua 5.4

github-ci: Disable lua on debian 10 as it doesn't have Lua 5.4.

Ticket: #4776
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 916fb70feb..5b1cb3d4da 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -1461,7 +1461,7 @@ jobs:
                 libnuma-dev \
                 libhiredis-dev \
                 libhyperscan-dev \
-                liblua5.1-dev \
+                liblua5.4-dev \
                 libjansson-dev \
                 libevent-dev \
                 libevent-pthreads-2.1-7 \
@@ -2042,7 +2042,7 @@ jobs:
                 libnfnetlink0 \
                 libnuma-dev \
                 libhiredis-dev \
-                liblua5.1-dev \
+                liblua5.4-dev \
                 libjansson-dev \
                 libevent-dev \
                 libevent-pthreads-2.1-7 \
@@ -2681,7 +2681,7 @@ jobs:
               libmaxminddb-dev \
               libjansson-dev \
               libjansson4 \
-              liblua5.1-dev \
+              liblua5.4-dev \
               libnuma-dev \
               liblz4-dev \
               libssl-dev \
@@ -2850,7 +2850,7 @@ jobs:
               libmaxminddb-dev \
               libjansson-dev \
               libjansson4 \
-              liblua5.1-dev \
+              liblua5.4-dev \
               libnuma-dev \
               liblz4-dev \
               libssl-dev \
@@ -2938,7 +2938,7 @@ jobs:
                 libmagic-dev \
                 libjansson-dev \
                 libgeoip-dev \
-                liblua5.1-dev \
+                liblua5.4-dev \
                 libhiredis-dev \
                 libevent-dev \
                 libtool \
@@ -3021,7 +3021,6 @@ jobs:
                 libmagic-dev \
                 libjansson-dev \
                 libgeoip-dev \
-                liblua5.1-dev \
                 libhiredis-dev \
                 libevent-dev \
                 libtool \
diff --git a/.github/workflows/scan-build.yml b/.github/workflows/scan-build.yml
index 516525e6c6..2cad3ff152 100644
--- a/.github/workflows/scan-build.yml
+++ b/.github/workflows/scan-build.yml
@@ -56,7 +56,7 @@ jobs:
                 libnuma-dev \
                 libhiredis-dev \
                 libhyperscan-dev \
-                liblua5.1-dev \
+                liblua5.4-dev \
                 libjansson-dev \
                 libevent-dev \
                 libevent-pthreads-2.1-7 \
diff --git a/configure.ac b/configure.ac
index ea8d5c88b8..c6b38efc25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,7 @@
     AC_MSG_CHECKING([host os])
 
     # Default lua libname if not detected otherwise.
-    LUA_LIB_NAME="lua5.1"
+    LUA_LIB_NAME="lua5.4"
 
     # If no host os was detected, try with uname
     if test -z "$host" ; then
@@ -259,7 +259,7 @@
     e_magic_file_comment="#"
     case "$host" in
         *-*-*freebsd*)
-            LUA_LIB_NAME="lua-5.1"
+            LUA_LIB_NAME="lua-5.4"
             CFLAGS="${CFLAGS} -DOS_FREEBSD"
             CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/local/include/libnet11"
             LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib/libnet11"
@@ -272,7 +272,7 @@
             RUST_LDADD="-lm -lc++ -lc++abi"
             ;;
         *darwin*|*Darwin*)
-            LUA_LIB_NAME="lua-5.1"
+            LUA_LIB_NAME="lua-5.4"
             CFLAGS="${CFLAGS} -DOS_DARWIN"
             CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
             LDFLAGS="${LDFLAGS} -L/opt/local/lib -framework Security"
@@ -1909,11 +1909,11 @@
         if test "$with_liblua_includes" != "no"; then
             CPPFLAGS="${CPPFLAGS} -I${with_liblua_includes}"
         else
-            # lua lua51 lua5.1 lua-5.1
+            # lua lua54 lua5.4 lua-5.4
             PKG_CHECK_MODULES([LUA], [lua], [LUA="yes"], [
-                PKG_CHECK_MODULES([LUA], [lua5.1], [LUA="yes"], [
-                    PKG_CHECK_MODULES([LUA], [lua-5.1], [LUA="yes"], [
-                        PKG_CHECK_MODULES([LUA], [lua51], [LUA="yes"], [
+                PKG_CHECK_MODULES([LUA], [lua5.4], [LUA="yes"], [
+                    PKG_CHECK_MODULES([LUA], [lua-5.4], [LUA="yes"], [
+                        PKG_CHECK_MODULES([LUA], [lua54], [LUA="yes"], [
                             LUA="no"
                         ])
                     ])
@@ -1932,7 +1932,7 @@
                     echo "   ERROR!  liblua library not found, go get it"
                     echo "   from http://lua.org/index.html or your distribution:"
                     echo
-                    echo "   Ubuntu: apt-get install liblua5.1-dev"
+                    echo "   Ubuntu: apt-get install liblua5.4-dev"
                     echo "   Fedora: dnf install lua-devel"
                     echo "   CentOS/RHEL: yum install lua-devel"
                     echo
@@ -1943,11 +1943,11 @@
                     exit 1
                 fi
             else
-                # lua lua51 lua5.1 lua-5.1
+                # lua lua54 lua5.4 lua-5.4
                 PKG_CHECK_MODULES([LUA], [lua], [LUA="yes"], [
-                    PKG_CHECK_MODULES([LUA], [lua5.1], [LUA="yes"], [
-                        PKG_CHECK_MODULES([LUA], [lua-5.1], [LUA="yes"], [
-                            PKG_CHECK_MODULES([LUA], [lua51], [LUA="yes"], [
+                    PKG_CHECK_MODULES([LUA], [lua5.4], [LUA="yes"], [
+                        PKG_CHECK_MODULES([LUA], [lua-5.4], [LUA="yes"], [
+                            PKG_CHECK_MODULES([LUA], [lua54], [LUA="yes"], [
                                 LUA="no"
                             ])
                         ])
@@ -1969,7 +1969,7 @@
                 echo "   ERROR!  liblua headers not found, go get them"
                 echo "   from http://lua.org/index.html or your distribution:"
                 echo
-                echo "   Ubuntu: apt-get install liblua5.1-dev"
+                echo "   Ubuntu: apt-get install liblua5.4-dev"
                 echo "   Fedora: dnf install lua-devel"
                 echo "   CentOS/RHEL: yum install lua-devel"
                 echo
diff --git a/doc/userguide/install.rst b/doc/userguide/install.rst
index ef9efdbb54..49885c99e5 100644
--- a/doc/userguide/install.rst
+++ b/doc/userguide/install.rst
@@ -109,7 +109,7 @@ Recommended::
     sudo apt-get install autoconf automake build-essential ccache clang curl git \
                     gosu jq libbpf-dev libcap-ng0 libcap-ng-dev libelf-dev \
                     libevent-dev libgeoip-dev libhiredis-dev libjansson-dev \
-                    liblua5.1-dev libmagic-dev libnet1-dev libpcap-dev \
+                    liblua5.4-dev libmagic-dev libnet1-dev libpcap-dev \
                     libpcre2-dev libtool libyaml-0-2 libyaml-dev m4 make \
                     pkg-config python3 python3-dev python3-yaml sudo zlib1g \
                     zlib1g-dev