summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD28
-rw-r--r--config.json6
-rwxr-xr-xstart.sh9
4 files changed, 32 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f9d478e398e..c314142dd09e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linuxqq-nt-bwrap
pkgdesc = Tencent QQ NT for Linux with bubblewrap wrapper
- pkgver = 2.0.2_510
- pkgrel = 6
+ pkgver = 2.0.3_543
+ pkgrel = 1
url = https://im.qq.com
install = linuxqq.install
arch = x86_64
@@ -28,16 +28,16 @@ pkgbase = linuxqq-nt-bwrap
source = start.sh
source = config.json
source = qq_channel_jsbridge_handler.desktop
- sha256sums = 3e3bab8273fca8f395ea3cb9a4daea0efaeebaf34526767105885b8c99cc1a69
- sha256sums = 8f6fae6fef7869dad2c309d77c9530e29dd737e63deced984f10ac379eeceb03
+ sha256sums = dac7d36c01c987ebca98fa4f58c61336820913baeaa6d39ace86ada8da02cacc
+ sha256sums = bce0e99fd8f7d22742c7fce83b00a230f2408f8d4caa45efd91b35ef0819f64d
sha256sums = e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df
source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/4691a571/QQ-v2.0.1-429_x64.deb
- source_x86_64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/2.0.2-510/2.0.2-510.zip.zip
+ source_x86_64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/2.0.3-543/2.0.3-543.zip.zip
sha256sums_x86_64 = e3aa15ff6ae089b655df3913c6020ca56726bd676995aaf29b313fbd0643ea42
- sha256sums_x86_64 = 26059ccd89a4491083add9291398de658f98fb08a779f7ce46ac7bef8245b53f
+ sha256sums_x86_64 = 2e89bc65faa26ddeed9883b5b7e414dea100ad45b5d569365431e761f00dea84
source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/0186a650/QQ-v2.0.1-453_arm64.deb
- source_aarch64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/2.0.2-510/2.0.2-510.zip.zip
+ source_aarch64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/2.0.3-543/2.0.3-543.zip.zip
sha256sums_aarch64 = 70c286006dae10da06c191b5f0718d17d686a8ef792f6f72215734773f01498b
- sha256sums_aarch64 = 556d3c9f3142dea199a6605694d5d47bb93d0b33e5c6ce8f70a69eb47b2235fc
+ sha256sums_aarch64 = 0267df2233bd03a1bd95e9571956a878c141068b2d4165d318481a3d425c0acd
pkgname = linuxqq-nt-bwrap
diff --git a/PKGBUILD b/PKGBUILD
index 290307aa2de3..854232c87901 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Yidaozhan Ya <yidaozhan_ya@outlook.com>
_pkgname=linuxqq
pkgname=linuxqq-nt-bwrap
-pkgver=2.0.2_510
-pkgrel=6
+pkgver=2.0.3_543
+pkgrel=1
pkgdesc="Tencent QQ NT for Linux with bubblewrap wrapper"
arch=('x86_64' 'aarch64')
url='https://im.qq.com'
@@ -14,24 +14,24 @@ provides=('qq-nt' 'linuxqq-nt')
conflicts=('linuxqq-new')
options=('!strip' '!emptydirs')
install=${_pkgname}.install
-source_x86_64=('https://dldir1.qq.com/qqfile/qq/QQNT/4691a571/QQ-v2.0.1-429_x64.deb' # 本体
- 'https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/2.0.2-510/2.0.2-510.zip.zip') # 热更新补丁
-source_aarch64=('https://dldir1.qq.com/qqfile/qq/QQNT/0186a650/QQ-v2.0.1-453_arm64.deb' # 本体
- 'https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/2.0.2-510/2.0.2-510.zip.zip' ) # 热更新补丁
+source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/4691a571/QQ-v2.0.1-429_x64.deb" # 本体
+ "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${pkgver//_/-}.zip.zip") # 热更新补丁
+source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/0186a650/QQ-v2.0.1-453_arm64.deb" # 本体
+ "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/${pkgver//_/-}/${pkgver//_/-}.zip.zip" ) # 热更新补丁
source=('start.sh' 'config.json' 'qq_channel_jsbridge_handler.desktop')
-sha256sums_x86_64=('e3aa15ff6ae089b655df3913c6020ca56726bd676995aaf29b313fbd0643ea42'
- '26059ccd89a4491083add9291398de658f98fb08a779f7ce46ac7bef8245b53f')
-sha256sums_aarch64=('70c286006dae10da06c191b5f0718d17d686a8ef792f6f72215734773f01498b'
- '556d3c9f3142dea199a6605694d5d47bb93d0b33e5c6ce8f70a69eb47b2235fc')
-sha256sums=('3e3bab8273fca8f395ea3cb9a4daea0efaeebaf34526767105885b8c99cc1a69'
- '8f6fae6fef7869dad2c309d77c9530e29dd737e63deced984f10ac379eeceb03'
- 'e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df')
+sha256sums_x86_64=('e3aa15ff6ae089b655df3913c6020ca56726bd676995aaf29b313fbd0643ea42' # 本体
+ '2e89bc65faa26ddeed9883b5b7e414dea100ad45b5d569365431e761f00dea84') # 热更新补丁
+sha256sums_aarch64=('70c286006dae10da06c191b5f0718d17d686a8ef792f6f72215734773f01498b' # 本体
+ '0267df2233bd03a1bd95e9571956a878c141068b2d4165d318481a3d425c0acd') # 热更新补丁
+sha256sums=('dac7d36c01c987ebca98fa4f58c61336820913baeaa6d39ace86ada8da02cacc' # start.sh
+ 'bce0e99fd8f7d22742c7fce83b00a230f2408f8d4caa45efd91b35ef0819f64d' # config.json
+ 'e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df') # qq_channel_jsbridge_handler.desktop
package() {
# 解压程序包
tar -xJ -f "data.tar.xz" -C "${pkgdir}"
rm -rf "${pkgdir}/opt/QQ/resources/app"
- 7z x "2.0.2-510.zip" -aoa -o"${pkgdir}/opt/QQ/resources/app"
+ 7z x "${pkgver//_/-}.zip" -aoa -o"${pkgdir}/opt/QQ/resources/app"
chmod 755 "${pkgdir}/opt/QQ/resources/app"
# 打包相关处理
diff --git a/config.json b/config.json
index 163b3279da8d..bbcf959eaa3a 100644
--- a/config.json
+++ b/config.json
@@ -1,7 +1,7 @@
{
- "baseVersion": "2.0.2-510",
- "currentVersion": "2.0.2-510",
- "buildVersion": "510",
+ "baseVersion": "2.0.3-543",
+ "currentVersion": "2.0.3-543",
+ "buildVersion": "543",
"skippedVersions": [
],
"inUsePkg": "",
diff --git a/start.sh b/start.sh
index bb355b86665a..68bc39a143a7 100755
--- a/start.sh
+++ b/start.sh
@@ -7,8 +7,8 @@ QQ_APP_DIR="${CONFIG_DIR}/QQ"
DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)"
NEW_DISPLAY="${DISPLAY}"
QQ_HOTUPDATE_DIR="${QQ_APP_DIR}/versions"
-QQ_HOTUPDATE_VERSION="2.0.2-510"
-QQ_PREVIOUS_VERSIONS=("2.0.1-429" "2.0.1-453")
+QQ_HOTUPDATE_VERSION="2.0.3-543"
+QQ_PREVIOUS_VERSIONS=("2.0.1-429" "2.0.1-453" "2.0.2-510")
if [ "${DOWNLOAD_DIR}" == "${HOME}" ]; then
DOWNLOAD_DIR="${HOME}/Downloads"
@@ -16,12 +16,16 @@ if [ "${DOWNLOAD_DIR}" == "${HOME}" ]; then
fi
if [ ! -e "${QQ_APP_DIR}" ]; then mkdir -p "${QQ_APP_DIR}"; fi
if [ ! -e "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" ]; then ln -sfd "/opt/QQ/resources/app" "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}"; fi
+rm -rf "${QQ_HOTUPDATE_DIR}/"**".zip"
# 处理 config.json
if [ ! -f "${QQ_HOTUPDATE_DIR}/config.json" ]; then
cp "/opt/QQ/workarounds/config.json" "${QQ_HOTUPDATE_DIR}/config.json"
else
for VERSION in ${QQ_PREVIOUS_VERSIONS[@]}; do
+ if [ -e "${QQ_HOTUPDATE_DIR}/${VERSION}" ]; then
+ rm -rf "${QQ_HOTUPDATE_DIR}/${VERSION}"
+ fi
if [ ! -z "$(grep -Rn "${VERSION}" "${QQ_HOTUPDATE_DIR}/config.json")" ]; then
cp "/opt/QQ/workarounds/config.json" "${QQ_HOTUPDATE_DIR}/config.json"
break
@@ -37,6 +41,7 @@ bwrap --new-session --die-with-parent --cap-drop ALL --unshare-user-try --unshar
--ro-bind /opt/QQ /opt/QQ \
--dev-bind /dev /dev \
--ro-bind /sys /sys \
+ --ro-bind /etc/passwd /etc/passwd \
--ro-bind /etc/resolv.conf /etc/resolv.conf \
--ro-bind /etc/localtime /etc/localtime \
--proc /proc \