diff --git a/CHANGES b/CHANGES index df1c759757..85916617d2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4.1.0-dev.330 | 2021-03-17 13:48:34 -0700 + + * Prevent use of LeakSanitizer on FreeBSD (Jon Siwek, Corelight) + 4.1.0-dev.328 | 2021-03-17 10:35:59 -0700 * Add tests for ERSPAN Type I patch diff --git a/VERSION b/VERSION index 4d863adaf8..c5fbb2798b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.328 +4.1.0-dev.330 diff --git a/auxil/bifcl b/auxil/bifcl index d356e4716e..919416a0a3 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit d356e4716ef22e6175fe5dd4f3c49b8c4c892214 +Subproject commit 919416a0a3457c95f23b67b39ce8e4da0b84c00b diff --git a/auxil/binpac b/auxil/binpac index daaecd4c76..f946ef50de 160000 --- a/auxil/binpac +++ b/auxil/binpac @@ -1 +1 @@ -Subproject commit daaecd4c76317b91d625f4919f7f104e9e6d76fa +Subproject commit f946ef50de1896df07adafd879c360ef29bea965 diff --git a/auxil/broker b/auxil/broker index c6779fb4dc..7810ec9936 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit c6779fb4dc5a636eb75e14f6306548bbc0386767 +Subproject commit 7810ec9936d1aa65c7c7d21b87e43c7d67481da0 diff --git a/zeek-config.h.in b/zeek-config.h.in index 5f5497f8a5..8cc0c013d5 100644 --- a/zeek-config.h.in +++ b/zeek-config.h.in @@ -260,7 +260,8 @@ extern const char* BRO_VERSION_FUNCTION(); #endif #endif -#if defined(ZEEK_ASAN) +// FreeBSD doesn't support LeakSanitizer +#if defined(ZEEK_ASAN) && !defined(__FreeBSD__) #include #define ZEEK_LSAN_CHECK(x) __lsan_do_leak_check(x) #define ZEEK_LSAN_ENABLE(x) __lsan_enable(x)