Skip to content

Commit

Permalink
refactor: removed syscollector sources and Makefile references
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjcr99
mjcr99 committed Aug 8, 2024
1 parent 5815f6d commit ce42310
Show file tree
Hide file tree
Showing 30 changed files with 11 additions and 5,726 deletions.
91 changes: 11 additions & 80 deletions src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,11 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')


ifeq (${uname_S},AIX)
libstdc++_path_temp := $(shell sh -c 'g++ --print-file-name=libstdc++.a 2>/dev/null || echo not')
libgcc_s_path_temp := $(shell sh -c 'g++ --print-file-name=libgcc_s.a 2>/dev/null || echo not')
libstdc++_path=$(subst libstdc++.a,pthread/libstdc++.a,$(libstdc++_path_temp))
libgcc_s_path=$(subst libgcc_s.a,pthread/libgcc_s.a,$(libgcc_s_path_temp))
LIBSTDCPP_NAME := libstdc++.a
LIBGCC_S_NAME := libgcc_s.a
else
libstdc++_path := $(shell sh -c 'g++ --print-file-name=libstdc++.so.6 2>/dev/null || echo not')
libgcc_s_path := $(shell sh -c 'g++ --print-file-name=libgcc_s.so.1 2>/dev/null || echo not')
LIBSTDCPP_NAME := libstdc++.so.6
LIBGCC_S_NAME := libgcc_s.so.1
endif
libstdc++_path := $(shell sh -c 'g++ --print-file-name=libstdc++.so.6 2>/dev/null || echo not')
libgcc_s_path := $(shell sh -c 'g++ --print-file-name=libgcc_s.so.1 2>/dev/null || echo not')
LIBSTDCPP_NAME := libstdc++.so.6
LIBGCC_S_NAME := libgcc_s.so.1

STRIP_TOOL := strip

ifeq (, $(filter ${libstdc++_path}, not ${LIBSTDCPP_NAME}))
Expand Down Expand Up @@ -87,7 +79,6 @@ SELINUX_POLICY=selinux/wazuh.pp
SHARED_MODULES=shared_modules/
DBSYNC=${SHARED_MODULES}dbsync/
RSYNC=${SHARED_MODULES}rsync/
SYSCOLLECTOR=wazuh_modules/syscollector/
ROUTER=shared_modules/router/
CONTENT_MANAGER=shared_modules/content_manager/
VULNERABILITY_SCANNER=wazuh_modules/vulnerability_scanner/
Expand All @@ -110,14 +101,12 @@ HTTP_REQUEST_BRANCH?=v1.0.0
ifneq (,$(filter ${TEST},YES yes y Y 1))
DBSYNC_TEST=-DUNIT_TEST=ON #--coverage
RSYNC_TEST=-DUNIT_TEST=ON #--coverage
SYSCOLLECTOR_TEST=-DUNIT_TEST=ON #--coverage
SYSINFO_TEST=-DUNIT_TEST=ON #--coverage
WAZUH_TEST=-DUNIT_TEST=ON #--coverage
endif
ifneq (,$(filter ${DEBUG},YES yes y Y 1))
SHARED_MODULES_RELEASE_TYPE=-DCMAKE_BUILD_TYPE=Debug
GTEST_RELEASE_TYPE=-DCMAKE_BUILD_TYPE=Debug
SYSCOLLECTOR_RELEASE_TYPE=-DCMAKE_BUILD_TYPE=Debug
SYSINFO_RELEASE_TYPE=-DCMAKE_BUILD_TYPE=Debug
WAZUH_RELEASE_TYPE=-DCMAKE_BUILD_TYPE=Debug
endif
Expand Down Expand Up @@ -239,7 +228,7 @@ 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${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/
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${SYSINFO}include -I${EXTERNAL_LIBPCRE2}include -I${EXTERNAL_RPM}/builddir/output/include -I${ROUTER}include -I${CONTENT_MANAGER}include -I${VULNERABILITY_SCANNER}include -I./shared_modules/

OSSEC_CFLAGS += ${CFLAGS}
OSSEC_LDFLAGS += ${LDFLAGS}
Expand Down Expand Up @@ -305,13 +294,9 @@ endif # USE_GEOIP

SYSINFO_LIB+=-lsysinfo

OSSEC_LDFLAGS+=-L${SYSCOLLECTOR}build/lib
OSSEC_LDFLAGS+=
OSSEC_LDFLAGS+=-L${SYSINFO}build/lib

ifeq (,$(filter ${DISABLE_SYSC}, YES yes y Y 1))
SYSCOLLECTOR_LIB+=-lsyscollector
endif

MI :=
PI :=
ifdef DATABASE
Expand Down Expand Up @@ -511,24 +496,15 @@ BUILD_SERVER+=wazuh-keystore

BUILD_CMAKE_PROJECTS+=build_sysinfo
BUILD_CMAKE_PROJECTS+=build_shared_modules
ifeq (${TARGET},server)
BUILD_CMAKE_PROJECTS+=build_wazuh_cmake
endif
ifeq (,$(filter ${DISABLE_SYSC},YES yes y Y 1))
BUILD_CMAKE_PROJECTS+=build_syscollector
endif

${WAZUH_LIB_OUTPUT_PATH}${LIBSTDCPP_NAME}: ${libstdc++_path}
cp $< $@
ifneq (${uname_S},AIX)
${STRIP_TOOL} -x $@
endif

${WAZUH_LIB_OUTPUT_PATH}${LIBGCC_S_NAME}: ${libgcc_s_path}
cp $< $@
ifneq (${uname_S},AIX)
${STRIP_TOOL} -x $@
endif

.PHONY: server

Expand Down Expand Up @@ -903,7 +879,7 @@ RESOURCES_URL := $(RESOURCES_URL_BASE)$(DEPS_VERSION)
CPYTHON := cpython
PYTHON_SOURCE := no

ifneq (,$(filter ${uname_S},Linux HP-UX))
ifneq (,$(filter ${uname_S},Linux))
cpu_arch := ${uname_M}
ifneq (,$(filter ${cpu_arch},x86_64 amd64))
PRECOMPILED_ARCH := /amd64
Expand Down Expand Up @@ -1195,20 +1171,14 @@ endif #TEST

build_shared_modules: $(WAZUHEXT_LIB)
cd ${DBSYNC} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${DBSYNC_TEST} ${SHARED_MODULES_RELEASE_TYPE} .. && ${MAKE}
cd ${RSYNC} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${RSYNC_TEST} ${SOLARIS_CMAKE_OPTS} ${SHARED_MODULES_RELEASE_TYPE} .. && ${MAKE}
cd ${RSYNC} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${RSYNC_TEST} ${SHARED_MODULES_RELEASE_TYPE} .. && ${MAKE}

#### Sysinfo ##
build_sysinfo: $(WAZUHEXT_LIB)
cd ${SYSINFO} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${SYSINFO_OS} ${SYSINFO_TEST} ${SYSINFO_RELEASE_TYPE} .. && ${MAKE}

#### Syscollector ##
ifeq (,$(filter ${DISABLE_SYSC}, YES yes y Y 1))
build_syscollector: build_shared_modules build_sysinfo
cd ${SYSCOLLECTOR} && mkdir -p build && cd build && cmake -DTARGET=${TARGET} ${CMAKE_OPTS} ${SOLARIS_CMAKE_OPTS} ${SYSCOLLECTOR_TEST} ${SYSCOLLECTOR_RELEASE_TYPE} .. && ${MAKE}
endif

#### Wazuh cmake ###
build_wazuh_cmake: $(WAZUHEXT_LIB) $(EXTERNAL_LIBS_NO_WHOLE) build_syscollector
build_wazuh_cmake: $(WAZUHEXT_LIB) $(EXTERNAL_LIBS_NO_WHOLE)
mkdir -p build && cd build && cmake .. -DTARGET=${TARGET} ${CMAKE_OPTS} ${WAZUH_RELEASE_TYPE} ${WAZUH_TEST} && ${MAKE}

#### crypto ##########
Expand Down Expand Up @@ -1251,51 +1221,13 @@ crypto_o := ${crypto_blowfish_o} \

#### libwazuh #########

libwazuh.a: ${crypto_o} ${os_zlib_o} ${UNIT_TEST_WRAPPERS} ${manage_agents}
libwazuh.a: ${crypto_o} ${os_zlib_o} ${UNIT_TEST_WRAPPERS}
${OSSEC_LINK} $@ $^
${OSSEC_RANLIB} $@

### libwazuhext #########

ifeq (${uname_S},SunOS)
ifneq ($(uname_R),5.10)
LIBGCC_FLAGS := -static-libgcc
else
LIBGCC_FLAGS := -Wl,-rpath,\$$ORIGIN
endif
ifeq (${uname_P},sparc)
$(WAZUHEXT_LIB): $(EXTERNAL_LIBS)
$(OSSEC_SHARED) $(OSSEC_CFLAGS) -mimpure-text -o $@ $(LIBGCC_FLAGS) -Wl,--whole-archive $^ -Wl,--no-whole-archive ${OSSEC_LIBS}
else
$(WAZUHEXT_LIB): $(EXTERNAL_LIBS)
$(OSSEC_SHARED) $(OSSEC_CFLAGS) -o $@ $(LIBGCC_FLAGS) -Wl,--whole-archive $^ -Wl,--no-whole-archive ${OSSEC_LIBS}
endif
else
ifeq (${uname_S},AIX)
$(WAZUHEXT_LIB): $(EXTERNAL_LIBS)
mkdir -p libwazuhext;
find external/ -name \*.a -exec cp {} libwazuhext/ \;
for lib in libcjson.a libz.a libmsgpack.a libssl.a libcrypto.a libsqlite3.a libyaml.a libpcre2-8.a ; do \
ar -x libwazuhext/$$lib; \
mv *.o libwazuhext/; \
done
$(OSSEC_SHARED) $(OSSEC_CFLAGS) libwazuhext/*.o -o $@ -static-libgcc -latomic
else
ifeq (${uname_S},HP-UX)
$(WAZUHEXT_LIB): $(EXTERNAL_LIBS)
mkdir -p libwazuhext;
find external/ -name \*.a -exec cp {} libwazuhext/ \;
for lib in libcjson.a libz.a libmsgpack.a libssl.a libcrypto.a libsqlite3.a libyaml.a libpcre2-8.a ; do \
ar -x libwazuhext/$$lib; \
mv *.o libwazuhext/; \
done
$(OSSEC_SHARED) $(OSSEC_CFLAGS) libwazuhext/*.o -o $@ -static-libgcc
else
$(WAZUHEXT_LIB): $(EXTERNAL_LIBS)
$(OSSEC_SHARED) $(OSSEC_CFLAGS) -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive ${OSSEC_LIBS}
endif
endif
endif

### libwazuhshared.so #########
$(WAZUH_LIB): $(WAZUHEXT_LIB) $(AR_PROGRAMS_DEPS)
Expand Down Expand Up @@ -1519,7 +1451,6 @@ clean-internals: clean-unit-tests
rm -f $(WAZUH_LIB)
rm -rf $(DBSYNC)build
rm -rf $(RSYNC)build
rm -rf $(SYSCOLLECTOR)build
rm -rf $(SHARED_MODULES)utils/flatbuffers/include/
rm -rf $(wildcard $(VULNERABILITY_SCANNER)include/*_generated.h)
rm -rf $(SYSINFO)build
Expand Down
208 changes: 0 additions & 208 deletions src/wazuh_modules/syscollector/CMakeLists.txt
View file

This file was deleted.

Loading

0 comments on commit ce42310

Please sign in to comment.