diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c65153f..1335825 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,7 @@ jobs: override: true - uses: katyo/publish-crates@v1 with: - args: "--features bundled-4_5_1" + args: "--features bundled-4_5_2" dry-run: ${{ github.event.inputs.dry_run }} registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f583e5b..0b0f6c5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,14 +26,14 @@ jobs: - name: Cargo fmt run: cargo fmt --all -- --check - name: Cargo clippy - run: cargo clippy --features bindgen,bundled-4_5_1,vendored -- -D warnings + run: cargo clippy --features bindgen,bundled-4_5_2,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_5_1" ] + features: [ "vendored,bindgen", "vendored,bundled-4_5_2" ] rust: [ stable, nightly ] runs-on: ${{ matrix.os }} @@ -54,7 +54,7 @@ jobs: strategy: matrix: os: [ windows-2019 ] - features: [ "vendored,bundled-4_5_1" ] + features: [ "vendored,bundled-4_5_2" ] rust: [ stable ] cryptolib: [ "WinCrypt", "disabled" ] @@ -81,7 +81,7 @@ jobs: strategy: matrix: os: [ macos-13 ] - features: [ "vendored,bindgen", "vendored,bundled-4_5_1" ] + features: [ "vendored,bindgen", "vendored,bundled-4_5_2" ] rust: [ stable, nightly ] cryptolib: [ "OpenSSL", "CommonCrypto", "disabled" ] openssl_dir: [ "/usr/local/opt/openssl@1.1" ] diff --git a/Cargo.toml b/Cargo.toml index b9155af..45f94b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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_5_1 = ["yara-sys/bundled-4_5_1"] +bundled-4_5_2 = ["yara-sys/bundled-4_5_2"] vendored = ["yara-sys/vendored"] module-cuckoo = ["yara-sys/module-cuckoo"] module-magic = ["yara-sys/module-magic"] diff --git a/yara-sys/Cargo.toml b/yara-sys/Cargo.toml index 8f67863..ad41bf3 100644 --- a/yara-sys/Cargo.toml +++ b/yara-sys/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [features] default = ["bindgen", 'module-dotnet', 'module-dex', 'module-macho', 'module-hash', 'ndebug'] -bundled-4_5_1 = [] +bundled-4_5_2 = [] vendored = ["cc", "glob", "fs_extra"] module-cuckoo = [] module-magic = [] @@ -35,4 +35,4 @@ fs_extra = { version = "1.2", optional = true } [package.metadata.docs.rs] no-default-features = true -features = ["bundled-4_5_1"] +features = ["bundled-4_5_2"] diff --git a/yara-sys/README.md b/yara-sys/README.md index b4018f5..0d2012e 100644 --- a/yara-sys/README.md +++ b/yara-sys/README.md @@ -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.5.1. -- `bundled-4_5_1`: use pre-generated bindings for Yara 4.5.1. Useful if you do not +- `vendored`: automatically compile and link libyara v4.5.2. +- `bundled-4_5_2`: use pre-generated bindings for Yara 4.5.2. 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 @@ -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.5.1 +## Compile options for libyara v4.5.2 When using the `vendored` feature, Yara will be automatically built and linked statically with yara-sys. diff --git a/yara-sys/bindings/yara-4.5.1-x86_64-apple-darwin.rs b/yara-sys/bindings/yara-4.5.2-x86_64-apple-darwin.rs similarity index 99% rename from yara-sys/bindings/yara-4.5.1-x86_64-apple-darwin.rs rename to yara-sys/bindings/yara-4.5.2-x86_64-apple-darwin.rs index 9ae7a9e..d6b2730 100644 --- a/yara-sys/bindings/yara-4.5.1-x86_64-apple-darwin.rs +++ b/yara-sys/bindings/yara-4.5.2-x86_64-apple-darwin.rs @@ -4750,7 +4750,7 @@ pub struct _YR_COMPILER { pub lex_buf: [::std::os::raw::c_char; 8192usize], pub lex_buf_ptr: *mut ::std::os::raw::c_char, pub lex_buf_len: ::std::os::raw::c_ushort, - pub include_base_dir: [::std::os::raw::c_char; 1024usize], + pub include_base_dir: [::std::os::raw::c_char; 4096usize], pub user_data: *mut ::std::os::raw::c_void, pub incl_clbk_user_data: *mut ::std::os::raw::c_void, pub re_ast_clbk_user_data: *mut ::std::os::raw::c_void, @@ -4766,7 +4766,7 @@ fn bindgen_test_layout__YR_COMPILER() { let ptr = UNINIT.as_ptr(); assert_eq!( ::std::mem::size_of::<_YR_COMPILER>(), - 10456usize, + 13528usize, concat!("Size of: ", stringify!(_YR_COMPILER)) ); assert_eq!( @@ -5086,7 +5086,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).user_data) as usize - ptr as usize }, - 10368usize, + 13440usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5096,7 +5096,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).incl_clbk_user_data) as usize - ptr as usize }, - 10376usize, + 13448usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5106,7 +5106,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_clbk_user_data) as usize - ptr as usize }, - 10384usize, + 13456usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5116,7 +5116,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, - 10392usize, + 13464usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5126,7 +5126,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_callback) as usize - ptr as usize }, - 10400usize, + 13472usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5136,7 +5136,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_free) as usize - ptr as usize }, - 10408usize, + 13480usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5146,7 +5146,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_callback) as usize - ptr as usize }, - 10416usize, + 13488usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5156,7 +5156,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).atoms_config) as usize - ptr as usize }, - 10424usize, + 13496usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), diff --git a/yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-gnu.rs b/yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-gnu.rs similarity index 99% rename from yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-gnu.rs rename to yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-gnu.rs index a23e87c..d499a10 100644 --- a/yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-gnu.rs +++ b/yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-gnu.rs @@ -7360,7 +7360,7 @@ pub struct _YR_COMPILER { pub lex_buf: [::std::os::raw::c_char; 8192usize], pub lex_buf_ptr: *mut ::std::os::raw::c_char, pub lex_buf_len: ::std::os::raw::c_ushort, - pub include_base_dir: [::std::os::raw::c_char; 260usize], + pub include_base_dir: [::std::os::raw::c_char; 4096usize], pub user_data: *mut ::std::os::raw::c_void, pub incl_clbk_user_data: *mut ::std::os::raw::c_void, pub re_ast_clbk_user_data: *mut ::std::os::raw::c_void, @@ -7376,7 +7376,7 @@ fn bindgen_test_layout__YR_COMPILER() { let ptr = UNINIT.as_ptr(); assert_eq!( ::std::mem::size_of::<_YR_COMPILER>(), - 9760usize, + 13600usize, concat!("Size of: ", stringify!(_YR_COMPILER)) ); assert_eq!( @@ -7696,7 +7696,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).user_data) as usize - ptr as usize }, - 9664usize, + 13504usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7706,7 +7706,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).incl_clbk_user_data) as usize - ptr as usize }, - 9672usize, + 13512usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7716,7 +7716,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_clbk_user_data) as usize - ptr as usize }, - 9680usize, + 13520usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7726,7 +7726,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, - 9688usize, + 13528usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7736,7 +7736,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_callback) as usize - ptr as usize }, - 9696usize, + 13536usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7746,7 +7746,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_free) as usize - ptr as usize }, - 9704usize, + 13544usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7756,7 +7756,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_callback) as usize - ptr as usize }, - 9712usize, + 13552usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7766,7 +7766,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).atoms_config) as usize - ptr as usize }, - 9720usize, + 13560usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), diff --git a/yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-msvc.rs b/yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-msvc.rs similarity index 99% rename from yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-msvc.rs rename to yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-msvc.rs index a23e87c..d499a10 100644 --- a/yara-sys/bindings/yara-4.5.1-x86_64-pc-windows-msvc.rs +++ b/yara-sys/bindings/yara-4.5.2-x86_64-pc-windows-msvc.rs @@ -7360,7 +7360,7 @@ pub struct _YR_COMPILER { pub lex_buf: [::std::os::raw::c_char; 8192usize], pub lex_buf_ptr: *mut ::std::os::raw::c_char, pub lex_buf_len: ::std::os::raw::c_ushort, - pub include_base_dir: [::std::os::raw::c_char; 260usize], + pub include_base_dir: [::std::os::raw::c_char; 4096usize], pub user_data: *mut ::std::os::raw::c_void, pub incl_clbk_user_data: *mut ::std::os::raw::c_void, pub re_ast_clbk_user_data: *mut ::std::os::raw::c_void, @@ -7376,7 +7376,7 @@ fn bindgen_test_layout__YR_COMPILER() { let ptr = UNINIT.as_ptr(); assert_eq!( ::std::mem::size_of::<_YR_COMPILER>(), - 9760usize, + 13600usize, concat!("Size of: ", stringify!(_YR_COMPILER)) ); assert_eq!( @@ -7696,7 +7696,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).user_data) as usize - ptr as usize }, - 9664usize, + 13504usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7706,7 +7706,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).incl_clbk_user_data) as usize - ptr as usize }, - 9672usize, + 13512usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7716,7 +7716,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_clbk_user_data) as usize - ptr as usize }, - 9680usize, + 13520usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7726,7 +7726,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, - 9688usize, + 13528usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7736,7 +7736,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_callback) as usize - ptr as usize }, - 9696usize, + 13536usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7746,7 +7746,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_free) as usize - ptr as usize }, - 9704usize, + 13544usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7756,7 +7756,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_callback) as usize - ptr as usize }, - 9712usize, + 13552usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -7766,7 +7766,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).atoms_config) as usize - ptr as usize }, - 9720usize, + 13560usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), diff --git a/yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-musl.rs b/yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-gnu.rs similarity index 99% rename from yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-musl.rs rename to yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-gnu.rs index 3328e40..94e7103 100644 --- a/yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-musl.rs +++ b/yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-gnu.rs @@ -4942,7 +4942,7 @@ pub struct _YR_COMPILER { pub lex_buf: [::std::os::raw::c_char; 8192usize], pub lex_buf_ptr: *mut ::std::os::raw::c_char, pub lex_buf_len: ::std::os::raw::c_ushort, - pub include_base_dir: [::std::os::raw::c_char; 1024usize], + pub include_base_dir: [::std::os::raw::c_char; 4096usize], pub user_data: *mut ::std::os::raw::c_void, pub incl_clbk_user_data: *mut ::std::os::raw::c_void, pub re_ast_clbk_user_data: *mut ::std::os::raw::c_void, @@ -4958,7 +4958,7 @@ fn bindgen_test_layout__YR_COMPILER() { let ptr = UNINIT.as_ptr(); assert_eq!( ::std::mem::size_of::<_YR_COMPILER>(), - 10464usize, + 13536usize, concat!("Size of: ", stringify!(_YR_COMPILER)) ); assert_eq!( @@ -5278,7 +5278,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).user_data) as usize - ptr as usize }, - 10376usize, + 13448usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5288,7 +5288,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).incl_clbk_user_data) as usize - ptr as usize }, - 10384usize, + 13456usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5298,7 +5298,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_clbk_user_data) as usize - ptr as usize }, - 10392usize, + 13464usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5308,7 +5308,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, - 10400usize, + 13472usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5318,7 +5318,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_callback) as usize - ptr as usize }, - 10408usize, + 13480usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5328,7 +5328,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_free) as usize - ptr as usize }, - 10416usize, + 13488usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5338,7 +5338,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_callback) as usize - ptr as usize }, - 10424usize, + 13496usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5348,7 +5348,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).atoms_config) as usize - ptr as usize }, - 10432usize, + 13504usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), diff --git a/yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-gnu.rs b/yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-musl.rs similarity index 99% rename from yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-gnu.rs rename to yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-musl.rs index 3328e40..94e7103 100644 --- a/yara-sys/bindings/yara-4.5.1-x86_64-unknown-linux-gnu.rs +++ b/yara-sys/bindings/yara-4.5.2-x86_64-unknown-linux-musl.rs @@ -4942,7 +4942,7 @@ pub struct _YR_COMPILER { pub lex_buf: [::std::os::raw::c_char; 8192usize], pub lex_buf_ptr: *mut ::std::os::raw::c_char, pub lex_buf_len: ::std::os::raw::c_ushort, - pub include_base_dir: [::std::os::raw::c_char; 1024usize], + pub include_base_dir: [::std::os::raw::c_char; 4096usize], pub user_data: *mut ::std::os::raw::c_void, pub incl_clbk_user_data: *mut ::std::os::raw::c_void, pub re_ast_clbk_user_data: *mut ::std::os::raw::c_void, @@ -4958,7 +4958,7 @@ fn bindgen_test_layout__YR_COMPILER() { let ptr = UNINIT.as_ptr(); assert_eq!( ::std::mem::size_of::<_YR_COMPILER>(), - 10464usize, + 13536usize, concat!("Size of: ", stringify!(_YR_COMPILER)) ); assert_eq!( @@ -5278,7 +5278,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).user_data) as usize - ptr as usize }, - 10376usize, + 13448usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5288,7 +5288,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).incl_clbk_user_data) as usize - ptr as usize }, - 10384usize, + 13456usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5298,7 +5298,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_clbk_user_data) as usize - ptr as usize }, - 10392usize, + 13464usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5308,7 +5308,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, - 10400usize, + 13472usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5318,7 +5318,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_callback) as usize - ptr as usize }, - 10408usize, + 13480usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5328,7 +5328,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).include_free) as usize - ptr as usize }, - 10416usize, + 13488usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5338,7 +5338,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).re_ast_callback) as usize - ptr as usize }, - 10424usize, + 13496usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), @@ -5348,7 +5348,7 @@ fn bindgen_test_layout__YR_COMPILER() { ); assert_eq!( unsafe { ::std::ptr::addr_of!((*ptr).atoms_config) as usize - ptr as usize }, - 10432usize, + 13504usize, concat!( "Offset of field: ", stringify!(_YR_COMPILER), diff --git a/yara-sys/build.rs b/yara-sys/build.rs index 7042e80..066026e 100644 --- a/yara-sys/build.rs +++ b/yara-sys/build.rs @@ -355,14 +355,14 @@ mod build { } } -#[cfg(feature = "bundled-4_5_1")] +#[cfg(feature = "bundled-4_5_2")] mod bindings { use std::env; use std::fs; use std::path::PathBuf; pub fn add_bindings() { - let binding_file = format!("yara-4.5.1-{}.rs", env::var("TARGET").unwrap()); + let binding_file = format!("yara-4.5.2-{}.rs", env::var("TARGET").unwrap()); let binding_path = PathBuf::from("bindings").join(binding_file); let out_dir = env::var("OUT_DIR").expect("$OUT_DIR should be defined"); let out_path = PathBuf::from(out_dir).join("bindings.rs"); @@ -378,7 +378,7 @@ mod bindings { } } -#[cfg(not(feature = "bundled-4_5_1"))] +#[cfg(not(feature = "bundled-4_5_2"))] mod bindings { use std::env; use std::path::PathBuf; diff --git a/yara-sys/yara b/yara-sys/yara index 0e5b6bb..688268d 160000 --- a/yara-sys/yara +++ b/yara-sys/yara @@ -1 +1 @@ -Subproject commit 0e5b6bb9660cba500eb58dbccb027757c82cc4cf +Subproject commit 688268d83983a0d61bb68ef3d8dfd28102b7d1b4