diff options
Diffstat (limited to 'security/wazuh-manager/files')
5 files changed, 43 insertions, 28 deletions
diff --git a/security/wazuh-manager/files/patch-src_Makefile b/security/wazuh-manager/files/patch-src_Makefile index 33cecd1aac15..70420cde9198 100644 --- a/security/wazuh-manager/files/patch-src_Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile 2025-01-08 01:15:05.000000000 -0800 -+++ src/Makefile 2025-01-14 19:17:44.081916000 -0800 +--- src/Makefile 2025-04-30 02:30:26.000000000 -0700 ++++ src/Makefile 2025-05-09 19:40:18.856441000 -0700 @@ -49,9 +49,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -109,7 +111,7 @@ +@@ -110,7 +112,7 @@ USE_PRELUDE?=no USE_ZEROMQ?=no USE_GEOIP?=no @@ -21,7 +21,7 @@ USE_BIG_ENDIAN=no USE_AUDIT=no MINGW_HOST=unknown -@@ -174,6 +176,8 @@ +@@ -175,6 +177,8 @@ DEFINES+=-DUSER=\"${WAZUH_USER}\" DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\" @@ -30,7 +30,7 @@ ifneq (${TARGET},winagent) DEFINES+=-D${uname_S} ifeq (${uname_S},Linux) -@@ -268,10 +272,10 @@ +@@ -269,10 +273,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -43,7 +43,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -433,7 +437,6 @@ +@@ -434,7 +438,6 @@ OSSEC_CFLAGS+=${DEFINES} OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99 @@ -51,7 +51,7 @@ OSSEC_CFLAGS += ${CFLAGS} OSSEC_LDFLAGS += ${LDFLAGS} -@@ -530,8 +533,8 @@ +@@ -531,8 +534,8 @@ ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1)) DEFINES+=-DINOTIFY_ENABLED ifeq (${uname_S},FreeBSD) @@ -62,7 +62,7 @@ OSSEC_CFLAGS+=-I/usr/local/include endif endif -@@ -956,6 +959,8 @@ +@@ -957,6 +960,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -71,7 +71,7 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1172,9 +1177,13 @@ +@@ -1186,9 +1191,13 @@ cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --with-openssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli --without-nghttp2 --without-zstd endif else @@ -85,16 +85,16 @@ #### procps ######### -@@ -2263,7 +2272,7 @@ +@@ -2295,7 +2304,7 @@ #### FIM ###### wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules -- cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} +- cd syscheckd && mkdir -p build && cd build && cmake ${SYSCHECK_OS} ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} -pipe -Wall -Wextra -std=gnu99" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} + cd syscheckd && mkdir -p build && cd build && cmake ${CMAKE_OPTS} -DCMAKE_C_FLAGS="${DEFINES} ${OSSEC_CFLAGS} -pipe -Wall -Wextra -std=gnu99" -DCMAKE_EXE_LINKER_FLAGS="${OSSEC_LDFLAGS} ${OSSEC_LIBS}" ${SYSCHECK_TEST} ${SYSCHECK_RELEASE_TYPE} .. && ${MAKE} #### Monitor ####### -@@ -2441,7 +2450,7 @@ +@@ -2473,7 +2482,7 @@ WPYTHON_DIR := ${INSTALLDIR}/framework/python OPTIMIZE_CPYTHON?=no WPYTHON_TAR=cpython.tar.gz @@ -103,7 +103,7 @@ ifneq (,$(filter ${OPTIMIZE_CPYTHON},YES yes y Y 1)) CPYTHON_FLAGS=--enable-optimizations -@@ -2455,7 +2464,7 @@ +@@ -2487,22 +2496,45 @@ endif ifeq (,$(wildcard ${EXTERNAL_CPYTHON}/python)) @@ -112,7 +112,12 @@ endif build_python: $(WAZUHEXT_LIB) -@@ -2467,10 +2476,33 @@ + + install_python: + ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) +- cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && ${MAKE} install ++ cd ${EXTERNAL_CPYTHON} && export WPATH_LIB=${INSTALLDIR}/lib && export SOURCE_PATH=${ROUTE_PATH} && export WAZUH_FFI_PATH=${EXTERNAL_LIBFFI} && export LD_LIBRARY_PATH=${ROUTE_PATH} && ${MAKE} install + else mkdir -p ${WPYTHON_DIR} cp external/${WPYTHON_TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} && ${TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} -C ${WPYTHON_DIR} && rm -rf ${WPYTHON_DIR}/${WPYTHON_TAR} endif @@ -146,7 +151,7 @@ install_dependencies: install_python ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) ${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple -@@ -2487,6 +2519,7 @@ +@@ -2519,6 +2551,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in b/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in index bab784ca965b..6f3aeb6eb06b 100644 --- a/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in +++ b/security/wazuh-manager/files/patch-src_external_cpython_Makefile.pre.in @@ -1,5 +1,5 @@ ---- src/external/cpython/Makefile.pre.in 2025-01-14 18:42:57.000000000 -0800 -+++ src/external/cpython/Makefile.pre.in 2025-01-17 18:04:15.924706000 -0800 +--- src/external/cpython/Makefile.pre.in 2025-04-08 07:15:29.000000000 -0700 ++++ src/external/cpython/Makefile.pre.in 2025-05-09 18:15:10.761567000 -0700 @@ -71,14 +71,14 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; @@ -66,7 +66,7 @@ $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -2144,38 +2144,10 @@ +@@ -2144,37 +2144,9 @@ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -80,8 +80,7 @@ - -j0 -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+ $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ @@ -102,16 +101,16 @@ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -- ++ $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + $(PYTHON_FOR_BUILD) -B -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt + # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. - python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh @@ -2235,7 +2207,7 @@ LIBPL= @LIBPL@ # pkgconfig directory --LIBPC= $(PREFIX)/libdata/pkgconfig +-LIBPC= $(LIBDIR)/pkgconfig +LIBPC= $(prefix)/libdata/pkgconfig libainstall: all python-config diff --git a/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt b/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt new file mode 100644 index 000000000000..461f3beeb586 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_syscheckd_src_db_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/syscheckd/src/db/CMakeLists.txt 2025-05-11 01:12:38.188450000 -0700 ++++ src/syscheckd/src/db/CMakeLists.txt 2025-05-11 01:13:28.349743000 -0700 +@@ -64,7 +64,7 @@ + endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + + if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") +- target_link_libraries(fimdb dbsync rsync wazuhext) ++ target_link_libraries(fimdb dbsync ${SRC_FOLDER}/shared_modules/rsync/build/lib/librsync.so wazuhext) + else() + target_link_libraries( + fimdb diff --git a/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt b/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt index 9ef110610ebb..c8721504bef8 100644 --- a/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt +++ b/security/wazuh-manager/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt @@ -5,7 +5,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX") - target_link_libraries(syscollector dbsync rsync sysinfo wazuhext) -+ target_link_libraries(syscollector dbsync rsync ${SRC_FOLDER}/data_provider/build/lib/libsysinfo.so nghttp2 wazuhext) ++ target_link_libraries(syscollector dbsync ${SRC_FOLDER}/shared_modules/rsync/build/lib/librsync.so ${SRC_FOLDER}/data_provider/build/lib/libsysinfo.so nghttp2 wazuhext) else() string(REPLACE ";" ":" CXX_IMPLICIT_LINK_DIRECTORIES_STR "${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}") string(REPLACE ";" ":" PLATFORM_REQUIRED_RUNTIME_PATH_STR "${CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH}") diff --git a/security/wazuh-manager/files/patch-src_wazuh__modules_vulnerability__scanner_testtool_wazuhDBQuery_CMakeLists.txt b/security/wazuh-manager/files/patch-src_wazuh__modules_vulnerability__scanner_testtool_wazuhDBQuery_CMakeLists.txt index d7ab459fadcd..9dcbda3841ce 100644 --- a/security/wazuh-manager/files/patch-src_wazuh__modules_vulnerability__scanner_testtool_wazuhDBQuery_CMakeLists.txt +++ b/security/wazuh-manager/files/patch-src_wazuh__modules_vulnerability__scanner_testtool_wazuhDBQuery_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/wazuh_modules/vulnerability_scanner/testtool/wazuhDBQuery/CMakeLists.txt.orig 2024-10-21 20:07:19.288180000 -0700 -+++ src/wazuh_modules/vulnerability_scanner/testtool/wazuhDBQuery/CMakeLists.txt 2024-10-21 20:07:23.665267000 -0700 -@@ -13,4 +13,4 @@ - ${WAZUH_DB_QUERY_TESTTOOL_SRC} +--- src/wazuh_modules/vulnerability_scanner/testtool/wazuhDBQuery/CMakeLists.txt 2025-04-30 02:30:26.000000000 -0700 ++++ src/wazuh_modules/vulnerability_scanner/testtool/wazuhDBQuery/CMakeLists.txt 2025-05-09 19:59:29.885715000 -0700 +@@ -14,4 +14,4 @@ ) + target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wshadow -Wnon-virtual-dtor -Woverloaded-virtual -Wunused -Wcast-align -Wformat=2) -target_link_libraries(${PROJECT_NAME} pthread) +target_link_libraries(${PROJECT_NAME} pthread epoll-shim) |