Merge remote-tracking branch 'origin/topic/timw/broctl-symlink'

* origin/topic/timw/broctl-symlink: Stop installing the broctl symlink
zeek · Aug 8, 2024 · 7e1a844 · 7e1a844
2 parents c6f6c13 + 535f4cb
commit 7e1a844
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.5.0-58 | 2024-08-08 09:25:59 -0700
+
+  * Stop installing the broctl symlink (Tim Wojtulewicz, Corelight)
+
 2.5.0-56 | 2024-08-08 10:43:44 +0200
 
   * Remove ignore-deprecations pragma from cluster layout (Arne Welzel, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -269,7 +269,6 @@ if ( NOT BINARY_PACKAGING_MODE )
   ")
 endif ()
 
-InstallSymlink("${PY_MOD_INSTALL_DIR}/zeekctl" "${LIBDIR}/broctl")
 install(DIRECTORY BroControl DESTINATION ${PY_MOD_INSTALL_DIR}/zeekctl)
 
 ########################################################################

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-56
+2.5.0-58
diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.5.0-56
+.. |version| replace:: 2.5.0-58
 
 ===========
 ZeekControl