From b9e59682996525df0e0b69dffb28a581a37defa9 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Tue, 21 Jan 2025 01:09:21 +0800 Subject: [PATCH 1/4] 1.1.13 --- Cargo.lock | 2 +- Cargo.toml | 2 +- db_v2.sqlite3 | Bin 24576 -> 24576 bytes debian/changelog | 3 +++ ui/setup.nsi | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7123e54..e731f0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1068,7 +1068,7 @@ dependencies = [ [[package]] name = "hbbs" -version = "1.1.12" +version = "1.1.13" dependencies = [ "async-speed-limit", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 0d677df..9a72b78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hbbs" -version = "1.1.12" +version = "1.1.13" authors = ["rustdesk "] edition = "2021" build = "build.rs" diff --git a/db_v2.sqlite3 b/db_v2.sqlite3 index 5fae8e35a3dec174fa2884bf17738be97e3a60e7..93d9801b0ce72813f71240b9adf5642926bfc6c0 100644 GIT binary patch delta 19 acmZoTz}Rqrae_3X*hCp;MzM_v3*rGmvIblL delta 19 acmZoTz}Rqrae_3X$V3@uMv;vP3*rGmlm=J; diff --git a/debian/changelog b/debian/changelog index 7305d3a..76c04a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,6 @@ +rustdesk-server (1.1.13) UNRELEASED; urgency=medium + * Version check and refactor hbb_common to share with rustdesk client + rustdesk-server (1.1.12) UNRELEASED; urgency=medium * WS real ip * Bump s6-overlay to v3.2.0.0 and fix env warnings diff --git a/ui/setup.nsi b/ui/setup.nsi index d386879..b48e1ab 100644 --- a/ui/setup.nsi +++ b/ui/setup.nsi @@ -15,7 +15,7 @@ !define PRODUCT_NAME "rustdesk_server" !define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}" !define COPYRIGHT "Copyright © 2021" -!define VERSION "1.1.12" +!define VERSION "1.1.13" VIProductVersion "${VERSION}.0" VIAddVersionKey "ProductName" "${PRODUCT_NAME}" From e251161c5d4a6bb6ee405193150ef210b58e5d34 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Tue, 21 Jan 2025 01:21:13 +0800 Subject: [PATCH 2/4] rust 1.81 --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0981e92..869b413 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,7 +47,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: "1.70.0" + toolchain: "1.81" override: true default: true components: rustfmt @@ -88,7 +88,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: "1.70.0" + toolchain: "1.81" override: true default: true components: rustfmt From 66c78c23fee4508dc68a7f3128724dc36db64ebf Mon Sep 17 00:00:00 2001 From: RustDesk <71636191+rustdesk@users.noreply.github.com> Date: Tue, 21 Jan 2025 01:33:42 +0800 Subject: [PATCH 3/4] Update build.yaml --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 869b413..cc17ca8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - { name: "arm64v8", target: "aarch64-unknown-linux-musl" } - { name: "armv7", target: "armv7-unknown-linux-musleabihf" } - { name: "i386", target: "i686-unknown-linux-musl" } - - { name: "amd64fb", target: "x86_64-unknown-freebsd" } + #- { name: "amd64fb", target: "x86_64-unknown-freebsd" } steps: @@ -181,7 +181,7 @@ jobs: - { os: "linux", name: "arm64v8", suffix: "" } - { os: "linux", name: "armv7", suffix: "" } - { os: "linux", name: "i386", suffix: "" } - - { os: "linux", name: "amd64fb", suffix: "" } + #- { os: "linux", name: "amd64fb", suffix: "" } - { os: "windows", name: "x86_64", suffix: "-unsigned" } steps: From 464a6870438c0ae8f08f03b0a62e3ece9d753be0 Mon Sep 17 00:00:00 2001 From: 21pages Date: Tue, 21 Jan 2025 17:03:45 +0800 Subject: [PATCH 4/4] fix windows crash (#504) Signed-off-by: 21pages --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index e731f0e..90f4714 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -558,7 +558,7 @@ dependencies = [ [[package]] name = "default_net" version = "0.1.0" -source = "git+https://github.com/rustdesk-org/default_net#a831d47bcacb4615b394968287697924a8f62be1" +source = "git+https://github.com/rustdesk-org/default_net#c400b0bbf49a987129796221fbc41a8a385b812e" dependencies = [ "anyhow", "regex",