More PR feedback

Author: philrz

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Create Zeek release
+name: Build/release Zeek
 
 on:
   pull_request:
@@ -22,8 +22,6 @@ jobs:
     steps:
     - name: Checkout build-zeek
       uses: actions/checkout@v3
-      with:
-        ref: ${{ inputs.build_zeek_ref }}
 
     - name: Setup Go
       uses: actions/setup-go@v3
@@ -34,7 +32,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: zeek/zeek
-        ref: ${{ inputs.zeek_ref }}
+        ref: v6.0.2
         fetch-depth: 1
         submodules: recursive
         path: zeek-src
@@ -49,15 +47,13 @@ jobs:
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
         curl -L https://github.com/maxmind/libmaxminddb/releases/download/1.8.0/libmaxminddb-1.8.0.tar.gz | tar xzvf -
-        cd libmaxminddb-1.8.0
-        curl -O https://github.com/maxmind/libmaxminddb/commit/e695f1b59640760ae14fcfaecfb26d8c0bd47f3e.diff
-        unix2dos e695f1b59640760ae14fcfaecfb26d8c0bd47f3e.diff
-        patch -p1 < e695f1b59640760ae14fcfaecfb26d8c0bd47f3e.diff
-        mkdir build
-        cd build
+        mkdir libmaxminddb-1.8.0\build
+        cd libmaxminddb-1.8.0\build
         cmake ..
         cmake --build .
         cmake --build . --target install
+        rename "C:\Program Files (x86)\maxminddb\include\maxminddb.h" maxminddb.h.bak
+        sed "/typedef ADDRESS_FAMILY sa_family_t/d" "C:\Program Files (x86)\maxminddb\include\maxminddb.h.bak" > "C:\Program Files (x86)\maxminddb\include\maxminddb.h"
       shell: cmd
 
     - name: Build Zeek (Windows)
@@ -96,10 +92,8 @@ jobs:
         sudo make install
         sudo strip /usr/local/zeek/bin/zeek
 
-    - name: Finish packaging release
+    - name: Finish packaging artifact
       run: ./release.sh
-      env:
-        RELEASE_TAG: ${{ inputs.release_tag }}
       shell: sh
 
     - name: Upload artifact
@@ -109,11 +103,11 @@ jobs:
         path: zeek-*.zip
 
     - name: Publish artifact as release
-      if: startsWith(inputs.release_tag, 'v')
+      if: startsWith(github.event.ref, 'refs/tags/')
       uses: svenstaro/upload-release-action@2.7.0
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: zeek-*.zip
         file_glob: true
-        tag: ${{ inputs.release_tag }}
+        tag: ${{ github.ref }}
         overwrite: true

README.md

@@ -20,13 +20,3 @@ glue found here starts from the official Zeek source code and makes only the
 changes necessary to build in GitHub Actions, add some needed
 [Zeek Packages](https://packages.zeek.org/), and produce artifacts ready for
 use in Brimcap/Zui.
-
-## Usage
-
-Create artifacts using the **Create Zeek release** workflow.
-
-![Create Zeek release workflow](workflow.png)
-
-If the given `release_tag` starts with a `v` the artifacts will be published
-to the **Releases** area of this repo. If not, the artifacts will just be
-attached to the Actions run.

release.sh

@@ -50,11 +50,8 @@ install_zeek_package() {
 
         build_command=$(zkg_meta package build_command)
         if [ "$build_command" ]; then
-            if [ "$OS" = Windows_NT ]; then
-                export LDFLAGS='-static -Wl,--allow-multiple-definition'
-            fi
-            sh -c "$build_command"
-            $sudo tar -xf build/*.tgz -C /usr/local/zeek/lib/zeek/plugins
+            echo "building plugins not currently supported"
+            exit 1
         fi
 
         test_command=$(zkg_meta package test_command)
@@ -85,9 +82,8 @@ echo "@load policy/protocols/conn/community-id-logging" | $sudo tee -a /usr/loca
 mkdir -p zeek/bin zeek/lib/zeek zeek/share/zeek
 cp zeekrunner$exe zeek/
 cp /usr/local/zeek/bin/zeek$exe zeek/bin/
-cp -R /usr/local/zeek/lib/zeek/plugins zeek/lib/zeek/
 for d in base policy site builtin-plugins; do
     cp -R /usr/local/zeek/share/zeek/$d zeek/share/zeek/
 done
 
-$zip -r zeek-$RELEASE_TAG.$(go env GOOS)-$(go env GOARCH).zip zeek
+$zip -r zeek-$(git describe --always --tags).$(go env GOOS)-$(go env GOARCH).zip zeek

workflow.png

@@ -3,7 +3,6 @@
 dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 export ZEEKPATH=$dir/share/zeek:$dir/share/zeek/policy:$dir/share/zeek/site
-export ZEEK_PLUGIN_PATH=$dir/lib/zeek/plugins
 
 # The packet filter and loaded scripts are disabled because they emit either
 # timeless logs or logs with timestamp set to execution time rather than time

zeekrunner

@@ -23,9 +23,6 @@ var (
 		"share/zeek/policy",
 		"share/zeek/site",
 	}
-	zeekPluginRelPaths = []string{
-		"lib/zeek/plugins",
-	}
 )
 
 func pathEnvVar(name, topDir string, subdirs []string) string {
@@ -46,13 +43,12 @@ event zeek_init() {
 
 func launchZeek(zdepsZeekDir, zeekExecPath string) error {
 	zeekPath := pathEnvVar("ZEEKPATH", zdepsZeekDir, zeekPathRelPaths)
-	zeekPlugin := pathEnvVar("ZEEK_PLUGIN_PATH", zdepsZeekDir, zeekPluginRelPaths)
 
 	cmd := exec.Command(zeekExecPath, "-C", "-r", "-", "--exec", ExecScript, "local")
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	cmd.Env = append(os.Environ(), zeekPath, zeekPlugin)
+	cmd.Env = append(os.Environ(), zeekPath)
 
 	return cmd.Run()
 }