Date: Tue, 30 May 2023 04:25:06 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: 55048ca1c75c - main - security/wazuh-*: Update to 4.4.3 Message-ID: <202305300425.34U4P6ZG061328@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=55048ca1c75c7dde6361b87249ff8c1d48aa2485 commit 55048ca1c75c7dde6361b87249ff8c1d48aa2485 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2023-05-30 04:14:28 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2023-05-30 04:24:56 +0000 security/wazuh-*: Update to 4.4.3 - Mark IGNORE on FreeBSD 12-aarch64 - Use makepatch to generate patch files - Fix typo at wazuh-agent and wazuh-manager pkg-message files [1] - Fix some linking issues when devel/libsysinfo is installed (using ports). wazuh-manager compile/install a library with the same name like libsysinfo and it is used by syscollector feature. - wazuh-dashboard use opensearch-dashboards 2.7.0 - Some other modifications ChangeLog at: https://github.com/wazuh/wazuh/releases PR: 271376 Reported by: lambert _ at _ sanesecurityguy.com [1] --- security/wazuh-agent/Makefile | 3 +- security/wazuh-agent/distinfo | 78 +- security/wazuh-agent/files/patch-api_Makefile | 6 +- .../wazuh-agent/files/patch-framework_Makefile | 4 +- security/wazuh-agent/files/patch-src-Makefile | 14 +- ...txt => patch-src_data__provider_CMakeLists.txt} | 6 +- ...s_string.c => patch-src_rootcheck_os__string.c} | 4 +- ...atch-src_shared__modules_dbsync_CMakeLists.txt} | 6 +- ...patch-src_shared__modules_rsync_CMakeLists.txt} | 6 +- ...-src_wazuh__modules_syscollector_CMakeLists.txt | 11 + .../files/patch-tools_mitre_mitredb.py} | 6 +- security/wazuh-agent/files/pkg-message.in | 6 +- security/wazuh-agent/pkg-plist | 13 + security/wazuh-dashboard/Makefile | 5 +- security/wazuh-dashboard/distinfo | 10 +- security/wazuh-dashboard/pkg-plist | 14 + security/wazuh-indexer/Makefile | 2 +- security/wazuh-indexer/distinfo | 6 +- security/wazuh-manager/Makefile | 23 +- security/wazuh-manager/distinfo | 112 +- security/wazuh-manager/files/patch-api_Makefile | 6 +- .../wazuh-manager/files/patch-framework_Makefile | 4 +- .../{patch-src-Makefile => patch-src_Makefile} | 14 +- .../files/patch-src_data__provider_CMakeLists.txt | 11 + ... => patch-src_external_cpython_Makefile.pre.in} | 30 +- ...s_string.c => patch-src_rootcheck_os__string.c} | 4 +- ...patch-src_shared__modules_dbsync_CMakeLists.txt | 11 + .../patch-src_shared__modules_rsync_CMakeLists.txt | 11 + ...-src_wazuh__modules_syscollector_CMakeLists.txt | 11 + .../files/patch-tools_mitre_mitredb.py} | 6 +- security/wazuh-manager/files/pkg-message.in | 6 +- security/wazuh-manager/pkg-plist | 3928 ++++++++++++++++++-- security/wazuh-server/Makefile | 2 +- security/wazuh-server/distinfo | 18 +- 34 files changed, 3840 insertions(+), 557 deletions(-) diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index 9b66cff43a0a..beae6fa45532 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -DISTVERSION= 4.4.1 +DISTVERSION= 4.4.3 DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= https://packages.wazuh.com/deps/20/libraries/sources/:wazuh_sources @@ -95,7 +95,6 @@ post-extract: post-patch: ${REINPLACE_CMD} -e 's|HOST_NAME_MAX|_POSIX_HOST_NAME_MAX|g' ${WRKSRC}/src/wazuh_modules/wm_database.c ${REINPLACE_CMD} -e 's|CC=|CC?=|g' -e 's|AR=|AR?=|g' ${WRKSRC}/src/external/bzip2/Makefile - ${REINPLACE_CMD} '114d' ${WRKSRC}/src/wazuh_modules/syscollector/CMakeLists.txt do-build: cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \ diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo index 61fb85bf2650..51244e32d009 100644 --- a/security/wazuh-agent/distinfo +++ b/security/wazuh-agent/distinfo @@ -1,39 +1,39 @@ -TIMESTAMP = 1681510376 -SHA256 (wazuh-4.4.1/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.4.1/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.4.1/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 -SIZE (wazuh-4.4.1/curl.tar.gz) = 3692998 -SHA256 (wazuh-4.4.1/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.4.1/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.4.1/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.4.1/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.4.1/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.4.1/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.4.1/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 -SIZE (wazuh-4.4.1/openssl.tar.gz) = 10162682 -SHA256 (wazuh-4.4.1/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.4.1/procps.tar.gz) = 55897 -SHA256 (wazuh-4.4.1/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 -SIZE (wazuh-4.4.1/sqlite.tar.gz) = 2296429 -SHA256 (wazuh-4.4.1/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d -SIZE (wazuh-4.4.1/zlib.tar.gz) = 638616 -SHA256 (wazuh-4.4.1/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.4.1/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.4.1/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.4.1/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.4.1/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.4.1/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.4.1/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe -SIZE (wazuh-4.4.1/nlohmann.tar.gz) = 134429 -SHA256 (wazuh-4.4.1/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.4.1/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.4.1/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa -SIZE (wazuh-4.4.1/libpcre2.tar.gz) = 1252173 -SHA256 (wazuh-4.4.1/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.4.1/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.4.1/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 -SIZE (wazuh-4.4.1/libarchive.tar.gz) = 7040169 -SHA256 (wazuh-4.4.1/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.4.1/popt.tar.gz) = 891309 -SHA256 (wazuh-4.4.1/wazuh-wazuh-v4.4.1_GH0.tar.gz) = 5f262c275d33357f632e335b68a120896b8f9a2d42ec9dc8f09a10d1c7b2a4ce -SIZE (wazuh-4.4.1/wazuh-wazuh-v4.4.1_GH0.tar.gz) = 11498598 +TIMESTAMP = 1685323696 +SHA256 (wazuh-4.4.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.4.3/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.4.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 +SIZE (wazuh-4.4.3/curl.tar.gz) = 3692998 +SHA256 (wazuh-4.4.3/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.4.3/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.4.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.4.3/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.4.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.4.3/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.4.3/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 +SIZE (wazuh-4.4.3/openssl.tar.gz) = 10162682 +SHA256 (wazuh-4.4.3/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.4.3/procps.tar.gz) = 55897 +SHA256 (wazuh-4.4.3/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 +SIZE (wazuh-4.4.3/sqlite.tar.gz) = 2296429 +SHA256 (wazuh-4.4.3/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d +SIZE (wazuh-4.4.3/zlib.tar.gz) = 638616 +SHA256 (wazuh-4.4.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.4.3/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.4.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.4.3/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.4.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.4.3/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.4.3/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe +SIZE (wazuh-4.4.3/nlohmann.tar.gz) = 134429 +SHA256 (wazuh-4.4.3/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.4.3/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.4.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa +SIZE (wazuh-4.4.3/libpcre2.tar.gz) = 1252173 +SHA256 (wazuh-4.4.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.4.3/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.4.3/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 +SIZE (wazuh-4.4.3/libarchive.tar.gz) = 7040169 +SHA256 (wazuh-4.4.3/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.4.3/popt.tar.gz) = 891309 +SHA256 (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 61d0a05c62021c8606c7fb70becab29a4df5eb82cc79131f4bb53afc368929f3 +SIZE (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 11553359 diff --git a/security/wazuh-agent/files/patch-api_Makefile b/security/wazuh-agent/files/patch-api_Makefile index de54bfba725e..b1f811cab6e5 100644 --- a/security/wazuh-agent/files/patch-api_Makefile +++ b/security/wazuh-agent/files/patch-api_Makefile @@ -1,6 +1,6 @@ ---- api/Makefile 2022-07-26 15:51:47.002374000 -0500 -+++ api/Makefile 2022-07-26 15:52:25.960498000 -0500 -@@ -8,11 +8,11 @@ +--- api/Makefile.orig 2023-05-24 19:23:05 UTC ++++ api/Makefile +@@ -8,11 +8,11 @@ WAZUH_GROUP = wazuh INSTALLDIR ?= /var/ossec RM_FILE = rm -f diff --git a/security/wazuh-agent/files/patch-framework_Makefile b/security/wazuh-agent/files/patch-framework_Makefile index 8266370762b0..9d0c318654f7 100644 --- a/security/wazuh-agent/files/patch-framework_Makefile +++ b/security/wazuh-agent/files/patch-framework_Makefile @@ -1,5 +1,5 @@ ---- framework/Makefile 2023-03-27 05:11:56.000000000 -0500 -+++ framework/Makefile 2023-03-28 21:20:23.081023000 -0500 +--- framework/Makefile.orig 2023-05-24 19:23:05 UTC ++++ framework/Makefile @@ -7,14 +7,14 @@ WAZUH_GROUP = wazuh INSTALLDIR ?= /var/ossec diff --git a/security/wazuh-agent/files/patch-src-Makefile b/security/wazuh-agent/files/patch-src-Makefile index 7433f6de4d8d..ca8953968d08 100644 --- a/security/wazuh-agent/files/patch-src-Makefile +++ b/security/wazuh-agent/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile 2023-03-27 05:11:56.000000000 -0500 -+++ src/Makefile 2023-03-28 21:38:29.729243000 -0500 -@@ -38,9 +38,11 @@ +--- src/Makefile.orig 2023-05-24 19:23:05 UTC ++++ src/Makefile +@@ -39,9 +39,11 @@ endif HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -239,10 +241,10 @@ +@@ -240,10 +242,10 @@ else ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -25,7 +25,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -853,6 +855,8 @@ +@@ -855,6 +857,8 @@ ifeq (${TARGET},winagent) EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -34,7 +34,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -2218,14 +2222,37 @@ +@@ -2224,14 +2228,37 @@ 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 @@ -74,7 +74,7 @@ endif install_framework: install_python -@@ -2238,7 +2265,7 @@ +@@ -2244,7 +2271,7 @@ install_api: install_python 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-data_provider_CMakeLists.txt b/security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt similarity index 59% rename from security/wazuh-agent/files/patch-src-data_provider_CMakeLists.txt rename to security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt index f042a27f6a88..0cec8b79cb08 100644 --- a/security/wazuh-agent/files/patch-src-data_provider_CMakeLists.txt +++ b/security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/data_provider/CMakeLists.txt 2022-11-15 18:38:58.096561000 -0500 -+++ src/data_provider/CMakeLists.txt 2022-11-15 18:39:14.271410000 -0500 -@@ -146,7 +146,7 @@ +--- src/data_provider/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC ++++ src/data_provider/CMakeLists.txt +@@ -152,7 +152,7 @@ elseif(APPLE) target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a) endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/security/wazuh-agent/files/patch-src-rootcheck_os_string.c b/security/wazuh-agent/files/patch-src_rootcheck_os__string.c similarity index 58% rename from security/wazuh-agent/files/patch-src-rootcheck_os_string.c rename to security/wazuh-agent/files/patch-src_rootcheck_os__string.c index 873eb069079c..66abbf1337ef 100644 --- a/security/wazuh-agent/files/patch-src-rootcheck_os_string.c +++ b/security/wazuh-agent/files/patch-src_rootcheck_os__string.c @@ -1,5 +1,5 @@ ---- src/rootcheck/os_string.c 2022-10-06 08:35:58.000000000 -0500 -+++ src/rootcheck/os_string.c 2022-10-30 14:31:56.614900000 -0500 +--- src/rootcheck/os_string.c.orig 2023-05-24 19:23:05 UTC ++++ src/rootcheck/os_string.c @@ -42,6 +42,9 @@ #include <locale.h> #include <unistd.h> diff --git a/security/wazuh-agent/files/patch-src-shared_modules-dbsync_CMakeLists.txt b/security/wazuh-agent/files/patch-src_shared__modules_dbsync_CMakeLists.txt similarity index 59% rename from security/wazuh-agent/files/patch-src-shared_modules-dbsync_CMakeLists.txt rename to security/wazuh-agent/files/patch-src_shared__modules_dbsync_CMakeLists.txt index e26d226d0907..bccee7e55036 100644 --- a/security/wazuh-agent/files/patch-src-shared_modules-dbsync_CMakeLists.txt +++ b/security/wazuh-agent/files/patch-src_shared__modules_dbsync_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/shared_modules/dbsync/CMakeLists.txt 2022-11-15 18:47:00.075043000 -0500 -+++ src/shared_modules/dbsync/CMakeLists.txt 2022-11-15 18:47:18.385940000 -0500 -@@ -72,7 +72,7 @@ +--- src/shared_modules/dbsync/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC ++++ src/shared_modules/dbsync/CMakeLists.txt +@@ -70,7 +70,7 @@ elseif(UNIX AND NOT APPLE) endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/security/wazuh-agent/files/patch-src-shared_modules-rsync_CMakeLists.txt b/security/wazuh-agent/files/patch-src_shared__modules_rsync_CMakeLists.txt similarity index 60% rename from security/wazuh-agent/files/patch-src-shared_modules-rsync_CMakeLists.txt rename to security/wazuh-agent/files/patch-src_shared__modules_rsync_CMakeLists.txt index aac9d1e9aaf0..12123313fe3b 100644 --- a/security/wazuh-agent/files/patch-src-shared_modules-rsync_CMakeLists.txt +++ b/security/wazuh-agent/files/patch-src_shared__modules_rsync_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/shared_modules/rsync/CMakeLists.txt 2022-11-15 18:49:35.527593000 -0500 -+++ src/shared_modules/rsync/CMakeLists.txt 2022-11-15 18:49:52.194493000 -0500 -@@ -74,7 +74,7 @@ +--- src/shared_modules/rsync/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC ++++ src/shared_modules/rsync/CMakeLists.txt +@@ -72,7 +72,7 @@ elseif(UNIX AND NOT APPLE) endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") 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 new file mode 100644 index 000000000000..697aceecc546 --- /dev/null +++ b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/wazuh_modules/syscollector/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC ++++ src/wazuh_modules/syscollector/CMakeLists.txt +@@ -90,7 +90,7 @@ elseif(UNIX AND NOT APPLE) + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + + 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) + 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-manager/files/patch-tools-mitre_mitredb-py b/security/wazuh-agent/files/patch-tools_mitre_mitredb.py similarity index 77% rename from security/wazuh-manager/files/patch-tools-mitre_mitredb-py rename to security/wazuh-agent/files/patch-tools_mitre_mitredb.py index 58c0b5aa4b92..4af4d5e375f7 100644 --- a/security/wazuh-manager/files/patch-tools-mitre_mitredb-py +++ b/security/wazuh-agent/files/patch-tools_mitre_mitredb.py @@ -1,6 +1,6 @@ ---- tools/mitre/mitredb.py 2022-07-26 14:50:02.401104000 -0500 -+++ tools/mitre/mitredb.py 2022-07-26 15:25:13.375626000 -0500 -@@ -763,13 +763,6 @@ +--- tools/mitre/mitredb.py.orig 2023-05-24 19:23:05 UTC ++++ tools/mitre/mitredb.py +@@ -766,13 +766,6 @@ def main(database=None): # Parse enterprise-attack.json file: parse_json(pathfile, session, database) diff --git a/security/wazuh-agent/files/pkg-message.in b/security/wazuh-agent/files/pkg-message.in index 046a60f40c6c..a8b72f8f91d4 100644 --- a/security/wazuh-agent/files/pkg-message.in +++ b/security/wazuh-agent/files/pkg-message.in @@ -22,9 +22,13 @@ Wazuh Agent was installed # sysrc wazuh_agent_enable="YES" + or + + # service wazuh-agent enable + 5) Start Wazuh agent - # service wazuh_agent start + # service wazuh-agent start 6) Enjoy it ;) EOM diff --git a/security/wazuh-agent/pkg-plist b/security/wazuh-agent/pkg-plist index fd5c0c9b8a82..4b7674af8f15 100644 --- a/security/wazuh-agent/pkg-plist +++ b/security/wazuh-agent/pkg-plist @@ -133,13 +133,22 @@ /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/rootcheck.manager.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/centos/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/15/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/16/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/16/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/17/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/17/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/18/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/18/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/19/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/19/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/20/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/20/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/21/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/21/sca.files +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/22/localfile-extra.template +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/22/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/localfile-commands.template +/var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/localfile-extra.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/sca.files /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/sca.template /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/syscheck.agent.template @@ -285,6 +294,7 @@ /var/ossec/packages_files/agent_installation_scripts/sca/darwin/19/cis_apple_macOS_10.15.yml /var/ossec/packages_files/agent_installation_scripts/sca/darwin/20/cis_apple_macOS_11.1.yml /var/ossec/packages_files/agent_installation_scripts/sca/darwin/21/cis_apple_macOS_12.0.yml +/var/ossec/packages_files/agent_installation_scripts/sca/darwin/22/cis_apple_macOS_13.x.yml /var/ossec/packages_files/agent_installation_scripts/sca/debian/cis_debian10.yml /var/ossec/packages_files/agent_installation_scripts/sca/debian/cis_debian11.yml /var/ossec/packages_files/agent_installation_scripts/sca/debian/cis_debian7.yml @@ -364,6 +374,7 @@ /var/ossec/ruleset/sca/cis_apple_macOS_10.15.yml /var/ossec/ruleset/sca/cis_apple_macOS_11.1.yml /var/ossec/ruleset/sca/cis_apple_macOS_12.0.yml +/var/ossec/ruleset/sca/cis_apple_macOS_13.x.yml /var/ossec/ruleset/sca/cis_centos6_linux.yml /var/ossec/ruleset/sca/cis_centos7_linux.yml /var/ossec/ruleset/sca/cis_centos8_linux.yml @@ -465,6 +476,7 @@ @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/19 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/20 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/21 +@dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin/22 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/darwin @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/debian/10 @dir /var/ossec/packages_files/agent_installation_scripts/etc/templates/config/debian/11 @@ -542,6 +554,7 @@ @dir /var/ossec/packages_files/agent_installation_scripts/sca/darwin/19 @dir /var/ossec/packages_files/agent_installation_scripts/sca/darwin/20 @dir /var/ossec/packages_files/agent_installation_scripts/sca/darwin/21 +@dir /var/ossec/packages_files/agent_installation_scripts/sca/darwin/22 @dir /var/ossec/packages_files/agent_installation_scripts/sca/darwin @dir /var/ossec/packages_files/agent_installation_scripts/sca/debian @dir /var/ossec/packages_files/agent_installation_scripts/sca/generic diff --git a/security/wazuh-dashboard/Makefile b/security/wazuh-dashboard/Makefile index 0b6b7922ff32..2cfe8b33ad9a 100644 --- a/security/wazuh-dashboard/Makefile +++ b/security/wazuh-dashboard/Makefile @@ -1,7 +1,6 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.4.1 -PORTREVISION= 1 +DISTVERSION= 4.4.3 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -dashboard @@ -21,7 +20,7 @@ NO_BUILD= yes SUB_FILES= pkg-message -OPENSEARCH_VERSION= 2.6.0 +OPENSEARCH_VERSION= 2.7.0 ETCDIR= ${PREFIX}/etc/wazuh-dashboard WRKSRC= ${WRKDIR}/${PORTNAME}-kibana-app-${DISTVERSION} diff --git a/security/wazuh-dashboard/distinfo b/security/wazuh-dashboard/distinfo index a76f499a144e..2221a2f50c44 100644 --- a/security/wazuh-dashboard/distinfo +++ b/security/wazuh-dashboard/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1682727098 -SHA256 (wazuh-4.4.1/wazuh-kibana-app-4.4.1-2.6.0.tar.gz) = 1ffaeeab18a172a348a3dac5fee65baaae8021c05672a4bf7a09a5a36ec7ca54 -SIZE (wazuh-4.4.1/wazuh-kibana-app-4.4.1-2.6.0.tar.gz) = 36986786 -SHA256 (wazuh-4.4.1/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 -SIZE (wazuh-4.4.1/opensearch_dashboards.yml) = 806 +TIMESTAMP = 1685412511 +SHA256 (wazuh-4.4.3/wazuh-kibana-app-4.4.3-2.7.0.tar.gz) = d4e28bd89c9f728819884ef80a3c6ba00e5febb9adf139ecbc8ec86b5b033295 +SIZE (wazuh-4.4.3/wazuh-kibana-app-4.4.3-2.7.0.tar.gz) = 37111865 +SHA256 (wazuh-4.4.3/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 +SIZE (wazuh-4.4.3/opensearch_dashboards.yml) = 806 diff --git a/security/wazuh-dashboard/pkg-plist b/security/wazuh-dashboard/pkg-plist index 169e50e22977..c7d58a9eca1d 100644 --- a/security/wazuh-dashboard/pkg-plist +++ b/security/wazuh-dashboard/pkg-plist @@ -310,6 +310,12 @@ www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/jsx-dev-runtim www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/jsx-runtime.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/next.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/package.json +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/experimental.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/global.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/index.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/jsx-dev-runtime.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/jsx-runtime.d.ts +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/next.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/LICENSE www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/README.md www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/index.d.ts @@ -2779,6 +2785,14 @@ www/opensearch-dashboards/plugins/wazuh/node_modules/has-property-descriptors/RE www/opensearch-dashboards/plugins/wazuh/node_modules/has-property-descriptors/index.js www/opensearch-dashboards/plugins/wazuh/node_modules/has-property-descriptors/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/has-property-descriptors/test/index.js +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/.eslintrc +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/.github/FUNDING.yml +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/CHANGELOG.md +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/LICENSE +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/README.md +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/index.js +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/package.json +www/opensearch-dashboards/plugins/wazuh/node_modules/has-proto/test/index.js www/opensearch-dashboards/plugins/wazuh/node_modules/has-symbols/.eslintrc www/opensearch-dashboards/plugins/wazuh/node_modules/has-symbols/.github/FUNDING.yml www/opensearch-dashboards/plugins/wazuh/node_modules/has-symbols/.nycrc diff --git a/security/wazuh-indexer/Makefile b/security/wazuh-indexer/Makefile index 2fa9f8e1b0be..74c02e59bc41 100644 --- a/security/wazuh-indexer/Makefile +++ b/security/wazuh-indexer/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -PORTVERSION= 4.4.1 +PORTVERSION= 4.4.3 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -indexer diff --git a/security/wazuh-indexer/distinfo b/security/wazuh-indexer/distinfo index 427413ab14c0..455a3def19c8 100644 --- a/security/wazuh-indexer/distinfo +++ b/security/wazuh-indexer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681510441 -SHA256 (wazuh-4.4.1/wazuh-indexer.yml) = f6bc1d4de01742268ca42ef285896c31b7a31fb82f0c9f13de32d383fa3669e0 -SIZE (wazuh-4.4.1/wazuh-indexer.yml) = 2123 +TIMESTAMP = 1685132057 +SHA256 (wazuh-4.4.3/wazuh-indexer.yml) = f6bc1d4de01742268ca42ef285896c31b7a31fb82f0c9f13de32d383fa3669e0 +SIZE (wazuh-4.4.3/wazuh-indexer.yml) = 2123 diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile index b1efb9054ce1..f10b6d057360 100644 --- a/security/wazuh-manager/Makefile +++ b/security/wazuh-manager/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -DISTVERSION= 4.4.1 +DISTVERSION= 4.4.3 DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= https://packages.wazuh.com/deps/20/libraries/sources/:wazuh_sources \ @@ -24,12 +24,13 @@ LIB_DEPENDS+= libgdbm.so:databases/gdbm \ USES= cpe gmake perl5 python:3.9 readline shebangfix sqlite:3 uidfix +IGNORE_FreeBSD_12_aarch64= FreeBSD 12.x is not supported on ${ARCH} ONLY_FOR_ARCHS= amd64 aarch64 USE_GITHUB= yes USE_RC_SUBR= ${PORTNAME}${PKGNAMESUFFIX} -MAKE_ARGS+= TARGET=server INSTALLDIR=${WAZUHPREFIX} INSTALL_SHARED="${INSTALL_LIB}" PYTHON_SOURCE=yes +MAKE_ARGS+= TARGET=server INSTALLDIR=${WAZUHPREFIX} INSTALL_SHARED="${INSTALL_LIB}" PYTHON_SOURCE=yes OPTIMIZE_CPYTHON=no WAZUH_CACHEFILE= ${PORTNAME}-cache-any-${DISTVERSION}${EXTRACT_SUFX} EXTERNAL_DISTFILES= cJSON.tar.gz:wazuh_sources \ @@ -90,11 +91,12 @@ WZBIN_FILES= wazuh-logcollector wazuh-syscheckd wazuh-execd manage_agents wazuh WZARBIN_FILES= default-firewall-drop pf npf ipfw firewalld-drop disable-account \ host-deny ip-customblock restart-wazuh route-null kaspersky wazuh-slack -WZSHEBANG_FILES=fixup_pubsub_v1_keywords.py pasteurize rst2xetex.py connexion rst2man.py rst2odt.py \ - pyrsa-priv2pub pyrsa-encrypt cygdb pyrsa-sign rstpep2html.py rst2s5.py rst2latex.py \ - chardetect futurize cython rst2pseudoxml.py pyrsa-keygen wsdump.py rst2odt_prepstyles.py \ - jp.py cythonize pyrsa-verify normalizer rst2html.py rst2html5.py openapi-spec-validator \ - rst2html4.py jsonschema rst2xml.py tabulate flask pyrsa-decrypt +WZSHEBANG_FILES=chardetect connexion cygdb cython cythonize f2py3.9 f2py3 f2py fixup_pubsub_v1_keywords.py \ + flask futurize jp.py jsonschema normalizer openapi-spec-validator pasteurize \ + plasma_store pyrsa-decrypt pyrsa-encrypt pyrsa-keygen pyrsa-priv2pub pyrsa-sign \ + pyrsa-verify rstpep2html.py rst2s5.py rst2xetex.py rst2man.py rst2odt.py \ + rst2latex.py rst2pseudoxml.py rst2odt_prepstyles.py rst2html.py rst2html5.py \ + rst2html4.py rst2xml.py tabulate wsdump.py WAZUHMOD750= / /logs/wazuh /logs/archives /logs/alerts /logs/firewall \ /logs/api /logs/cluster /bin /lib /queue /queue/agentless \ @@ -124,7 +126,9 @@ WZPYTHONWHEELS= aiohttp-3.8.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ hiredis-1.1.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ MarkupSafe-2.1.2-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ multidict-5.1.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ + numpy-1.21.6-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ psutil-5.8.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ + pyarrow-8.0.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ PyYAML-5.4.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ SQLAlchemy-1.3.11-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ uvloop-0.15.2-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH_BASE}.whl \ @@ -141,7 +145,7 @@ FBSD_VERSION_BASE=freebsd_12_4_release_p1 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd12-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache .elif ${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000 -FBSD_VERSION_BASE=freebsd_13_1_release_p6 +FBSD_VERSION_BASE=freebsd_13_2_release WAZUH_CACHENAME=${PORTNAME}-cache-fbsd13-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache .elif ${OSVERSION} >= 1400000 @@ -149,7 +153,7 @@ FBSD_VERSION_BASE=freebsd_14_0_current WAZUH_CACHENAME=${PORTNAME}-cache-fbsd14-${ARCH}-${DISTVERSION} DISTFILES+= ${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache .else -IGNORE= FreeBSD ${OSVERSION} is not supported +IGNORE= FreeBSD ${OSVERSION} ${ARCH} is not supported .endif post-extract: @@ -166,7 +170,6 @@ post-extract: post-patch: ${REINPLACE_CMD} -e 's|HOST_NAME_MAX|_POSIX_HOST_NAME_MAX|g' ${WRKSRC}/src/wazuh_modules/wm_database.c ${REINPLACE_CMD} -e 's|CC=|CC?=|g' -e 's|AR=|AR?=|g' ${WRKSRC}/src/external/bzip2/Makefile - ${REINPLACE_CMD} '114d' ${WRKSRC}/src/wazuh_modules/syscollector/CMakeLists.txt ${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/src/external/cpython/configure do-build: diff --git a/security/wazuh-manager/distinfo b/security/wazuh-manager/distinfo index 81f189873856..77e347fc1de6 100644 --- a/security/wazuh-manager/distinfo +++ b/security/wazuh-manager/distinfo @@ -1,57 +1,55 @@ -TIMESTAMP = 1681497184 -SHA256 (wazuh-4.4.1/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.4.1/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.4.1/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 -SIZE (wazuh-4.4.1/curl.tar.gz) = 3692998 -SHA256 (wazuh-4.4.1/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 -SIZE (wazuh-4.4.1/jemalloc.tar.gz) = 579864 -SHA256 (wazuh-4.4.1/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.4.1/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.4.1/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.4.1/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.4.1/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.4.1/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.4.1/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 -SIZE (wazuh-4.4.1/openssl.tar.gz) = 10162682 -SHA256 (wazuh-4.4.1/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.4.1/procps.tar.gz) = 55897 -SHA256 (wazuh-4.4.1/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 -SIZE (wazuh-4.4.1/sqlite.tar.gz) = 2296429 -SHA256 (wazuh-4.4.1/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d -SIZE (wazuh-4.4.1/zlib.tar.gz) = 638616 -SHA256 (wazuh-4.4.1/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.4.1/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.4.1/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.4.1/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.4.1/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.4.1/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.4.1/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe -SIZE (wazuh-4.4.1/nlohmann.tar.gz) = 134429 -SHA256 (wazuh-4.4.1/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.4.1/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.4.1/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa -SIZE (wazuh-4.4.1/libpcre2.tar.gz) = 1252173 -SHA256 (wazuh-4.4.1/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.4.1/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.4.1/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 -SIZE (wazuh-4.4.1/libarchive.tar.gz) = 7040169 -SHA256 (wazuh-4.4.1/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.4.1/popt.tar.gz) = 891309 -SHA256 (wazuh-4.4.1/cpython.tar.gz) = f33a28f8a3c7baec27807070a31565de09301aa4d2b3a297ff3412265e3d5016 -SIZE (wazuh-4.4.1/cpython.tar.gz) = 154075792 -SHA256 (wazuh-4.4.1/wazuh-cache-any-4.4.1.tar.gz) = 588433d0d8de095bf51f4b4aaa49afdf9adff1c63a6805e7635e51c1348ff116 -SIZE (wazuh-4.4.1/wazuh-cache-any-4.4.1.tar.gz) = 90022393 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd12-aarch64-4.4.1.tar.gz) = 169cdd746da81501326d1d73ade535676e6df3116bfab727799c8d3143096b69 -SIZE (wazuh-4.4.1/wazuh-cache-fbsd12-aarch64-4.4.1.tar.gz) = 8007571 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd13-aarch64-4.4.1.tar.gz) = aacd0ce33018e3f00a82a7131f7f4a6d205cf77077ada62de90313f0ad707416 -SIZE (wazuh-4.4.1/wazuh-cache-fbsd13-aarch64-4.4.1.tar.gz) = 8014332 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd14-aarch64-4.4.1.tar.gz) = 03b2dade692f6fcb870481669e39933c76d4e1bae532ea1678140f37ed42c0ac -SIZE (wazuh-4.4.1/wazuh-cache-fbsd14-aarch64-4.4.1.tar.gz) = 8090651 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd12-amd64-4.4.1.tar.gz) = ff53a36021dcf038c87f06222d56e0ce540a906ca2e9a14ceff2cc2317415c08 -SIZE (wazuh-4.4.1/wazuh-cache-fbsd12-amd64-4.4.1.tar.gz) = 8390289 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd13-amd64-4.4.1.tar.gz) = fd0316be63ab7994fe744bab79c445af599158da6bbabb3810f5684f3f620fb2 -SIZE (wazuh-4.4.1/wazuh-cache-fbsd13-amd64-4.4.1.tar.gz) = 8405811 -SHA256 (wazuh-4.4.1/wazuh-cache-fbsd14-amd64-4.4.1.tar.gz) = 53ebe66db608c855149720a333bee8c2d3de5877aae4b8d134944f7ad7b34668 -SIZE (wazuh-4.4.1/wazuh-cache-fbsd14-amd64-4.4.1.tar.gz) = 8374611 -SHA256 (wazuh-4.4.1/wazuh-wazuh-v4.4.1_GH0.tar.gz) = 5f262c275d33357f632e335b68a120896b8f9a2d42ec9dc8f09a10d1c7b2a4ce -SIZE (wazuh-4.4.1/wazuh-wazuh-v4.4.1_GH0.tar.gz) = 11498598 +TIMESTAMP = 1685252625 +SHA256 (wazuh-4.4.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.4.3/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.4.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 +SIZE (wazuh-4.4.3/curl.tar.gz) = 3692998 +SHA256 (wazuh-4.4.3/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 +SIZE (wazuh-4.4.3/jemalloc.tar.gz) = 579864 +SHA256 (wazuh-4.4.3/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.4.3/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.4.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.4.3/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.4.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.4.3/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.4.3/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 +SIZE (wazuh-4.4.3/openssl.tar.gz) = 10162682 +SHA256 (wazuh-4.4.3/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.4.3/procps.tar.gz) = 55897 +SHA256 (wazuh-4.4.3/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 +SIZE (wazuh-4.4.3/sqlite.tar.gz) = 2296429 +SHA256 (wazuh-4.4.3/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d +SIZE (wazuh-4.4.3/zlib.tar.gz) = 638616 +SHA256 (wazuh-4.4.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.4.3/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.4.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.4.3/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.4.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.4.3/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.4.3/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe +SIZE (wazuh-4.4.3/nlohmann.tar.gz) = 134429 +SHA256 (wazuh-4.4.3/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.4.3/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.4.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa +SIZE (wazuh-4.4.3/libpcre2.tar.gz) = 1252173 +SHA256 (wazuh-4.4.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.4.3/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.4.3/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 +SIZE (wazuh-4.4.3/libarchive.tar.gz) = 7040169 +SHA256 (wazuh-4.4.3/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.4.3/popt.tar.gz) = 891309 +SHA256 (wazuh-4.4.3/cpython.tar.gz) = d49fb4f23a10576c614dce7c9e6114c082b468198a7547c86d5efe6180897629 +SIZE (wazuh-4.4.3/cpython.tar.gz) = 237260330 +SHA256 (wazuh-4.4.3/wazuh-cache-any-4.4.3.tar.gz) = cc6865fb6dd9aa89c9507741cf50134fcbacf5f83811878d5eeb02a1904d6716 +SIZE (wazuh-4.4.3/wazuh-cache-any-4.4.3.tar.gz) = 15595248 +SHA256 (wazuh-4.4.3/wazuh-cache-fbsd13-aarch64-4.4.3.tar.gz) = 9a13eb243e18f7337664ca64152a5ca53af0cd703455823480133b1f495fe1fe +SIZE (wazuh-4.4.3/wazuh-cache-fbsd13-aarch64-4.4.3.tar.gz) = 15982673 +SHA256 (wazuh-4.4.3/wazuh-cache-fbsd14-aarch64-4.4.3.tar.gz) = c5b11d12c10878b2193c3337774784312edf3f257b754beab9f67818d2825a23 +SIZE (wazuh-4.4.3/wazuh-cache-fbsd14-aarch64-4.4.3.tar.gz) = 17601326 +SHA256 (wazuh-4.4.3/wazuh-cache-fbsd12-amd64-4.4.3.tar.gz) = 1f8b59b188d29be3bf1c44f45577248c5a33595825763650f234449eec8c13f4 +SIZE (wazuh-4.4.3/wazuh-cache-fbsd12-amd64-4.4.3.tar.gz) = 17175513 +SHA256 (wazuh-4.4.3/wazuh-cache-fbsd13-amd64-4.4.3.tar.gz) = 495f6c232763fca3b6a3d3c0dbb3e319c82b0a56613af2ecbdf88d5ff360a3f9 +SIZE (wazuh-4.4.3/wazuh-cache-fbsd13-amd64-4.4.3.tar.gz) = 17214367 +SHA256 (wazuh-4.4.3/wazuh-cache-fbsd14-amd64-4.4.3.tar.gz) = 4eb9e95dae4a10781fe6d1dfb00c1062cbc838e87f9a28de7092567d9bc623bc +SIZE (wazuh-4.4.3/wazuh-cache-fbsd14-amd64-4.4.3.tar.gz) = 17181995 +SHA256 (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 61d0a05c62021c8606c7fb70becab29a4df5eb82cc79131f4bb53afc368929f3 +SIZE (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 11553359 diff --git a/security/wazuh-manager/files/patch-api_Makefile b/security/wazuh-manager/files/patch-api_Makefile index de54bfba725e..e0c6ddf9e3e2 100644 --- a/security/wazuh-manager/files/patch-api_Makefile +++ b/security/wazuh-manager/files/patch-api_Makefile @@ -1,6 +1,6 @@ ---- api/Makefile 2022-07-26 15:51:47.002374000 -0500 -+++ api/Makefile 2022-07-26 15:52:25.960498000 -0500 -@@ -8,11 +8,11 @@ +--- api/Makefile.orig 2023-05-12 12:30:40 UTC ++++ api/Makefile +@@ -8,11 +8,11 @@ WAZUH_GROUP = wazuh INSTALLDIR ?= /var/ossec RM_FILE = rm -f diff --git a/security/wazuh-manager/files/patch-framework_Makefile b/security/wazuh-manager/files/patch-framework_Makefile index 8266370762b0..5e78c0f9ffc7 100644 --- a/security/wazuh-manager/files/patch-framework_Makefile +++ b/security/wazuh-manager/files/patch-framework_Makefile @@ -1,5 +1,5 @@ ---- framework/Makefile 2023-03-27 05:11:56.000000000 -0500 -+++ framework/Makefile 2023-03-28 21:20:23.081023000 -0500 +--- framework/Makefile.orig 2023-05-12 12:30:40 UTC ++++ framework/Makefile @@ -7,14 +7,14 @@ WAZUH_GROUP = wazuh INSTALLDIR ?= /var/ossec diff --git a/security/wazuh-manager/files/patch-src-Makefile b/security/wazuh-manager/files/patch-src_Makefile similarity index 94% rename from security/wazuh-manager/files/patch-src-Makefile rename to security/wazuh-manager/files/patch-src_Makefile index 7433f6de4d8d..53bd5d5a8de1 100644 --- a/security/wazuh-manager/files/patch-src-Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile 2023-03-27 05:11:56.000000000 -0500 -+++ src/Makefile 2023-03-28 21:38:29.729243000 -0500 -@@ -38,9 +38,11 @@ +--- src/Makefile.orig 2023-05-12 12:30:40 UTC ++++ src/Makefile +@@ -38,9 +38,11 @@ endif HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -239,10 +241,10 @@ +@@ -239,10 +241,10 @@ else ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -25,7 +25,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -853,6 +855,8 @@ +@@ -853,6 +855,8 @@ ifeq (${TARGET},winagent) EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -34,7 +34,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -2218,14 +2222,37 @@ +@@ -2218,14 +2222,37 @@ 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 @@ -74,7 +74,7 @@ endif install_framework: install_python -@@ -2238,7 +2265,7 @@ +@@ -2238,7 +2265,7 @@ install_api: install_python 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_data__provider_CMakeLists.txt b/security/wazuh-manager/files/patch-src_data__provider_CMakeLists.txt new file mode 100644 index 000000000000..a5527dcc913a --- /dev/null +++ b/security/wazuh-manager/files/patch-src_data__provider_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/data_provider/CMakeLists.txt.orig 2023-05-22 04:53:06 UTC ++++ src/data_provider/CMakeLists.txt +@@ -153,7 +153,7 @@ elseif(APPLE) + target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a) + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + +-target_link_libraries(sysinfo wazuhext) ++target_link_libraries(sysinfo nghttp2 wazuhext) + + + if(APPLE) 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 similarity index 84% rename from security/wazuh-manager/files/patch-src-external-cpython_Makefile.pre.in rename to security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in index 1b2b40726ef7..0edb3f218329 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,6 +1,6 @@ ---- src/external/cpython/Makefile.pre.in 2022-02-08 10:05:54.000000000 -0500 -+++ src/external/cpython/Makefile.pre.in 2022-07-29 16:26:56.387414000 -0500 -@@ -70,7 +70,7 @@ +--- src/external/cpython/Makefile.pre.in.orig 2023-03-21 17:26:00 UTC ++++ src/external/cpython/Makefile.pre.in +@@ -70,14 +70,14 @@ INSTALL_SCRIPT= @INSTALL_SCRIPT@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; # rather than figuring out exactly which, we always give them executable mode. @@ -9,7 +9,15 @@ MKDIR_P= @MKDIR_P@ -@@ -474,7 +474,7 @@ + MAKESETUP= $(srcdir)/Modules/makesetup + + # Compiler options +-OPT= @OPT@ ++OPT= -DNDEBUG + BASECFLAGS= @BASECFLAGS@ + BASECPPFLAGS= @BASECPPFLAGS@ + CONFIGURE_CFLAGS= @CFLAGS@ +@@ -474,7 +474,7 @@ DTRACE_DEPS = \ # Default target all: @DEF_MAKE_ALL_RULE@ build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks \ @@ -18,7 +26,7 @@ # Check that the source is clean when building out of source. check-clean-src: -@@ -723,8 +723,8 @@ +@@ -723,8 +723,8 @@ Makefile Modules/config.c: Makefile.pre \ @echo "The Makefile was updated, you may need to re-run make." @@ -29,7 +37,7 @@ ############################################################################ # Importlib -@@ -797,8 +797,8 @@ +@@ -797,8 +797,8 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefil Programs/python.o: $(srcdir)/Programs/python.c $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c @@ -40,7 +48,7 @@ Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h $(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h -@@ -1254,7 +1254,7 @@ +@@ -1255,7 +1255,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininst upgrade) ensurepip="--upgrade" ;; \ install|*) ensurepip="" ;; \ esac; \ @@ -49,7 +57,7 @@ $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -1264,7 +1264,7 @@ +@@ -1265,7 +1265,7 @@ altinstall: commoninstall upgrade) ensurepip="--altinstall --upgrade" ;; \ install|*) ensurepip="--altinstall" ;; \ esac; \ @@ -58,7 +66,7 @@ $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -1549,37 +1549,10 @@ +@@ -1550,37 +1550,10 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -98,7 +106,7 @@ # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. -@@ -1693,7 +1666,7 @@ +@@ -1694,7 +1667,7 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -107,7 +115,7 @@ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -@@ -1859,7 +1832,7 @@ +@@ -1860,7 +1833,7 @@ clean-retain-profile: pycremoval find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle diff --git a/security/wazuh-manager/files/patch-src-rootcheck_os_string.c b/security/wazuh-manager/files/patch-src_rootcheck_os__string.c similarity index 58% rename from security/wazuh-manager/files/patch-src-rootcheck_os_string.c rename to security/wazuh-manager/files/patch-src_rootcheck_os__string.c index fdbe184aace3..45c9be82edc8 100644 --- a/security/wazuh-manager/files/patch-src-rootcheck_os_string.c +++ b/security/wazuh-manager/files/patch-src_rootcheck_os__string.c @@ -1,5 +1,5 @@ ---- src/rootcheck/os_string.c 2022-10-06 08:35:58.000000000 -0500 -+++ src/rootcheck/os_string.c 2022-10-30 14:31:56.614900000 -0500 +--- src/rootcheck/os_string.c.orig 2023-05-12 12:30:40 UTC ++++ src/rootcheck/os_string.c @@ -42,6 +42,9 @@ #include <locale.h> #include <unistd.h> diff --git a/security/wazuh-manager/files/patch-src_shared__modules_dbsync_CMakeLists.txt b/security/wazuh-manager/files/patch-src_shared__modules_dbsync_CMakeLists.txt new file mode 100644 index 000000000000..07797273e673 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_shared__modules_dbsync_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/shared_modules/dbsync/CMakeLists.txt.orig 2023-05-22 04:54:30 UTC ++++ src/shared_modules/dbsync/CMakeLists.txt +@@ -70,7 +70,7 @@ elseif(UNIX AND NOT APPLE) + endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + +-target_link_libraries(dbsync wazuhext) ++target_link_libraries(dbsync nghttp2 wazuhext) + + if(CMAKE_BUILD_TYPE STREQUAL "Release") + if(CMAKE_SYSTEM_NAME STREQUAL "AIX") diff --git a/security/wazuh-manager/files/patch-src_shared__modules_rsync_CMakeLists.txt b/security/wazuh-manager/files/patch-src_shared__modules_rsync_CMakeLists.txt new file mode 100644 index 000000000000..e9f6fa46f511 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_shared__modules_rsync_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/shared_modules/rsync/CMakeLists.txt.orig 2023-05-22 04:56:09 UTC ++++ src/shared_modules/rsync/CMakeLists.txt +@@ -72,7 +72,7 @@ elseif(UNIX AND NOT APPLE) + endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + +-target_link_libraries(rsync dbsync wazuhext) ++target_link_libraries(rsync dbsync nghttp2 wazuhext) + + if(CMAKE_BUILD_TYPE STREQUAL "Release") + if(CMAKE_SYSTEM_NAME STREQUAL "AIX") diff --git a/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt b/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt new file mode 100644 index 000000000000..9ef110610ebb --- /dev/null +++ b/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/wazuh_modules/syscollector/CMakeLists.txt.orig 2023-05-12 12:30:40 UTC ++++ src/wazuh_modules/syscollector/CMakeLists.txt +@@ -91,7 +91,7 @@ elseif(UNIX AND NOT APPLE) + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + + 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) + 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/files/patch-tools-mitre_mitredb-py b/security/wazuh-manager/files/patch-tools_mitre_mitredb.py similarity index 77% rename from security/wazuh-agent/files/patch-tools-mitre_mitredb-py rename to security/wazuh-manager/files/patch-tools_mitre_mitredb.py index 58c0b5aa4b92..bae41b280221 100644 --- a/security/wazuh-agent/files/patch-tools-mitre_mitredb-py +++ b/security/wazuh-manager/files/patch-tools_mitre_mitredb.py @@ -1,6 +1,6 @@ ---- tools/mitre/mitredb.py 2022-07-26 14:50:02.401104000 -0500 -+++ tools/mitre/mitredb.py 2022-07-26 15:25:13.375626000 -0500 -@@ -763,13 +763,6 @@ +--- tools/mitre/mitredb.py.orig 2023-05-12 12:30:40 UTC ++++ tools/mitre/mitredb.py +@@ -766,13 +766,6 @@ def main(database=None): # Parse enterprise-attack.json file: parse_json(pathfile, session, database) diff --git a/security/wazuh-manager/files/pkg-message.in b/security/wazuh-manager/files/pkg-message.in index 62c75efbb0f1..ec8dec4acfab 100644 --- a/security/wazuh-manager/files/pkg-message.in +++ b/security/wazuh-manager/files/pkg-message.in @@ -30,9 +30,13 @@ Wazuh Manager was installed *** 4210 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305300425.34U4P6ZG061328>