Update Falco libs

.gitmodules

@@ -34,3 +34,6 @@
 [submodule "modules/elf"]
 	path = modules/elf
 	url = https://github.com/arachsys/libelf.git
+[submodule "modules/hash-library"]
+	path = modules/hash-library
+	url = https://github.com/stbrumme/hash-library.git

Makefile

@@ -128,7 +128,7 @@ docker-driver-build:
 
 .PHONY: docker-driver-build/musl
 docker-driver-build/musl:
-	( DOCKER_BUILDKIT=1 docker build --no-cache --build-arg ALPINE_VER=${ALPINE_VERSION} --build-arg UBI_VER=${UBI_VERSION} --build-arg FALCO_VER=${FALCO_VERSION} --build-arg FALCOCTL_VERSION=${FALCOCTL_VERSION} --build-arg FALCO_LIBS_VER=${FALCO_LIBS_VERSION} --build-arg FALCO_LIBS_DRIVER_VER=${FALCO_LIBS_DRIVER_VERSION} --target driver -t sysflowtelemetry/alpine:driver-${FALCO_LIBS_VERSION}-${FALCO_VERSION}-${UBI_VERSION} -f Dockerfile.driver.alpine.amd64 . )
+	( DOCKER_BUILDKIT=1 docker build --no-cache --build-arg ALPINE_VER=${ALPINE_VERSION} --build-arg UBI_VER=${UBI_VERSION} --build-arg FALCO_VER=${FALCO_VERSION} --build-arg FALCOCTL_VERSION=${FALCOCTL_VERSION} --build-arg FALCO_LIBS_VER=${FALCO_LIBS_VERSION} --build-arg FALCO_LIBS_DRIVER_VER=${FALCO_LIBS_DRIVER_VERSION} --target driver -t sysflowtelemetry/alpine:driver-${FALCO_LIBS_VERSION}-${FALCO_VERSION}-${ALPINE_VERSION} -f Dockerfile.driver.alpine.amd64 . )
 
 .PHONY: docker-libs-build
 docker-libs-build:

makefile.manifest.inc

@@ -16,12 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SYSFLOW_VERSION?=0.8.0
+SYSFLOW_VERSION?=0.9.0-dev
 SYSFLOW_BUILD_NUMBER?=1
-FALCO_VERSION=0.40.0
-FALCO_LIBS_VERSION=0.20.0
-FALCO_LIBS_DRIVER_VERSION=8.0.0+driver
-FALCOCTL_VERSION=0.11.0
+FALCO_VERSION=0.43.0
+FALCO_LIBS_VERSION=0.23.2
+FALCO_LIBS_DRIVER_VERSION=9.1.0+driver
+FALCOCTL_VERSION=0.12.2
 AVRO_VERSION=release-1.11.0
 ELF_VERSION=v0.189
 GLOG_VERSION=v0.6.0
@@ -32,3 +32,4 @@ XXHASH_VERSION=v0.8.2
 SPARSE_VERSION=sparsehash-2.0.4
 ALPINE_VERSION=3.18.3
 UBI_VERSION=9.4-1214.1729773476
+HASH_LIBRARY=hash_library_v8

modules/Makefile

@@ -50,6 +50,7 @@ endif
 	cd filesystem && git fetch origin && git checkout $(GHCFS_VERSION)
 	cd sparsehash && git fetch origin && git checkout $(SPARSE_VERSION)
 	cd xxHash && git fetch origin && git checkout $(XXHASH_VERSION)
+	cd hash-library && git fetch origin && git checkout $(HASH_LIBRARY)
 
 # libelf is a pre-requisite for libs build
 .PHONY: modules
@@ -61,7 +62,8 @@ modules: elf/package \
 		glog/package \
 		snappy/package \
 		xxhash/package \
-		sparsehash/package
+		sparsehash/package \
+		hash-library/package
 
 .PHONY: install
 install: modules \
@@ -74,7 +76,8 @@ install: modules \
 	snappy/install \
 	dkms-rh/install \
 	xxhash/install \
-	sparsehash/install
+	sparsehash/install \
+	hash-library/install
 
 .PHONY: falcolibs/package
 falcolibs/package:
@@ -101,18 +104,15 @@ falcolibs/package:
 			-DCMD_MAKE="make -j${MAKE_JOBS}" \
 			${MUSL_FLAG} ../. && make -j${MAKE_JOBS} && \
 	mkdir -p include && mkdir -p lib && mkdir -p bin && \
-	mkdir -p include/curl && cp curl-prefix/src/curl/include/curl/*.h include/curl && \
 	mkdir -p include/driver && cp driver/src/*h include/driver && cp ../driver/*h include/driver && \
 	mkdir -p include/userspace/libsinsp && cp ../userspace/libsinsp/*.h include/userspace/libsinsp && \
 	mkdir -p include/userspace/libsinsp/sinsp_filter_transformers && cp ../userspace/libsinsp/sinsp_filter_transformers/*.h include/userspace/libsinsp/sinsp_filter_transformers/ && \
-	mkdir -p include/userspace/libsinsp/container_engine && cp ../userspace/libsinsp/container_engine/*.h include/userspace/libsinsp/container_engine/ && \
 	mkdir -p include/userspace/libsinsp/filter && cp ../userspace/libsinsp/filter/*.h include/userspace/libsinsp/filter/ && \
 	mkdir -p include/userspace/libsinsp/events && cp ../userspace/libsinsp/events/*.h include/userspace/libsinsp/events/ && \
 	mkdir -p include/userspace/libsinsp/state && cp ../userspace/libsinsp/state/*.h include/userspace/libsinsp/state/ && \
 	mkdir -p include/userspace/plugin && cp ../userspace/plugin/*.h include/userspace/plugin/ && \
 	mkdir -p include/userspace/libscap && cd .. && find userspace/libscap -name '*.h' -exec cp -r --parents '{}' build/include \; && cd build && \
 	cp libscap/*.h include/userspace/libscap && \
-	mkdir -p include/openssl && cp openssl-prefix/src/openssl/include/openssl/*.h include/openssl && \
 	cp -r tbb-prefix/src/tbb/include/tbb include/ && \
 	cp -r tbb-prefix/src/tbb/include/oneapi include/ && \
 	cp uthash-prefix/src/uthash/src/*.h include/ && \
@@ -123,27 +123,16 @@ falcolibs/package:
 	cp tbb-prefix/src/tbb/lib_release/libtbb.a lib/ && \
 	cp jsoncpp-prefix/src/lib/libjsoncpp.a lib/ && \
 	cp -r jsoncpp-prefix/src/include/json  include/ && \
-	cp -r c-ares-prefix/src/c-ares/include/*.h include/ && \
 	cp libpman/*.a lib/ && \
 	cp libsinsp/*.a lib/ && \
 	find libscap -name '*.a' -exec cp '{}' lib \; && \
 	cp ../../falco/docker/driver-loader-buster/docker-entrypoint.sh bin/ && \
     cp re2-prefix/build/libre2.a lib/ && \
-	cp grpc-prefix/src/grpc/*.a lib/ && \
-	find grpc-prefix/src/grpc/third_party/abseil-cpp -name '*.a' -exec cp '{}' lib \; && \
-	cp c-ares-prefix/src/c-ares/lib/libcares.a lib/ && \
-	cp curl-prefix/src/curl/lib/.libs/libcurl.a lib/ && \
-	cp openssl-prefix/src/openssl/target/lib/*.a lib/ && \
 	cp zlib-prefix/src/zlib/libz.a lib/libz.a
 ifeq ($(BUNDLE_FALCO_LIBS), 1)	
 	cp -r falco-libs/build/lib falco-libs/build/bundle
 	cp falco-libs.$(ARCH).mri falco-libs/build/bundle 
 	cd falco-libs/build/bundle && \
-	mv libgrpc++.a libgrpcpp.a && \
-	mv libgrpc++_alts.a libgrpcpp_alts.a && \
-	mv libgrpc++_error_details.a libgrpcpp_error_details.a && \
-	mv libgrpc++_reflection.a libgrpcpp_reflection.a && \
-	mv libgrpc++_unsecure.a libgrpcpp_unsecure.a && \
 	ar -M <falco-libs.$(ARCH).mri && cp libs.a ../lib/
 endif
 
@@ -234,6 +223,14 @@ sparsehash/package:
 sparsehash/install:
 	cd sparsehash && make install
 
+.PHONY: hash-library/package
+hash-library/package:
+	cd hash-library && $(CXX) -c sha1.cpp -o sha1.o && ar rcs sha1.a sha1.o
+
+.PHONY: hash-library/install
+hash-library/install:
+	cd hash-library && cp sha1.a $(LIBPREFIX) && cp sha1.h $(MODPREFIX)/include/
+
 .PHONY: dkms-deb/install
 dkms-deb/install:
 	cd dkms && make install-debian

modules/falco-libs.x86_64.mri

@@ -1,82 +1,5 @@
 create libs.a
-addlib libabsl_bad_any_cast_impl.a
-addlib libabsl_bad_optional_access.a
-addlib libabsl_bad_variant_access.a
-addlib libabsl_base.a
-addlib libabsl_city.a
-addlib libabsl_civil_time.a
-addlib libabsl_cord.a
-addlib libabsl_cord_internal.a
-addlib libabsl_cordz_functions.a
-addlib libabsl_cordz_handle.a
-addlib libabsl_cordz_info.a
-addlib libabsl_cordz_sample_token.a
-addlib libabsl_debugging_internal.a
-addlib libabsl_demangle_internal.a
-addlib libabsl_examine_stack.a
-addlib libabsl_exponential_biased.a
-addlib libabsl_failure_signal_handler.a
-addlib libabsl_flags.a
-addlib libabsl_flags_commandlineflag.a
-addlib libabsl_flags_commandlineflag_internal.a
-addlib libabsl_flags_config.a
-addlib libabsl_flags_internal.a
-addlib libabsl_flags_marshalling.a
-addlib libabsl_flags_parse.a
-addlib libabsl_flags_private_handle_accessor.a
-addlib libabsl_flags_program_name.a
-addlib libabsl_flags_reflection.a
-addlib libabsl_flags_usage.a
-addlib libabsl_flags_usage_internal.a
-addlib libabsl_graphcycles_internal.a
-addlib libabsl_hash.a
-addlib libabsl_hashtablez_sampler.a
-addlib libabsl_int128.a
-addlib libabsl_leak_check.a
-addlib libabsl_leak_check_disable.a
-addlib libabsl_log_severity.a
-addlib libabsl_low_level_hash.a
-addlib libabsl_malloc_internal.a
-addlib libabsl_periodic_sampler.a
-addlib libabsl_random_distributions.a
-addlib libabsl_random_internal_distribution_test_util.a
-addlib libabsl_random_internal_platform.a
-addlib libabsl_random_internal_pool_urbg.a
-addlib libabsl_random_internal_randen.a
-addlib libabsl_random_internal_randen_hwaes.a
-addlib libabsl_random_internal_randen_hwaes_impl.a
-addlib libabsl_random_internal_randen_slow.a
-addlib libabsl_random_internal_seed_material.a
-addlib libabsl_random_seed_gen_exception.a
-addlib libabsl_random_seed_sequences.a
-addlib libabsl_raw_hash_set.a
-addlib libabsl_raw_logging_internal.a
-addlib libabsl_scoped_set_env.a
-addlib libabsl_spinlock_wait.a
-addlib libabsl_stacktrace.a
-addlib libabsl_status.a
-addlib libabsl_statusor.a
-addlib libabsl_str_format_internal.a
-addlib libabsl_strerror.a
-addlib libabsl_strings.a
-addlib libabsl_strings_internal.a
-addlib libabsl_symbolize.a
-addlib libabsl_synchronization.a
-addlib libabsl_throw_delegate.a
-addlib libabsl_time.a
-addlib libabsl_time_zone.a
-addlib libcurl.a
 addlib libdriver_event_schema.a
-addlib libgpr.a
-addlib libgrpcpp.a
-addlib libgrpcpp_alts.a
-addlib libgrpcpp_error_details.a
-addlib libgrpcpp_reflection.a
-addlib libgrpcpp_unsecure.a
-addlib libgrpc.a
-addlib libgrpc_plugin_support.a
-addlib libgrpc_unsecure.a
-addlib libgrpcpp_channelz.a
 addlib libscap.a
 addlib libscap_engine_bpf.a
 addlib libscap_engine_gvisor.a
@@ -92,9 +15,6 @@ addlib libscap_event_schema.a
 addlib libscap_platform.a
 addlib libscap_platform_util.a
 addlib libsinsp.a
-addlib libcontainerd_interface.a
-addlib libcri_v1alpha2.a
-addlib libcri_v1.a
 addlib libtbb.a
 addlib libpman.a
 addlib libbpf.a

src/collector/Makefile

@@ -55,7 +55,7 @@ MUSL ?= 0
 
 # Compiler options
 CXX = g++
-LIBS = ../libs/libsysflow_with_deps.a -lstdc++ -lz -lssl -lcrypto -lpthread -lm -ldl -lupb -laddress_sorting -lre2 -lcares -lprotobuf -lstdc++fs -lelf
+LIBS = ../libs/libsysflow_with_deps.a -lstdc++ -lz -lpthread -lm -ldl -lre2 -lprotobuf -lstdc++fs -lelf
 MUSLFLAGS = -Os
 LDFLAGS = $(LIBS) -L$(FALCOLIBPREFIX)/ -L$(AVRLIBPREFIX)/  -L/usr/lib/ 
 CFLAGS = -std=c++17 -Wall -I.. -I../libs/ -I/usr/local/include/ -I/usr/include/ \
@@ -65,7 +65,6 @@ CFLAGS = -std=c++17 -Wall -I.. -I../libs/ -I/usr/local/include/ -I/usr/include/
 	 	 -I$(FALCOINCPREFIX)/ \
 		 -I$(FALCOINCPREFIX)/curl/ \
 		 -I$(FALCOINCPREFIX)/json2/ \
-		 -I$(FALCOINCPREFIX)/openssl/ \
 		 -I$(FALCOINCPREFIX)/driver/ \
 		 -I$(FALCOINCPREFIX)/userspace/libsinsp/ \
 		 -I$(FALCOINCPREFIX)/userspace/libscap/ \