diff --git a/.travis.yml b/.travis.yml index 5e19c6d..6ab8ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ env: global: - MAKEFLAGS="-j 2" jobs: - - YARA_VERSION=4.1.0 YARA_FEATURES=bindgen - - YARA_VERSION=4.1.0 YARA_FEATURES=bundled-4_1_0 + - YARA_VERSION=4.1.1 YARA_FEATURES=bindgen + - YARA_VERSION=4.1.1 YARA_FEATURES=bundled-4_1_1 - YARA_FEATURES=vendored,bindgen - - YARA_FEATURES=vendored,bundled-4_1_0 + - YARA_FEATURES=vendored,bundled-4_1_1 before_install: - | if [ -n "$YARA_VERSION" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then @@ -34,7 +34,7 @@ jobs: env: YARA_FEATURES=vendored,bindgen - os: windows rust: stable - env: YARA_FEATURES=vendored,bundled-4_1_0 + env: YARA_FEATURES=vendored,bundled-4_1_1 allow_failures: - rust: nightly diff --git a/Cargo.toml b/Cargo.toml index 5a3a56d..d874d8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [features] default = ["bindgen"] bindgen = ["yara-sys/bindgen"] -bundled-4_1_0 = ["yara-sys/bundled-4_1_0"] +bundled-4_1_1 = ["yara-sys/bundled-4_1_1"] vendored = ["yara-sys/vendored"] [dependencies] @@ -31,4 +31,4 @@ default-features = false [package.metadata.docs.rs] no-default-features = true -features = ["bundled-4_1_0"] +features = ["bundled-4_1_1"] diff --git a/yara-sys/Cargo.toml b/yara-sys/Cargo.toml index 8f1a05d..e01fe61 100644 --- a/yara-sys/Cargo.toml +++ b/yara-sys/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [features] default = ["bindgen"] -bundled-4_1_0 = [] +bundled-4_1_1 = [] vendored = ["cc"] [build-dependencies] @@ -22,4 +22,4 @@ cc = { version = "1.0", optional = true } [package.metadata.docs.rs] no-default-features = true -features = ["bundled-4_1_0"] +features = ["bundled-4_1_1"] diff --git a/yara-sys/README.md b/yara-sys/README.md index 0e1d6c8..0fd63ef 100644 --- a/yara-sys/README.md +++ b/yara-sys/README.md @@ -16,10 +16,10 @@ 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. -- `bundled-4_1_0`: use pre-generated bindings for Yara 4.1.0. Useful if you do not +- `bundled-4_1_1`: use pre-generated bindings for Yara 4.1.1. 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. -- `vendored`: automatically compile and link libyara v4.1.0. +- `vendored`: automatically compile and link libyara v4.1.1. You can specify the location of Yara: diff --git a/yara-sys/bindings/yara-4.1.0-unix.rs b/yara-sys/bindings/yara-4.1.1-unix.rs similarity index 100% rename from yara-sys/bindings/yara-4.1.0-unix.rs rename to yara-sys/bindings/yara-4.1.1-unix.rs diff --git a/yara-sys/bindings/yara-4.1.0-windows.rs b/yara-sys/bindings/yara-4.1.1-windows.rs similarity index 100% rename from yara-sys/bindings/yara-4.1.0-windows.rs rename to yara-sys/bindings/yara-4.1.1-windows.rs diff --git a/yara-sys/build.rs b/yara-sys/build.rs index 65ce214..dc52960 100644 --- a/yara-sys/build.rs +++ b/yara-sys/build.rs @@ -136,7 +136,7 @@ mod build { } } -#[cfg(feature = "bundled-4_1_0")] +#[cfg(feature = "bundled-4_1_1")] mod bindings { use std::env; use std::fs; @@ -144,8 +144,8 @@ mod bindings { pub fn add_bindings() { let binding_file = match env::var("CARGO_CFG_TARGET_FAMILY").unwrap().as_ref() { - "unix" => "yara-4.1.0-unix.rs", - "windows" => "yara-4.1.0-windows.rs", + "unix" => "yara-4.1.1-unix.rs", + "windows" => "yara-4.1.1-windows.rs", f => panic!("no bundled bindings for family {}", f), }; let out_dir = env::var("OUT_DIR").expect("$OUT_DIR should be defined"); @@ -155,7 +155,7 @@ mod bindings { } } -#[cfg(not(feature = "bundled-4_1_0"))] +#[cfg(not(feature = "bundled-4_1_1"))] mod bindings { extern crate bindgen; diff --git a/yara-sys/yara b/yara-sys/yara index e1360f6..8206dc6 160000 --- a/yara-sys/yara +++ b/yara-sys/yara @@ -1 +1 @@ -Subproject commit e1360f6cbe3d8daf350018661bc6772bd5b726f2 +Subproject commit 8206dc6f728fe50e21af92cb40e454b68ef6af05