diff --git a/discord-electron-openasar/.SRCINFO b/discord-electron-openasar/.SRCINFO index ccc2131..0c15cb3 100644 --- a/discord-electron-openasar/.SRCINFO +++ b/discord-electron-openasar/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron-openasar - pkgdesc = Discord packaged with OpenAsar using system provided electron (v24) for increased security and performance + pkgdesc = Discord packaged with OpenAsar using system provided electron (v22) for increased security and performance pkgver = 0.0.29+812 - pkgrel = 2 + pkgrel = 1 url = https://discord.com install = discord-electron-openasar.install arch = x86_64 @@ -11,7 +11,7 @@ pkgbase = discord-electron-openasar makedepends = nodejs makedepends = curl makedepends = python-html2text - depends = electron24 + depends = electron22 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -24,7 +24,7 @@ pkgbase = discord-electron-openasar source = discord-launcher.sh source = git+https://github.com/goosemod/openasar.git#commit=85220650bde84ff1b27f496da5d7a9cbc995874c sha512sums = 38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0 - sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab + sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826 sha512sums = SKIP pkgname = discord-electron-openasar diff --git a/discord-electron-openasar/PKGBUILD b/discord-electron-openasar/PKGBUILD index 68c294a..159052b 100644 --- a/discord-electron-openasar/PKGBUILD +++ b/discord-electron-openasar/PKGBUILD @@ -6,10 +6,10 @@ pkgname=discord-electron-openasar _pkgname=discord -_electron=24 +_electron=22 pkgver=0.0.29+812 _pkgver=${pkgver%%+*} -pkgrel=2 +pkgrel=1 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -30,10 +30,11 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}. 'discord-launcher.sh' "git+https://github.com/goosemod/openasar.git#commit=85220650bde84ff1b27f496da5d7a9cbc995874c") sha512sums=('38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0' - 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab' + 'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826' 'SKIP') -_krisp_b2sum='09db0a3b1e736049f39d8fb6c726b6468e725e503dc9109ebb17930d68007cc3818c7123ad836c36df704da9c803f944b77b3412a1b0418552c87be56ed11604' +# Krisp patch stopped working, will update later +_krisp_b2sum='' # just in case I get the version wrong pkgver() { diff --git a/discord-electron-openasar/discord-launcher.sh b/discord-electron-openasar/discord-launcher.sh index 86fc394..6012a36 100644 --- a/discord-electron-openasar/discord-launcher.sh +++ b/discord-electron-openasar/discord-launcher.sh @@ -12,8 +12,8 @@ krisp_b2=@KRISPB2@ if hash rizin &> /dev/null; then # Patch Krisp binary to ignore signature check if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then - addr=$(rz-find -x '4881ec00010000' "${krisp_bin}" | head -n1) - rizin -q -w -c "s $addr + 0x30 ; wao nop" "${krisp_bin}" &> /dev/null + addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1) + rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null fi fi diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO index ba4e272..a192c38 100644 --- a/discord-electron/.SRCINFO +++ b/discord-electron/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v24) for increased security and performance + pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.29 - pkgrel = 2 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron24 + depends = electron22 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.29/discord-0.0.29.tar.gz source = discord-launcher.sh sha512sums = 38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0 - sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab + sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826 pkgname = discord-electron diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD index d1c1db7..360c1a3 100644 --- a/discord-electron/PKGBUILD +++ b/discord-electron/PKGBUILD @@ -13,9 +13,9 @@ pkgname=discord-electron _pkgname=discord -_electron=24 +_electron=22 pkgver=0.0.29 -pkgrel=2 +pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -35,9 +35,10 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0' - 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') + 'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826') -_krisp_b2sum='09db0a3b1e736049f39d8fb6c726b6468e725e503dc9109ebb17930d68007cc3818c7123ad836c36df704da9c803f944b77b3412a1b0418552c87be56ed11604' +# Krisp patch stopped working, will update later +_krisp_b2sum='' prepare() { # prepare launcher script diff --git a/discord-electron/discord-launcher.sh b/discord-electron/discord-launcher.sh index 86fc394..6012a36 100644 --- a/discord-electron/discord-launcher.sh +++ b/discord-electron/discord-launcher.sh @@ -12,8 +12,8 @@ krisp_b2=@KRISPB2@ if hash rizin &> /dev/null; then # Patch Krisp binary to ignore signature check if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then - addr=$(rz-find -x '4881ec00010000' "${krisp_bin}" | head -n1) - rizin -q -w -c "s $addr + 0x30 ; wao nop" "${krisp_bin}" &> /dev/null + addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1) + rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null fi fi