diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-08-18 00:25:50 -0500 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-08-18 00:25:50 -0500 |
| commit | 3bfa0c383e4f984daa1c973a4882d025b2a7df8d (patch) | |
| tree | 3cedd39a33e38a5c79e6322100c63125a399a5b2 /security/wazuh-agent/files/patch-src-Makefile | |
| parent | textproc/opensearch*: Update to 2.9.0 (diff) | |
security/wazuh-*: Update to 4.5.0
- wazuh-indexer and wazuh-dashboards now use 2.9.0 version of opensearch and
opensearch-dashboard
- Revert beats dependency to beats7 (filebeat) at security/wazuh-server. beats8
has some issues with filebeat (Take a look at PR/272701)
Diffstat (limited to 'security/wazuh-agent/files/patch-src-Makefile')
| -rw-r--r-- | security/wazuh-agent/files/patch-src-Makefile | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/security/wazuh-agent/files/patch-src-Makefile b/security/wazuh-agent/files/patch-src-Makefile index ca8953968d08..49b0810acfdd 100644 --- a/security/wazuh-agent/files/patch-src-Makefile +++ b/security/wazuh-agent/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2023-05-24 19:23:05 UTC -+++ src/Makefile -@@ -39,9 +39,11 @@ endif +--- src/Makefile 2023-08-04 05:19:33.000000000 -0500 ++++ src/Makefile 2023-08-11 02:02:09.552633000 -0500 +@@ -39,9 +39,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -240,10 +242,10 @@ else +@@ -240,10 +242,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -25,7 +25,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -855,6 +857,8 @@ ifeq (${TARGET},winagent) +@@ -855,6 +857,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -34,7 +34,22 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -2224,14 +2228,37 @@ else +@@ -1036,10 +1040,14 @@ + ifeq (${uname_S},Linux) + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --disable-ldap --without-libidn2 --without-libpsl --without-brotli + else ++ifeq (${uname_S},FreeBSD) ++ cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-pthread" ./configure --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp ++else + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --disable-ldap --without-libidn2 + endif + endif + endif ++endif + + + #### procps ######### +@@ -2224,14 +2232,37 @@ mkdir -p ${WPYTHON_DIR} cp external/${WPYTHON_TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} && ${TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} -C ${WPYTHON_DIR} && rm -rf ${WPYTHON_DIR}/${WPYTHON_TAR} endif @@ -74,7 +89,7 @@ endif install_framework: install_python -@@ -2244,7 +2271,7 @@ install_api: install_python +@@ -2244,7 +2275,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db |