git: c31fa40f6617 - main - net-im/fractal: update openssl-sys crate
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 05 Apr 2024 03:16:14 UTC
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=c31fa40f661760fcc7b72ffdeeee88152ad28a41 commit c31fa40f661760fcc7b72ffdeeee88152ad28a41 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2024-04-05 03:14:55 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2024-04-05 03:14:55 +0000 net-im/fractal: update openssl-sys crate ...for LibreSSL 3.9.1 and later compatibility --- net-im/fractal/Makefile.crates | 2 +- net-im/fractal/distinfo | 6 ++-- ...-cargo-crates_openssl-sys-0.9.101_build_main.rs | 34 ---------------------- 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/net-im/fractal/Makefile.crates b/net-im/fractal/Makefile.crates index 0c3fd69164a9..633f06206a21 100644 --- a/net-im/fractal/Makefile.crates +++ b/net-im/fractal/Makefile.crates @@ -173,7 +173,7 @@ CARGO_CRATES= adler-1.0.2 \ openssl-0.10.64 \ openssl-macros-0.1.0 \ openssl-probe-0.1.5 \ - openssl-sys-0.9.101 \ + openssl-sys-0.9.102 \ pango-0.8.0 \ pango-sys-0.9.1 \ pangocairo-0.9.0 \ diff --git a/net-im/fractal/distinfo b/net-im/fractal/distinfo index 048626116430..0e2ff5a0be84 100644 --- a/net-im/fractal/distinfo +++ b/net-im/fractal/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1710616109 +TIMESTAMP = 1711806324 SHA256 (fractal-4.4.2.tar.gz) = 97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e SIZE (fractal-4.4.2.tar.gz) = 849281 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -351,8 +351,8 @@ SHA256 (rust/crates/openssl-macros-0.1.0.crate) = b501e44f11665960c7e7fcf062c7d9 SIZE (rust/crates/openssl-macros-0.1.0.crate) = 5566 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/pango-0.8.0.crate) = 1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577 SIZE (rust/crates/pango-0.8.0.crate) = 42250 SHA256 (rust/crates/pango-sys-0.9.1.crate) = 86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d diff --git a/net-im/fractal/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs b/net-im/fractal/files/patch-cargo-crates_openssl-sys-0.9.101_build_main.rs deleted file mode 100644 index 493f1b862592..000000000000 --- a/net-im/fractal/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. - - "