diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index d363295a6e5c..8cedadf766ae 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -22,7 +22,7 @@ env: # vcpkg version: 2023.04.15 # for multiarch gcc compatibility VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" - VERSION: "1.2.3" + VERSION: "1.2.3-1" NDK_VERSION: "r25c" #signing keys env variable checks ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}' diff --git a/.github/workflows/flutter-tag.yml b/.github/workflows/flutter-tag.yml index 4925f26c82d0..8a5e7d6b1e62 100644 --- a/.github/workflows/flutter-tag.yml +++ b/.github/workflows/flutter-tag.yml @@ -15,4 +15,4 @@ jobs: secrets: inherit with: upload-artifact: true - upload-tag: "1.2.3" + upload-tag: "1.2.3-1" diff --git a/.github/workflows/history.yml b/.github/workflows/history.yml index 6921ea4cd0fb..32e4385b0cc3 100644 --- a/.github/workflows/history.yml +++ b/.github/workflows/history.yml @@ -10,7 +10,7 @@ env: # vcpkg version: 2022.05.10 # for multiarch gcc compatibility VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" - VERSION: "1.2.3" + VERSION: "1.2.3-1" jobs: build-for-history-windows: diff --git a/Cargo.lock b/Cargo.lock index 3a8adbda2ca6..1f84c12e42ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5133,7 +5133,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.3" +version = "1.2.3-1" dependencies = [ "android_logger", "arboard", diff --git a/Cargo.toml b/Cargo.toml index 9e8224fc1526..f486d4888e6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustdesk" -version = "1.2.3" +version = "1.2.3-1" authors = ["rustdesk "] edition = "2021" build= "build.rs" diff --git a/appimage/AppImageBuilder-aarch64.yml b/appimage/AppImageBuilder-aarch64.yml index 337e022beda1..d20cb66d8c31 100644 --- a/appimage/AppImageBuilder-aarch64.yml +++ b/appimage/AppImageBuilder-aarch64.yml @@ -2,7 +2,7 @@ version: 1 script: - rm -rf ./AppDir || true - - bsdtar -zxvf ../rustdesk-1.2.3.deb + - bsdtar -zxvf ../rustdesk-1.2.3-1.deb - tar -xvf ./data.tar.xz - mkdir ./AppDir - mv ./usr ./AppDir/usr @@ -18,7 +18,7 @@ AppDir: id: rustdesk name: rustdesk icon: rustdesk - version: 1.2.3 + version: 1.2.3-1 exec: usr/lib/rustdesk/rustdesk exec_args: $@ apt: diff --git a/appimage/AppImageBuilder-x86_64.yml b/appimage/AppImageBuilder-x86_64.yml index 650d2f201e5d..c742b36ce9ec 100644 --- a/appimage/AppImageBuilder-x86_64.yml +++ b/appimage/AppImageBuilder-x86_64.yml @@ -2,7 +2,7 @@ version: 1 script: - rm -rf ./AppDir || true - - bsdtar -zxvf ../rustdesk-1.2.3.deb + - bsdtar -zxvf ../rustdesk-1.2.3-1.deb - tar -xvf ./data.tar.xz - mkdir ./AppDir - mv ./usr ./AppDir/usr @@ -18,7 +18,7 @@ AppDir: id: rustdesk name: rustdesk icon: rustdesk - version: 1.2.3 + version: 1.2.3-1 exec: usr/lib/rustdesk/rustdesk exec_args: $@ apt: diff --git a/build.py b/build.py index 42dc8d6de6f5..a7bd8e1b3f0d 100755 --- a/build.py +++ b/build.py @@ -46,12 +46,6 @@ def get_version(): def parse_rc_features(feature): available_features = { - 'IddDriver': { - 'platform': ['windows'], - 'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/RustDeskIddDriver_x64.zip', - 'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/checksum_md5', - 'exclude': ['README.md', 'certmgr.exe', 'install_cert_runas_admin.bat', 'RustDeskIddApp.exe'], - }, 'PrivacyMode': { 'platform': ['windows'], 'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1' @@ -109,7 +103,7 @@ def make_parser(): nargs='+', default='', help='Integrate features, windows only.' - 'Available: IddDriver, PrivacyMode. Special value is "ALL" and empty "". Default is empty.') + 'Available: PrivacyMode. Special value is "ALL" and empty "". Default is empty.') parser.add_argument('--flutter', action='store_true', help='Build flutter package', default=False) parser.add_argument( @@ -261,8 +255,6 @@ def external_resources(flutter, args, res_dir): def get_features(args): features = ['inline'] if not args.flutter else [] - if windows: - features.append('virtual_display_driver') if args.hwcodec: features.append('hwcodec') if args.flutter: diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json index fb62d9250a41..0c94ea0a8d48 100644 --- a/flatpak/rustdesk.json +++ b/flatpak/rustdesk.json @@ -12,7 +12,7 @@ "name": "rustdesk", "buildsystem": "simple", "build-commands": [ - "bsdtar -zxvf rustdesk-1.2.3.deb", + "bsdtar -zxvf rustdesk-1.2.3-1.deb", "tar -xvf ./data.tar.xz", "cp -r ./usr/* /app/", "mkdir -p /app/bin && ln -s /app/lib/rustdesk/rustdesk /app/bin/rustdesk", @@ -26,7 +26,7 @@ "sources": [ { "type": "file", - "path": "../rustdesk-1.2.3.deb" + "path": "../rustdesk-1.2.3-1.deb" }, { "type": "file", diff --git a/flutter/lib/desktop/pages/install_page.dart b/flutter/lib/desktop/pages/install_page.dart index 44ba06263e00..e3dc6ecee0a0 100644 --- a/flutter/lib/desktop/pages/install_page.dart +++ b/flutter/lib/desktop/pages/install_page.dart @@ -66,7 +66,6 @@ class _InstallPageBodyState extends State<_InstallPageBody> late final TextEditingController controller; final RxBool startmenu = true.obs; final RxBool desktopicon = true.obs; - final RxBool driverCert = true.obs; final RxBool showProgress = false.obs; final RxBool btnEnabled = true.obs; @@ -158,10 +157,6 @@ class _InstallPageBodyState extends State<_InstallPageBody> Option(startmenu, label: 'Create start menu shortcuts') .marginOnly(bottom: 7), Option(desktopicon, label: 'Create desktop icon'), - Offstage( - offstage: !Platform.isWindows, - child: Option(driverCert, label: 'install_cert_tip'), - ).marginOnly(top: 7), Container( padding: EdgeInsets.all(12), decoration: BoxDecoration( @@ -253,43 +248,10 @@ class _InstallPageBodyState extends State<_InstallPageBody> String args = ''; if (startmenu.value) args += ' startmenu'; if (desktopicon.value) args += ' desktopicon'; - if (driverCert.value) args += ' driverCert'; bind.installInstallMe(options: args, path: controller.text); } - if (driverCert.isTrue) { - final tag = 'install-info-install-cert-confirm'; - final btns = [ - OutlinedButton.icon( - icon: Icon(Icons.close_rounded, size: 16), - label: Text(translate('Cancel')), - onPressed: () => gFFI.dialogManager.dismissByTag(tag), - style: buttonStyle, - ), - ElevatedButton.icon( - icon: Icon(Icons.done_rounded, size: 16), - label: Text(translate('OK')), - onPressed: () { - gFFI.dialogManager.dismissByTag(tag); - do_install(); - }, - style: buttonStyle, - ) - ]; - gFFI.dialogManager.show( - (setState, close, context) => CustomAlertDialog( - title: null, - content: SelectionArea( - child: - msgboxContent('info', 'Warning', 'confirm_install_cert_tip')), - actions: btns, - onCancel: close, - ), - tag: tag, - ); - } else { - do_install(); - } + do_install(); } void selectInstallPath() async { diff --git a/res/PKGBUILD b/res/PKGBUILD index 0e83b68914db..eb9decf5dd61 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -1,5 +1,5 @@ pkgname=rustdesk -pkgver=1.2.3 +pkgver=1.2.3-1 pkgrel=0 epoch= pkgdesc="" diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index 8c71fa7deda8..4bc457f14deb 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -1,5 +1,5 @@ Name: rustdesk -Version: 1.2.3 +Version: 1.2.3-1 Release: 0 Summary: RPM package License: GPL-3.0 diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index ca63093eb5db..c677063ac7d1 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -1,5 +1,5 @@ Name: rustdesk -Version: 1.2.3 +Version: 1.2.3-1 Release: 0 Summary: RPM package License: GPL-3.0 diff --git a/res/rpm.spec b/res/rpm.spec index c92ad904a3d8..362d0f806c13 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -1,5 +1,5 @@ Name: rustdesk -Version: 1.2.3 +Version: 1.2.3-1 Release: 0 Summary: RPM package License: GPL-3.0 diff --git a/src/core_main.rs b/src/core_main.rs index e7bb4d0f6de2..5c1b2f9be0a1 100644 --- a/src/core_main.rs +++ b/src/core_main.rs @@ -183,7 +183,7 @@ pub fn core_main() -> Option> { return None; } else if args[0] == "--silent-install" { let res = platform::install_me( - "desktopicon startmenu driverCert", + "desktopicon startmenu", "".to_owned(), true, args.len() > 1, diff --git a/src/lang/en.rs b/src/lang/en.rs index ea5c18399c84..0e31be876f96 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -166,8 +166,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Default Codec", "Default codec"), ("Other Default Options", "Other default options"), ("relay_hint_tip", "It may not be possible to connect directly; you can try connecting via relay. Additionally, if you want to use a relay on your first attempt, you can add the \"/r\" suffix to the ID or select the option \"Always connect via relay\" in the card of recent sessions if it exists."), - ("install_cert_tip", "Install RustDesk certificate"), - ("confirm_install_cert_tip", "This is a RustDesk testing certificate, which can be trusted. The certificate will be used to trust and install RustDesk drivers when required."), ("RDP Settings", "RDP settings"), ("New Connection", "New connection"), ("Your Device", "Your device"), diff --git a/src/lang/template.rs b/src/lang/template.rs index dfd4b96519ea..3acd8ff4fc49 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -458,8 +458,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Resolution", ""), ("No transfers in progress", ""), ("Set one-time password length", ""), - ("install_cert_tip", ""), - ("confirm_install_cert_tip", ""), ("RDP Settings", ""), ("Sort by", ""), ("New Connection", ""),