From 1610fe9eaf3d6c44d440f2785c908dd5ecf9aa99 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 3 Apr 2025 10:52:45 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/johanna/remove-bind-library-check' * origin/topic/johanna/remove-bind-library-check: Remove unnecessary check for bind library. Closes GH-432t log9 (cherry picked from commit 37be65dfd04906270111c44533b3aadc5f421784) --- CHANGES | 9 +++++++++ CMakeLists.txt | 3 --- VERSION | 2 +- cmake | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index f5d021daaf..6f3cf1121f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +7.0.7-4 | 2025-05-19 09:17:52 -0700 + + * Remove unnecessary check for bind library. (Johanna Amann, Corelight) + + This has not been required since we switched to c-ares and breaks builds + on Fedora Rawhide. + + (cherry picked from commit 37be65dfd04906270111c44533b3aadc5f421784) + 7.0.7-3 | 2025-05-19 09:15:54 -0700 * fix for ZAM optimization when an aggregate is modified inside of a loop (Vern Paxson, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b4ba49197..5f4c0a3d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -800,9 +800,6 @@ find_package(FLEX REQUIRED) find_package(BISON 2.5 REQUIRED) find_package(PCAP REQUIRED) find_package(OpenSSL REQUIRED) -if (NOT MSVC) - find_package(BIND REQUIRED) -endif () find_package(ZLIB REQUIRED) if (NOT BINARY_PACKAGING_MODE) diff --git a/VERSION b/VERSION index 7de7a87922..9f3122683a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.7-3 +7.0.7-4 diff --git a/cmake b/cmake index a10c95c9df..621d098e6d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a10c95c9dfc158d3da658917c29eaf062bf507f9 +Subproject commit 621d098e6dcc52ad355cb2a196a7aa1a7b1a676f