From e8507f3a951176d11babcae41e87809ac7758da6 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 20 Oct 2022 19:20:40 -0700
Subject: [PATCH 1/2] Remove some leftover nb_dns stuff from the DNS_Mgr rework

---
 src/3rdparty       | 2 +-
 src/CMakeLists.txt | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/3rdparty b/src/3rdparty
index 1c6558d424..a1e633aaa6 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 1c6558d424fdd16d9e19d77485e0a2c5cba6b293
+Subproject commit a1e633aaa619473a105ff29fff65b5bcb472714b
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ab1d85a4b..172b1ea3e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -262,9 +262,6 @@ set(_gen_zeek_script_cpp ${CMAKE_CURRENT_BINARY_DIR}/../CPP-gen.cc)
 add_custom_command(OUTPUT ${_gen_zeek_script_cpp}
 		   COMMAND ${CMAKE_COMMAND} -E touch ${_gen_zeek_script_cpp})
 
-set_source_files_properties(3rdparty/nb_dns.c PROPERTIES COMPILE_FLAGS
-                            -fno-strict-aliasing)
-
 set(MAIN_SRCS
     digest.cc
     net_util.cc
@@ -426,7 +423,6 @@ set(THIRD_PARTY_SRCS
     3rdparty/ConvertUTF.c
     3rdparty/in_cksum.cc
     3rdparty/modp_numtoa.c
-    3rdparty/nb_dns.c
     3rdparty/patricia.c
     3rdparty/setsignal.c
     3rdparty/sqlite3.c
@@ -607,7 +603,6 @@ install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zeek_inet_ntop.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bsd-getopt-long.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/modp_numtoa.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/nb_dns.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/patricia.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/setsignal.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sqlite3.h

From 05ba11c72a9eaac2155284f464a1093817f8ddfc Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 20 Oct 2022 19:21:14 -0700
Subject: [PATCH 2/2] Reorder includes in Options.cc

---
 src/Options.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Options.cc b/src/Options.cc
index 3652e11f56..98f251b19a 100644
--- a/src/Options.cc
+++ b/src/Options.cc
@@ -6,9 +6,6 @@
 
 #include <unistd.h>
 
-#include "zeek/ScriptProfile.h"
-#include "zeek/script_opt/ScriptOpt.h"
-
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@@ -18,8 +15,9 @@
 #include <cstdlib>
 #include <sstream>
 
-#include "zeek/3rdparty/bsd-getopt-long.h"
+#include "zeek/ScriptProfile.h"
 #include "zeek/logging/writers/ascii/Ascii.h"
+#include "zeek/script_opt/ScriptOpt.h"
 
 namespace zeek
 	{