From nobody Fri Mar 31 16:49:02 2023 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 4Pp5pk6HXkz42yss; Fri, 31 Mar 2023 16:49:02 +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 4Pp5pk5rZ4z4QTG; Fri, 31 Mar 2023 16:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680281342; 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=6oDCQmZK9rHMV4LSWZtPaQIZaTOxJgxV/J8LP9MCoBc=; b=WWGTmH8DHkmFiJBBZ/RTcUi+gM9l2c2/XwdhhiIiM/qDyd/64hDCquckbFOyIVaBkHBc85 GMktybrxTmpV2YBNRZO0voi+PeL/MOchv/lu0KUD74bDbCn73F2+g96mbrm/XItw3ho0f4 lF99UQh2MIsb3/2nSoBvAkaNfJlCCQuz49ORG9telHzukse9dWz4IKoeudpqt2b8gW/p2i F7LbffiJTavrgd6uJlc/FG7bdpstqpawh4Mnc3biNKA1EXQqiuHp+gRCa0ne5j636n+kvb v71LBLLaL9pCJPqnJgPRsP7VkeYSLIMRFLmAHX08Enf+Ga/rAvz27kjeoKmsYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680281342; 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=6oDCQmZK9rHMV4LSWZtPaQIZaTOxJgxV/J8LP9MCoBc=; b=sRZElSp01skCBmm6pHM3FBW5VwTJerbVL0pyPP4x0hb1+Xg+YfQT4UsnaYDweySTkEtZz8 v/I2FKS67PpYZaX9xS0IhKeffQPUloD2MYH28tPkYUTBuljalws42wCV++fyc28srvRllU re7tquDwk/zppQtBShA95zDm3j8V89i4jel3OQDMloAS3XuYgOER5Z/1EXoz4El+UmCcSB 73L2jMiEu3wSZO6og4Mr9U3HG+TepjIrVIRb/hFsaCS7JZ7njLZPEEJ+YcRhYmW3N1Ci3z YzjT3n3ItGjT8UJDmoXQYDvyxPN8P7pkgsmkgrYwaa+AlFRbVj4uz6ugLsH4gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680281342; a=rsa-sha256; cv=none; b=F1huMIStuHabtH2aqWnTyZ3g7fQ6WArNJgbT9bShQG3WHTM6hXjBt6Q6obBSq40j0uvSzh 1FH3Kt64D8mC1rqk6aSvdfiTTbj4cy1NgcPl14vAjwvmOeKL+ABV6tDndcje0WvpoPy8vK XxQDx19ql6PDhTNlmzbXQGrDcBsmoPYqNyfcuXDReAxqgyoJ3n0V1iKNG7ZRhF7bEupjr/ NToeJlUN+xI/Fo+ShX4q+ybZ1R0emJRn3GiXmKwwJhXExT7PDdWv4koZHqyY8oG8oHImts 0MU2lH0TEQv3q0z9DNBBqMbYQfYVA7KudBB7bcGYairZnLDb5J9hxDqYNKcXPw== 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 4Pp5pk4vy6z11nj; Fri, 31 Mar 2023 16:49:02 +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 32VGn2DT064010; Fri, 31 Mar 2023 16:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VGn2J5064009; Fri, 31 Mar 2023 16:49:02 GMT (envelope-from git) Date: Fri, 31 Mar 2023 16:49:02 GMT Message-Id: <202303311649.32VGn2J5064009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 292a4f4f5e75 - main - net/rustdesk-server: Update patch 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 292a4f4f5e751f452b1162cf876fd0166b6df025 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=292a4f4f5e751f452b1162cf876fd0166b6df025 commit 292a4f4f5e751f452b1162cf876fd0166b6df025 Author: Guido Falsi AuthorDate: 2023-03-31 16:47:49 +0000 Commit: Guido Falsi CommitDate: 2023-03-31 16:48:58 +0000 net/rustdesk-server: Update patch Modify patch, needed to avoid crashes on startup, to improved one, discussed in upstream PR. Adding the "dont_minimize_extra_stacks" option to the flexi_logger avoids the stack overflow causing the startup crashes. Obtained from: https://github.com/rustdesk/rustdesk-server/pull/232#issuecomment-1491347232 --- net/rustdesk-server/Makefile | 1 + net/rustdesk-server/files/patch-Cargo.toml | 11 +++++++++++ net/rustdesk-server/files/patch-src_hbbr.rs | 11 ----------- net/rustdesk-server/files/patch-src_main.rs | 11 ----------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/net/rustdesk-server/Makefile b/net/rustdesk-server/Makefile index 7eb92a4aa6d6..5c7d591a0547 100644 --- a/net/rustdesk-server/Makefile +++ b/net/rustdesk-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= rustdesk-server DISTVERSION= 1.1.7-3 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org diff --git a/net/rustdesk-server/files/patch-Cargo.toml b/net/rustdesk-server/files/patch-Cargo.toml new file mode 100644 index 000000000000..49122d786bf2 --- /dev/null +++ b/net/rustdesk-server/files/patch-Cargo.toml @@ -0,0 +1,11 @@ +--- Cargo.toml.orig 2023-03-29 16:43:49 UTC ++++ Cargo.toml +@@ -46,7 +46,7 @@ http = "0.2" + regex = "1.4" + tower-http = { version = "0.3", features = ["fs", "trace", "cors"] } + http = "0.2" +-flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] } ++flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset", "dont_minimize_extra_stacks"] } + ipnetwork = "0.20" + local-ip-address = "0.5.1" + dns-lookup = "1.0.8" diff --git a/net/rustdesk-server/files/patch-src_hbbr.rs b/net/rustdesk-server/files/patch-src_hbbr.rs deleted file mode 100644 index f0e32c14789c..000000000000 --- a/net/rustdesk-server/files/patch-src_hbbr.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hbbr.rs.orig 2023-03-29 16:43:49 UTC -+++ src/hbbr.rs -@@ -10,7 +10,7 @@ fn main() -> ResultType<()> { - let _logger = Logger::try_with_env_or_str("info")? - .log_to_stdout() - .format(opt_format) -- .write_mode(WriteMode::Async) -+ .write_mode(WriteMode::Direct) - .start()?; - let args = format!( - "-p, --port=[NUMBER(default={RELAY_PORT})] 'Sets the listening port' diff --git a/net/rustdesk-server/files/patch-src_main.rs b/net/rustdesk-server/files/patch-src_main.rs deleted file mode 100644 index 192c92c4a790..000000000000 --- a/net/rustdesk-server/files/patch-src_main.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.rs.orig 2023-03-29 16:43:49 UTC -+++ src/main.rs -@@ -11,7 +11,7 @@ fn main() -> ResultType<()> { - let _logger = Logger::try_with_env_or_str("info")? - .log_to_stdout() - .format(opt_format) -- .write_mode(WriteMode::Async) -+ .write_mode(WriteMode::Direct) - .start()?; - let args = format!( - "-c --config=[FILE] +takes_value 'Sets a custom config file'