diff --git a/CHANGES b/CHANGES index d65c3e4346..343ee002ea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.235 | 2019-10-30 15:04:13 -0700 + + * GH-649: define missing DLT_NFLOG to support OpenBSD (Jon Siwek, Corelight) + 3.1.0-dev.234 | 2019-10-30 13:33:08 -0700 * Add --libdir convenience flag to configure. (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index f19562a8f8..6c9ffac794 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.234 +3.1.0-dev.235 diff --git a/aux/bifcl b/aux/bifcl index 32afd03e34..4565be72bd 160000 --- a/aux/bifcl +++ b/aux/bifcl @@ -1 +1 @@ -Subproject commit 32afd03e3478d43ba156e959bafd9d16fadd92e7 +Subproject commit 4565be72bdb2c39532a6e21e24a498b131517492 diff --git a/aux/binpac b/aux/binpac index b1b79be93c..db52dc35d0 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit b1b79be93cd136fde75b39252e857b3257dbd974 +Subproject commit db52dc35d0a6a503caf7b8c5428cc84ef6fc204d diff --git a/aux/broker b/aux/broker index d624c004be..960b97bff2 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit d624c004be6c2d39ebb35bf21da49c417f05581d +Subproject commit 960b97bff2da42bca5ac64af7146ccba727432de diff --git a/aux/zeek-aux b/aux/zeek-aux index 246688b548..b36db12038 160000 --- a/aux/zeek-aux +++ b/aux/zeek-aux @@ -1 +1 @@ -Subproject commit 246688b5484049000b5c7c8b4d05cf4559d0fa2f +Subproject commit b36db12038eb9d9b400f19308227854e3885835a diff --git a/aux/zeekctl b/aux/zeekctl index dbe9d5cba9..246ba470e5 160000 --- a/aux/zeekctl +++ b/aux/zeekctl @@ -1 +1 @@ -Subproject commit dbe9d5cba9378b804d36e102b751a754ff28b7c9 +Subproject commit 246ba470e5e653c64589bb1fb0c210a2617fac34 diff --git a/cmake b/cmake index 329c27dc78..e8ddcaeb58 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 329c27dc78d97e2782b17f5a35a8e7a058dd2011 +Subproject commit e8ddcaeb5885970f3abdcd641120bbb803ddefb4 diff --git a/zeek-config.h.in b/zeek-config.h.in index d21a7bdc7c..343ab49363 100644 --- a/zeek-config.h.in +++ b/zeek-config.h.in @@ -163,13 +163,18 @@ /* Define u_int8_t */ #cmakedefine u_int8_t @u_int8_t@ -/* OpenBSD's bpf.h may not declare this data link type, but it's supposed to be +/* OpenBSD's bpf.h may not declare some data link types, but they're used consistently for the same purpose on all platforms. */ #cmakedefine HAVE_DLT_PPP_SERIAL #ifndef HAVE_DLT_PPP_SERIAL #define DLT_PPP_SERIAL @DLT_PPP_SERIAL@ #endif +#cmakedefine HAVE_DLT_NFLOG +#ifndef HAVE_DLT_NFLOG +#define DLT_NFLOG @DLT_NFLOG@ +#endif + /* IPv6 Next Header values defined by RFC 3542 */ #cmakedefine HAVE_IPPROTO_HOPOPTS #ifndef HAVE_IPPROTO_HOPOPTS