From d131a096a869195be36ef7d4fa36739373346cb2 Mon Sep 17 00:00:00 2001 From: dmiller Date: Sat, 24 Jun 2023 01:53:09 +0000 Subject: [PATCH] Remove nse_pcrelib from build. Conflict: NA Reference: https://github.com/nmap/nmap/commit/d131a096a869195be36ef7d4fa36739373346cb2 --- Makefile.in | 6 +++--- mswin32/nmap.vcxproj | 2 -- nse_main.cc | 2 -- nse_main.lua | 2 +- nselib/unittest.lua | 1 - 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index ccfceda..8c19056 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,9 +88,9 @@ UNINSTALLNDIFF=@UNINSTALLNDIFF@ UNINSTALLNPING=@UNINSTALLNPING@ ifneq (@NOLUA@,yes) -NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_lpeg.cc -NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_pcrelib.h nse_lpeg.h -NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_lpeg.o +NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_lpeg.cc +NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_lpeg.h +NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_lpeg.o ifneq (@OPENSSL_LIBS@,) NSE_SRC+=nse_openssl.cc nse_ssl_cert.cc NSE_HDRS+=nse_openssl.h nse_ssl_cert.h diff --git a/nse_main.cc b/nse_main.cc index 110291f..b946c7c 100644 --- a/nse_main.cc +++ b/nse_main.cc @@ -14,7 +14,6 @@ #include "nse_fs.h" #include "nse_nsock.h" #include "nse_nmaplib.h" -#include "nse_pcrelib.h" #include "nse_openssl.h" #include "nse_debug.h" #include "nse_lpeg.h" @@ -557,7 +556,6 @@ static int panic (lua_State *L) static void set_nmap_libraries (lua_State *L) { static const luaL_Reg libs[] = { - {NSE_PCRELIBNAME, luaopen_pcrelib}, {NSE_NMAPLIBNAME, luaopen_nmap}, {LFSLIBNAME, luaopen_lfs}, {LPEGLIBNAME, luaopen_lpeg}, diff --git a/nse_main.lua b/nse_main.lua index af5f611..7fba46e 100644 --- a/nse_main.lua +++ b/nse_main.lua @@ -285,7 +285,7 @@ local REQUIRE_ERROR = {}; rawset(stdnse, "silent_require", function (...) local status, mod = pcall(require, ...); if not status then - print_debug(1, "%s", traceback(mod)); + print_debug(2, "%s", traceback(mod)); error(REQUIRE_ERROR) else return mod; diff --git a/nselib/unittest.lua b/nselib/unittest.lua index ac90c31..d780b85 100644 --- a/nselib/unittest.lua +++ b/nselib/unittest.lua @@ -107,7 +107,6 @@ local libs = { "ospf", "outlib", "packet", -"pcre", "pgsql", "pop3", "pppoe", -- 2.33.0