From nobody Fri Apr 5 03:16:15 2024 X-Original-To: dev-commits-ports-all@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 4V9kCh2Sw7z5GdxV; Fri, 5 Apr 2024 03:16:16 +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 4V9kCh177Xz442C; Fri, 5 Apr 2024 03:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712286976; 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=s9kN0hMW2gZWvmR7gcH+5NA1cUpMbntd8B+WBP3g2HQ=; b=luAM1kBc0UbZoSrddMeiDQW3I6UDKn5JuaC6P5aE5P8fK9EN0l7KwpHxM8WeS1dijE9/90 Z0dXY0yaN9Lo6hqu0xPuFKNA3z2hV4P8lJDKv1ZBU0CiNeK/UKGujxYULgeUOONEtXanXW MVipEYy0ZEAyZSb1ju069ZL0OFB2K9+gOud5WXfpPK0aVOouP7CGjku6AFjCbQg+ou9KoM yXASnFMHtHnW3VdWq/GVVa1QJU86/O0AjtsZKa0kv9EKfhWYlnHxeFvKwv00jSwdC0M/s6 iVbeju7qOp36XZzAF8PrS6P5iZkkeqZDcKXtjcOiMhU+Vanz5v4NChVzdzPBAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712286976; a=rsa-sha256; cv=none; b=KA3rXV0lnGhB1QKGKjxg+Nk79d6kDVoPv22TVqNqJUaT95akEegaPoj55DJ5jUBy/on5fo cTZMrS/kAUR4gZqj9QsHjbj5xZWkucZ/TXpy+FK2dyy0eowo53tlLBO2Nx+IVjJyvQoFG7 hExzNHGsj/bPpY1MC7VZi5AFlqny3sEYio1LM5/zrsNhrFaPBEYreoThG5oUTKeunFNHPT NO6YoPOgBgPDUyHIfQds6MiCR2O3aqLfwKuWcPibL8Zv+OuNuIEEINORJ/a4HmUnWvTuf+ z0FYWXC/LwSpiLwUpN5VfR+8H0Gb9GtKyuQDp1BAFmaMWY9Ye96CZFaJ57WIOA== 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=1712286976; 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=s9kN0hMW2gZWvmR7gcH+5NA1cUpMbntd8B+WBP3g2HQ=; b=lKZdNvWxbcMkXueOIZ53kGsmuwm/g/QMz2MLFowIeKsrDqZDpS6Bqx43MGUEl/N3HgL4em n2FyzmLZ/4IeUiAV9OGlEnh5e6ZoIcZKpCbu8uaB88qhm7lfsP0eV6Ncgy51rXXOJPbBv6 qV97vZ967euu8VHK7KO31go6JxiDJxaatVOxvjpQpSDQCFQpvcbZ1V4fqSqSIH1P9tEjzn BBPhjvvQ0AoVK4APr/uNN6QpxrZD1xiFD+1/yFYUT/CHWCiYPJ9grdHOc9wkjxoFFAAB2/ zDI61PYpQPGXi+rVfi+4cDDOXORmsSmwrrHs03SXmErK6lrYXicrUG1gQCbhew== 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 4V9kCh0RN2zkRW; Fri, 5 Apr 2024 03:16:16 +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 4353GFXB060591; Fri, 5 Apr 2024 03:16:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4353GFrq060588; Fri, 5 Apr 2024 03:16:15 GMT (envelope-from git) Date: Fri, 5 Apr 2024 03:16:15 GMT Message-Id: <202404050316.4353GFrq060588@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: 2878604ecd1f - main - security/sequoia-sq: update openssl-sys crate List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 2878604ecd1fa5261099215b4bcabe6610459886 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=2878604ecd1fa5261099215b4bcabe6610459886 commit 2878604ecd1fa5261099215b4bcabe6610459886 Author: Charlie Li AuthorDate: 2024-04-05 03:15:51 +0000 Commit: Charlie Li 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. - - "