Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add workaround for zeek/3534 on Windows #7

Merged
merged 3 commits into from
Jan 16, 2024
+9 −2
Merged

Add workaround for zeek/3534 on Windows #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f978db9
Add workaround for zeek/3534 on Windows
philrz Jan 15, 2024
48a82f0
PR feedback: Make sed more readable
philrz Jan 16, 2024
3e96886
Drop extra space char
philrz Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Finish packaging artifact
run: ./release.sh
shell: sh
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down
7 changes: 6 additions & 1 deletion release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh -ex
#!/bin/bash -ex

case $(uname) in
Darwin|Linux)
Expand Down Expand Up @@ -75,6 +75,11 @@ install_zeek_package salesforce/hassh 76a47abe9382109ce9ba530e7f1d7014a4a95209
install_zeek_package salesforce/ja3 421dd4f3616b533e6971bb700289c6bb8355e707
echo "@load policy/protocols/conn/community-id-logging" | $sudo tee -a /usr/local/zeek/share/zeek/site/local.zeek

# Work around https://github.com/zeek/zeek/issues/3534 on Windows
[[ $(uname) =~ "NT" ]] &&
mv /usr/local/zeek/share/zeek/site/local.zeek /usr/local/zeek/share/zeek/site/local.zeek.orig &&
sed 's/^@load protocols\/ssh\/interesting-hostnames/#@load protocols\/ssh\/interesting-hostnames # https:\/\/github.com\/zeek\/zeek\/issues\/3534 workaround/; s/^@load frameworks\/files\/detect-MHR/#@load frameworks\/files\/detect-MHR # https:\/\/github.com\/zeek\/zeek\/issues\/3534 workaround/' /usr/local/zeek/share/zeek/site/local.zeek.orig > /usr/local/zeek/share/zeek/site/local.zeek
philrz marked this conversation as resolved.
Show resolved Hide resolved

#
# Create zip file.
#
Expand Down