From 2e35d8e45bb9a1e7a46a3d1f38d1bd79090120af Mon Sep 17 00:00:00 2001 From: Mike Mueller Date: Wed, 6 May 2026 18:00:04 +0200 Subject: [PATCH] submodule(hbb_common): rebase pro-features onto upstream/main Rebases the fork's branch onto current upstream rustdesk/hbb_common main (6490a86), pulling in 267 upstream commits (security hardening, IPC perm fixes, file-transfer path-traversal fixes, privacy-mode option, etc). The local HttpProxyRequest/Response backport is dropped because upstream now has the same proto messages with the same tag numbers. Cherry-picks the local "implement app_icon" commit on top, adding the OPTION_APP_ICON buildin key needed by the customization page. Sets branch=pro-features in .gitmodules so future 'git submodule update --remote' tracks the right branch. Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitmodules | 1 + libs/hbb_common | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index af437ef3d..6a18f2121 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "libs/hbb_common"] path = libs/hbb_common url = https://gitea.cstudio.ch/mike/hbb_common.git + branch = pro-features diff --git a/libs/hbb_common b/libs/hbb_common index 3e31a9493..615473157 160000 --- a/libs/hbb_common +++ b/libs/hbb_common @@ -1 +1 @@ -Subproject commit 3e31a94939e026ab2c05d21a2c436960aa9bfea8 +Subproject commit 61547315766f40f5c7ee59435e83d832da00e4a8