From nobody Sat May 11 00:40:32 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 4Vbn3N2l9Zz5KkVB; Sat, 11 May 2024 00:40: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 4Vbn3N2FNjz50Jm; Sat, 11 May 2024 00:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715388032; 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=wkOywTE8zJHvm5SyL0xysDVSGv72K2dfpPxFNcGj0yE=; b=o5PFjRtu2EJduxRrwGQcs1FoJrB7yo5GKoPRDH77DYf8fWrh6EFaHKqthP7CZ7scF4lkuR XL+cw4AqPUjtHxkGHu18JT3o9E6fPo8wo6Iva53VOiSn2+yxP0y8+XbOE/CauUCCQqi2uv 9TcwxzNBfUS+6SyWrM7mguDBdfk6Jg11rFdwQxDm/rwtvwn1c3ktST6l/qOHmEEig5x4BX We+TXVJ+7z3TAy2vDOB+lesyd6uZEjJvTBiky9eifwQQLkpGfsMk0uHm0eKiqxyFOX/Lir stM3mNe2oEVYi1i0g8FjdNV5qZKVNzgbxgg6Se55cCoNE7bJhbSQyKA6vwKwGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715388032; a=rsa-sha256; cv=none; b=ruhgUthHrnnWVB/mBRGc7s04/EfywrNdi6uGS6EoRzQEE+mk6zB/N5rPjiH5AO7SWmdlcn i66oGN1fVX/hTq2h45jgMkfBal/B+FadI+/aSfyN+F2k6w9V8QQ2umCCb+CdleWLTBXijR YgeNbA/fqs3OuONWOd9fSMcx01a9gDJ0GJkOVoHq8x7gcwNiIsamY1B4YmWdV3YaOteeTf fK+b50ccSoo8iiJWOlMNnsFcJQh8UH2KTw3DpXvAb0iok+/8ER2ypzRBGXSXlMSgat6fl+ V6DJ96MlE4RF01ZJsHmQPIEle5wQ8SQ3+Hw93B5UKpWHnCRBPFrsUec0Hio5nw== 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=1715388032; 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=wkOywTE8zJHvm5SyL0xysDVSGv72K2dfpPxFNcGj0yE=; b=cK86JOwn74G4NrsSeAjWuDT044pMis/VLhw6G8oad7OforK8P9j2efcGhS/RImgtpe+7bK 504eep8SVYO7LxaFArmgBWqNSU3XpaE8LFtkAnnHAom8Xe5zXS73LiBAMZUiWJlwDFieaX /CkrwBG2qe1aHAw0j0y0+nmI/mXCECrhVX+JsPW8RrIZV5J79Drx1VCw+ra1jIFLyA83Tw ISUyv6pTELhzaQBNlkCCQfRnZIJrGLj3Rc8+zlgONJ+HZGFuX74ua3KPmnQfnPpUtefW3e HR9U5AKkhqUNFqDlyo8mK/RDVyJhSh2f3hrIC3iMkhn4CccO9E5TCf5my37g/Q== 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 4Vbn3N1sLsz10SK; Sat, 11 May 2024 00:40: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 44B0eW6b029386; Sat, 11 May 2024 00:40:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44B0eWKg029383; Sat, 11 May 2024 00:40:32 GMT (envelope-from git) Date: Sat, 11 May 2024 00:40:32 GMT Message-Id: <202405110040.44B0eWKg029383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: e8c8d237cafa - 2024Q2 - games/veloren-weekly: unbreak without security/ca_root_nss 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: e8c8d237cafae23adf136bf267958bc4728f1d7c Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8c8d237cafae23adf136bf267958bc4728f1d7c commit e8c8d237cafae23adf136bf267958bc4728f1d7c Author: Jan Beich AuthorDate: 2024-05-10 22:45:31 +0000 Commit: Jan Beich CommitDate: 2024-05-11 00:40:26 +0000 games/veloren-weekly: unbreak without security/ca_root_nss PanicInfo: panicked at cargo-crates/hyper-rustls-0.24.2/src/config.rs:48:9: no CA certificates found Game version: b47aa6ae [2024-05-09] Backtrace: 0: veloren_voxygen::panic_handler::set_panic_hook::{{closure}} 1: std::panicking::rust_panic_with_hook 2: std::panicking::begin_panic_handler::{{closure}} 3: std::sys_common::backtrace::__rust_end_short_backtrace 4: rust_begin_unwind 5: core::panicking::panic_fmt 6: authc::AuthClient::new 7: veloren_client::Client::new::{{closure}} 8: veloren_voxygen::menu::main::client_init::ClientInit::new::{{closure}} 9: tokio::runtime::task::raw::poll 10: tokio::runtime::scheduler::multi_thread::worker::Context::run_task 11: tokio::runtime::scheduler::multi_thread::worker::run 12: tokio::runtime::task::raw::poll 13: std::sys_common::backtrace::__rust_begin_short_backtrace 14: core::ops::function::FnOnce::call_once{{vtable.shim}} 15: std::sys::pal::unix::thread::Thread::new::thread_start 16: (cherry picked from commit 4e9f09f24982bde0785ab1cf8baafe0e419d161b) --- games/veloren-weekly/Makefile | 2 +- .../veloren-weekly/files/patch-rustls-native-certs | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index 576eaffb3bd0..437539fc7ded 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,6 +1,6 @@ PORTNAME= veloren PORTVERSION= s20240509 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly diff --git a/games/veloren-weekly/files/patch-rustls-native-certs b/games/veloren-weekly/files/patch-rustls-native-certs new file mode 100644 index 000000000000..f17a6074ac06 --- /dev/null +++ b/games/veloren-weekly/files/patch-rustls-native-certs @@ -0,0 +1,36 @@ +https://github.com/rustls/rustls-native-certs/issues/28 +https://github.com/rustls/rustls-native-certs/commit/8162b232045e + +--- cargo-crates/rustls-native-certs-0.6.3/src/unix.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/rustls-native-certs-0.6.3/src/unix.rs +@@ -1,13 +1,27 @@ use crate::Certificate; + use crate::load_pem_certs; + use crate::Certificate; + ++use std::fs; + use std::io::Error; + + pub fn load_native_certs() -> Result, Error> { + let likely_locations = openssl_probe::probe(); + +- match likely_locations.cert_file { +- Some(cert_file) => load_pem_certs(&cert_file), +- None => Ok(Vec::new()), ++ let mut certs = match likely_locations.cert_file { ++ Some(cert_file) => load_pem_certs(&cert_file)?, ++ None => Vec::new(), ++ }; ++ ++ if let Some(cert_dir) = likely_locations.cert_dir { ++ let dir_reader = fs::read_dir(cert_dir)?; ++ for entry in dir_reader { ++ let entry = entry?; ++ let path = entry.path(); ++ if fs::metadata(&path)?.is_file() { ++ certs.append(&mut load_pem_certs(&path)?); ++ } ++ } + } ++ ++ Ok(certs) + }