Skip to content

Disable lua #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atomicturtle merged 2 commits into from
Dec 30, 2018
Merged

Disable lua #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5681d
Disable lua for now. We're not currently using it, and I'd prefer
ddpbsd Dec 24, 2018
e6bff48
Disable lua for Windows builds as well.
ddpbsd Dec 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ EXTERNAL_LUA=external/lua-5.2.3/
EXTERNAL_ZLIB=external/zlib-1.2.11/
ZLIB_SYSTEM?=no
LUA_PLAT=posix
LUA_ENABLE?=yes
LUA_ENABLE?=no
MAXAGENTS?=2048
REUSE_ID?=no
# XXX Becareful NO EXTRA Spaces here
Expand Down Expand Up @@ -653,9 +653,9 @@ endif
.PHONY: winagent
winagent:
${MAKE} ${WINDOWS_BINS} CFLAGS="-DCLIENT -DWIN32 -I./${EXTERNAL_ZLIB}" LDFLAGS="-lwsock32 -lwevtapi -lshlwapi -lcomctl32 -lws2_32"
cd ${EXTERNAL_LUA}src/ && ${MAKE} CC=${MING_BASE}${CC} -f Makefile.mingw mingw
cp ${EXTERNAL_LUA}src/ossec-lua.exe win32/
cp ${EXTERNAL_LUA}src/ossec-luac.exe win32/
#cd ${EXTERNAL_LUA}src/ && ${MAKE} CC=${MING_BASE}${CC} -f Makefile.mingw mingw
#cp ${EXTERNAL_LUA}src/ossec-lua.exe win32/
#cp ${EXTERNAL_LUA}src/ossec-luac.exe win32/
cd win32/ && ./unix2dos.pl ossec.conf > default-ossec.conf
cd win32/ && ./unix2dos.pl help.txt > help_win.txt
cd win32/ && ./unix2dos.pl ../../etc/internal_options.conf > internal_options.conf
Expand Down Expand Up @@ -1355,9 +1355,9 @@ clean-windows:
rm -f ${win32_o} ${win32_ui_o} win32/win_service_rk.o
rm -f win32/icon.o win32/resource.o
rm -f ${WINDOWS_BINS}
rm -f ${EXTERNAL_LUA}src/lua52.dll
rm -f ${EXTERNAL_LUA}src/ossec-lua.exe
rm -f ${EXTERNAL_LUA}src/ossec-luac.exe
rm -f win32/ossec-lua.exe
rm -f win32/ossec-luac.exe
#rm -f ${EXTERNAL_LUA}src/lua52.dll
#rm -f ${EXTERNAL_LUA}src/ossec-lua.exe
#rm -f ${EXTERNAL_LUA}src/ossec-luac.exe
#rm -f win32/ossec-lua.exe
#rm -f win32/ossec-luac.exe
rm -f win32/ossec-win32-agent.exe
8 changes: 4 additions & 4 deletions src/win32/ossec-installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ Section "OSSEC Agent (required)" MainSec
CreateDirectory "$INSTDIR\tmp"

; install files
File ossec-lua.exe
File ossec-luac.exe
;File ossec-lua.exe
;File ossec-luac.exe
File ossec-agent.exe
File ossec-agent-eventchannel.exe
File agent-auth.exe
Expand Down Expand Up @@ -408,8 +408,8 @@ Section "Uninstall"

; remove files and uninstaller
Delete "$INSTDIR\ossec-agent.exe"
Delete "$INSTDIR\ossec-lua.exe"
Delete "$INSTDIR\ossec-luac.exe"
;Delete "$INSTDIR\ossec-lua.exe"
;Delete "$INSTDIR\ossec-luac.exe"
Delete "$INSTDIR\manage_agents.exe"
Delete "$INSTDIR\ossec.conf"
Delete "$INSTDIR\uninstall.exe"
Expand Down