Attachment 246230 Details for Bug 275008 – header include fix in Makefile

[patch] header include fix in Makefile

wazuh-agent.patch (text/plain), 8.10 KB, created by Franco Fichtner on 2023-11-10 09:36:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2023-11-10 09:36:47 UTC

Size: 8.10 KB

patch

obsolete

>From ddd181f2c06239392f5d16307351f08842e9345a Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Fri, 10 Nov 2023 10:18:54 +0100
>Subject: [PATCH] security/wazuh-agent: fix ssl=openssl build
>
>---
> security/wazuh-agent/files/patch-src-Makefile | 39 +++++++++++++------
> .../patch-src_data__provider_CMakeLists.txt   |  6 +--
> ...-src_shared__modules_dbsync_CMakeLists.txt |  6 +--
> ...h-src_shared__modules_rsync_CMakeLists.txt |  6 +--
> ...wazuh__modules_syscollector_CMakeLists.txt |  4 +-
> 5 files changed, 39 insertions(+), 22 deletions(-)
>
>diff --git a/security/wazuh-agent/files/patch-src-Makefile b/security/wazuh-agent/files/patch-src-Makefile
>index 2c03f3fddbc..653357e5fa3 100644
>--- a/security/wazuh-agent/files/patch-src-Makefile
>+++ b/security/wazuh-agent/files/patch-src-Makefile
>@@ -1,6 +1,6 @@
>---- src/Makefile	2023-10-30 12:58:46.000000000 -0500
>-+++ src/Makefile	2023-11-02 13:03:04.740615000 -0500
>-@@ -49,9 +49,11 @@
>+--- src/Makefile.orig	2023-10-30 17:58:46 UTC
>++++ src/Makefile
>+@@ -49,9 +49,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 =
>  
>-@@ -101,7 +103,7 @@
>+@@ -101,7 +103,7 @@ SYSCHECK=syscheckd/
>  USE_PRELUDE?=no
>  USE_ZEROMQ?=no
>  USE_GEOIP?=no
>@@ -21,7 +21,16 @@
>  USE_BIG_ENDIAN=no
>  USE_AUDIT=no
>  MINGW_HOST=unknown
>-@@ -253,10 +255,10 @@
>+@@ -163,6 +165,8 @@ DEFINES=-DOSSECHIDS
>+ DEFINES+=-DUSER=\"${WAZUH_USER}\"
>+ DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\"
>+ 
>++OSSEC_CFLAGS=-I./ -I./headers/ -I${EXTERNAL_OPENSSL}include -I$(EXTERNAL_JSON) -I${EXTERNAL_LIBYAML}include -I${EXTERNAL_CURL}include -I${EXTERNAL_MSGPACK}include -I${EXTERNAL_BZIP2} -I${SHARED_MODULES}common -I${DBSYNC}include -I${RSYNC}include -I${SYSCOLLECTOR}include  -I${SYSINFO}include  -I${EXTERNAL_LIBPCRE2}include -I${EXTERNAL_RPM}/builddir/output/include -I${SYSCHECK}include
>++
>+ ifneq (${TARGET},winagent)
>+ 		DEFINES+=-D${uname_S}
>+ ifeq (${uname_S},Linux)
>+@@ -253,10 +257,10 @@ else
>  ifeq (${uname_S},FreeBSD)
>  		DEFINES+=-DFreeBSD
>  		OSSEC_CFLAGS+=-pthread -I/usr/local/include
>@@ -34,7 +43,15 @@
>  		AR_LDFLAGS+=-L/usr/local/lib
>  		AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib'
>  		PRECOMPILED_OS:=freebsd
>-@@ -487,8 +489,8 @@
>+@@ -390,7 +394,6 @@ endif
>+ 
>+ OSSEC_CFLAGS+=${DEFINES}
>+ OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99
>+-OSSEC_CFLAGS+=-I./ -I./headers/ -I${EXTERNAL_OPENSSL}include -I$(EXTERNAL_JSON) -I${EXTERNAL_LIBYAML}include -I${EXTERNAL_CURL}include -I${EXTERNAL_MSGPACK}include -I${EXTERNAL_BZIP2} -I${SHARED_MODULES}common -I${DBSYNC}include -I${RSYNC}include -I${SYSCOLLECTOR}include  -I${SYSINFO}include  -I${EXTERNAL_LIBPCRE2}include -I${EXTERNAL_RPM}/builddir/output/include -I${SYSCHECK}include
>+ 
>+ OSSEC_CFLAGS += ${CFLAGS}
>+ OSSEC_LDFLAGS += ${LDFLAGS}
>+@@ -487,8 +490,8 @@ OSSEC_WINDRES 		=${QUIET_CCBIN}${MING_BASE}windres
>  ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1))
>  	DEFINES+=-DINOTIFY_ENABLED
>  	ifeq (${uname_S},FreeBSD)
>@@ -45,7 +62,7 @@
>  		OSSEC_CFLAGS+=-I/usr/local/include
>  	endif
>  endif
>-@@ -907,6 +909,8 @@
>+@@ -907,6 +910,8 @@ ifeq (${TARGET},winagent)
>  	EXTERNAL_LIBS += $(LIBCURL_LIB)
>  else ifeq (${uname_S},Linux)
>  	EXTERNAL_LIBS += $(LIBCURL_LIB)
>@@ -54,7 +71,7 @@
>  else ifeq (${uname_S},Darwin)
>  	EXTERNAL_LIBS += $(LIBCURL_LIB)
>  endif
>-@@ -1084,9 +1088,13 @@
>+@@ -1084,9 +1089,13 @@ $(EXTERNAL_CURL)Makefile: $(OPENSSL_LIB)
>  ifeq (${uname_S},Linux)
>  	cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli --without-nghttp2
>  else
>@@ -68,7 +85,7 @@
>  
>  
>  #### procps #########
>-@@ -2106,7 +2114,7 @@
>+@@ -2106,7 +2115,7 @@ librootcheck.a: ${rootcheck_o_lib}
>  #### FIM ######
>  
>  wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules
>@@ -77,7 +94,7 @@
>  
>  #### Monitor #######
>  
>-@@ -2305,10 +2313,33 @@
>+@@ -2305,10 +2314,33 @@ 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
>@@ -111,7 +128,7 @@
>  install_dependencies: install_python
>  ifneq (,$(wildcard ${EXTERNAL_CPYTHON}))
>  	${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple
>-@@ -2325,6 +2356,7 @@
>+@@ -2325,6 +2357,7 @@ install_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
>index 0cec8b79cb0..db83c40b0af 100644
>--- a/security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt
>+++ b/security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt
>@@ -1,7 +1,7 @@
>---- src/data_provider/CMakeLists.txt.orig	2023-05-24 19:23:05 UTC
>+--- src/data_provider/CMakeLists.txt.orig	2023-10-30 17:58:46 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)
>+@@ -177,7 +177,7 @@ elseif(APPLE)
>+   target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a ${iokit_lib} ${corefoundation_lib})
>  endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>  
> -target_link_libraries(sysinfo wazuhext)
>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
>index bccee7e5503..e1b1cab3d9c 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,7 +1,7 @@
>---- src/shared_modules/dbsync/CMakeLists.txt.orig	2023-05-24 19:23:05 UTC
>+--- src/shared_modules/dbsync/CMakeLists.txt.orig	2023-10-30 17:58:46 UTC
> +++ src/shared_modules/dbsync/CMakeLists.txt
>-@@ -70,7 +70,7 @@ elseif(UNIX AND NOT APPLE)
>-   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")
>+@@ -78,7 +78,7 @@ elseif(UNIX AND NOT APPLE)
>+   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX" AND NOT CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
>  endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>  
> -target_link_libraries(dbsync wazuhext)
>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
>index 12123313fe3..1deae7f0d6d 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,7 +1,7 @@
>---- src/shared_modules/rsync/CMakeLists.txt.orig	2023-05-24 19:23:05 UTC
>+--- src/shared_modules/rsync/CMakeLists.txt.orig	2023-10-30 17:58:46 UTC
> +++ src/shared_modules/rsync/CMakeLists.txt
>-@@ -72,7 +72,7 @@ elseif(UNIX AND NOT APPLE)
>-   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")
>+@@ -80,7 +80,7 @@ elseif(UNIX AND NOT APPLE)
>+   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX" AND NOT CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
>  endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>  
> -target_link_libraries(rsync dbsync wazuhext)
>diff --git a/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt
>index 697aceecc54..bc6fd72e5d1 100644
>--- a/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt
>+++ b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- src/wazuh_modules/syscollector/CMakeLists.txt.orig	2023-05-24 19:23:05 UTC
>+--- src/wazuh_modules/syscollector/CMakeLists.txt.orig	2023-10-30 17:58:46 UTC
> +++ src/wazuh_modules/syscollector/CMakeLists.txt
>-@@ -90,7 +90,7 @@ elseif(UNIX AND NOT APPLE)
>+@@ -97,7 +97,7 @@ elseif(UNIX AND NOT APPLE)
>  endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>  
>  if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")

Actions: View | Diff

Attachments on bug 275008: 246230