rustdesk/rustdesk-server
1
0 Fork 0
Code Releases 1 Activity

Merge branch 'master' into forapi

Browse Source 
# Conflicts:
#	.github/workflows/build.yaml
#	debian/changelog
This commit is contained in:
lejianwen committed 2025-01-21 19:19:51 +08:00
2 parents 45c900a7e6 464a687043
commit ea3d353aa6
5 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build.yaml
+2 -2
View File
@@ -35,7 +35,7 @@ jobs:
- { name: "arm64v8", target: "aarch64-unknown-linux-musl" } - { name: "arm64v8", target: "aarch64-unknown-linux-musl" }
- { name: "armv7", target: "armv7-unknown-linux-musleabihf" } - { name: "armv7", target: "armv7-unknown-linux-musleabihf" }
- { name: "i386", target: "i686-unknown-linux-musl" } - { name: "i386", target: "i686-unknown-linux-musl" }
- { name: "amd64fb", target: "x86_64-unknown-freebsd" } #- { name: "amd64fb", target: "x86_64-unknown-freebsd" }
steps: steps:
@@ -181,7 +181,7 @@ jobs:
- { os: "linux", name: "arm64v8", suffix: "" } - { os: "linux", name: "arm64v8", suffix: "" }
- { os: "linux", name: "armv7", suffix: "" } - { os: "linux", name: "armv7", suffix: "" }
- { os: "linux", name: "i386", suffix: "" } - { os: "linux", name: "i386", suffix: "" }
- { os: "linux", name: "amd64fb", suffix: "" } #- { os: "linux", name: "amd64fb", suffix: "" }
- { os: "windows", name: "x86_64", suffix: "-unsigned" } - { os: "windows", name: "x86_64", suffix: "-unsigned" }
steps: steps:
Cargo.lock
Generated
+2 -2
View File
@@ -558,7 +558,7 @@ dependencies = [
[[package]] [[package]]
name = "default_net" name = "default_net"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"regex", "regex",
@@ -1068,7 +1068,7 @@ dependencies = [
[[package]] [[package]]
name = "hbbs" name = "hbbs"
version = "1.1.12" version = "1.1.13"
dependencies = [ dependencies = [
"async-speed-limit", "async-speed-limit",
"async-trait", "async-trait",
db_v2.sqlite3
BIN
View File
Binary file not shown.
debian/changelog
Vendored
+4 -1
View File
@@ -1,8 +1,11 @@
rustdesk-server (1.1.13) UNRELEASED; urgency=medium rustdesk-server (1.1.14) UNRELEASED; urgency=medium
* add KeyExchange * add KeyExchange
* fix ws query online * fix ws query online
* add Must Login * add Must Login
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 rustdesk-server (1.1.12) UNRELEASED; urgency=medium
* WS real ip * WS real ip
* Bump s6-overlay to v3.2.0.0 and fix env warnings * Bump s6-overlay to v3.2.0.0 and fix env warnings
ui/setup.nsi
+1 -1
View File
@@ -15,7 +15,7 @@
!define PRODUCT_NAME "rustdesk_server" !define PRODUCT_NAME "rustdesk_server"
!define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}" !define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
!define COPYRIGHT "Copyright © 2021" !define COPYRIGHT "Copyright © 2021"
!define VERSION "1.1.12" !define VERSION "1.1.13"
VIProductVersion "${VERSION}.0" VIProductVersion "${VERSION}.0"
VIAddVersionKey "ProductName" "${PRODUCT_NAME}" VIAddVersionKey "ProductName" "${PRODUCT_NAME}"