Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/bbannier/issue-3266'

Browse source 
* origin/topic/bbannier/issue-3266:
  Fix installation of symlink with `DESTDIR`
This commit is contained in:
Tim Wojtulewicz 2025-08-26 08:59:20 -07:00
commit d7db612b0f
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,3 +1,17 @@
8.1.0-dev.459 | 2025-08-26 08:59:20 -0700
* Fix installation of symlink with `DESTDIR` (Benjamin Bannier, Corelight)
We install test data which we also make available under an alternative
path for backwards compatibility. The installation of this symlink did
not take `DESTDIR` installs like used by Zeek's packaging into account
which caused installations from packages to behave different from
installs from source.
This patch fixes the symlink to respect a possible `DESTDIR`.
Closes #3266.
8.1.0-dev.456 | 2025-08-25 12:29:32 -0700 8.1.0-dev.456 | 2025-08-25 12:29:32 -0700
* Bump zeekctl (Arne Welzel, Corelight) * Bump zeekctl (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.1.0-dev.456 8.1.0-dev.459

2
testing/CMakeLists.txt
View file

@ -14,7 +14,7 @@ install(
CODE "execute_process( \ CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \ COMMAND ${CMAKE_COMMAND} -E create_symlink \
${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \ ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \
${CMAKE_INSTALL_PREFIX}/share/zeek/tests \ \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \
)") )")
install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts