Date: Fri, 5 Apr 2024 03:16:15 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2878604ecd1f - main - security/sequoia-sq: update openssl-sys crate Message-ID: <202404050316.4353GFrq060588@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=2878604ecd1fa5261099215b4bcabe6610459886 commit 2878604ecd1fa5261099215b4bcabe6610459886 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2024-04-05 03:15:51 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2024-04-05 03:15:51 +0000 security/sequoia-sq: update openssl-sys crate ...for LibreSSL 3.9.1 and later compatibility --- security/sequoia-sq/Makefile.crates | 2 +- security/sequoia-sq/distinfo | 6 ++-- ...-cargo-crates_openssl-sys-0.9.101_build_main.rs | 34 ---------------------- 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/security/sequoia-sq/Makefile.crates b/security/sequoia-sq/Makefile.crates index 97ca2eeadbd8..554fea73d34a 100644 --- a/security/sequoia-sq/Makefile.crates +++ b/security/sequoia-sq/Makefile.crates @@ -229,7 +229,7 @@ CARGO_CRATES= addr2line-0.21.0 \ openssl-0.10.64 \ openssl-macros-0.1.1 \ openssl-probe-0.1.5 \ - openssl-sys-0.9.101 \ + openssl-sys-0.9.102 \ option-ext-0.2.0 \ overload-0.1.1 \ p256-0.13.2 \ diff --git a/security/sequoia-sq/distinfo b/security/sequoia-sq/distinfo index 5e161e98b78c..d09df1a4d3d9 100644 --- a/security/sequoia-sq/distinfo +++ b/security/sequoia-sq/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1710616769 +TIMESTAMP = 1711806412 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb SIZE (rust/crates/addr2line-0.21.0.crate) = 40807 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -461,8 +461,8 @@ SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4 SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227 -SHA256 (rust/crates/openssl-sys-0.9.101.crate) = dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff -SIZE (rust/crates/openssl-sys-0.9.101.crate) = 68568 +SHA256 (rust/crates/openssl-sys-0.9.102.crate) = c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2 +SIZE (rust/crates/openssl-sys-0.9.102.crate) = 68622 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d SIZE (rust/crates/option-ext-0.2.0.crate) = 7345 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39 diff --git a/security/sequoia-sq/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs b/security/sequoia-sq/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs deleted file mode 100644 index 493f1b862592..000000000000 --- a/security/sequoia-sq/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs +++ /dev/null @@ -1,34 +0,0 @@ ---- cargo-crates/openssl-sys-0.9.101/build/main.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/openssl-sys-0.9.101/build/main.rs -@@ -82,9 +82,11 @@ fn main() { - // rerun-if-changed causes openssl-sys to rebuild if the openssl include - // dir has changed since the last build. However, this causes a rebuild - // every time when vendoring so we disable it. -- #[cfg(not(feature = "vendored"))] -- if let Some(printable_include) = include_dir.join("openssl").to_str() { -- println!("cargo:rerun-if-changed={}", printable_include); -+ let potential_path = include_dir.join("openssl"); -+ if potential_path.exists() && !cfg!(feature = "vendored") { -+ if let Some(printable_include) = potential_path.to_str() { -+ println!("cargo:rerun-if-changed={}", printable_include); -+ } - } - - if !lib_dirs.iter().all(|p| p.exists()) { -@@ -300,6 +302,7 @@ See rust-openssl documentation for more information: - (3, 8, 0) => ('3', '8', '0'), - (3, 8, 1) => ('3', '8', '1'), - (3, 8, _) => ('3', '8', 'x'), -+ (3, 9, 0) => ('3', '9', '0'), - _ => version_error(), - }; - -@@ -342,7 +345,7 @@ This crate is only compatible with OpenSSL (version 1. - " - - This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5 --through 3.8.1, but a different version of OpenSSL was found. The build is now aborting -+through 3.9.0, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404050316.4353GFrq060588>