diff --git a/CHANGES b/CHANGES index d172cc0925..64d4f34c19 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +6.1.0-dev.343 | 2023-08-28 20:07:16 +0200 + + * cmake: Bump submodule for removal of NEED_KRB5_H (Arne Welzel, Corelight) + + * zeek-config.h: Drop NEED_KRB5_H (Arne Welzel, Corelight) + + This is unused in the Zeek tree after the previous commit, remove it + from zeek-config.h + + * File: Drop krb5.h include (Arne Welzel, Corelight) + + It looks as if krb5.h was only ever needed together with OpenSSL, then + OpenSSL includes were removed, but the krb5.h ones stayed around. + 6.1.0-dev.339 | 2023-08-28 10:53:37 -0700 * change Trigger constructor to not potentially auto-delete itself (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index dc9e578d14..fdad10995c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.339 +6.1.0-dev.343 diff --git a/cmake b/cmake index 1f709b9f06..d50c51862e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1f709b9f067b29462f8f9e2f30a8eabb7b175a86 +Subproject commit d50c51862ec591e88ffae33d33937e2dd4736722 diff --git a/cmake_templates/zeek-config.h.in b/cmake_templates/zeek-config.h.in index 7f9fe60a0c..81409c8a09 100644 --- a/cmake_templates/zeek-config.h.in +++ b/cmake_templates/zeek-config.h.in @@ -80,9 +80,6 @@ /* Define if you have the header file. */ #cmakedefine HAVE_SYS_ETHERNET_H -/* Include krb5.h */ -#cmakedefine NEED_KRB5_H - /* Compatibility for Darwin */ #cmakedefine NEED_NAMESER_COMPAT_H diff --git a/src/File.h b/src/File.h index 98b722228d..26ef3c154f 100644 --- a/src/File.h +++ b/src/File.h @@ -7,10 +7,6 @@ #include #include -#ifdef NEED_KRB5_H -#include -#endif // NEED_KRB5_H - #include "zeek/Val.h" #include "zeek/util.h"