From nobody Fri Apr 5 03:16:14 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 4V9kCg1Lwfz5GfB7; Fri, 5 Apr 2024 03:16:15 +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 4V9kCg09yYz4477; Fri, 5 Apr 2024 03:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712286975; 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=7iNuAPttBYNbwIEe/xsaetGqvAqcnaVeV+O9yTty34k=; b=i6JiYQny8rVbiK2/RyEQkHZl4cUm+tbw4SB/WhImA1qXgyQRYOZ0pVQfO6xi1qKJ/IQ7eL gpjJSilnQuZ4qJFY82YhYjwVfvMF/cJYGhl280rAaAYAxUUtpdRewkAiM2HCsA75RlWMxg Uo0eDhNqk5ERnyhrKGC8lsca/e32FrRohgOkK1DaRUCch/0uFOIC+FkTcOggWjJHqilLlj GKP894MMW2Unh7tYVn7+BlAp+kM40LrWHRC79EOTzGGN8xCt+okMBwEkuFi/W0BsFEDwph shDqh5Nk6/1xGTVkN/ysgSi/6KeD0pwndF8m5uP/GGHJS5xyYEoCuATJoCIJoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712286975; a=rsa-sha256; cv=none; b=XbblzhutsY/hq/ntwdlLYj8FWNLJ8dfjVfFFyj8bwM3bqtX097EIBT+WDxRkIRyPq161uj 8ePKfacUFSXk4kfFyQFrEns5zb/QCrXCVdzZSdi5jMFzrDBRNHZFKV3VuRysUX+rp55rdw 0s5m7kPKChbTgsiZ8NdAfKPibzNJNL6t9mmTcgrHxrSAMU0zepmIOnJBJtY0hPgcB4UXfc RU8P9j0qx5agfPgSU/gAY1IcvyA+/OiVWa4rDuu3PdukzQYD9Z65poD999/FQzk90VZsI3 qHKT4s/eJNcQSGC1JM1TWCyrMzpmG/MTc2fopy3oKZJJb/mD33wPAncl8xCIDw== 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=1712286975; 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=7iNuAPttBYNbwIEe/xsaetGqvAqcnaVeV+O9yTty34k=; b=unDt99joPW6DpQRySRWD79NTrc8eMYZzklH9ihrrZ3dK7CRG7HzBbHADFzCuyLRI6GHPUE fqkHLykPSlySI45lSxdpaAVgg4seH7BE6arUQ3WSDpRf+MDDePyxPL/zhC+ezDJ/OAgnVz CIefD/jANULywJUsrpAPR6P21hl10iiWwhRBpn7pxLitF/fcN1YKqBsD1R71IvXVx+qIxC JPfWLSKsc68u+sMl+HTn3c/UA4nuERVcTTyXHsBkuEkInhMC0Ag29XZZgSBxtQwNkm6oXo 3bbe9cgJOj+DzYcG4LrrDDaIXyhg8KrYwRljC0vUgjtnpcYqNQkD+a87FbLISw== 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 4V9kCf6mnWzk5r; Fri, 5 Apr 2024 03:16:14 +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 4353GEqT060552; Fri, 5 Apr 2024 03:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4353GETm060549; Fri, 5 Apr 2024 03:16:14 GMT (envelope-from git) Date: Fri, 5 Apr 2024 03:16:14 GMT Message-Id: <202404050316.4353GETm060549@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: c31fa40f6617 - main - net-im/fractal: update openssl-sys crate 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: c31fa40f661760fcc7b72ffdeeee88152ad28a41 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=c31fa40f661760fcc7b72ffdeeee88152ad28a41 commit c31fa40f661760fcc7b72ffdeeee88152ad28a41 Author: Charlie Li AuthorDate: 2024-04-05 03:14:55 +0000 Commit: Charlie Li 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. - - "