Skip to content

Commit

Permalink
feat: update yara dependency to v4.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vthib committed Feb 13, 2024
1 parent 72822fe commit a28a6d8
Show file tree
Hide file tree
Showing 12 changed files with 20,304 additions and 20,031 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
override: true
- uses: katyo/publish-crates@v1
with:
args: "--features bundled-4_3_1"
args: "--features bundled-4_5_0"
dry-run: ${{ github.event.inputs.dry_run }}
registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
- name: Cargo fmt
run: cargo fmt --all -- --check
- name: Cargo clippy
run: cargo clippy --features bindgen,bundled-4_3_1,vendored -- -D warnings
run: cargo clippy --features bindgen,bundled-4_5_0,vendored -- -D warnings

test-posix:
strategy:
matrix:
os: [ ubuntu-latest ]
target: ["x86_64-unknown-linux-musl", "x86_64-unknown-linux-gnu"]
features: [ "vendored,bindgen", "vendored,bundled-4_3_1" ]
features: [ "vendored,bindgen", "vendored,bundled-4_5_0" ]
rust: [ stable, nightly ]

runs-on: ${{ matrix.os }}
Expand All @@ -54,7 +54,7 @@ jobs:
strategy:
matrix:
os: [ windows-2019 ]
features: [ "vendored,bundled-4_3_1" ]
features: [ "vendored,bundled-4_5_0" ]
rust: [ stable ]
cryptolib: [ "WinCrypt", "disabled" ]

Expand All @@ -81,7 +81,7 @@ jobs:
strategy:
matrix:
os: [ macos-latest ]
features: [ "vendored,bindgen", "vendored,bundled-4_3_1" ]
features: [ "vendored,bindgen", "vendored,bundled-4_5_0" ]
rust: [ stable, nightly ]
cryptolib: [ "OpenSSL", "CommonCrypto", "disabled" ]
openssl_dir: [ "/usr/local/opt/[email protected]" ]
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rust-version = "1.63"
[features]
default = ["bindgen", 'module-dotnet', 'module-dex', 'module-macho', 'module-hash', 'ndebug']
bindgen = ["yara-sys/bindgen"]
bundled-4_3_1 = ["yara-sys/bundled-4_3_1"]
bundled-4_5_0 = ["yara-sys/bundled-4_5_0"]
vendored = ["yara-sys/vendored"]
module-cuckoo = ["yara-sys/module-cuckoo"]
module-magic = ["yara-sys/module-magic"]
Expand Down Expand Up @@ -48,4 +48,4 @@ default-features = false

[package.metadata.docs.rs]
no-default-features = true
features = ["bundled-4_3_1"]
features = ["bundled-4_5_0"]
4 changes: 2 additions & 2 deletions yara-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"

[features]
default = ["bindgen", 'module-dotnet', 'module-dex', 'module-macho', 'module-hash', 'ndebug']
bundled-4_3_1 = []
bundled-4_5_0 = []
vendored = ["cc", "glob", "fs_extra"]
module-cuckoo = []
module-magic = []
Expand All @@ -35,4 +35,4 @@ fs_extra = { version = "1.2", optional = true }

[package.metadata.docs.rs]
no-default-features = true
features = ["bundled-4_3_1"]
features = ["bundled-4_5_0"]
6 changes: 3 additions & 3 deletions yara-sys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ version of Yara. Just make sure the version you specify is the same that the
version on your system!

- `bindgen`: **recommended**: this is the default feature, to use generated bindings.
- `vendored`: automatically compile and link libyara v4.3.1.
- `bundled-4_3_1`: use pre-generated bindings for Yara 4.3.1. Useful if you do not
- `vendored`: automatically compile and link libyara v4.5.0.
- `bundled-4_5_0`: use pre-generated bindings for Yara 4.5.0. Useful if you do not
want to install LLVM to run bindgen. However, you'll have to make sure you use
a version of Yara with the same major and minor version number. List of supported targets:
- x86_64-apple-darwin
Expand All @@ -38,7 +38,7 @@ You can specify the following environment variables:
You can also specify the `yara-static` feature to link Yara statically
rather than dynamically.

## Compile options for libyara v4.3.1
## Compile options for libyara v4.5.0

When using the `vendored` feature, Yara will be automatically built and linked
statically with yara-sys.
Expand Down
Loading

0 comments on commit a28a6d8

Please sign in to comment.