git: 292a4f4f5e75 - main - net/rustdesk-server: Update patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 31 Mar 2023 16:49:02 UTC
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=292a4f4f5e751f452b1162cf876fd0166b6df025 commit 292a4f4f5e751f452b1162cf876fd0166b6df025 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2023-03-31 16:47:49 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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'