diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-12-16 16:30:51 -0500 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-12-16 16:36:43 -0500 |
| commit | abaf8dc39cc35be6d2e861a4245c6367c1aa1234 (patch) | |
| tree | 93b46d0b744bbf46f3174eaecce0eb3748476aa9 /security/wazuh-manager/files/patch-src_Makefile | |
| parent | textproc/opensearch210: textproc/opensearch-dashboards210: New ports (diff) | |
security/wazuh: Update to 4.7.0
- Fix ssl=openssl build [1]
- Fix permissions of backup/db directory. Now backup are generated without
problems
- Add support for get ports info
- Add support for get processes info
- Add a better way for get memory info
- Add new decoders and rules files (https://github.com/alonsobsd/wazuh-freebsd)
- Update FreeBSD sca files (https://github.com/alonsobsd/wazuh-freebsd)
- Minor changes to SysInfo::getPackages function
- Another minor modifications
PR: 275008
Reported by: franco _at_ opnsense.org [1]
Diffstat (limited to 'security/wazuh-manager/files/patch-src_Makefile')
| -rw-r--r-- | security/wazuh-manager/files/patch-src_Makefile | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/security/wazuh-manager/files/patch-src_Makefile b/security/wazuh-manager/files/patch-src_Makefile index 857f08017dd6..3dbbc34bb431 100644 --- a/security/wazuh-manager/files/patch-src_Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile 2023-10-30 12:58:46.000000000 -0500 -+++ src/Makefile 2023-11-01 23:49:14.518957000 -0500 +--- src/Makefile 2023-11-23 07:17:53.000000000 -0500 ++++ src/Makefile 2023-12-07 17:33:23.827002000 -0500 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -12,7 +12,16 @@ ARCH_FLAGS = -@@ -253,10 +255,10 @@ +@@ -163,6 +165,8 @@ + DEFINES+=-DUSER=\"${WAZUH_USER}\" + DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\" + ++OSSEC_CFLAGS+=-I./ -I./headers/ -I${EXTERNAL_OPENSSL}include -I$(EXTERNAL_JSON) -I${EXTERNAL_LIBYAML}include -I${EXTERNAL_CURL}include -I${EXTERNAL_MSGPACK}include -I${EXTERNAL_BZIP2} -I${SHARED_MODULES}common -I${DBSYNC}include -I${RSYNC}include -I${SYSCOLLECTOR}include -I${SYSINFO}include -I${EXTERNAL_LIBPCRE2}include -I${EXTERNAL_RPM}/builddir/output/include -I${SYSCHECK}include ++ + ifneq (${TARGET},winagent) + DEFINES+=-D${uname_S} + ifeq (${uname_S},Linux) +@@ -253,10 +257,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -25,7 +34,15 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -907,6 +909,8 @@ +@@ -390,7 +394,6 @@ + + OSSEC_CFLAGS+=${DEFINES} + OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99 +-OSSEC_CFLAGS+=-I./ -I./headers/ -I${EXTERNAL_OPENSSL}include -I$(EXTERNAL_JSON) -I${EXTERNAL_LIBYAML}include -I${EXTERNAL_CURL}include -I${EXTERNAL_MSGPACK}include -I${EXTERNAL_BZIP2} -I${SHARED_MODULES}common -I${DBSYNC}include -I${RSYNC}include -I${SYSCOLLECTOR}include -I${SYSINFO}include -I${EXTERNAL_LIBPCRE2}include -I${EXTERNAL_RPM}/builddir/output/include -I${SYSCHECK}include + + OSSEC_CFLAGS += ${CFLAGS} + OSSEC_LDFLAGS += ${LDFLAGS} +@@ -907,6 +910,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -34,7 +51,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1084,9 +1088,13 @@ +@@ -1084,9 +1089,13 @@ 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 --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli --without-nghttp2 else @@ -48,16 +65,15 @@ #### procps ######### -@@ -2305,10 +2313,33 @@ +@@ -2305,10 +2314,33 @@ 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 -- find ${WPYTHON_DIR} -name "*${WLIBPYTHON}" -exec ln -f {} ${INSTALLDIR}/lib/${WLIBPYTHON} \; +ifeq (${uname_S},FreeBSD) + mkdir -p $(STAGEDIR)${INSTALLDIR}/lib + find $(STAGEDIR)${WPYTHON_DIR} -name "*${WLIBPYTHON}" -exec ln -f {} $(STAGEDIR)${INSTALLDIR}/lib/${WLIBPYTHON} \; +else -+ find ${WPYTHON_DIR} -name "*${WLIBPYTHON}" -exec ln -f {} ${INSTALLDIR}/lib/${WLIBPYTHON} \; + find ${WPYTHON_DIR} -name "*${WLIBPYTHON}" -exec ln -f {} ${INSTALLDIR}/lib/${WLIBPYTHON} \; +endif python_dependencies := requirements.txt @@ -83,7 +99,7 @@ install_dependencies: install_python ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) ${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple -@@ -2325,6 +2356,7 @@ +@@ -2325,6 +2357,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db |