Date: Sun, 19 Jan 2025 09:39:08 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 397e09575221 - main - security/wazuh-*: Update to 4.10.1 Message-ID: <202501190939.50J9d8Rp058637@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=397e09575221406df7bfc22dc66ab115590cbed9 commit 397e09575221406df7bfc22dc66ab115590cbed9 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2025-01-19 09:33:32 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2025-01-19 09:38:59 +0000 security/wazuh-*: Update to 4.10.1 - Update bundle python to 3.11.11 - Update opensearch dependency to 2.16.x - Update opensearch-dashboards dependency to 2.16.x ChangeLog at: https://documentation.wazuh.com/current/release-notes/release-4-10-1.html --- security/wazuh-agent/Makefile | 4 +- security/wazuh-agent/distinfo | 82 ++-- security/wazuh-agent/files/patch-src-Makefile | 37 +- security/wazuh-agent/pkg-plist | 1 + security/wazuh-dashboard/Makefile | 6 +- security/wazuh-dashboard/distinfo | 10 +- security/wazuh-dashboard/pkg-plist | 29 +- security/wazuh-indexer/Makefile | 4 +- security/wazuh-indexer/distinfo | 6 +- security/wazuh-manager/Makefile | 14 +- security/wazuh-manager/distinfo | 146 +++--- .../patch-src-shared_modules-utils_stringHelper.h | 26 +- security/wazuh-manager/files/patch-src_Makefile | 37 +- .../patch-src_external_cpython_Makefile.pre.in | 13 +- ...red__modules_content__manager_testtool_main.cpp | 11 + security/wazuh-manager/pkg-plist | 496 ++++++--------------- security/wazuh-server/Makefile | 2 +- security/wazuh-server/distinfo | 18 +- 18 files changed, 391 insertions(+), 551 deletions(-) diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index 19efb5dcdde3..fde3d42815be 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -1,8 +1,8 @@ PORTNAME= wazuh -DISTVERSION= 4.9.2 +DISTVERSION= 4.10.1 DISTVERSIONPREFIX= v CATEGORIES= security -MASTER_SITES= https://packages.wazuh.com/deps/30/libraries/sources/:wazuh_sources +MASTER_SITES= https://packages.wazuh.com/deps/35/libraries/sources/:wazuh_sources PKGNAMESUFFIX= -agent DISTFILES= ${EXTERNAL_DISTFILES} DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo index 3b8a7f6da0e9..1b47b608d250 100644 --- a/security/wazuh-agent/distinfo +++ b/security/wazuh-agent/distinfo @@ -1,41 +1,41 @@ -TIMESTAMP = 1732499065 -SHA256 (wazuh-4.9.2/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.9.2/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.9.2/curl.tar.gz) = 40151d4bca5a2c1c840ed224371fe0d951523176a5bc3c4d0362f3da6f966540 -SIZE (wazuh-4.9.2/curl.tar.gz) = 4867890 -SHA256 (wazuh-4.9.2/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.9.2/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.9.2/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.9.2/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.9.2/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.9.2/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.9.2/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e -SIZE (wazuh-4.9.2/openssl.tar.gz) = 15637517 -SHA256 (wazuh-4.9.2/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.9.2/procps.tar.gz) = 55897 -SHA256 (wazuh-4.9.2/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 -SIZE (wazuh-4.9.2/sqlite.tar.gz) = 2486661 -SHA256 (wazuh-4.9.2/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b -SIZE (wazuh-4.9.2/zlib.tar.gz) = 1593304 -SHA256 (wazuh-4.9.2/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.9.2/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.9.2/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.9.2/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.9.2/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.9.2/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.9.2/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 -SIZE (wazuh-4.9.2/nlohmann.tar.gz) = 135749 -SHA256 (wazuh-4.9.2/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.9.2/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.9.2/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 -SIZE (wazuh-4.9.2/libpcre2.tar.gz) = 1329651 -SHA256 (wazuh-4.9.2/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.9.2/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.9.2/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a -SIZE (wazuh-4.9.2/libarchive.tar.gz) = 7512700 -SHA256 (wazuh-4.9.2/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.9.2/popt.tar.gz) = 891309 -SHA256 (wazuh-4.9.2/wazuh-wazuh-v4.9.2_GH0.tar.gz) = 6d580155f692aa44da7c416b86a2b00423ee6eed3806320edb1efc63ddcef8c3 -SIZE (wazuh-4.9.2/wazuh-wazuh-v4.9.2_GH0.tar.gz) = 17485179 -SHA256 (wazuh-4.9.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 -SIZE (wazuh-4.9.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 +TIMESTAMP = 1737182711 +SHA256 (wazuh-4.10.1/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.10.1/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.10.1/curl.tar.gz) = 3bc70c67bbba70775022b792fecb597368bdff5184bbdb637cea3d672b87fa6b +SIZE (wazuh-4.10.1/curl.tar.gz) = 4482534 +SHA256 (wazuh-4.10.1/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.10.1/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.10.1/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.10.1/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.10.1/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.10.1/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.10.1/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e +SIZE (wazuh-4.10.1/openssl.tar.gz) = 15637517 +SHA256 (wazuh-4.10.1/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.10.1/procps.tar.gz) = 55897 +SHA256 (wazuh-4.10.1/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 +SIZE (wazuh-4.10.1/sqlite.tar.gz) = 2486661 +SHA256 (wazuh-4.10.1/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b +SIZE (wazuh-4.10.1/zlib.tar.gz) = 1593304 +SHA256 (wazuh-4.10.1/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.10.1/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.10.1/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.10.1/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.10.1/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.10.1/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.10.1/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 +SIZE (wazuh-4.10.1/nlohmann.tar.gz) = 135749 +SHA256 (wazuh-4.10.1/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.10.1/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.10.1/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 +SIZE (wazuh-4.10.1/libpcre2.tar.gz) = 1329651 +SHA256 (wazuh-4.10.1/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.10.1/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.10.1/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a +SIZE (wazuh-4.10.1/libarchive.tar.gz) = 7512700 +SHA256 (wazuh-4.10.1/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.10.1/popt.tar.gz) = 891309 +SHA256 (wazuh-4.10.1/wazuh-wazuh-v4.10.1_GH0.tar.gz) = a3b8910d72ca6a7b5bceaf523559e137070244748b2408df075b0db2f5669b96 +SIZE (wazuh-4.10.1/wazuh-wazuh-v4.10.1_GH0.tar.gz) = 17952476 +SHA256 (wazuh-4.10.1/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 +SIZE (wazuh-4.10.1/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 9ff774eb260d..33cecd1aac15 100644 --- a/security/wazuh-agent/files/patch-src-Makefile +++ b/security/wazuh-agent/files/patch-src-Makefile @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2024-10-28 07:30:27.000000000 -0700 -+++ src/Makefile 2024-12-01 16:39:15.434082000 -0800 +--- src/Makefile 2025-01-08 01:15:05.000000000 -0800 ++++ src/Makefile 2025-01-14 19:17:44.081916000 -0800 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -25,12 +25,12 @@ 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 ++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 -I${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/ + ifneq (${TARGET},winagent) DEFINES+=-D${uname_S} ifeq (${uname_S},Linux) -@@ -264,10 +268,10 @@ +@@ -268,10 +272,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -43,7 +43,15 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -503,8 +507,8 @@ +@@ -433,7 +437,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 -I${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/ + + OSSEC_CFLAGS += ${CFLAGS} + OSSEC_LDFLAGS += ${LDFLAGS} +@@ -530,8 +533,8 @@ ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1)) DEFINES+=-DINOTIFY_ENABLED ifeq (${uname_S},FreeBSD) @@ -54,7 +62,7 @@ OSSEC_CFLAGS+=-I/usr/local/include endif endif -@@ -929,6 +933,8 @@ +@@ -956,6 +959,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -63,21 +71,21 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1145,9 +1151,13 @@ +@@ -1172,9 +1177,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 +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 ++ 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 --without-zstd --without-libpsl +else - cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp --without-zstd + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp --without-zstd --without-libpsl endif endif +endif #### procps ######### -@@ -2236,7 +2246,7 @@ +@@ -2263,7 +2272,7 @@ #### FIM ###### wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules @@ -86,7 +94,7 @@ #### Monitor ####### -@@ -2414,7 +2424,7 @@ +@@ -2441,7 +2450,7 @@ WPYTHON_DIR := ${INSTALLDIR}/framework/python OPTIMIZE_CPYTHON?=no WPYTHON_TAR=cpython.tar.gz @@ -95,7 +103,7 @@ ifneq (,$(filter ${OPTIMIZE_CPYTHON},YES yes y Y 1)) CPYTHON_FLAGS=--enable-optimizations -@@ -2428,7 +2438,7 @@ +@@ -2455,7 +2464,7 @@ endif ifeq (,$(wildcard ${EXTERNAL_CPYTHON}/python)) @@ -104,7 +112,7 @@ endif build_python: $(WAZUHEXT_LIB) -@@ -2440,10 +2450,34 @@ +@@ -2467,10 +2476,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 @@ -135,11 +143,10 @@ +install_mitre: + export CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1 && cd ../tools/mitre && $(STAGEDIR)${WPYTHON_DIR}/bin/python3 mitredb.py -d $(STAGEDIR)${INSTALLDIR}/var/db/mitre.db +else -+ 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 -@@ -2460,6 +2494,7 @@ +@@ -2487,6 +2519,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/pkg-plist b/security/wazuh-agent/pkg-plist index 1d5897adc8ff..e56c68599059 100644 --- a/security/wazuh-agent/pkg-plist +++ b/security/wazuh-agent/pkg-plist @@ -344,6 +344,7 @@ /var/ossec/packages_files/agent_installation_scripts/sca/ubuntu/cis_ubuntu22-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 /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2012r2.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2016.yml /var/ossec/packages_files/agent_installation_scripts/sca/windows/cis_win2019.yml diff --git a/security/wazuh-dashboard/Makefile b/security/wazuh-dashboard/Makefile index 008a2ab3f7d1..d386bec0cd2f 100644 --- a/security/wazuh-dashboard/Makefile +++ b/security/wazuh-dashboard/Makefile @@ -1,6 +1,6 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.9.2 +DISTVERSION= 4.10.1 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-dashboards213 +RUN_DEPENDS= ${LOCALBASE}/www/opensearch-dashboards/bin/opensearch-dashboards:textproc/opensearch-dashboards216 NO_BUILD= yes SUB_FILES= pkg-message -OPENSEARCH_VERSION= 2.13.0 +OPENSEARCH_VERSION= 2.16.0 ETCDIR= ${PREFIX}/etc/wazuh-dashboard WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-plugins diff --git a/security/wazuh-dashboard/distinfo b/security/wazuh-dashboard/distinfo index 7fcf2097e764..a4501f39af0e 100644 --- a/security/wazuh-dashboard/distinfo +++ b/security/wazuh-dashboard/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1733185185 -SHA256 (wazuh-4.9.2/wazuh-dashboard-plugins-4.9.2-2.13.0.tar.gz) = 4e6555a30b850400ceab13a1505eaa61a765c7a9bc1b663f66eb0806e4d710d5 -SIZE (wazuh-4.9.2/wazuh-dashboard-plugins-4.9.2-2.13.0.tar.gz) = 24440482 -SHA256 (wazuh-4.9.2/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 -SIZE (wazuh-4.9.2/opensearch_dashboards.yml) = 806 +TIMESTAMP = 1737192700 +SHA256 (wazuh-4.10.1/wazuh-dashboard-plugins-4.10.1-2.16.0.tar.gz) = f1f35fdf2214a9b7ecd7044e207616350c40a72f65b28448127a49bd134778db +SIZE (wazuh-4.10.1/wazuh-dashboard-plugins-4.10.1-2.16.0.tar.gz) = 25127653 +SHA256 (wazuh-4.10.1/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 +SIZE (wazuh-4.10.1/opensearch_dashboards.yml) = 806 diff --git a/security/wazuh-dashboard/pkg-plist b/security/wazuh-dashboard/pkg-plist index 8b7f204acd2c..faa5da71d0cb 100644 --- a/security/wazuh-dashboard/pkg-plist +++ b/security/wazuh-dashboard/pkg-plist @@ -5657,8 +5657,15 @@ www/opensearch-dashboards/plugins/wazuh/server/lib/api-errors-equivalence.js www/opensearch-dashboards/plugins/wazuh/server/lib/api-request-list.json www/opensearch-dashboards/plugins/wazuh/server/lib/cookie.js www/opensearch-dashboards/plugins/wazuh/server/lib/error-response.js +www/opensearch-dashboards/plugins/wazuh/server/lib/extract-error-message.js www/opensearch-dashboards/plugins/wazuh/server/lib/filesystem.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/constants.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/generate-alerts-script.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/helpers/date-formatter.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/helpers/interpolate-alert-props.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/helpers/number-formatter.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/helpers/random.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/helpers/rule-generator.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/apache.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/audit.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/authentication.js @@ -5679,6 +5686,7 @@ www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/s www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/virustotal.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/vulnerabilities.js www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/web.js +www/opensearch-dashboards/plugins/wazuh/server/lib/generate-alerts/sample-data/yara.js www/opensearch-dashboards/plugins/wazuh/server/lib/index-date.js www/opensearch-dashboards/plugins/wazuh/server/lib/parse-cron.js www/opensearch-dashboards/plugins/wazuh/server/lib/process-state-equivalence.js @@ -5749,9 +5757,6 @@ www/opensearch-dashboards/plugins/wazuh/target/public/f7f1738ca345185e01856ac558 www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js.br www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js.gz -www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.1.js -www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.1.js.br -www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.1.js.gz www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.10.js www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.10.js.br www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.10.js.gz @@ -5776,6 +5781,18 @@ www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.16.js.gz www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.17.js www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.17.js.br www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.17.js.gz +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.18.js +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.18.js.br +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.18.js.gz +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.19.js +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.19.js.br +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.19.js.gz +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.2.js +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.2.js.br +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.2.js.gz +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.20.js +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.20.js.br +www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.20.js.gz www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.3.js www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.3.js.br www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.3.js.gz @@ -6112,9 +6129,9 @@ www/opensearch-dashboards/plugins/wazuhCheckUpdates/server/services/user-prefere www/opensearch-dashboards/plugins/wazuhCheckUpdates/server/services/user-preferences/update-user-preferences.js www/opensearch-dashboards/plugins/wazuhCheckUpdates/server/types.js www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/.osd-optimizer-cache -www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.0.js -www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.0.js.br -www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.0.js.gz +www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.1.js +www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.1.js.br +www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.1.js.gz www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.2.js www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.2.js.br www/opensearch-dashboards/plugins/wazuhCheckUpdates/target/public/wazuhCheckUpdates.chunk.2.js.gz diff --git a/security/wazuh-indexer/Makefile b/security/wazuh-indexer/Makefile index 5b0f136115bc..5105042f2d94 100644 --- a/security/wazuh-indexer/Makefile +++ b/security/wazuh-indexer/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -PORTVERSION= 4.9.2 +PORTVERSION= 4.10.1 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/opensearch213 +RUN_DEPENDS= ${LOCALBASE}/lib/opensearch/bin/opensearch:textproc/opensearch216 NO_BUILD= yes diff --git a/security/wazuh-indexer/distinfo b/security/wazuh-indexer/distinfo index c2cb0bd87ae2..9b23548bc992 100644 --- a/security/wazuh-indexer/distinfo +++ b/security/wazuh-indexer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732565895 -SHA256 (wazuh-4.9.2/wazuh-4.9.2-indexer.yml) = 15290a6e81026d970891d7e1805afe4a87420984893948b5dd7a65789d62f5c5 -SIZE (wazuh-4.9.2/wazuh-4.9.2-indexer.yml) = 2216 +TIMESTAMP = 1737182650 +SHA256 (wazuh-4.10.1/wazuh-4.10.1-indexer.yml) = 15290a6e81026d970891d7e1805afe4a87420984893948b5dd7a65789d62f5c5 +SIZE (wazuh-4.10.1/wazuh-4.10.1-indexer.yml) = 2216 diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile index eaf3452dd023..b8e1f24b4d07 100644 --- a/security/wazuh-manager/Makefile +++ b/security/wazuh-manager/Makefile @@ -1,9 +1,8 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.9.2 -PORTREVISION= 1 +DISTVERSION= 4.10.1 CATEGORIES= security -MASTER_SITES= https://packages.wazuh.com/deps/30/libraries/sources/:wazuh_sources \ +MASTER_SITES= https://packages.wazuh.com/deps/35/libraries/sources/:wazuh_sources \ LOCAL/acm/${PORTNAME}/:wazuh_cache PKGNAMESUFFIX= -manager DISTFILES= ${EXTERNAL_DISTFILES} \ @@ -50,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.tar.gz:wazuh_cache \ + cpython-3.11.11.tar.gz:wazuh_cache \ curl.tar.gz:wazuh_sources \ flatbuffers.tar.gz:wazuh_sources \ googletest.tar.gz:wazuh_sources \ @@ -140,9 +139,9 @@ 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-42.0.4-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ + cryptography-43.0.1-cp37-abi3-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ greenlet-2.0.2-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ - grpcio-1.66.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 \ MarkupSafe-2.1.2-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ multidict-5.2.0-cp311-cp311-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ @@ -165,7 +164,6 @@ IGNORE= FreeBSD ${OSVERSION} ${ARCH} is not supported .if ${ARCH} != "aarch64" FBSD13_PATCH_LEVEL= _p1 -FBSD14_PATCH_LEVEL= _p5 .endif .if ${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000 @@ -174,7 +172,7 @@ FBSD_MAJOR_VERSION=13 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd13-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache .elif ${OSVERSION} >= 1400000 && ${OSVERSION} < 1500000 -FBSD_VERSION_BASE=freebsd_14_1_release${FBSD14_PATCH_LEVEL} +FBSD_VERSION_BASE=freebsd_14_2_release${FBSD14_PATCH_LEVEL} FBSD_MAJOR_VERSION=14 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd14-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache diff --git a/security/wazuh-manager/distinfo b/security/wazuh-manager/distinfo index 4823d02e9e61..2d4086102614 100644 --- a/security/wazuh-manager/distinfo +++ b/security/wazuh-manager/distinfo @@ -1,73 +1,73 @@ -TIMESTAMP = 1733126579 -SHA256 (wazuh-4.9.2/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.9.2/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.9.2/benchmark.tar.gz) = 94c57aa0cb2bd78dbe9e77d332cbc644daf0fecdc9a09632048be6e09f9ced6b -SIZE (wazuh-4.9.2/benchmark.tar.gz) = 184460 -SHA256 (wazuh-4.9.2/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.9.2/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.9.2/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.9.2/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.9.2/cpp-httplib.tar.gz) = 6517573263611686b9219ba796c35f54a306eb27dc3c72e1807f2a0a34cac1e8 -SIZE (wazuh-4.9.2/cpp-httplib.tar.gz) = 57890 -SHA256 (wazuh-4.9.2/cpython.tar.gz) = 752a39b8c303192a821eab36d1c6ab93a74bf12ef73e23c60402c14f0af941ce -SIZE (wazuh-4.9.2/cpython.tar.gz) = 27156043 -SHA256 (wazuh-4.9.2/curl.tar.gz) = 40151d4bca5a2c1c840ed224371fe0d951523176a5bc3c4d0362f3da6f966540 -SIZE (wazuh-4.9.2/curl.tar.gz) = 4867890 -SHA256 (wazuh-4.9.2/flatbuffers.tar.gz) = 943699a1fe86c197371cd214c4c355da0f253a3093f0c73fb74cb4c48b8978a9 -SIZE (wazuh-4.9.2/flatbuffers.tar.gz) = 2313322 -SHA256 (wazuh-4.9.2/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.9.2/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.9.2/http-request.tar.gz) = 664374273880328e62591d8bc60c2160fb3e31218124d22a4a4275446e6decc4 -SIZE (wazuh-4.9.2/http-request.tar.gz) = 61693 -SHA256 (wazuh-4.9.2/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 -SIZE (wazuh-4.9.2/jemalloc.tar.gz) = 579864 -SHA256 (wazuh-4.9.2/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a -SIZE (wazuh-4.9.2/libarchive.tar.gz) = 7512700 -SHA256 (wazuh-4.9.2/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.9.2/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.9.2/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.9.2/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.9.2/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 -SIZE (wazuh-4.9.2/libpcre2.tar.gz) = 1329651 -SHA256 (wazuh-4.9.2/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.9.2/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.9.2/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.9.2/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.9.2/lua.tar.gz) = 62eeb7e24b246c50708bcd4d92db3c9de8d196d94c9c33b8bff400f25f105a1f -SIZE (wazuh-4.9.2/lua.tar.gz) = 304235 -SHA256 (wazuh-4.9.2/lzma.tar.gz) = 4ce0c192d41072b5679af89bb531efb685c8267a4b7e2005999149ac17028134 -SIZE (wazuh-4.9.2/lzma.tar.gz) = 1327581 -SHA256 (wazuh-4.9.2/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.9.2/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.9.2/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 -SIZE (wazuh-4.9.2/nlohmann.tar.gz) = 135749 -SHA256 (wazuh-4.9.2/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e -SIZE (wazuh-4.9.2/openssl.tar.gz) = 15637517 -SHA256 (wazuh-4.9.2/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.9.2/popt.tar.gz) = 891309 -SHA256 (wazuh-4.9.2/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.9.2/procps.tar.gz) = 55897 -SHA256 (wazuh-4.9.2/rocksdb.tar.gz) = eeed60a3d4e29f7305e79f9f5cebd4261174261227f1b5a7d05da55565675436 -SIZE (wazuh-4.9.2/rocksdb.tar.gz) = 12800920 -SHA256 (wazuh-4.9.2/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 -SIZE (wazuh-4.9.2/sqlite.tar.gz) = 2486661 -SHA256 (wazuh-4.9.2/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b -SIZE (wazuh-4.9.2/zlib.tar.gz) = 1593304 -SHA256 (wazuh-4.9.2/wazuh-cache-any-4.9.2.tar.gz) = 776b15550c7a88afa14755c409ce89c9daa60371763fe7e469cac47530c8da00 -SIZE (wazuh-4.9.2/wazuh-cache-any-4.9.2.tar.gz) = 22921189 -SHA256 (wazuh-4.9.2/wazuh-python-4.9.2.tar.gz) = c88de9471c952cd3036d274975b30d35e65b3ccd9a3f7403087d80762cacadf3 -SIZE (wazuh-4.9.2/wazuh-python-4.9.2.tar.gz) = 465376 -SHA256 (wazuh-4.9.2/wazuh-cache-fbsd13-amd64-4.9.2.tar.gz) = adf4b29eaa11fe57d5ea279848268581bde238ba0eeb2c591fcbc5be59abd0aa -SIZE (wazuh-4.9.2/wazuh-cache-fbsd13-amd64-4.9.2.tar.gz) = 25050540 -SHA256 (wazuh-4.9.2/wazuh-cache-fbsd14-aarch64-4.9.2.tar.gz) = 7381b30e4f06f2794473eb373e0d7a3d16d234c8b3119d200ebe7811bbd585fa -SIZE (wazuh-4.9.2/wazuh-cache-fbsd14-aarch64-4.9.2.tar.gz) = 22964941 -SHA256 (wazuh-4.9.2/wazuh-cache-fbsd14-amd64-4.9.2.tar.gz) = 30726d62d5b5bd6a58726ea84242dbc69f3d123a7590a3c6bcb6a9e7f70b352a -SIZE (wazuh-4.9.2/wazuh-cache-fbsd14-amd64-4.9.2.tar.gz) = 23025250 -SHA256 (wazuh-4.9.2/wazuh-cache-fbsd15-aarch64-4.9.2.tar.gz) = 517fb653237892679403a7abd5d4b69781e4aced7938b14b5657c2a8558ab361 -SIZE (wazuh-4.9.2/wazuh-cache-fbsd15-aarch64-4.9.2.tar.gz) = 22948103 -SHA256 (wazuh-4.9.2/wazuh-cache-fbsd15-amd64-4.9.2.tar.gz) = 09882f8a7f120887bf75156d25b24c715d9ece84fb4db989bc2a04e013dbce71 -SIZE (wazuh-4.9.2/wazuh-cache-fbsd15-amd64-4.9.2.tar.gz) = 23491366 -SHA256 (wazuh-4.9.2/wazuh-wazuh-v4.9.2_GH0.tar.gz) = 6d580155f692aa44da7c416b86a2b00423ee6eed3806320edb1efc63ddcef8c3 -SIZE (wazuh-4.9.2/wazuh-wazuh-v4.9.2_GH0.tar.gz) = 17485179 -SHA256 (wazuh-4.9.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 -SIZE (wazuh-4.9.2/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 +TIMESTAMP = 1737146734 +SHA256 (wazuh-4.10.1/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.10.1/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.10.1/benchmark.tar.gz) = 94c57aa0cb2bd78dbe9e77d332cbc644daf0fecdc9a09632048be6e09f9ced6b +SIZE (wazuh-4.10.1/benchmark.tar.gz) = 184460 +SHA256 (wazuh-4.10.1/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.10.1/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.10.1/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.10.1/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.10.1/cpp-httplib.tar.gz) = 6517573263611686b9219ba796c35f54a306eb27dc3c72e1807f2a0a34cac1e8 +SIZE (wazuh-4.10.1/cpp-httplib.tar.gz) = 57890 +SHA256 (wazuh-4.10.1/cpython-3.11.11.tar.gz) = 7d13a6e68bd2af9608337b5e35582c51823cc3866aa0b4b9f7883f04da606d32 +SIZE (wazuh-4.10.1/cpython-3.11.11.tar.gz) = 27280192 +SHA256 (wazuh-4.10.1/curl.tar.gz) = 3bc70c67bbba70775022b792fecb597368bdff5184bbdb637cea3d672b87fa6b +SIZE (wazuh-4.10.1/curl.tar.gz) = 4482534 +SHA256 (wazuh-4.10.1/flatbuffers.tar.gz) = 943699a1fe86c197371cd214c4c355da0f253a3093f0c73fb74cb4c48b8978a9 +SIZE (wazuh-4.10.1/flatbuffers.tar.gz) = 2313322 +SHA256 (wazuh-4.10.1/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.10.1/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.10.1/http-request.tar.gz) = 664374273880328e62591d8bc60c2160fb3e31218124d22a4a4275446e6decc4 +SIZE (wazuh-4.10.1/http-request.tar.gz) = 61693 +SHA256 (wazuh-4.10.1/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 +SIZE (wazuh-4.10.1/jemalloc.tar.gz) = 579864 +SHA256 (wazuh-4.10.1/libarchive.tar.gz) = c958048175dad5a13d0851d03c7c1a36361e12e8e93e7432c1844e9549ddf58a +SIZE (wazuh-4.10.1/libarchive.tar.gz) = 7512700 +SHA256 (wazuh-4.10.1/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.10.1/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.10.1/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.10.1/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.10.1/libpcre2.tar.gz) = 5a80d654d7d14b3db9fa3a49d7bf44a498683b46784a88cec514a8b194767b92 +SIZE (wazuh-4.10.1/libpcre2.tar.gz) = 1329651 +SHA256 (wazuh-4.10.1/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.10.1/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.10.1/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.10.1/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.10.1/lua.tar.gz) = 62eeb7e24b246c50708bcd4d92db3c9de8d196d94c9c33b8bff400f25f105a1f +SIZE (wazuh-4.10.1/lua.tar.gz) = 304235 +SHA256 (wazuh-4.10.1/lzma.tar.gz) = 4ce0c192d41072b5679af89bb531efb685c8267a4b7e2005999149ac17028134 +SIZE (wazuh-4.10.1/lzma.tar.gz) = 1327581 +SHA256 (wazuh-4.10.1/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.10.1/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.10.1/nlohmann.tar.gz) = cefb07936d3d5bfdd3efc5e9bb8d3c807d681273bdac2e83b3d67aef2d1158c4 +SIZE (wazuh-4.10.1/nlohmann.tar.gz) = 135749 +SHA256 (wazuh-4.10.1/openssl.tar.gz) = 238415641120c8f79d9c1c2caf97b88d3d6dbed562859dd0663bd4b68dc2179e +SIZE (wazuh-4.10.1/openssl.tar.gz) = 15637517 +SHA256 (wazuh-4.10.1/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.10.1/popt.tar.gz) = 891309 +SHA256 (wazuh-4.10.1/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.10.1/procps.tar.gz) = 55897 +SHA256 (wazuh-4.10.1/rocksdb.tar.gz) = eeed60a3d4e29f7305e79f9f5cebd4261174261227f1b5a7d05da55565675436 +SIZE (wazuh-4.10.1/rocksdb.tar.gz) = 12800920 +SHA256 (wazuh-4.10.1/sqlite.tar.gz) = 9a8fa6a916f8c2107ed65dab8dced392604e175104d6a8c3c9c1383479869f07 +SIZE (wazuh-4.10.1/sqlite.tar.gz) = 2486661 +SHA256 (wazuh-4.10.1/zlib.tar.gz) = b59d38149f0c29ec54d2766611ebc5a51a032bf9717e39a9af00fb6cb8532b8b +SIZE (wazuh-4.10.1/zlib.tar.gz) = 1593304 +SHA256 (wazuh-4.10.1/wazuh-cache-any-4.10.1.tar.gz) = 3255e535c424321ea1382754a91bf6f45aff3e775cf37a6164ac153072b6d9ab +SIZE (wazuh-4.10.1/wazuh-cache-any-4.10.1.tar.gz) = 22890148 +SHA256 (wazuh-4.10.1/wazuh-python-4.10.1.tar.gz) = 448d5cc47fdcc466d81f23a26f109b28e540ecc1182a28722a070daf32814d65 +SIZE (wazuh-4.10.1/wazuh-python-4.10.1.tar.gz) = 465769 +SHA256 (wazuh-4.10.1/wazuh-cache-fbsd13-amd64-4.10.1.tar.gz) = 8f91950cc28a174ad5914d467dac395fb46349d586d3a801965f12d8b1dadc36 +SIZE (wazuh-4.10.1/wazuh-cache-fbsd13-amd64-4.10.1.tar.gz) = 25377138 +SHA256 (wazuh-4.10.1/wazuh-cache-fbsd14-aarch64-4.10.1.tar.gz) = b41fafc381516d64145b6b59f9b1ae6196240a912a803f7e7b18aa3c1badbfaf +SIZE (wazuh-4.10.1/wazuh-cache-fbsd14-aarch64-4.10.1.tar.gz) = 22133100 +SHA256 (wazuh-4.10.1/wazuh-cache-fbsd14-amd64-4.10.1.tar.gz) = 0d7d8345ef73f5395d22d527aee4827d154de6e9e198d4a4eca666efbab5d99d +SIZE (wazuh-4.10.1/wazuh-cache-fbsd14-amd64-4.10.1.tar.gz) = 23774028 +SHA256 (wazuh-4.10.1/wazuh-cache-fbsd15-aarch64-4.10.1.tar.gz) = cebe39f45afb94b764338949b7100b8fc7f529ff42a9112f00589aa5a33b5ead +SIZE (wazuh-4.10.1/wazuh-cache-fbsd15-aarch64-4.10.1.tar.gz) = 22125872 +SHA256 (wazuh-4.10.1/wazuh-cache-fbsd15-amd64-4.10.1.tar.gz) = ab6cf3ee9e397aa53af1788d24c12cb81f6c4aba98f02617bd8b093988037ee4 +SIZE (wazuh-4.10.1/wazuh-cache-fbsd15-amd64-4.10.1.tar.gz) = 23822453 +SHA256 (wazuh-4.10.1/wazuh-wazuh-v4.10.1_GH0.tar.gz) = a3b8910d72ca6a7b5bceaf523559e137070244748b2408df075b0db2f5669b96 +SIZE (wazuh-4.10.1/wazuh-wazuh-v4.10.1_GH0.tar.gz) = 17952476 +SHA256 (wazuh-4.10.1/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = d20100f8840e6f600aa0a49585bac80e62850fe5f2be40e11eaa1ffd50adf5c1 +SIZE (wazuh-4.10.1/alonsobsd-wazuh-freebsd-cd0051b_GH0.tar.gz) = 178174 diff --git a/security/wazuh-manager/files/patch-src-shared_modules-utils_stringHelper.h b/security/wazuh-manager/files/patch-src-shared_modules-utils_stringHelper.h index fa94a0278e65..d06cb28926e7 100644 --- a/security/wazuh-manager/files/patch-src-shared_modules-utils_stringHelper.h +++ b/security/wazuh-manager/files/patch-src-shared_modules-utils_stringHelper.h @@ -1,9 +1,19 @@ ---- src/shared_modules/utils/stringHelper.h.orig 2024-10-17 00:22:27.000000000 -0700 -+++ src/shared_modules/utils/stringHelper.h 2024-10-19 23:58:11.231439000 -0700 -@@ -256,6 +256,17 @@ - return ret; - } +--- src/shared_modules/utils/stringHelper.h 2025-01-08 01:15:05.000000000 -0800 ++++ src/shared_modules/utils/stringHelper.h 2025-01-14 21:32:26.067988000 -0800 +@@ -19,6 +19,7 @@ + #include <sstream> + #include <string> + #include <vector> ++#include <map> + + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-function" +@@ -254,6 +255,17 @@ + // LCOV_EXCL_STOP + return ret; ++ } ++ + static std::string trimToOneSpace(const std::string& str) + { + std::string str_output; @@ -13,8 +23,6 @@ + [](char a,char b){ return std::isspace(a) && std::isspace(b);}); + + return str_output; -+ } -+ + } + static std::string toUpperCase(const std::string& str) - { - std::string temp {str}; diff --git a/security/wazuh-manager/files/patch-src_Makefile b/security/wazuh-manager/files/patch-src_Makefile index 9ff774eb260d..33cecd1aac15 100644 --- a/security/wazuh-manager/files/patch-src_Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2024-10-28 07:30:27.000000000 -0700 -+++ src/Makefile 2024-12-01 16:39:15.434082000 -0800 +--- src/Makefile 2025-01-08 01:15:05.000000000 -0800 ++++ src/Makefile 2025-01-14 19:17:44.081916000 -0800 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -25,12 +25,12 @@ 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 ++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 -I${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/ + ifneq (${TARGET},winagent) DEFINES+=-D${uname_S} ifeq (${uname_S},Linux) -@@ -264,10 +268,10 @@ +@@ -268,10 +272,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -43,7 +43,15 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -503,8 +507,8 @@ +@@ -433,7 +437,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 -I${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/ + + OSSEC_CFLAGS += ${CFLAGS} + OSSEC_LDFLAGS += ${LDFLAGS} +@@ -530,8 +533,8 @@ ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1)) DEFINES+=-DINOTIFY_ENABLED ifeq (${uname_S},FreeBSD) @@ -54,7 +62,7 @@ OSSEC_CFLAGS+=-I/usr/local/include endif endif -@@ -929,6 +933,8 @@ +@@ -956,6 +959,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -63,21 +71,21 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1145,9 +1151,13 @@ +@@ -1172,9 +1177,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 +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 ++ 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 --without-zstd --without-libpsl +else - cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp --without-zstd + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp --without-zstd --without-libpsl endif endif +endif #### procps ######### -@@ -2236,7 +2246,7 @@ +@@ -2263,7 +2272,7 @@ #### FIM ###### wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules @@ -86,7 +94,7 @@ #### Monitor ####### -@@ -2414,7 +2424,7 @@ +@@ -2441,7 +2450,7 @@ WPYTHON_DIR := ${INSTALLDIR}/framework/python OPTIMIZE_CPYTHON?=no WPYTHON_TAR=cpython.tar.gz @@ -95,7 +103,7 @@ ifneq (,$(filter ${OPTIMIZE_CPYTHON},YES yes y Y 1)) CPYTHON_FLAGS=--enable-optimizations -@@ -2428,7 +2438,7 @@ +@@ -2455,7 +2464,7 @@ endif ifeq (,$(wildcard ${EXTERNAL_CPYTHON}/python)) @@ -104,7 +112,7 @@ endif build_python: $(WAZUHEXT_LIB) -@@ -2440,10 +2450,34 @@ +@@ -2467,10 +2476,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 @@ -135,11 +143,10 @@ +install_mitre: + export CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1 && cd ../tools/mitre && $(STAGEDIR)${WPYTHON_DIR}/bin/python3 mitredb.py -d $(STAGEDIR)${INSTALLDIR}/var/db/mitre.db +else -+ 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 -@@ -2460,6 +2494,7 @@ +@@ -2487,6 +2519,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 e5b1981124cd..bab784ca965b 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.orig 2024-10-20 14:05:43.000000000 -0700 -+++ src/external/cpython/Makefile.pre.in 2024-10-20 18:54:46.292821000 -0700 +--- 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 @@ -71,14 +71,14 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; @@ -107,6 +107,15 @@ # 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= $(prefix)/libdata/pkgconfig + + libainstall: all python-config + @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \ @@ -2292,7 +2264,7 @@ # Install the dynamically loadable modules # This goes into $(exec_prefix) diff --git a/security/wazuh-manager/files/patch-src_shared__modules_content__manager_testtool_main.cpp b/security/wazuh-manager/files/patch-src_shared__modules_content__manager_testtool_main.cpp new file mode 100644 index 000000000000..6ff185b90917 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_shared__modules_content__manager_testtool_main.cpp @@ -0,0 +1,11 @@ +--- src/shared_modules/content_manager/testtool/main.cpp 2025-01-19 00:10:00.441927000 -0800 ++++ src/shared_modules/content_manager/testtool/main.cpp 2025-01-19 00:10:08.656971000 -0800 +@@ -1,7 +1,7 @@ ++#include "contentRegister.hpp" + #include "HTTPRequest.hpp" + #include "UNIXSocketRequest.hpp" + #include "contentManager.hpp" +-#include "contentRegister.hpp" + #include "defs.h" + #include <chrono> + #include <iostream> diff --git a/security/wazuh-manager/pkg-plist b/security/wazuh-manager/pkg-plist index b60ee0f1a2a2..e77f139edd47 100644 --- a/security/wazuh-manager/pkg-plist +++ b/security/wazuh-manager/pkg-plist @@ -378,10 +378,6 @@ /var/ossec/framework/python/lib/lib%%PYTHON_VERSION%%.so /var/ossec/framework/python/lib/lib%%PYTHON_VERSION%%.so.1.0 /var/ossec/framework/python/lib/libpython3.so -/var/ossec/framework/python/lib/pkgconfig/python-%%PYTHON_VER%%-embed.pc -/var/ossec/framework/python/lib/pkgconfig/python-%%PYTHON_VER%%.pc -/var/ossec/framework/python/lib/pkgconfig/python3-embed.pc -/var/ossec/framework/python/lib/pkgconfig/python3.pc /var/ossec/framework/python/%%PYTHON_LIBDIR%%/LICENSE.txt /var/ossec/framework/python/%%PYTHON_LIBDIR%%/__future__.py /var/ossec/framework/python/%%PYTHON_LIBDIR%%/__hello__.py @@ -3158,9 +3154,9 @@ /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib-dynload/xxlimited_35%%PYTHON_EXT_SUFFIX%%.so /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib-dynload/zlib%%PYTHON_EXT_SUFFIX%%.so /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/Grammar.txt -/var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/Grammar%%PYTHON_VER%%.10.final.0.pickle +/var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/Grammar%%PYTHON_VER%%.11.final.0.pickle /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -/var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar%%PYTHON_VER%%.10.final.0.pickle +/var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar%%PYTHON_VER%%.11.final.0.pickle /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/__init__.py /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/__main__.py /var/ossec/framework/python/%%PYTHON_LIBDIR%%/lib2to3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -4397,9 +4393,6 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/xmltodict%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/xmltodict%%PYTHON_EXT_SUFFIX%%.opt-2.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/xmltodict%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/zipp%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/zipp%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/__pycache__/zipp%%PYTHON_EXT_SUFFIX%%.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/_cffi_backend%%PYTHON_EXT_SUFFIX%%.so /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/_distutils_hack/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/_distutils_hack/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -4571,13 +4564,13 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/anyio/streams/tls.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/anyio/to_process.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/anyio/to_thread.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/INSTALLER -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/METADATA -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/RECORD -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/REQUESTED -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/WHEEL -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/direct_url.json -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.9.2.dist-info/top_level.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/INSTALLER +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/METADATA +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/RECORD +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/REQUESTED +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/WHEEL +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/direct_url.json +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.10.1.dist-info/top_level.txt /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc @@ -7842,14 +7835,14 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cachetools/lru.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cachetools/rr.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cachetools/ttl.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/INSTALLER -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/LICENSE -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/METADATA -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/RECORD -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/REQUESTED -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/WHEEL -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/direct_url.json -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2023.7.22.dist-info/top_level.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/INSTALLER +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/LICENSE +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/METADATA +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/RECORD +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/REQUESTED +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/WHEEL +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/direct_url.json +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi-2024.7.4.dist-info/top_level.txt /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi/__main__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/certifi/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -8512,16 +8505,15 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/content_size_limit_asgi/errors.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/content_size_limit_asgi/logger.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/content_size_limit_asgi/middleware.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/INSTALLER -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/LICENSE -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/LICENSE.APACHE -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/LICENSE.BSD -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/METADATA -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/RECORD -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/REQUESTED -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/WHEEL -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/direct_url.json -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-42.0.4.dist-info/top_level.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/INSTALLER +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/METADATA +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/RECORD +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/REQUESTED +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/WHEEL +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/direct_url.json +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/licenses/LICENSE +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/licenses/LICENSE.APACHE +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography-43.0.1.dist-info/licenses/LICENSE.BSD /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/__about__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/__pycache__/__about__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -8557,27 +8549,15 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/aead%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/aead%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/aead%%PYTHON_EXT_SUFFIX%%.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/backend%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/backend%%PYTHON_EXT_SUFFIX%%.opt-2.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/backend%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/ciphers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/ciphers%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/ciphers%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/decode_asn1%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/decode_asn1%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/__pycache__/decode_asn1%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/aead.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/backend.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/ciphers.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/backends/openssl/decode_asn1.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust%%PYTHON_EXT_SUFFIX%%.so +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust.abi3.so /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/__init__.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/_openssl.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/asn1.pyi @@ -8585,6 +8565,7 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/ocsp.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/__init__.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/aead.pyi +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/ciphers.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/cmac.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/dh.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/dsa.pyi @@ -8599,7 +8580,9 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/rsa.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/x25519.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/openssl/x448.pyi +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/pkcs12.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/pkcs7.pyi +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/test_support.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/_rust/x509.pyi /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/openssl/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/openssl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -8613,6 +8596,18 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/openssl/__pycache__/binding%%PYTHON_EXT_SUFFIX%%.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/openssl/_conditional.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/bindings/openssl/binding.py +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/decrepit/__init__.py +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/decrepit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/decrepit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/cryptography/hazmat/decrepit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc *** 701 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501190939.50J9d8Rp058637>