From nobody Sun Mar 17 02:27:33 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ty22F3f6sz5F443; Sun, 17 Mar 2024 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ty22F2XcRz4Ttl; Sun, 17 Mar 2024 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710642453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dgQ6slB0JXiFj07HPa/j8EhV61J7af1ZrJ9D6iC36q8=; b=xbISC07C5y1O217WE1U3QzqfQhSaTE0x3tkkbtzj11JJddmz0sW2BLKG1z6c02iiniSC8B qbmYbXR1q37SJ7uRy5UE8Nb//OZ3TaQzztGj/+XC2mLbppOQTMeDsigk5UWWNpo1gCrj5s HKTwnXJr5F+rJstXGS0O1UAYDV8LW+VvvkDdvXKnPaU8UDV/a1/GKFAyoedv9z54EvBpRa bQvPePyukMX+IU9W1K7xpp+MZ9pTqux7VFGRETxzugFjkkD2Em2hEG59cPvgdE2uDIk9qi kA8MJqbgZS4mW/ZwL9vYn0A+3Y+J/FeB8vu7TYdK8mgUtXcNU33G9udD4SHK5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710642453; a=rsa-sha256; cv=none; b=yovQpiF+bAFkISfynng7okBBbQsS5//3TWrcQvzIflNNO65w05wFxmJYohSoJRPnmcVm1g FmCfgPZMZke4WH7zG0QwxmDlqGPB//gcIxTgacRz21Y8jBmIamRUxcHy+i3gWkDJFIKUh2 fT3qL5tRwFTEC0ERqKBGJrcjo5SBZ37JG4kiNdM36VlOhTMWNCXRpV3tDR7XIhwV7kaQEA sYw3azr0NAwxpyC+iXycxaWOZExw/ksEwlHxcofCWe8cRolzkgX0nwRWTjtWRHn49Xb2tC MhmmyMgpqOTl8BIuZ+I82iXmQoBKG4AORn8MWh7xRvgjWd1jxvq/ROriazuD4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710642453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dgQ6slB0JXiFj07HPa/j8EhV61J7af1ZrJ9D6iC36q8=; b=OOyvDp2UCqOdKJ0pEAbL9CUXKupEsoaDSkCwNeaxmolXjvynBP9M6Nzrpegh9sN3djGe6L SKrIOak/4M8SWV7LHn+uZO1iyVzN5dejLDvLQwTW1iq+TegBuwvK/4BLFBix/EEVmF47NM /t/BKA7oB5ZJqXUmC9LWnnVFetHV411F9nku9o1hSStU12AAhrFoiJSmEAnVr3H173lrYy mDZmi44VBW9jm1FaYLW6OSzMcce4VPsTvVgzZ0qWX0zqMjX9CnL1ArcsRLt2nkVnQB14+1 8j1uPAOrkAAHX4yrZ6bVDDWxY6XGxjdD38RHo3tlcsIHmGUOSgkbiwkMl9ro9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ty22F27zzzKgg; Sun, 17 Mar 2024 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42H2RXsM093154; Sun, 17 Mar 2024 02:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42H2RXvU093151; Sun, 17 Mar 2024 02:27:33 GMT (envelope-from git) Date: Sun, 17 Mar 2024 02:27:33 GMT Message-Id: <202403170227.42H2RXvU093151@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: d015e7b0096e - main - security/sequoia-sq: update openssl crates + enable LibreSSL 3.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d015e7b0096e92855fc2dbab700c5e00b5a95f90 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=d015e7b0096e92855fc2dbab700c5e00b5a95f90 commit d015e7b0096e92855fc2dbab700c5e00b5a95f90 Author: Charlie Li AuthorDate: 2024-03-17 02:27:05 +0000 Commit: Charlie Li 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. + + "