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

Jump to bottom

Patch release v1.3.1 #2859

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Patch release v1.3.1 #2859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc95f5c
Filter out Suricata rules when assembling zdeps on Windows (#2858)
philrz Oct 16, 2023
19ac619
Set version in package.json to 1.3.1
philrz Oct 16, 2023
09f9154
Update changelog for v1.3.1
philrz Oct 16, 2023
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
3 changes: 3 additions & 0 deletions apps/zui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## v1.3.1
- Due to malware false positives, Windows releases no longer include a full initial set of Suricata rules (as always, up-to-date rules will be downloaded on first Internet-connected launch of Zui) (#2858)

## v1.3.0
- Update Zed to [v1.10.0](https://github.com/brimdata/zed/releases/tag/v1.10.0)
- Update Brimcap to [v1.5.2](https://github.com/brimdata/brimcap/releases/tag/v1.5.2)
Expand Down
2 changes: 1 addition & 1 deletion apps/zui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Zed User Interface",
"repository": "https://github.com/brimdata/zui",
"license": "BSD-3-Clause",
"version": "1.3.0",
"version": "1.3.1",
"main": "dist/main.js",
"author": "Brim Data <[email protected]> (http://www.brimdata.io)",
"lake": {
Expand Down
15 changes: 14 additions & 1 deletion apps/zui/scripts/download-zdeps/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,24 @@ async function zedDevBuild(destPath) {
}
}

// Suricata rules are dropped from the Windows build to fix a false positive
// malware flagging. See https://github.com/brimdata/zui/issues/2857.
const filterBrimcapZdeps = (src, dest) => {
if (process.platform == "win32" &&
(/suricata\.rules$/.test(src) || /emerging\.rules\.tar\.gz$/.test(src)) &&
fs.statSync(src).isFile()) {
return false
} else {
return true
}
}

async function main() {
try {
fs.copySync(
path.resolve("..", "..", "node_modules", "brimcap", "build", "dist"),
zdepsPath
zdepsPath,
{ filter: filterBrimcapZdeps }
)
const brimcapVersion = child_process
.execSync(path.join(zdepsPath, "brimcap") + " -version")
Expand Down
Loading