aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lua: require lua 5.4

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

Ticket: #4776
pull/11165/head
Jo Johnson 2 years ago committed by Jason Ish
parent e0411878fc
commit 586c92d9d5
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File

11
.github/workflows/builds.yml vendored
Unescape Escape View File

@ -1461,7 +1461,7 @@ jobs:
libnuma-dev \ libnuma-dev \
libhiredis-dev \ libhiredis-dev \
libhyperscan-dev \ libhyperscan-dev \
liblua5.1-dev \ liblua5.4-dev \
libjansson-dev \ libjansson-dev \
libevent-dev \ libevent-dev \
libevent-pthreads-2.1-7 \ libevent-pthreads-2.1-7 \
@ -2042,7 +2042,7 @@ jobs:
libnfnetlink0 \ libnfnetlink0 \
libnuma-dev \ libnuma-dev \
libhiredis-dev \ libhiredis-dev \
liblua5.1-dev \ liblua5.4-dev \
libjansson-dev \ libjansson-dev \
libevent-dev \ libevent-dev \
libevent-pthreads-2.1-7 \ libevent-pthreads-2.1-7 \
@ -2681,7 +2681,7 @@ jobs:
libmaxminddb-dev \ libmaxminddb-dev \
libjansson-dev \ libjansson-dev \
libjansson4 \ libjansson4 \
liblua5.1-dev \ liblua5.4-dev \
libnuma-dev \ libnuma-dev \
liblz4-dev \ liblz4-dev \
libssl-dev \ libssl-dev \
@ -2850,7 +2850,7 @@ jobs:
libmaxminddb-dev \ libmaxminddb-dev \
libjansson-dev \ libjansson-dev \
libjansson4 \ libjansson4 \
liblua5.1-dev \ liblua5.4-dev \
libnuma-dev \ libnuma-dev \
liblz4-dev \ liblz4-dev \
libssl-dev \ libssl-dev \
@ -2938,7 +2938,7 @@ jobs:
libmagic-dev \ libmagic-dev \
libjansson-dev \ libjansson-dev \
libgeoip-dev \ libgeoip-dev \
liblua5.1-dev \ liblua5.4-dev \
libhiredis-dev \ libhiredis-dev \
libevent-dev \ libevent-dev \
libtool \ libtool \
@ -3021,7 +3021,6 @@ jobs:
libmagic-dev \ libmagic-dev \
libjansson-dev \ libjansson-dev \
libgeoip-dev \ libgeoip-dev \
liblua5.1-dev \
libhiredis-dev \ libhiredis-dev \
libevent-dev \ libevent-dev \
libtool \ libtool \

2
.github/workflows/scan-build.yml vendored
Unescape Escape View File

@ -56,7 +56,7 @@ jobs:
libnuma-dev \ libnuma-dev \
libhiredis-dev \ libhiredis-dev \
libhyperscan-dev \ libhyperscan-dev \
liblua5.1-dev \ liblua5.4-dev \
libjansson-dev \ libjansson-dev \
libevent-dev \ libevent-dev \
libevent-pthreads-2.1-7 \ libevent-pthreads-2.1-7 \

26
configure.ac
Unescape Escape View File

@ -244,7 +244,7 @@
AC_MSG_CHECKING([host os]) AC_MSG_CHECKING([host os])
# Default lua libname if not detected otherwise. # 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 no host os was detected, try with uname
if test -z "$host" ; then if test -z "$host" ; then
@ -259,7 +259,7 @@
e_magic_file_comment="#" e_magic_file_comment="#"
case "$host" in case "$host" in
*-*-*freebsd*) *-*-*freebsd*)
LUA_LIB_NAME="lua-5.1" LUA_LIB_NAME="lua-5.4"
CFLAGS="${CFLAGS} -DOS_FREEBSD" CFLAGS="${CFLAGS} -DOS_FREEBSD"
CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/local/include/libnet11" CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/local/include/libnet11"
LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib/libnet11" LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib/libnet11"
@ -272,7 +272,7 @@
RUST_LDADD="-lm -lc++ -lc++abi" RUST_LDADD="-lm -lc++ -lc++abi"
;; ;;
*darwin*|*Darwin*) *darwin*|*Darwin*)
LUA_LIB_NAME="lua-5.1" LUA_LIB_NAME="lua-5.4"
CFLAGS="${CFLAGS} -DOS_DARWIN" CFLAGS="${CFLAGS} -DOS_DARWIN"
CPPFLAGS="${CPPFLAGS} -I/opt/local/include" CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
LDFLAGS="${LDFLAGS} -L/opt/local/lib -framework Security" LDFLAGS="${LDFLAGS} -L/opt/local/lib -framework Security"
@ -1909,11 +1909,11 @@
if test "$with_liblua_includes" != "no"; then if test "$with_liblua_includes" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_liblua_includes}" CPPFLAGS="${CPPFLAGS} -I${with_liblua_includes}"
else 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], [lua], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua5.1], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua5.4], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua-5.1], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua-5.4], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua51], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua54], [LUA="yes"], [
LUA="no" LUA="no"
]) ])
]) ])
@ -1932,7 +1932,7 @@
echo " ERROR! liblua library not found, go get it" echo " ERROR! liblua library not found, go get it"
echo " from http://lua.org/index.html or your distribution:" echo " from http://lua.org/index.html or your distribution:"
echo echo
echo " Ubuntu: apt-get install liblua5.1-dev" echo " Ubuntu: apt-get install liblua5.4-dev"
echo " Fedora: dnf install lua-devel" echo " Fedora: dnf install lua-devel"
echo " CentOS/RHEL: yum install lua-devel" echo " CentOS/RHEL: yum install lua-devel"
echo echo
@ -1943,11 +1943,11 @@
exit 1 exit 1
fi fi
else 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], [lua], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua5.1], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua5.4], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua-5.1], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua-5.4], [LUA="yes"], [
PKG_CHECK_MODULES([LUA], [lua51], [LUA="yes"], [ PKG_CHECK_MODULES([LUA], [lua54], [LUA="yes"], [
LUA="no" LUA="no"
]) ])
]) ])
@ -1969,7 +1969,7 @@
echo " ERROR! liblua headers not found, go get them" echo " ERROR! liblua headers not found, go get them"
echo " from http://lua.org/index.html or your distribution:" echo " from http://lua.org/index.html or your distribution:"
echo echo
echo " Ubuntu: apt-get install liblua5.1-dev" echo " Ubuntu: apt-get install liblua5.4-dev"
echo " Fedora: dnf install lua-devel" echo " Fedora: dnf install lua-devel"
echo " CentOS/RHEL: yum install lua-devel" echo " CentOS/RHEL: yum install lua-devel"
echo echo

2
doc/userguide/install.rst
Unescape Escape View File

@ -109,7 +109,7 @@ Recommended::
sudo apt-get install autoconf automake build-essential ccache clang curl git \ sudo apt-get install autoconf automake build-essential ccache clang curl git \
gosu jq libbpf-dev libcap-ng0 libcap-ng-dev libelf-dev \ gosu jq libbpf-dev libcap-ng0 libcap-ng-dev libelf-dev \
libevent-dev libgeoip-dev libhiredis-dev libjansson-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 \ libpcre2-dev libtool libyaml-0-2 libyaml-dev m4 make \
pkg-config python3 python3-dev python3-yaml sudo zlib1g \ pkg-config python3 python3-dev python3-yaml sudo zlib1g \
zlib1g-dev zlib1g-dev

Write Preview
Loading…
Cancel
Save