diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt index bbcfe456..0b82aa90 100644 --- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt +++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt @@ -24,5 +24,4 @@ ExternalProject_Add( CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - TEST_COMMAND "" - PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch) + TEST_COMMAND "") diff --git a/cmake/modules/falcosecurity-libs-repo/patch/libscap.patch b/cmake/modules/falcosecurity-libs-repo/patch/libscap.patch deleted file mode 100644 index c0d7aa90..00000000 --- a/cmake/modules/falcosecurity-libs-repo/patch/libscap.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/userspace/libscap/scap.c b/userspace/libscap/scap.c -index 6f51588e..5f9ea84e 100644 ---- a/userspace/libscap/scap.c -+++ b/userspace/libscap/scap.c -@@ -55,7 +55,7 @@ limitations under the License. - //#define NDEBUG - #include - --static const char *SYSDIG_BPF_PROBE_ENV = "SYSDIG_BPF_PROBE"; -+static const char *SYSDIG_BPF_PROBE_ENV = "FALCO_BPF_PROBE"; - - // - // Probe version string size -@@ -114,7 +114,7 @@ scap_t* scap_open_udig_int(char *error, int32_t *rc, - static uint32_t get_max_consumers() - { - uint32_t max; -- FILE *pfile = fopen("/sys/module/" PROBE_DEVICE_NAME "_probe/parameters/max_consumers", "r"); -+ FILE *pfile = fopen("/sys/module/" PROBE_DEVICE_NAME "/parameters/max_consumers", "r"); - if(pfile != NULL) - { - int w = fscanf(pfile, "%"PRIu32, &max); -@@ -186,7 +186,7 @@ scap_t* scap_open_live_int(char *error, int32_t *rc, - return NULL; - } - -- snprintf(buf, sizeof(buf), "%s/.sysdig/%s-bpf.o", home, PROBE_NAME); -+ snprintf(buf, sizeof(buf), "%s/.falco/%s-bpf.o", home, PROBE_NAME); - bpf_probe = buf; - } - } -@@ -344,7 +344,7 @@ scap_t* scap_open_live_int(char *error, int32_t *rc, - else if(errno == EBUSY) - { - uint32_t curr_max_consumers = get_max_consumers(); -- snprintf(error, SCAP_LASTERR_SIZE, "Too many sysdig instances attached to device %s. Current value for /sys/module/" PROBE_DEVICE_NAME "_probe/parameters/max_consumers is '%"PRIu32"'.", filename, curr_max_consumers); -+ snprintf(error, SCAP_LASTERR_SIZE, "Too many Falco instances attached to device %s. Current value for /sys/module/" PROBE_DEVICE_NAME "/parameters/max_consumers is '%"PRIu32"'.", filename, curr_max_consumers); - } - else - { -@@ -2175,7 +2175,7 @@ int32_t scap_disable_dynamic_snaplen(scap_t* handle) - - const char* scap_get_host_root() - { -- char* p = getenv("SYSDIG_HOST_ROOT"); -+ char* p = getenv("HOST_ROOT"); - static char env_str[SCAP_MAX_PATH_SIZE + 1]; - static bool inited = false; - if (! inited) {