git: 8e222d0e957d - main - security/wazuh-*: Updatet to 4.12.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 11 May 2025 09:09:45 UTC
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e222d0e957d12f8b23dfa39848c7bdcc6a3564d commit 8e222d0e957d12f8b23dfa39848c7bdcc6a3564d Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2025-05-11 09:05:30 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2025-05-11 09:09:37 +0000 security/wazuh-*: Updatet to 4.12.0 - Update bundle python to 3.11.12 - Update opensearch dependency to 2.19.1 - Update opensearch-dashboards dependency to 2.19.1 ChangeLog at: https://documentation.wazuh.com/current/release-notes/release-4-12-0.html Sponsored by: Entersekt --- security/wazuh-agent/Makefile | 8 +- security/wazuh-agent/distinfo | 82 ++--- security/wazuh-agent/files/patch-src-Makefile | 35 +- .../patch-src_syscheckd_src_db_CMakeLists.txt | 11 + ...-src_wazuh__modules_syscollector_CMakeLists.txt | 2 +- security/wazuh-agent/pkg-plist | 23 +- security/wazuh-dashboard/Makefile | 6 +- security/wazuh-dashboard/distinfo | 10 +- security/wazuh-dashboard/pkg-plist | 16 +- security/wazuh-indexer/Makefile | 4 +- security/wazuh-indexer/distinfo | 6 +- security/wazuh-manager/Makefile | 16 +- security/wazuh-manager/distinfo | 146 ++++----- security/wazuh-manager/files/patch-src_Makefile | 35 +- .../patch-src_external_cpython_Makefile.pre.in | 15 +- .../patch-src_syscheckd_src_db_CMakeLists.txt | 11 + ...-src_wazuh__modules_syscollector_CMakeLists.txt | 2 +- ...y__scanner_testtool_wazuhDBQuery_CMakeLists.txt | 8 +- security/wazuh-manager/pkg-plist | 358 +++++++++++++-------- security/wazuh-server/Makefile | 2 +- security/wazuh-server/distinfo | 18 +- 21 files changed, 480 insertions(+), 334 deletions(-) diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index bf04922b813b..b36ffd41b6c7 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -1,8 +1,8 @@ PORTNAME= wazuh -DISTVERSION= 4.11.2 +DISTVERSION= 4.12.0 DISTVERSIONPREFIX= v CATEGORIES= security -MASTER_SITES= https://packages.wazuh.com/deps/35/libraries/sources/:wazuh_sources +MASTER_SITES= https://packages.wazuh.com/deps/40/libraries/sources/:wazuh_sources PKGNAMESUFFIX= -agent DISTFILES= ${EXTERNAL_DISTFILES} DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} @@ -186,7 +186,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/wodles/azure/azure-logs.py ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs.py ${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs - ${INSTALL_DATA} ${WRKSRC}/ruleset/sca/generic/sca_unix_audit.yml ${STAGEDIR}${WAZUHPREFIX}/ruleset/sca/ + ${INSTALL_DATA} ${WRKSRC}/ruleset/sca/generic/sca_distro_independent_linux.yml ${STAGEDIR}${WAZUHPREFIX}/ruleset/sca/ ${INSTALL_LIB} ${WRKSRC}/src/libwazuhext.so ${STAGEDIR}${WAZUHPREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/src/libwazuhshared.so ${STAGEDIR}${WAZUHPREFIX}/lib @@ -209,4 +209,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/gen_ossec.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/ ${INSTALL_SCRIPT} ${WRKSRC}/add_localfiles.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/ + ${INSTALL_DATA} ${WRKSRC}/VERSION.json ${STAGEDIR}${WAZUHPREFIX} + .include <bsd.port.post.mk> diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo index d639aa1c04a5..aaf1436beda3 100644 --- a/security/wazuh-agent/distinfo +++ b/security/wazuh-agent/distinfo @@ -1,41 +1,41 @@ -TIMESTAMP = 1743571801 -SHA256 (wazuh-4.11.2/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.11.2/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.11.2/curl.tar.gz) = 3bc70c67bbba70775022b792fecb597368bdff5184bbdb637cea3d672b87fa6b -SIZE (wazuh-4.11.2/curl.tar.gz) = 4482534 -SHA256 (wazuh-4.11.2/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.11.2/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.11.2/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.11.2/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.11.2/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.11.2/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.11.2/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e -SIZE (wazuh-4.11.2/openssl.tar.gz) = 15637517 -SHA256 (wazuh-4.11.2/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.11.2/procps.tar.gz) = 55897 -SHA256 (wazuh-4.11.2/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 -SIZE (wazuh-4.11.2/sqlite.tar.gz) = 2486661 -SHA256 (wazuh-4.11.2/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b -SIZE (wazuh-4.11.2/zlib.tar.gz) = 1593304 -SHA256 (wazuh-4.11.2/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.11.2/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.11.2/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.11.2/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.11.2/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.11.2/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.11.2/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 -SIZE (wazuh-4.11.2/nlohmann.tar.gz) = 135749 -SHA256 (wazuh-4.11.2/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.11.2/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.11.2/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 -SIZE (wazuh-4.11.2/libpcre2.tar.gz) = 1329651 -SHA256 (wazuh-4.11.2/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.11.2/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.11.2/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a -SIZE (wazuh-4.11.2/libarchive.tar.gz) = 7512700 -SHA256 (wazuh-4.11.2/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.11.2/popt.tar.gz) = 891309 -SHA256 (wazuh-4.11.2/wazuh-wazuh-v4.11.2_GH0.tar.gz) = 4583e9d77e87907f35ed49e5fdb423a4f4d1fea1ea91f2d7b616f6d982bd6dfe -SIZE (wazuh-4.11.2/wazuh-wazuh-v4.11.2_GH0.tar.gz) = 18034573 -SHA256 (wazuh-4.11.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 -SIZE (wazuh-4.11.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 +TIMESTAMP = 1746862127 +SHA256 (wazuh-4.12.0/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.12.0/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.12.0/curl.tar.gz) = a93b5b839255d92487a3f9ad7dfada1dc73ab016802c7f669dc09a891c6546fa +SIZE (wazuh-4.12.0/curl.tar.gz) = 4525465 +SHA256 (wazuh-4.12.0/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.12.0/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.12.0/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.12.0/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.12.0/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.12.0/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.12.0/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e +SIZE (wazuh-4.12.0/openssl.tar.gz) = 15637517 +SHA256 (wazuh-4.12.0/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.12.0/procps.tar.gz) = 55897 +SHA256 (wazuh-4.12.0/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 +SIZE (wazuh-4.12.0/sqlite.tar.gz) = 2486661 +SHA256 (wazuh-4.12.0/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b +SIZE (wazuh-4.12.0/zlib.tar.gz) = 1593304 +SHA256 (wazuh-4.12.0/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.12.0/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.12.0/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.12.0/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.12.0/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.12.0/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.12.0/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 +SIZE (wazuh-4.12.0/nlohmann.tar.gz) = 135749 +SHA256 (wazuh-4.12.0/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.12.0/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.12.0/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 +SIZE (wazuh-4.12.0/libpcre2.tar.gz) = 1329651 +SHA256 (wazuh-4.12.0/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.12.0/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.12.0/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a +SIZE (wazuh-4.12.0/libarchive.tar.gz) = 7512700 +SHA256 (wazuh-4.12.0/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.12.0/popt.tar.gz) = 891309 +SHA256 (wazuh-4.12.0/wazuh-wazuh-v4.12.0_GH0.tar.gz) = a0af093328df4658ff52cf78d8d6a03cc943fbd95a160cccd8b3e5e294b71ac5 +SIZE (wazuh-4.12.0/wazuh-wazuh-v4.12.0_GH0.tar.gz) = 18498222 +SHA256 (wazuh-4.12.0/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 +SIZE (wazuh-4.12.0/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 diff --git a/security/wazuh-agent/files/patch-src-Makefile b/security/wazuh-agent/files/patch-src-Makefile index 33cecd1aac15..70420cde9198 100644 --- a/security/wazuh-agent/files/patch-src-Makefile +++ b/security/wazuh-agent/files/patch-src-Makefile @@ -1,5 +1,5 @@ ---- src/Makefile 2025-01-08 01:15:05.000000000 -0800 -+++ src/Makefile 2025-01-14 19:17:44.081916000 -0800 +--- src/Makefile 2025-04-30 02:30:26.000000000 -0700 ++++ src/Makefile 2025-05-09 19:40:18.856441000 -0700 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -109,7 +111,7 @@ +@@ -110,7 +112,7 @@ USE_PRELUDE?=no USE_ZEROMQ?=no USE_GEOIP?=no @@ -21,7 +21,7 @@ USE_BIG_ENDIAN=no USE_AUDIT=no MINGW_HOST=unknown -@@ -174,6 +176,8 @@ +@@ -175,6 +177,8 @@ DEFINES+=-DUSER=\"${WAZUH_USER}\" DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\" @@ -30,7 +30,7 @@ ifneq (${TARGET},winagent) DEFINES+=-D${uname_S} ifeq (${uname_S},Linux) -@@ -268,10 +272,10 @@ +@@ -269,10 +273,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -43,7 +43,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -433,7 +437,6 @@ +@@ -434,7 +438,6 @@ OSSEC_CFLAGS+=${DEFINES} OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99 @@ -51,7 +51,7 @@ OSSEC_CFLAGS += ${CFLAGS} OSSEC_LDFLAGS += ${LDFLAGS} -@@ -530,8 +533,8 @@ +@@ -531,8 +534,8 @@ ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1)) DEFINES+=-DINOTIFY_ENABLED ifeq (${uname_S},FreeBSD) @@ -62,7 +62,7 @@ OSSEC_CFLAGS+=-I/usr/local/include endif endif -@@ -956,6 +959,8 @@ +@@ -957,6 +960,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -71,7 +71,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1172,9 +1177,13 @@ +@@ -1186,9 +1191,13 @@ cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli --without-nghttp2 --without-zstd endif else @@ -85,16 +85,16 @@ #### procps ######### -@@ -2263,7 +2272,7 @@ +@@ -2295,7 +2304,7 @@ #### FIM ###### wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules -- cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} +- cd syscheckd && mkdir -p build && cd build && cmake ${SYSCHECK_OS} ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} + cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} ${OSSEC_CFLAGS} -pipe -Wall -Wextra -std=gnu99" -DCMAKE_EXE_LINKER_FLAGS="${OSSEC_LDFLAGS} ${OSSEC_LIBS}" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} #### Monitor ####### -@@ -2441,7 +2450,7 @@ +@@ -2473,7 +2482,7 @@ WPYTHON_DIR := ${INSTALLDIR}/framework/python OPTIMIZE_CPYTHON?=no WPYTHON_TAR=cpython.tar.gz @@ -103,7 +103,7 @@ ifneq (,$(filter ${OPTIMIZE_CPYTHON},YES yes y Y 1)) CPYTHON_FLAGS=--enable-optimizations -@@ -2455,7 +2464,7 @@ +@@ -2487,22 +2496,45 @@ endif ifeq (,$(wildcard ${EXTERNAL_CPYTHON}/python)) @@ -112,7 +112,12 @@ endif build_python: $(WAZUHEXT_LIB) -@@ -2467,10 +2476,33 @@ + + install_python: + ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) +- cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && ${MAKE} install ++ cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && export LD_LIBRARY_PATH=${ROUTE_PATH} && ${MAKE} install + else 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 @@ -146,7 +151,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 -@@ -2487,6 +2519,7 @@ +@@ -2519,6 +2551,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db diff --git a/security/wazuh-agent/files/patch-src_syscheckd_src_db_CMakeLists.txt b/security/wazuh-agent/files/patch-src_syscheckd_src_db_CMakeLists.txt new file mode 100644 index 000000000000..461f3beeb586 --- /dev/null +++ b/security/wazuh-agent/files/patch-src_syscheckd_src_db_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/syscheckd/src/db/CMakeLists.txt 2025-05-11 01:12:38.188450000 -0700 ++++ src/syscheckd/src/db/CMakeLists.txt 2025-05-11 01:13:28.349743000 -0700 +@@ -64,7 +64,7 @@ + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + + if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") +- target_link_libraries(fimdb dbsync rsync wazuhext) ++ target_link_libraries(fimdb dbsync ${SRC_FOLDER}/shared_modules/rsync/build/lib/librsync.so wazuhext) + else() + target_link_libraries( + fimdb diff --git a/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt index 697aceecc546..bcff4dfa9ce1 100644 --- a/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt +++ b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt @@ -5,7 +5,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") - target_link_libraries(syscollector dbsync rsync sysinfo wazuhext) -+ target_link_libraries(syscollector dbsync rsync ${SRC_FOLDER}/data_provider/build/lib/libsysinfo.so nghttp2 wazuhext) ++ target_link_libraries(syscollector dbsync ${SRC_FOLDER}/shared_modules/rsync/build/lib/librsync.so ${SRC_FOLDER}/data_provider/build/lib/libsysinfo.so nghttp2 wazuhext) else() string(REPLACE ";" ":" CXX_IMPLICIT_LINK_DIRECTORIES_STR "${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}") string(REPLACE ";" ":" PLATFORM_REQUIRED_RUNTIME_PATH_STR "${CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH}") diff --git a/security/wazuh-agent/pkg-plist b/security/wazuh-agent/pkg-plist index e56c68599059..d66c337de3a7 100644 --- a/security/wazuh-agent/pkg-plist +++ b/security/wazuh-agent/pkg-plist @@ -1,6 +1,7 @@ @mode 750 @owner root @group wazuh +/var/ossec/VERSION.json /var/ossec/active-response/bin/default-firewall-drop /var/ossec/active-response/bin/disable-account /var/ossec/active-response/bin/firewall-drop @@ -114,6 +115,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/aix/localfile-commands.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/aix/syscheck.agent.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/aix/wodle-syscollector.template +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/10/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/8/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/9/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/sca.files @@ -123,6 +125,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/amzn/2023/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/bsd/localfile-commands.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/bsd/wodle-syscollector.template +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/10/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/5/rootcheck.agent.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/5/rootcheck.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/5/sca.files @@ -173,6 +176,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/32/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/33/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/34/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/41/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/rootcheck.agent.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/rootcheck.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/sca.files @@ -208,6 +212,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/generic/wodle-syscollector.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/generic/wodle-vulnerability-detection.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ol/9/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/10/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/5/rootcheck.agent.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/5/rootcheck.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/5/sca.files @@ -258,6 +263,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/18/04/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/20/04/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/22/04/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/24/04/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/rootcheck.agent.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/rootcheck.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/sca.files @@ -279,6 +285,7 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/windows/xp/profile.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/windows/xp/syscheck.template /var/ossec/packages_files/agent_installation_scripts/gen_ossec.sh +/var/ossec/packages_files/agent_installation_scripts/sca/almalinux/cis_alma_linux_10.yml /var/ossec/packages_files/agent_installation_scripts/sca/almalinux/cis_alma_linux_8.yml /var/ossec/packages_files/agent_installation_scripts/sca/almalinux/cis_alma_linux_9.yml /var/ossec/packages_files/agent_installation_scripts/sca/amazon/cis_amazon_linux_1.yml @@ -295,6 +302,7 @@ /var/ossec/packages_files/agent_installation_scripts/sca/applications/cis_sqlserver_2017.yml /var/ossec/packages_files/agent_installation_scripts/sca/applications/cis_sqlserver_2019.yml /var/ossec/packages_files/agent_installation_scripts/sca/applications/web_vulnerabilities.yml +/var/ossec/packages_files/agent_installation_scripts/sca/centos/10/cis_centos10_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/centos/6/cis_centos6_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/centos/7/cis_centos7_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/centos/8/cis_centos8_linux.yml @@ -318,13 +326,14 @@ /var/ossec/packages_files/agent_installation_scripts/sca/freebsd/cis_freebsd13.yml /var/ossec/packages_files/agent_installation_scripts/sca/freebsd/cis_freebsd14.yml /var/ossec/packages_files/agent_installation_scripts/sca/freebsd/cis_freebsd15.yml -/var/ossec/packages_files/agent_installation_scripts/sca/generic/sca_unix_audit.yml +/var/ossec/packages_files/agent_installation_scripts/sca/generic/sca_distro_independent_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/hpux/cis_hpux_11i.yml /var/ossec/packages_files/agent_installation_scripts/sca/hpux/cis_hpux_11i_bastille.yml /var/ossec/packages_files/agent_installation_scripts/sca/mongodb/cis_mongodb_36.yml /var/ossec/packages_files/agent_installation_scripts/sca/nginx/cis_nginx_1.yml /var/ossec/packages_files/agent_installation_scripts/sca/ol/9/cis_oracle_linux_9.yml /var/ossec/packages_files/agent_installation_scripts/sca/oracledb/cis_oracle_database_19c.yml +/var/ossec/packages_files/agent_installation_scripts/sca/rhel/10/cis_rhel10_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/rhel/5/cis_rhel5_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/rhel/6/cis_rhel6_linux.yml /var/ossec/packages_files/agent_installation_scripts/sca/rhel/7/cis_rhel7_linux.yml @@ -342,6 +351,7 @@ /var/ossec/packages_files/agent_installation_scripts/sca/ubuntu/cis_ubuntu18-04.yml /var/ossec/packages_files/agent_installation_scripts/sca/ubuntu/cis_ubuntu20-04.yml /var/ossec/packages_files/agent_installation_scripts/sca/ubuntu/cis_ubuntu22-04.yml +/var/ossec/packages_files/agent_installation_scripts/sca/ubuntu/cis_ubuntu24-04.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win10_enterprise.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win11_enterprise.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2012_non_r2.yml @@ -349,6 +359,7 @@ /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2016.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2019.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2022.yml +/var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2025.yml /var/ossec/packages_files/agent_installation_scripts/src/init/adduser.sh /var/ossec/packages_files/agent_installation_scripts/src/init/darwin-addusers.sh /var/ossec/packages_files/agent_installation_scripts/src/init/darwin-delete-oldusers.sh @@ -386,7 +397,7 @@ @owner root @group wazuh /var/ossec/queue/syscollector/norm_config.json -/var/ossec/ruleset/sca/sca_unix_audit.yml +/var/ossec/ruleset/sca/sca_distro_independent_linux.yml @mode 750 @owner root @group wazuh @@ -425,6 +436,7 @@ @group wazuh @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/HP-UX @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/aix +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/10 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/8 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux/9 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/almalinux @@ -434,6 +446,7 @@ @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/amzn/2023 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/amzn @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/bsd +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/10 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/5 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/6 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/7 @@ -463,11 +476,13 @@ @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/32 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/33 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/34 +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora/41 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/fedora @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/generic/localfile-logs @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/generic @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ol/9 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ol +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/10 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/5 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/6 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/rhel/7 @@ -501,6 +516,8 @@ @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/20 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/22/04 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/22 +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/24/04 +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu/24 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/ubuntu @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/windows/10 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/windows/2003 @@ -522,6 +539,7 @@ @dir /var/ossec/packages_files/agent_installation_scripts/sca/almalinux @dir /var/ossec/packages_files/agent_installation_scripts/sca/amazon @dir /var/ossec/packages_files/agent_installation_scripts/sca/applications +@dir /var/ossec/packages_files/agent_installation_scripts/sca/centos/10 @dir /var/ossec/packages_files/agent_installation_scripts/sca/centos/6 @dir /var/ossec/packages_files/agent_installation_scripts/sca/centos/7 @dir /var/ossec/packages_files/agent_installation_scripts/sca/centos/8 @@ -546,6 +564,7 @@ @dir /var/ossec/packages_files/agent_installation_scripts/sca/ol/9 @dir /var/ossec/packages_files/agent_installation_scripts/sca/ol @dir /var/ossec/packages_files/agent_installation_scripts/sca/oracledb +@dir /var/ossec/packages_files/agent_installation_scripts/sca/rhel/10 @dir /var/ossec/packages_files/agent_installation_scripts/sca/rhel/5 @dir /var/ossec/packages_files/agent_installation_scripts/sca/rhel/6 @dir /var/ossec/packages_files/agent_installation_scripts/sca/rhel/7 diff --git a/security/wazuh-dashboard/Makefile b/security/wazuh-dashboard/Makefile index cb4db8b83e61..3248ef349f72 100644 --- a/security/wazuh-dashboard/Makefile +++ b/security/wazuh-dashboard/Makefile @@ -1,6 +1,6 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.11.2 +DISTVERSION= 4.12.0 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -dashboard @@ -14,13 +14,13 @@ WWW= https://github.com/wazuh/wazuh-dashboard-plugins LICENSE= GPLv2 -RUN_DEPENDS= ${LOCALBASE}/www/opensearch-dashboards/bin/opensearch-dashboards:textproc/opensearch-dashboards216 +RUN_DEPENDS= ${LOCALBASE}/www/opensearch-dashboards/bin/opensearch-dashboards:textproc/opensearch-dashboards219 NO_BUILD= yes SUB_FILES= pkg-message -OPENSEARCH_VERSION= 2.16.0 +OPENSEARCH_VERSION= 2.19.1 ETCDIR= ${PREFIX}/etc/wazuh-dashboard WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-plugins diff --git a/security/wazuh-dashboard/distinfo b/security/wazuh-dashboard/distinfo index 9beecd4fc491..08b384bbfbfc 100644 --- a/security/wazuh-dashboard/distinfo +++ b/security/wazuh-dashboard/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1743642401 -SHA256 (wazuh-4.11.2/wazuh-dashboard-plugins-4.11.2-2.16.0.tar.gz) = c4a7dd52ead7d648d3755f1d274f29380c36a3f2037146be1d7db67c7c02d136 -SIZE (wazuh-4.11.2/wazuh-dashboard-plugins-4.11.2-2.16.0.tar.gz) = 25096770 -SHA256 (wazuh-4.11.2/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 -SIZE (wazuh-4.11.2/opensearch_dashboards.yml) = 806 +TIMESTAMP = 1746862021 +SHA256 (wazuh-4.12.0/wazuh-dashboard-plugins-4.12.0-2.19.1.tar.gz) = 1fdf778d027fb06b366cf3747df7269f743606ed481124fe3169ba82aac7dc73 +SIZE (wazuh-4.12.0/wazuh-dashboard-plugins-4.12.0-2.19.1.tar.gz) = 25461558 +SHA256 (wazuh-4.12.0/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 +SIZE (wazuh-4.12.0/opensearch_dashboards.yml) = 806 diff --git a/security/wazuh-dashboard/pkg-plist b/security/wazuh-dashboard/pkg-plist index faa5da71d0cb..aa526acf865f 100644 --- a/security/wazuh-dashboard/pkg-plist +++ b/security/wazuh-dashboard/pkg-plist @@ -574,6 +574,14 @@ www/opensearch-dashboards/plugins/wazuh/node_modules/axios/lib/platform/node/cla www/opensearch-dashboards/plugins/wazuh/node_modules/axios/lib/platform/node/classes/URLSearchParams.js www/opensearch-dashboards/plugins/wazuh/node_modules/axios/lib/platform/node/index.js www/opensearch-dashboards/plugins/wazuh/node_modules/axios/lib/utils.js +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/License +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/README.md.bak +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/Readme.md +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/index.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/lib/browser.js +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/lib/form_data.js +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/lib/populate.js +www/opensearch-dashboards/plugins/wazuh/node_modules/axios/node_modules/form-data/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/axios/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/base64-js/LICENSE www/opensearch-dashboards/plugins/wazuh/node_modules/base64-js/README.md @@ -3107,14 +3115,6 @@ www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/esprima/ www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/esprima/bin/esvalidate.js www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/esprima/dist/esprima.js www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/esprima/package.json -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/License -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/README.md.bak -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/Readme.md -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/index.d.ts -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/lib/browser.js -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/lib/form_data.js -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/lib/populate.js -www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/node_modules/form-data/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/jsdom/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/json2csv/.eslintrc www/opensearch-dashboards/plugins/wazuh/node_modules/json2csv/.gitattributes diff --git a/security/wazuh-indexer/Makefile b/security/wazuh-indexer/Makefile index 65f6bd77c67f..823f3b8e80c9 100644 --- a/security/wazuh-indexer/Makefile +++ b/security/wazuh-indexer/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -PORTVERSION= 4.11.2 +PORTVERSION= 4.12.0 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -indexer @@ -12,7 +12,7 @@ WWW= https://wazuh.com/ LICENSE= GPLv2 -RUN_DEPENDS= ${LOCALBASE}/lib/opensearch/bin/opensearch:textproc/opensearch216 +RUN_DEPENDS= ${LOCALBASE}/lib/opensearch/bin/opensearch:textproc/opensearch219 NO_BUILD= yes diff --git a/security/wazuh-indexer/distinfo b/security/wazuh-indexer/distinfo index 0abcbeaa2864..825b29dbf027 100644 --- a/security/wazuh-indexer/distinfo +++ b/security/wazuh-indexer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743642881 -SHA256 (wazuh-4.11.2/wazuh-4.11.2-indexer.yml) = 15290a6e81026d970891d7e1805afe4a87420984893948b5dd7a65789d62f5c5 -SIZE (wazuh-4.11.2/wazuh-4.11.2-indexer.yml) = 2216 +TIMESTAMP = 1746861787 +SHA256 (wazuh-4.12.0/wazuh-4.12.0-indexer.yml) = 15290a6e81026d970891d7e1805afe4a87420984893948b5dd7a65789d62f5c5 +SIZE (wazuh-4.12.0/wazuh-4.12.0-indexer.yml) = 2216 diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile index f053d495f7f9..1c347936b893 100644 --- a/security/wazuh-manager/Makefile +++ b/security/wazuh-manager/Makefile @@ -1,8 +1,8 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.11.2 +DISTVERSION= 4.12.0 CATEGORIES= security -MASTER_SITES= https://packages.wazuh.com/deps/35/libraries/sources/:wazuh_sources \ +MASTER_SITES= https://packages.wazuh.com/deps/40/libraries/sources/:wazuh_sources \ LOCAL/acm/${PORTNAME}/:wazuh_cache PKGNAMESUFFIX= -manager DISTFILES= ${EXTERNAL_DISTFILES} \ @@ -49,7 +49,7 @@ EXTERNAL_DISTFILES= audit-userspace.tar.gz:wazuh_sources \ bzip2.tar.gz:wazuh_sources \ cJSON.tar.gz:wazuh_sources \ cpp-httplib.tar.gz:wazuh_sources \ - cpython-3.11.11.tar.gz:wazuh_cache \ + cpython-3.11.12.tar.gz:wazuh_cache \ curl.tar.gz:wazuh_sources \ flatbuffers.tar.gz:wazuh_sources \ googletest.tar.gz:wazuh_sources \ @@ -139,7 +139,7 @@ WAZUHMOD770= /etc/decoders /etc/lists /etc/lists/amazon /etc/rootcheck \ WAZUHPREFIX= /var/ossec WZPYTHONWHEELS= cffi-1.15.1-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ - cryptography-43.0.1-cp37-abi3-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ + cryptography-44.0.1-cp37-abi3-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ greenlet-2.0.2-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ grpcio-1.69.0-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ lazy_object_proxy-1.10.0-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ @@ -163,16 +163,16 @@ IGNORE= FreeBSD ${OSVERSION} ${ARCH} is not supported .endif .if ${ARCH} == "aarch64" -FBSD14_PATCH_LEVEL= _p2 +FBSD14_PATCH_LEVEL= _p3 .endif .if ${ARCH} != "aarch64" -FBSD13_PATCH_LEVEL= _p3 +FBSD13_PATCH_LEVEL= _p1 FBSD14_PATCH_LEVEL= _p1 .endif .if ${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000 -FBSD_VERSION_BASE=freebsd_13_4_release${FBSD13_PATCH_LEVEL} +FBSD_VERSION_BASE=freebsd_13_5_release${FBSD13_PATCH_LEVEL} FBSD_MAJOR_VERSION=13 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd13-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache @@ -377,6 +377,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/wazuh_modules/vulnerability_scanner/indexer/template/index-template.json ${STAGEDIR}${WAZUHPREFIX}/templates/vd_states_template.json + ${INSTALL_DATA} ${WRKSRC}/VERSION.json ${STAGEDIR}${WAZUHPREFIX} + cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \ ${MAKE_CMD} install_python ${MAKE_ARGS} cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \ diff --git a/security/wazuh-manager/distinfo b/security/wazuh-manager/distinfo index 6b4479296fc8..c8725b26cd79 100644 --- a/security/wazuh-manager/distinfo +++ b/security/wazuh-manager/distinfo @@ -1,73 +1,73 @@ -TIMESTAMP = 1743563753 -SHA256 (wazuh-4.11.2/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.11.2/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.11.2/benchmark.tar.gz) = 94c57aa0cb2bd78dbe9e77d332cbc644daf0fecdc9a09632048be6e09f9ced6b -SIZE (wazuh-4.11.2/benchmark.tar.gz) = 184460 -SHA256 (wazuh-4.11.2/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.11.2/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.11.2/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.11.2/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.11.2/cpp-httplib.tar.gz) = 6517573263611686b9219ba796c35f54a306eb27dc3c72e1807f2a0a34cac1e8 -SIZE (wazuh-4.11.2/cpp-httplib.tar.gz) = 57890 -SHA256 (wazuh-4.11.2/cpython-3.11.11.tar.gz) = 7d13a6e68bd2af9608337b5e35582c51823cc3866aa0b4b9f7883f04da606d32 -SIZE (wazuh-4.11.2/cpython-3.11.11.tar.gz) = 27280192 -SHA256 (wazuh-4.11.2/curl.tar.gz) = 3bc70c67bbba70775022b792fecb597368bdff5184bbdb637cea3d672b87fa6b -SIZE (wazuh-4.11.2/curl.tar.gz) = 4482534 -SHA256 (wazuh-4.11.2/flatbuffers.tar.gz) = 943699a1fe86c197371cd214c4c355da0f253a3093f0c73fb74cb4c48b8978a9 -SIZE (wazuh-4.11.2/flatbuffers.tar.gz) = 2313322 -SHA256 (wazuh-4.11.2/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.11.2/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.11.2/http-request.tar.gz) = e843ee984938c7540955cc4a9c0c8dc6f1b9ed9fd8a09f6430623b2f34437c4d -SIZE (wazuh-4.11.2/http-request.tar.gz) = 63490 -SHA256 (wazuh-4.11.2/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 -SIZE (wazuh-4.11.2/jemalloc.tar.gz) = 579864 -SHA256 (wazuh-4.11.2/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a -SIZE (wazuh-4.11.2/libarchive.tar.gz) = 7512700 -SHA256 (wazuh-4.11.2/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.11.2/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.11.2/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.11.2/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.11.2/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 -SIZE (wazuh-4.11.2/libpcre2.tar.gz) = 1329651 -SHA256 (wazuh-4.11.2/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.11.2/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.11.2/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.11.2/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.11.2/lua.tar.gz) = 62eeb7e24b246c50708bcd4d92db3c9de8d196d94c9c33b8bff400f25f105a1f -SIZE (wazuh-4.11.2/lua.tar.gz) = 304235 -SHA256 (wazuh-4.11.2/lzma.tar.gz) = 4ce0c192d41072b5679af89bb531efb685c8267a4b7e2005999149ac17028134 -SIZE (wazuh-4.11.2/lzma.tar.gz) = 1327581 -SHA256 (wazuh-4.11.2/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.11.2/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.11.2/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 -SIZE (wazuh-4.11.2/nlohmann.tar.gz) = 135749 -SHA256 (wazuh-4.11.2/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e -SIZE (wazuh-4.11.2/openssl.tar.gz) = 15637517 -SHA256 (wazuh-4.11.2/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.11.2/popt.tar.gz) = 891309 -SHA256 (wazuh-4.11.2/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.11.2/procps.tar.gz) = 55897 -SHA256 (wazuh-4.11.2/rocksdb.tar.gz) = eeed60a3d4e29f7305e79f9f5cebd4261174261227f1b5a7d05da55565675436 -SIZE (wazuh-4.11.2/rocksdb.tar.gz) = 12800920 -SHA256 (wazuh-4.11.2/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 -SIZE (wazuh-4.11.2/sqlite.tar.gz) = 2486661 -SHA256 (wazuh-4.11.2/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b -SIZE (wazuh-4.11.2/zlib.tar.gz) = 1593304 -SHA256 (wazuh-4.11.2/wazuh-cache-any-4.11.2.tar.gz) = 3255e535c424321ea1382754a91bf6f45aff3e775cf37a6164ac153072b6d9ab -SIZE (wazuh-4.11.2/wazuh-cache-any-4.11.2.tar.gz) = 22890148 -SHA256 (wazuh-4.11.2/wazuh-python-4.11.2.tar.gz) = e0e5f9cfd5d89a5a8fce95f2c844e95be187a9f6b82742064a3f2f2bfffe62c7 -SIZE (wazuh-4.11.2/wazuh-python-4.11.2.tar.gz) = 466321 -SHA256 (wazuh-4.11.2/wazuh-cache-fbsd13-amd64-4.11.2.tar.gz) = fe25ba5c71ff06bd5aa69b11d4baf4c405f1a1d047c3f76c8357810d4ed44f45 -SIZE (wazuh-4.11.2/wazuh-cache-fbsd13-amd64-4.11.2.tar.gz) = 26784406 -SHA256 (wazuh-4.11.2/wazuh-cache-fbsd14-aarch64-4.11.2.tar.gz) = 0a0718d870f5569e3b13d90c3b4df0405e4dd992db9d0261cd0040812bb88db9 -SIZE (wazuh-4.11.2/wazuh-cache-fbsd14-aarch64-4.11.2.tar.gz) = 24919162 -SHA256 (wazuh-4.11.2/wazuh-cache-fbsd14-amd64-4.11.2.tar.gz) = 7772f3db2d584d5c51b48d9aaf0f320f64fff27095e9a4ef95a16b5ac113ad5f -SIZE (wazuh-4.11.2/wazuh-cache-fbsd14-amd64-4.11.2.tar.gz) = 26809002 -SHA256 (wazuh-4.11.2/wazuh-cache-fbsd15-aarch64-4.11.2.tar.gz) = baa0dc7a27ee33823e171065a9c5aada13f6f635ad3b5092a4fc0df8c1f9ed51 -SIZE (wazuh-4.11.2/wazuh-cache-fbsd15-aarch64-4.11.2.tar.gz) = 24899668 -SHA256 (wazuh-4.11.2/wazuh-cache-fbsd15-amd64-4.11.2.tar.gz) = 26c6ffc93f8c95fa198e829e1dd6e981ce621c25f9ee121ca238401ec8109020 -SIZE (wazuh-4.11.2/wazuh-cache-fbsd15-amd64-4.11.2.tar.gz) = 26858751 -SHA256 (wazuh-4.11.2/wazuh-wazuh-v4.11.2_GH0.tar.gz) = 4583e9d77e87907f35ed49e5fdb423a4f4d1fea1ea91f2d7b616f6d982bd6dfe -SIZE (wazuh-4.11.2/wazuh-wazuh-v4.11.2_GH0.tar.gz) = 18034573 -SHA256 (wazuh-4.11.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 -SIZE (wazuh-4.11.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 +TIMESTAMP = 1746846541 +SHA256 (wazuh-4.12.0/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.12.0/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.12.0/benchmark.tar.gz) = 94c57aa0cb2bd78dbe9e77d332cbc644daf0fecdc9a09632048be6e09f9ced6b +SIZE (wazuh-4.12.0/benchmark.tar.gz) = 184460 +SHA256 (wazuh-4.12.0/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.12.0/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.12.0/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.12.0/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.12.0/cpp-httplib.tar.gz) = 6517573263611686b9219ba796c35f54a306eb27dc3c72e1807f2a0a34cac1e8 +SIZE (wazuh-4.12.0/cpp-httplib.tar.gz) = 57890 +SHA256 (wazuh-4.12.0/cpython-3.11.12.tar.gz) = 484f599929fd45e31fe3c53ab0121bbe481ef19f1778a1dbc7fb6093b7188b06 +SIZE (wazuh-4.12.0/cpython-3.11.12.tar.gz) = 27177085 +SHA256 (wazuh-4.12.0/curl.tar.gz) = a93b5b839255d92487a3f9ad7dfada1dc73ab016802c7f669dc09a891c6546fa +SIZE (wazuh-4.12.0/curl.tar.gz) = 4525465 +SHA256 (wazuh-4.12.0/flatbuffers.tar.gz) = 943699a1fe86c197371cd214c4c355da0f253a3093f0c73fb74cb4c48b8978a9 +SIZE (wazuh-4.12.0/flatbuffers.tar.gz) = 2313322 +SHA256 (wazuh-4.12.0/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.12.0/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.12.0/http-request.tar.gz) = e843ee984938c7540955cc4a9c0c8dc6f1b9ed9fd8a09f6430623b2f34437c4d +SIZE (wazuh-4.12.0/http-request.tar.gz) = 63490 +SHA256 (wazuh-4.12.0/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 +SIZE (wazuh-4.12.0/jemalloc.tar.gz) = 579864 +SHA256 (wazuh-4.12.0/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a +SIZE (wazuh-4.12.0/libarchive.tar.gz) = 7512700 +SHA256 (wazuh-4.12.0/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.12.0/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.12.0/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.12.0/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.12.0/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 +SIZE (wazuh-4.12.0/libpcre2.tar.gz) = 1329651 +SHA256 (wazuh-4.12.0/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.12.0/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.12.0/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.12.0/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.12.0/lua.tar.gz) = 62eeb7e24b246c50708bcd4d92db3c9de8d196d94c9c33b8bff400f25f105a1f +SIZE (wazuh-4.12.0/lua.tar.gz) = 304235 +SHA256 (wazuh-4.12.0/lzma.tar.gz) = 4ce0c192d41072b5679af89bb531efb685c8267a4b7e2005999149ac17028134 +SIZE (wazuh-4.12.0/lzma.tar.gz) = 1327581 +SHA256 (wazuh-4.12.0/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.12.0/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.12.0/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 +SIZE (wazuh-4.12.0/nlohmann.tar.gz) = 135749 +SHA256 (wazuh-4.12.0/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e +SIZE (wazuh-4.12.0/openssl.tar.gz) = 15637517 +SHA256 (wazuh-4.12.0/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.12.0/popt.tar.gz) = 891309 +SHA256 (wazuh-4.12.0/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.12.0/procps.tar.gz) = 55897 +SHA256 (wazuh-4.12.0/rocksdb.tar.gz) = eeed60a3d4e29f7305e79f9f5cebd4261174261227f1b5a7d05da55565675436 +SIZE (wazuh-4.12.0/rocksdb.tar.gz) = 12800920 +SHA256 (wazuh-4.12.0/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 +SIZE (wazuh-4.12.0/sqlite.tar.gz) = 2486661 +SHA256 (wazuh-4.12.0/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b +SIZE (wazuh-4.12.0/zlib.tar.gz) = 1593304 +SHA256 (wazuh-4.12.0/wazuh-cache-any-4.12.0.tar.gz) = c5e7ce333b2ec47f40c748ff79f8a74d7492ea72de1f5457f124aa8eff1447c1 +SIZE (wazuh-4.12.0/wazuh-cache-any-4.12.0.tar.gz) = 22863738 +SHA256 (wazuh-4.12.0/wazuh-python-4.12.0.tar.gz) = d4c68ac05ec7c45af17cc784f3708dbfc6322f124bd8f46b43ad6a360ab28ba7 +SIZE (wazuh-4.12.0/wazuh-python-4.12.0.tar.gz) = 466860 +SHA256 (wazuh-4.12.0/wazuh-cache-fbsd13-amd64-4.12.0.tar.gz) = 1a5250e98d58a98ac76fb98d66cc636905d3a563dc42df920e875b1e1b810003 +SIZE (wazuh-4.12.0/wazuh-cache-fbsd13-amd64-4.12.0.tar.gz) = 25402410 +SHA256 (wazuh-4.12.0/wazuh-cache-fbsd14-aarch64-4.12.0.tar.gz) = 2e7a139180a5023061fa92db550c204bf8ca0d6ebb842d1e9264bba2cd0cabe6 +SIZE (wazuh-4.12.0/wazuh-cache-fbsd14-aarch64-4.12.0.tar.gz) = 23491102 +SHA256 (wazuh-4.12.0/wazuh-cache-fbsd14-amd64-4.12.0.tar.gz) = 4a8de792422af595b3ab81da3dfa3dff490b054eec4b7d244a7df27e1a8cf016 +SIZE (wazuh-4.12.0/wazuh-cache-fbsd14-amd64-4.12.0.tar.gz) = 25134525 +SHA256 (wazuh-4.12.0/wazuh-cache-fbsd15-aarch64-4.12.0.tar.gz) = be29adb527956c7d73538793f68626e162637cd4863a314c94aa3bdd7a87fa84 +SIZE (wazuh-4.12.0/wazuh-cache-fbsd15-aarch64-4.12.0.tar.gz) = 24812302 +SHA256 (wazuh-4.12.0/wazuh-cache-fbsd15-amd64-4.12.0.tar.gz) = fff9241e826077fab7410aa5032bc0063c2420b9be36f4449e84cfb8362ce25d +SIZE (wazuh-4.12.0/wazuh-cache-fbsd15-amd64-4.12.0.tar.gz) = 25184261 +SHA256 (wazuh-4.12.0/wazuh-wazuh-v4.12.0_GH0.tar.gz) = a0af093328df4658ff52cf78d8d6a03cc943fbd95a160cccd8b3e5e294b71ac5 +SIZE (wazuh-4.12.0/wazuh-wazuh-v4.12.0_GH0.tar.gz) = 18498222 +SHA256 (wazuh-4.12.0/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 +SIZE (wazuh-4.12.0/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 diff --git a/security/wazuh-manager/files/patch-src_Makefile b/security/wazuh-manager/files/patch-src_Makefile index 33cecd1aac15..70420cde9198 100644 --- a/security/wazuh-manager/files/patch-src_Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile 2025-01-08 01:15:05.000000000 -0800 -+++ src/Makefile 2025-01-14 19:17:44.081916000 -0800 +--- src/Makefile 2025-04-30 02:30:26.000000000 -0700 ++++ src/Makefile 2025-05-09 19:40:18.856441000 -0700 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -109,7 +111,7 @@ +@@ -110,7 +112,7 @@ USE_PRELUDE?=no USE_ZEROMQ?=no USE_GEOIP?=no @@ -21,7 +21,7 @@ USE_BIG_ENDIAN=no USE_AUDIT=no MINGW_HOST=unknown -@@ -174,6 +176,8 @@ +@@ -175,6 +177,8 @@ DEFINES+=-DUSER=\"${WAZUH_USER}\" DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\" @@ -30,7 +30,7 @@ ifneq (${TARGET},winagent) DEFINES+=-D${uname_S} ifeq (${uname_S},Linux) -@@ -268,10 +272,10 @@ +@@ -269,10 +273,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -43,7 +43,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -433,7 +437,6 @@ +@@ -434,7 +438,6 @@ OSSEC_CFLAGS+=${DEFINES} OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99 @@ -51,7 +51,7 @@ OSSEC_CFLAGS += ${CFLAGS} OSSEC_LDFLAGS += ${LDFLAGS} -@@ -530,8 +533,8 @@ +@@ -531,8 +534,8 @@ ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1)) DEFINES+=-DINOTIFY_ENABLED ifeq (${uname_S},FreeBSD) @@ -62,7 +62,7 @@ OSSEC_CFLAGS+=-I/usr/local/include endif endif -@@ -956,6 +959,8 @@ +@@ -957,6 +960,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -71,7 +71,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1172,9 +1177,13 @@ +@@ -1186,9 +1191,13 @@ cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli --without-nghttp2 --without-zstd endif else @@ -85,16 +85,16 @@ #### procps ######### -@@ -2263,7 +2272,7 @@ +@@ -2295,7 +2304,7 @@ #### FIM ###### wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules -- cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} +- cd syscheckd && mkdir -p build && cd build && cmake ${SYSCHECK_OS} ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} + cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} ${OSSEC_CFLAGS} -pipe -Wall -Wextra -std=gnu99" -DCMAKE_EXE_LINKER_FLAGS="${OSSEC_LDFLAGS} ${OSSEC_LIBS}" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} #### Monitor ####### -@@ -2441,7 +2450,7 @@ +@@ -2473,7 +2482,7 @@ WPYTHON_DIR := ${INSTALLDIR}/framework/python OPTIMIZE_CPYTHON?=no WPYTHON_TAR=cpython.tar.gz @@ -103,7 +103,7 @@ ifneq (,$(filter ${OPTIMIZE_CPYTHON},YES yes y Y 1)) CPYTHON_FLAGS=--enable-optimizations -@@ -2455,7 +2464,7 @@ +@@ -2487,22 +2496,45 @@ endif ifeq (,$(wildcard ${EXTERNAL_CPYTHON}/python)) @@ -112,7 +112,12 @@ endif build_python: $(WAZUHEXT_LIB) -@@ -2467,10 +2476,33 @@ + + install_python: + ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) +- cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && ${MAKE} install ++ cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && export LD_LIBRARY_PATH=${ROUTE_PATH} && ${MAKE} install + else 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 @@ -146,7 +151,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 -@@ -2487,6 +2519,7 @@ +@@ -2519,6 +2551,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in b/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in index bab784ca965b..6f3aeb6eb06b 100644 --- a/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in +++ b/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in @@ -1,5 +1,5 @@ ---- src/external/cpython/Makefile.pre.in 2025-01-14 18:42:57.000000000 -0800 -+++ src/external/cpython/Makefile.pre.in 2025-01-17 18:04:15.924706000 -0800 +--- src/external/cpython/Makefile.pre.in 2025-04-08 07:15:29.000000000 -0700 ++++ src/external/cpython/Makefile.pre.in 2025-05-09 18:15:10.761567000 -0700 @@ -71,14 +71,14 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; @@ -66,7 +66,7 @@ $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -2144,38 +2144,10 @@ +@@ -2144,37 +2144,9 @@ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -80,8 +80,7 @@ - -j0 -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+ $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ @@ -102,16 +101,16 @@ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -- ++ $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt + # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. - python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh @@ -2235,7 +2207,7 @@ LIBPL= @LIBPL@ # pkgconfig directory --LIBPC= $(PREFIX)/libdata/pkgconfig +-LIBPC= $(LIBDIR)/pkgconfig +LIBPC= $(prefix)/libdata/pkgconfig libainstall: all python-config diff --git a/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt b/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt new file mode 100644 index 000000000000..461f3beeb586 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt @@ -0,0 +1,11 @@ *** 1023 LINES SKIPPED ***