Date: Sun, 17 Mar 2024 02:27:33 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: d015e7b0096e - main - security/sequoia-sq: update openssl crates + enable LibreSSL 3.9.0 Message-ID: <202403170227.42H2RXvU093151@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=d015e7b0096e92855fc2dbab700c5e00b5a95f90 commit d015e7b0096e92855fc2dbab700c5e00b5a95f90 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2024-03-17 02:27:05 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2024-03-17 02:27:05 +0000 security/sequoia-sq: update openssl crates + enable LibreSSL 3.9.0 --- security/sequoia-sq/Makefile.crates | 4 +-- security/sequoia-sq/distinfo | 10 +++---- ...-cargo-crates_openssl-sys-0.9.101_build_main.rs | 34 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/security/sequoia-sq/Makefile.crates b/security/sequoia-sq/Makefile.crates index 9dc39e22a347..97ca2eeadbd8 100644 --- a/security/sequoia-sq/Makefile.crates +++ b/security/sequoia-sq/Makefile.crates @@ -226,10 +226,10 @@ CARGO_CRATES= addr2line-0.21.0 \ once_cell-1.19.0 \ opaque-debug-0.3.0 \ openpgp-cert-d-0.3.1 \ - openssl-0.10.62 \ + openssl-0.10.64 \ openssl-macros-0.1.1 \ openssl-probe-0.1.5 \ - openssl-sys-0.9.98 \ + openssl-sys-0.9.101 \ 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 72a55623b2b3..5e161e98b78c 100644 --- a/security/sequoia-sq/distinfo +++ b/security/sequoia-sq/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1706474903 +TIMESTAMP = 1710616769 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 @@ -455,14 +455,14 @@ SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 SHA256 (rust/crates/openpgp-cert-d-0.3.1.crate) = 0c2c3b55a1bd2b7b15b1d969fcde543bf6b679294f9efd3c2360459d49ae62ce SIZE (rust/crates/openpgp-cert-d-0.3.1.crate) = 31144 -SHA256 (rust/crates/openssl-0.10.62.crate) = 8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671 -SIZE (rust/crates/openssl-0.10.62.crate) = 266311 +SHA256 (rust/crates/openssl-0.10.64.crate) = 95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f +SIZE (rust/crates/openssl-0.10.64.crate) = 272306 SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c 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.98.crate) = c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7 -SIZE (rust/crates/openssl-sys-0.9.98.crate) = 68035 +SHA256 (rust/crates/openssl-sys-0.9.101.crate) = dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff +SIZE (rust/crates/openssl-sys-0.9.101.crate) = 68568 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 new file mode 100644 index 000000000000..493f1b862592 --- /dev/null +++ b/security/sequoia-sq/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs @@ -0,0 +1,34 @@ +--- 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?202403170227.42H2RXvU093151>