Merge remote-tracking branch 'origin/topic/jsiwek/openbsd'

* origin/topic/jsiwek/openbsd:
  Adjust btests for OpenBSD portability
  Convert pcapng test suite files to pcap format
  Fix undefined symbols loading libbroker on OpenBSD
  Fix compile warnings on OpenBSD

CMakeLists.txt

@@ -189,6 +189,46 @@ if (MISSING_PREREQS)
     message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
 endif ()
 
+if ( CAF_ROOT_DIR )
+  find_package(CAF COMPONENTS core io openssl REQUIRED)
+endif ()
+
+add_subdirectory(aux/paraglob)
+set(zeekdeps ${zeekdeps} paraglob)
+
+if ( BROKER_ROOT_DIR )
+  # Avoid calling find_package(CAF) twice.
+  if ( NOT CAF_ROOT_DIR )
+    find_package(CAF COMPONENTS core io openssl REQUIRED)
+  endif ()
+  find_package(Broker REQUIRED)
+  set(zeekdeps ${zeekdeps} ${BROKER_LIBRARY})
+  set(broker_includes ${BROKER_INCLUDE_DIR})
+else ()
+  set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
+
+  if ( BUILD_STATIC_BROKER )
+    set(ENABLE_STATIC_ONLY true)
+  endif()
+
+  add_subdirectory(aux/broker)
+  set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
+
+  if ( BUILD_STATIC_BROKER )
+    set(zeekdeps ${zeekdeps} broker_static)
+  else()
+    set(zeekdeps ${zeekdeps} broker)
+  endif()
+  set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker/include ${CMAKE_CURRENT_BINARY_DIR}/aux/broker/include)
+endif ()
+
+# CAF_LIBRARIES and CAF_INCLUDE_DIRS are defined either by calling
+# find_package(CAF) or by calling add_subdirectory(aux/broker). In either case,
+# we have to care about CAF here because Broker headers can pull in CAF
+# headers.
+set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
+include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
 include_directories(BEFORE
                     ${PCAP_INCLUDE_DIR}
                     ${BIND_INCLUDE_DIR}
@@ -262,7 +302,7 @@ if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux AND EXISTS /etc/os-release )
     endif ()
 endif ()
 
-set(zeekdeps
+set(zeekdeps ${zeekdeps}
     ${BinPAC_LIBRARY}
     ${PCAP_LIBRARY}
     ${OPENSSL_LIBRARIES}
@@ -347,48 +387,6 @@ InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFI
 ########################################################################
 ## Recurse on sub-directories
 
-if ( CAF_ROOT_DIR )
-  find_package(CAF COMPONENTS core io openssl REQUIRED)
-endif ()
-
-if ( BROKER_ROOT_DIR )
-  # Avoid calling find_package(CAF) twice.
-  if ( NOT CAF_ROOT_DIR )
-    find_package(CAF COMPONENTS core io openssl REQUIRED)
-  endif ()
-  find_package(Broker REQUIRED)
-  set(zeekdeps ${zeekdeps} ${BROKER_LIBRARY})
-  include_directories(BEFORE ${BROKER_INCLUDE_DIR})
-else ()
-  set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
-
-  if ( BUILD_STATIC_BROKER )
-    set(ENABLE_STATIC_ONLY true)
-  endif()
-
-  add_subdirectory(aux/broker)
-  set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
-
-  if ( BUILD_STATIC_BROKER )
-    set(zeekdeps ${zeekdeps} broker_static)
-  else()
-    set(zeekdeps ${zeekdeps} broker)
-  endif()
-  include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker/include
-                             ${CMAKE_CURRENT_BINARY_DIR}/aux/broker/include)
-endif ()
-
-# CAF_LIBRARIES and CAF_INCLUDE_DIRS are defined either by calling
-# find_package(CAF) or by calling add_subdirectory(aux/broker). In either case,
-# we have to care about CAF here because Broker headers can pull in CAF
-# headers.
-set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
-include_directories(BEFORE ${CAF_INCLUDE_DIRS})
-
-add_subdirectory(aux/paraglob)
-set(zeekdeps ${zeekdeps} paraglob)
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
-
 add_subdirectory(src)
 add_subdirectory(scripts)
 add_subdirectory(man)

src/Sessions.cc

@@ -3,6 +3,7 @@
 
 #include "zeek-config.h"
 
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <stdlib.h>

src/analyzer/protocol/dns/DNS.cc

@@ -5,6 +5,7 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "NetVar.h"

testing/btest/language/nested-sets.zeek

@@ -1,6 +1,29 @@
-# @TEST-EXEC: for i in `seq 21`; do echo 0 >> random.seed; done
 # @TEST-EXEC: test `zeek -b -G random.seed %INPUT` = "pass"
 
+@TEST-START-FILE random.seed
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+@TEST-END-FILE
+
 type r: record {
 	b: set[count];
 };

testing/btest/scripts/base/frameworks/logging/ascii-gz.zeek

@@ -1,6 +1,7 @@
 #
 # @TEST-EXEC: zeek -b %INPUT
-# @TEST-EXEC: gunzip -S .gzip ssh.log.gzip
+# @TEST-EXEC: mv ssh.log.gzip ssh.log.gz
+# @TEST-EXEC: gunzip ssh.log.gz
 # @TEST-EXEC: btest-diff ssh.log
 # @TEST-EXEC: btest-diff ssh-uncompressed.log
 #

testing/btest/scripts/base/protocols/radius/radius-multiple-attempts.test

@@ -1,6 +1,6 @@
 # Test a more complicated radius session with multiple attempts
 
-# @TEST-EXEC: zeek -b -C -r $TRACES/radius/radius_localhost.pcapng %INPUT
+# @TEST-EXEC: zeek -b -C -r $TRACES/radius/radius_localhost.pcap %INPUT
 # @TEST-EXEC: btest-diff radius.log
 
 @load base/protocols/radius