From nobody Tue Dec 07 23:59:18 2021 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 B05F518C01D2; Tue, 7 Dec 2021 23:59:18 +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 4J7y2G3F5lz4WMq; Tue, 7 Dec 2021 23:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4EEDFDEF; Tue, 7 Dec 2021 23:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B7NxIdJ002021; Tue, 7 Dec 2021 23:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7NxIZQ002020; Tue, 7 Dec 2021 23:59:18 GMT (envelope-from git) Date: Tue, 7 Dec 2021 23:59:18 GMT Message-Id: <202112072359.1B7NxIZQ002020@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ed815de7a6be - main - devel/cargo-c: unbreak with libressl after 5c5878b7d124 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed815de7a6be1cc5e903cce4567cc34e3dc91a1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638921558; 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=QNU4MiU9O0vvljZTrBteuJ1BE8SRe/pdw7rnhe2pcGU=; b=e3uFjXKgdrB9GsUd5vuq5EAtJDhiaGkk7PClDfT5Mi6tdUdDSaLiBRUk167TZ+A+NUgwP3 IaPPHl0e1KPhdpPl9hVAs7d6mjvcBfAgBHTCdLq+k8drGavkbpl0pi5h7GaoVBWmLXwCeN bqkRURiarVa5g/FQCnkI5XV25RtR26sGDhLyRI4NPswmD7w6LBjPLJangGn0PaDTnDepYe HkI6XluIjmz3PN5BX2MC5dHT750lQ5+t8QK1WGrb9bDhBMdbNovUBniS9aMHzMdhLDCpWW q9/IPpLRAsLs63It7OBMapDYAATqXeIniZMowUGL9nLJq7N6GshSfEYQjazLoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638921558; a=rsa-sha256; cv=none; b=JWX0RLYPDStIOKS+IbnzvpJYQOuWjfFpLH/o0q9Lcgd4R6Ue8kTJTm6xyvH8TSrRscLVG2 MZ6VPE2s04cDSetZBE/drNNceHKIktF1Q5UTS+ZaNvRxeAWydShbaHLuWfqfNSoNklCJ8O rK6c1rPG/S5DjokM9mqvtGweCN3InCwiUZtY+ypd4BJElHr4fcSw98baPPIUvyzgyg2sli 6HjVo9Hbvlf+7JNLZWmrwrTIGzZI3k8Iiwkz+kC7klrFG1X6UciMMAIyM7Gi9fzAAnPM5k M9AcKzILx5649Sn1z/lwGR7ROqHmyeEhlQn/CdEKFleNwd75Z5CxDHvy3p8EuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed815de7a6be1cc5e903cce4567cc34e3dc91a1e commit ed815de7a6be1cc5e903cce4567cc34e3dc91a1e Author: Jan Beich AuthorDate: 2021-12-07 23:45:19 +0000 Commit: Jan Beich CommitDate: 2021-12-07 23:57:50 +0000 devel/cargo-c: unbreak with libressl after 5c5878b7d124 error: failed to run custom build command for `openssl-sys v0.9.67` Caused by: process didn't exit successfully: `../target/release/build/openssl-sys-27209cbe1c4dcecb/build-script-main` (exit status: 101) --- stderr thread 'main' panicked at ' This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 through 3.4.0, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. ', cargo-crates/openssl-sys-0.9.67/build/main.rs:279:5 stack backtrace: 0: std::panicking::begin_panic 1: build_script_main::version_error 2: build_script_main::validate_headers 3: build_script_main::main 4: core::ops::function::FnOnce::call_oncex PR: 260269 Submitted by: lysfjord.daniel@smokepit.net (based on) Obtained from: upstream --- devel/cargo-c/files/patch-libressl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/devel/cargo-c/files/patch-libressl b/devel/cargo-c/files/patch-libressl new file mode 100644 index 000000000000..afd03b581adb --- /dev/null +++ b/devel/cargo-c/files/patch-libressl @@ -0,0 +1,13 @@ +https://github.com/sfackler/rust-openssl/commit/c6e3c17f9275 +https://github.com/sfackler/rust-openssl/commit/7768e0638078 + +--- cargo-crates/openssl-sys-0.9.67/build/main.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/openssl-sys-0.9.67/build/main.rs +@@ -238,6 +238,7 @@ See rust-openssl README for more information: + (3, 3, 1) => ('3', '3', '1'), + (3, 3, _) => ('3', '3', 'x'), + (3, 4, 0) => ('3', '4', '0'), ++ (3, 4, _) => ('3', '4', 'x'), + _ => version_error(), + }; +