improve security by @AvianaCruz

3 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ee92972e856..31e3ca8d3189 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wemeet-bin
 	pkgdesc = Tencent Video Conferencing, tencent meeting 腾讯会议
 	pkgver = 3.11.0.402
-	pkgrel = 2
+	pkgrel = 3
 	url = https://source.meeting.qq.com/download-center.html
 	arch = x86_64
 	arch = aarch64
@@ -11,7 +11,7 @@ pkgbase = wemeet-bin
 	provides = wemeet
 	provides = tencent-meeting
 	source = wemeet.sh
-	sha512sums = e67d6b8fdd9bd055ba8c2177aca884d803a2473fcfe9faf9b23e5bfd4152115814be066709db1e1dbf62917a36aa99693c5ebd8f23f2858950a3f3b98d6b8136
+	sha512sums = f49ecb5797786015cb4f715998d25780606a01514e8192e91757c7092e57d68f15caba33edf3afdf65c2795c818fc3180f0cc8e72c856aa2de9ced147dbff765
 	source_x86_64 = wemeet-3.11.0.402-x86_64.deb::https://updatecdn.meeting.qq.com/cos/9b74d4127a16a011db8cb6300fa5fbc9/TencentMeeting_0300000000_3.11.0.402_x86_64_default.publish.deb
 	sha512sums_x86_64 = 6b4a5a5499fd8a92dbf86ae04990434b3a7ff2ade7d768dbe70dd3f60e347c599281e1aed211673a3a7986f5cb7a014abefec0c859e087c291286467bf8fbe73
 	source_aarch64 = wemeet-3.11.0.402-aarch64.deb::https://updatecdn.meeting.qq.com/cos/ce5d25cc8e8aae8ddd19295bc3b00d5e/TencentMeeting_0300000000_3.11.0.402_arm64_default.publish.deb
diff --git a/PKGBUILD b/PKGBUILD
index a0658ca4de26..9f29fd60b42f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ provides=('wemeet' 'tencent-meeting')
 pkgver=3.11.0.402
 _x86_md5=9b74d4127a16a011db8cb6300fa5fbc9
 _arm_md5=ce5d25cc8e8aae8ddd19295bc3b00d5e
-pkgrel=2
+pkgrel=3
 pkgdesc="Tencent Video Conferencing, tencent meeting 腾讯会议"
 arch=('x86_64' 'aarch64')
 license=('unknown')
@@ -18,7 +18,7 @@ source_aarch64=("${_pkgname}-${pkgver}-aarch64.deb::https://updatecdn.meeting.qq
 source=("${_pkgname}".sh)
 optdepends=('bubblewrap: Fix abnormal text color in dark mode.')
 makedepends=('patchelf')
-sha512sums=('e67d6b8fdd9bd055ba8c2177aca884d803a2473fcfe9faf9b23e5bfd4152115814be066709db1e1dbf62917a36aa99693c5ebd8f23f2858950a3f3b98d6b8136')
+sha512sums=('f49ecb5797786015cb4f715998d25780606a01514e8192e91757c7092e57d68f15caba33edf3afdf65c2795c818fc3180f0cc8e72c856aa2de9ced147dbff765')
 sha512sums_x86_64=('6b4a5a5499fd8a92dbf86ae04990434b3a7ff2ade7d768dbe70dd3f60e347c599281e1aed211673a3a7986f5cb7a014abefec0c859e087c291286467bf8fbe73')
 sha512sums_aarch64=('534657987d8030c0798731d72fade34c40a5863f4dcd289423eb0509115e290ad5507616c19d86e76c25ae5ea82272fe167ef45599f0ad1433531ff72f74ce78')
 
diff --git a/wemeet.sh b/wemeet.sh
index 2ddaeb63a716..ec2b1742b80f 100755
--- a/wemeet.sh
+++ b/wemeet.sh
@@ -4,17 +4,20 @@ export QT_QPA_PLATFORM=xcb
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 export QT_STYLE_OVERRIDE=fusion # 解决使用自带qt情况下，字体颜色全白看不到的问题
 export IBUS_USE_PORTAL=1 # fix ibus
-FONTCONFIG_DIR=$HOME/.config/fontconfig
+FONTCONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/fontconfig"
 unset WAYLAND_DISPLAY
 
 # if pipewire-pulse installed
 if [ -f /usr/bin/pipewire-pulse ]; then
     export PULSE_LATENCY_MSEC=20
-fi;
+fi
 
-if [ -f "/usr/bin/bwrap" ];then
-    mkdir -p $FONTCONFIG_DIR
-    bwrap --dev-bind / / --tmpfs $HOME/.config --ro-bind $FONTCONFIG_DIR $FONTCONFIG_DIR /opt/wemeet/bin/wemeetapp $*;
+if [ -f /usr/bin/bwrap ]; then
+    mkdir -p "$FONTCONFIG_DIR"
+    if [ -f "${XDG_CACHE_HOME:-$HOME/.cache}/icon-cache.kcache" ]; then
+        BIND_KDE_ICON_CACHE="--bind '${XDG_CACHE_HOME:-$HOME/.cache}/icon-cache.kcache' '${XDG_CACHE_HOME:-$HOME/.cache}/icon-cache.kcache'"
+    fi
+    bwrap --new-session --unshare-all --share-net --ro-bind / / --dev-bind /dev /dev --tmpfs "${XDG_CONFIG_HOME:-$HOME/.config}" ${BIND_KDE_ICON_CACHE:-} --bind "${XDG_DATA_HOME:-$HOME/.local/share}/wemeetapp" "${XDG_DATA_HOME:-$HOME/.local/share}/wemeetapp" /opt/wemeet/bin/wemeetapp "$@"
 else
-    exec /opt/wemeet/bin/wemeetapp $*;
-fi;
+    exec /opt/wemeet/bin/wemeetapp "$@"
+fi