Attachment #246230 for bug #275008

View | Details | Raw Unified | Return to bug 275008
Collapse All | Expand All




--- 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)

 
 ARCH_FLAGS =
 
@@ -101,7 +103,7 @@ SYSCHECK=syscheckd/
 USE_PRELUDE?=no
 USE_ZEROMQ?=no
 USE_GEOIP?=no

 USE_BIG_ENDIAN=no
 USE_AUDIT=no
 MINGW_HOST=unknown
@@ -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

 		AR_LDFLAGS+=-L/usr/local/lib
 		AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib'
 		PRECOMPILED_OS:=freebsd
@@ -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)

 		OSSEC_CFLAGS+=-I/usr/local/include
 	endif
 endif
@@ -907,6 +910,8 @@ ifeq (${TARGET},winagent)
 	EXTERNAL_LIBS += $(LIBCURL_LIB)
 else ifeq (${uname_S},Linux)
 	EXTERNAL_LIBS += $(LIBCURL_LIB)

 else ifeq (${uname_S},Darwin)
 	EXTERNAL_LIBS += $(LIBCURL_LIB)
 endif
@@ -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

 
 
 #### procps #########
@@ -2106,7 +2115,7 @@ librootcheck.a: ${rootcheck_o_lib}
 #### FIM ######
 
 wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules

 
 #### Monitor #######
 
@@ -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

 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 +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

Lines 1-7 Link Here

(-)b/security/wazuh-agent/files/patch-src_data__provider_CMakeLists.txt (-3 / +3 lines)
1	--- src/data_provider/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC	1	--- src/data_provider/CMakeLists.txt.orig 2023-10-30 17:58:46 UTC
2	+++ src/data_provider/CMakeLists.txt	2	+++ src/data_provider/CMakeLists.txt
3	@@ -152,7 +152,7 @@ elseif(APPLE)	3	@@ -177,7 +177,7 @@ elseif(APPLE)
4	target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a)	4	target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a ${iokit_lib} ${corefoundation_lib})
5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")	5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
6		6
7	-target_link_libraries(sysinfo wazuhext)	7	-target_link_libraries(sysinfo wazuhext)

Lines 1-7 Link Here

(-)b/security/wazuh-agent/files/patch-src_shared__modules_dbsync_CMakeLists.txt (-3 / +3 lines)
1	--- src/shared_modules/dbsync/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC	1	--- src/shared_modules/dbsync/CMakeLists.txt.orig 2023-10-30 17:58:46 UTC
2	+++ src/shared_modules/dbsync/CMakeLists.txt	2	+++ src/shared_modules/dbsync/CMakeLists.txt
3	@@ -70,7 +70,7 @@ elseif(UNIX AND NOT APPLE)	3	@@ -78,7 +78,7 @@ elseif(UNIX AND NOT APPLE)
4	endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")	4	endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX" AND NOT CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")	5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
6		6
7	-target_link_libraries(dbsync wazuhext)	7	-target_link_libraries(dbsync wazuhext)

Lines 1-7 Link Here

(-)b/security/wazuh-agent/files/patch-src_shared__modules_rsync_CMakeLists.txt (-3 / +3 lines)
1	--- src/shared_modules/rsync/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC	1	--- src/shared_modules/rsync/CMakeLists.txt.orig 2023-10-30 17:58:46 UTC
2	+++ src/shared_modules/rsync/CMakeLists.txt	2	+++ src/shared_modules/rsync/CMakeLists.txt
3	@@ -72,7 +72,7 @@ elseif(UNIX AND NOT APPLE)	3	@@ -80,7 +80,7 @@ elseif(UNIX AND NOT APPLE)
4	endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")	4	endif(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX" AND NOT CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")	5	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
6		6
7	-target_link_libraries(rsync dbsync wazuhext)	7	-target_link_libraries(rsync dbsync wazuhext)

Lines 1-6 Link Here

(-)b/security/wazuh-agent/files/patch-src_wazuh__modules_syscollector_CMakeLists.txt (-2 / +2 lines)
1	--- src/wazuh_modules/syscollector/CMakeLists.txt.orig 2023-05-24 19:23:05 UTC	1	--- src/wazuh_modules/syscollector/CMakeLists.txt.orig 2023-10-30 17:58:46 UTC
2	+++ src/wazuh_modules/syscollector/CMakeLists.txt	2	+++ src/wazuh_modules/syscollector/CMakeLists.txt
3	@@ -90,7 +90,7 @@ elseif(UNIX AND NOT APPLE)	3	@@ -97,7 +97,7 @@ elseif(UNIX AND NOT APPLE)
4	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")	4	endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
5		5
6	if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")	6	if(NOT CMAKE_SYSTEM_NAME STREQUAL "AIX")

Return to bug 275008

Lines 1-6 Link Here

(-)b/security/wazuh-agent/files/patch-src-Makefile (-11 / +28 lines)
1	--- src/Makefile 2023-10-30 12:58:46.000000000 -0500	1	--- src/Makefile.orig 2023-10-30 17:58:46 UTC
2	+++ src/Makefile 2023-11-02 13:03:04.740615000 -0500	2	+++ src/Makefile
3	@@ -49,9 +49,11 @@	3	@@ -49,9 +49,11 @@ endif
4		4
5	HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES)	5	HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES)
6	HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES)	6	HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES)
Lines 12-18 Link Here
12		12
13	ARCH_FLAGS =	13	ARCH_FLAGS =
14		14
15	@@ -101,7 +103,7 @@	15	@@ -101,7 +103,7 @@ SYSCHECK=syscheckd/
16	USE_PRELUDE?=no	16	USE_PRELUDE?=no
17	USE_ZEROMQ?=no	17	USE_ZEROMQ?=no
18	USE_GEOIP?=no	18	USE_GEOIP?=no
Lines 21-27 Link Here
21	USE_BIG_ENDIAN=no	21	USE_BIG_ENDIAN=no
22	USE_AUDIT=no	22	USE_AUDIT=no
23	MINGW_HOST=unknown	23	MINGW_HOST=unknown
24	@@ -253,10 +255,10 @@	24	@@ -163,6 +165,8 @@ DEFINES=-DOSSECHIDS
		25	DEFINES+=-DUSER=\"${WAZUH_USER}\"
		26	DEFINES+=-DGROUPGLOBAL=\"${WAZUH_GROUP}\"
		27
		28	+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
		29	+
		30	ifneq (${TARGET},winagent)
		31	DEFINES+=-D${uname_S}
		32	ifeq (${uname_S},Linux)
		33	@@ -253,10 +257,10 @@ else
25	ifeq (${uname_S},FreeBSD)	34	ifeq (${uname_S},FreeBSD)
26	DEFINES+=-DFreeBSD	35	DEFINES+=-DFreeBSD
27	OSSEC_CFLAGS+=-pthread -I/usr/local/include	36	OSSEC_CFLAGS+=-pthread -I/usr/local/include
Lines 34-40 Link Here
34	AR_LDFLAGS+=-L/usr/local/lib	43	AR_LDFLAGS+=-L/usr/local/lib
35	AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib'	44	AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib'
36	PRECOMPILED_OS:=freebsd	45	PRECOMPILED_OS:=freebsd
37	@@ -487,8 +489,8 @@	46	@@ -390,7 +394,6 @@ endif
		47
		48	OSSEC_CFLAGS+=${DEFINES}
		49	OSSEC_CFLAGS+=-pipe -Wall -Wextra -std=gnu99
		50	-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
		51
		52	OSSEC_CFLAGS += ${CFLAGS}
		53	OSSEC_LDFLAGS += ${LDFLAGS}
		54	@@ -487,8 +490,8 @@ OSSEC_WINDRES =${QUIET_CCBIN}${MING_BASE}windres
38	ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1))	55	ifneq (,$(filter ${USE_INOTIFY},YES auto yes y Y 1))
39	DEFINES+=-DINOTIFY_ENABLED	56	DEFINES+=-DINOTIFY_ENABLED
40	ifeq (${uname_S},FreeBSD)	57	ifeq (${uname_S},FreeBSD)
Lines 45-51 Link Here
45	OSSEC_CFLAGS+=-I/usr/local/include	62	OSSEC_CFLAGS+=-I/usr/local/include
46	endif	63	endif
47	endif	64	endif
48	@@ -907,6 +909,8 @@	65	@@ -907,6 +910,8 @@ ifeq (${TARGET},winagent)
49	EXTERNAL_LIBS += $(LIBCURL_LIB)	66	EXTERNAL_LIBS += $(LIBCURL_LIB)
50	else ifeq (${uname_S},Linux)	67	else ifeq (${uname_S},Linux)
51	EXTERNAL_LIBS += $(LIBCURL_LIB)	68	EXTERNAL_LIBS += $(LIBCURL_LIB)
Lines 54-60 Link Here
54	else ifeq (${uname_S},Darwin)	71	else ifeq (${uname_S},Darwin)
55	EXTERNAL_LIBS += $(LIBCURL_LIB)	72	EXTERNAL_LIBS += $(LIBCURL_LIB)
56	endif	73	endif
57	@@ -1084,9 +1088,13 @@	74	@@ -1084,9 +1089,13 @@ $(EXTERNAL_CURL)Makefile: $(OPENSSL_LIB)
58	ifeq (${uname_S},Linux)	75	ifeq (${uname_S},Linux)
59	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	76	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
60	else	77	else
Lines 68-74 Link Here
68		85
69		86
70	#### procps #########	87	#### procps #########
71	@@ -2106,7 +2114,7 @@	88	@@ -2106,7 +2115,7 @@ librootcheck.a: ${rootcheck_o_lib}
72	#### FIM ######	89	#### FIM ######
73		90
74	wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules	91	wazuh-syscheckd: librootcheck.a libwazuh.a ${WAZUHEXT_LIB} build_shared_modules
Lines 77-83 Link Here
77		94
78	#### Monitor #######	95	#### Monitor #######
79		96
80	@@ -2305,10 +2313,33 @@	97	@@ -2305,10 +2314,33 @@ else
81	mkdir -p ${WPYTHON_DIR}	98	mkdir -p ${WPYTHON_DIR}
82	cp external/${WPYTHON_TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} && ${TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} -C ${WPYTHON_DIR} && rm -rf ${WPYTHON_DIR}/${WPYTHON_TAR}	99	cp external/${WPYTHON_TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} && ${TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} -C ${WPYTHON_DIR} && rm -rf ${WPYTHON_DIR}/${WPYTHON_TAR}
83	endif	100	endif
Lines 111-117 Link Here
111	install_dependencies: install_python	128	install_dependencies: install_python
112	ifneq (,$(wildcard ${EXTERNAL_CPYTHON}))	129	ifneq (,$(wildcard ${EXTERNAL_CPYTHON}))
113	${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple	130	${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple
114	@@ -2325,6 +2356,7 @@	131	@@ -2325,6 +2357,7 @@ install_api: install_python
115		132
116	install_mitre: install_python	133	install_mitre: install_python
117	cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db	134	cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db