From nobody Sun Mar 17 02:27:32 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 4Ty22D2s98z5F416; Sun, 17 Mar 2024 02:27:32 +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 4Ty22D1t2Nz4VJt; Sun, 17 Mar 2024 02:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710642452; 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=mr5SQfv2+VNm3D6B+plJjux4Ux2cmSXBX5KtDnOUay0=; b=p9NkLnhjo07JI+Ji6R4xVF5MuO3HcP2jFD8B9js+LZauhJlwt3KquZfk8pyX7YPrJAaxLV P/PlP5leKlWKhfkdKs+o8B6zOAU4NmS2XQ6oyHDbvfUI8UD2v2pVAWIJzAUNgs110mFwXG vP5goEQ2adUIlF0yofaUNlqaniab4Ih3aZV7YgP+O4TPbbJnIaRA7hUVINc21zdoT8qO9J 1erhC+2lTOmNG4ApHPM7W4jZN12dBPw2/98kGEw5XDZn0spRcA9VPf+B4R8GB5Cymg3waB FlFltGMZ0K+0pSdmauVVRvxeugnBmZrl6aVBjxFDRpcHDeqxEFuyg7Kofd1iUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710642452; a=rsa-sha256; cv=none; b=aDH/T3H2fDR3M5ptBroLs/HZMd7gnCmVx2aQwmoBRKg2AYOJdg5jn3l+eLZbEG95+h2E8p kWeIDJcfV4Ka19zEeYEmLUNs2uwTLMgwAR0AlM4fTR9FpGXU0VJgV+Xc9nJb7MzS1J/wYo n1/HrfuwAcO+5HJqe2n7G7XnISOK0gHuSlKBkkPSz5nsooHK2c/OqQHHwz4JpoDHMeqsmS ly6UmHwYliuiil4tMMkTcg+tvN5OPNjhdnomlw88Xr6ZvTy7ATg4umSA4DcpXgsVQ62lT6 fakARBKJn/ZRQiupRoX0cdNofD8o5mY0TTHARzPTAu9PFWmvPIcVZCtrHVgw6g== 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=1710642452; 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=mr5SQfv2+VNm3D6B+plJjux4Ux2cmSXBX5KtDnOUay0=; b=JudHH4UgagySlSkOebk+KvUqVUDB7jnta2o01dvMY4LXkEDuubtIXI+MMH/muWstU2dQ2O oswW99gAmT958YeLCXtlPndVB1fFGfwT1qMX9WcDsZ3ZMCusMQ8y1lwqesHWeQYJMqx+Vn /jVi0W3SvBbPRETMeRtZeq/ynZ1KsrnBRMAhM5Ih3aK/kRtCoVyZRVakMV0QSJc7tUd1tO MzCDPsXwTbWDXM3fwumUSguX3lN/WkqTUAhrdMswqhmFSCJ6VLBXl9Ya7sy3pOxI5TwpBZ ZqB4WNouPaZe3buQqY2heAwVuSep248NevOYBrb3gY/IEitLw0o4sXRjjKtBmA== 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 4Ty22D1MPTzL24; Sun, 17 Mar 2024 02:27:32 +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 42H2RWiw093103; Sun, 17 Mar 2024 02:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42H2RWQE093100; Sun, 17 Mar 2024 02:27:32 GMT (envelope-from git) Date: Sun, 17 Mar 2024 02:27:32 GMT Message-Id: <202403170227.42H2RWQE093100@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: 6a06aab9f6f5 - main - net-im/fractal: 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: 6a06aab9f6f581947298cf143d8231281d7026f4 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a06aab9f6f581947298cf143d8231281d7026f4 commit 6a06aab9f6f581947298cf143d8231281d7026f4 Author: Charlie Li AuthorDate: 2024-03-17 02:26:18 +0000 Commit: Charlie Li CommitDate: 2024-03-17 02:26:18 +0000 net-im/fractal: update openssl crates + enable LibreSSL 3.9.0 --- net-im/fractal/Makefile.crates | 4 +-- net-im/fractal/distinfo | 10 +++---- ...-cargo-crates_openssl-sys-0.9.101_build_main.rs | 34 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/net-im/fractal/Makefile.crates b/net-im/fractal/Makefile.crates index 2c6a99700101..0c3fd69164a9 100644 --- a/net-im/fractal/Makefile.crates +++ b/net-im/fractal/Makefile.crates @@ -170,10 +170,10 @@ CARGO_CRATES= adler-1.0.2 \ num_cpus-1.15.0 \ once_cell-1.17.1 \ opaque-debug-0.3.0 \ - openssl-0.10.59 \ + openssl-0.10.64 \ openssl-macros-0.1.0 \ openssl-probe-0.1.5 \ - openssl-sys-0.9.95 \ + openssl-sys-0.9.101 \ 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 cb1b131d7273..048626116430 100644 --- a/net-im/fractal/distinfo +++ b/net-im/fractal/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1699372792 +TIMESTAMP = 1710616109 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 @@ -345,14 +345,14 @@ SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af26 SIZE (rust/crates/once_cell-1.17.1.crate) = 32856 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 -SHA256 (rust/crates/openssl-0.10.59.crate) = 7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33 -SIZE (rust/crates/openssl-0.10.59.crate) = 264765 +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.0.crate) = b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c 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.95.crate) = 40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9 -SIZE (rust/crates/openssl-sys-0.9.95.crate) = 67520 +SHA256 (rust/crates/openssl-sys-0.9.101.crate) = dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff +SIZE (rust/crates/openssl-sys-0.9.101.crate) = 68568 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 new file mode 100644 index 000000000000..493f1b862592 --- /dev/null +++ b/net-im/fractal/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. + + "