Compare commits
No commits in common. "a18f9f79d4926746c8a646c8ef380d7eb52d140e" and "40d44afdcca90b8b95e11feac87f62a8c09af518" have entirely different histories.
a18f9f79d4
...
40d44afdcc
8 changed files with 17 additions and 21 deletions
|
@ -1,6 +1,6 @@
|
||||||
pkgbase = clonezilla-unstable
|
pkgbase = clonezilla-unstable
|
||||||
pkgdesc = ncurses partition and disk imaging/cloning program
|
pkgdesc = ncurses partition and disk imaging/cloning program
|
||||||
pkgver = 5.6.12
|
pkgver = 5.6.11
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://clonezilla.org
|
url = https://clonezilla.org
|
||||||
arch = any
|
arch = any
|
||||||
|
@ -29,9 +29,9 @@ pkgbase = clonezilla-unstable
|
||||||
provides = clonezilla
|
provides = clonezilla
|
||||||
conflicts = clonezilla
|
conflicts = clonezilla
|
||||||
backup = etc/drbl/drbl-ocs.conf
|
backup = etc/drbl/drbl-ocs.conf
|
||||||
source = https://free.nchc.org.tw/drbl-core/src/unstable/clonezilla-5.6.12.tar.xz
|
source = https://free.nchc.org.tw/drbl-core/src/unstable/clonezilla-5.6.11.tar.xz
|
||||||
source = usrbin.patch
|
source = usrbin.patch
|
||||||
sha512sums = 04705403e9b052dbfb07a5bfb345f3281502487d5d00bfef83869640778b51b6351aaa11f82218653f8886225cf9b35d5af4348668f0d54246554a7cc31ab70b
|
sha512sums = a085834ee885ca2b5e7a3a2015b172e296a123336468a7d55fa59ccd220c304eaade444367ad0f5a036570e031a13f4bb116400410aa81fb35aa29cc4bce7d55
|
||||||
sha512sums = 39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac
|
sha512sums = 39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac
|
||||||
|
|
||||||
pkgname = clonezilla-unstable
|
pkgname = clonezilla-unstable
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
pkgname=clonezilla-unstable
|
pkgname=clonezilla-unstable
|
||||||
_pkgname=clonezilla
|
_pkgname=clonezilla
|
||||||
pkgver=5.6.12
|
pkgver=5.6.11
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="ncurses partition and disk imaging/cloning program"
|
pkgdesc="ncurses partition and disk imaging/cloning program"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
@ -16,7 +16,7 @@ conflicts=("${_pkgname}")
|
||||||
provides=("${_pkgname}")
|
provides=("${_pkgname}")
|
||||||
source=("https://free.nchc.org.tw/drbl-core/src/unstable/${_pkgname}-${pkgver}.tar.xz"
|
source=("https://free.nchc.org.tw/drbl-core/src/unstable/${_pkgname}-${pkgver}.tar.xz"
|
||||||
'usrbin.patch')
|
'usrbin.patch')
|
||||||
sha512sums=('04705403e9b052dbfb07a5bfb345f3281502487d5d00bfef83869640778b51b6351aaa11f82218653f8886225cf9b35d5af4348668f0d54246554a7cc31ab70b'
|
sha512sums=('a085834ee885ca2b5e7a3a2015b172e296a123336468a7d55fa59ccd220c304eaade444367ad0f5a036570e031a13f4bb116400410aa81fb35aa29cc4bce7d55'
|
||||||
'39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac')
|
'39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = discord-electron-openasar
|
pkgbase = discord-electron-openasar
|
||||||
pkgdesc = Discord packaged with OpenAsar using system provided electron (v31) for increased security and performance
|
pkgdesc = Discord packaged with OpenAsar using system provided electron (v31) for increased security and performance
|
||||||
pkgver = 0.0.59+828
|
pkgver = 0.0.59+828
|
||||||
pkgrel = 2
|
pkgrel = 1
|
||||||
url = https://discord.com
|
url = https://discord.com
|
||||||
install = discord-electron-openasar.install
|
install = discord-electron-openasar.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
@ -27,7 +27,7 @@ pkgbase = discord-electron-openasar
|
||||||
source = git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c
|
source = git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c
|
||||||
sha512sums = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
|
sha512sums = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
|
||||||
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
||||||
sha512sums = ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938
|
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
||||||
sha512sums = 36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22
|
sha512sums = 36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22
|
||||||
|
|
||||||
pkgname = discord-electron-openasar
|
pkgname = discord-electron-openasar
|
||||||
|
|
|
@ -4,7 +4,7 @@ pkgname=discord-electron-openasar
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
pkgver=0.0.59+828
|
pkgver=0.0.59+828
|
||||||
_pkgver=${pkgver%%+*}
|
_pkgver=${pkgver%%+*}
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
_electronver=31
|
_electronver=31
|
||||||
_electronname="electron${_electronver}"
|
_electronname="electron${_electronver}"
|
||||||
pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
|
pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
|
||||||
|
@ -30,7 +30,7 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.
|
||||||
"git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c")
|
"git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c")
|
||||||
sha512sums=('43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132'
|
sha512sums=('43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132'
|
||||||
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
||||||
'ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938'
|
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f'
|
||||||
'36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22')
|
'36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22')
|
||||||
|
|
||||||
# just in case I get the version wrong
|
# just in case I get the version wrong
|
||||||
|
|
|
@ -41,10 +41,9 @@ found_issigned_by_discord_test = False
|
||||||
found_issigned_by_discord_je = False
|
found_issigned_by_discord_je = False
|
||||||
found_already_patched = False
|
found_already_patched = False
|
||||||
je_location = None
|
je_location = None
|
||||||
je_size = 0
|
|
||||||
|
|
||||||
# We are looking for a call to IsSignedByDiscord, followed by a test, followed by a je.
|
# We are looking for a call to IsSignedByDiscord, followed by a test, followed by a je.
|
||||||
# Then we replace the je with nops.
|
# Then we patch the je into a two byte nop.
|
||||||
|
|
||||||
md = Cs(CS_ARCH_X86, CS_MODE_64)
|
md = Cs(CS_ARCH_X86, CS_MODE_64)
|
||||||
md.detail = True
|
md.detail = True
|
||||||
|
@ -62,7 +61,6 @@ for i in md.disasm(krisp_initialize, krisp_initialize_address):
|
||||||
if found_issigned_by_discord_test:
|
if found_issigned_by_discord_test:
|
||||||
found_issigned_by_discord_je = True
|
found_issigned_by_discord_je = True
|
||||||
je_location = i.address
|
je_location = i.address
|
||||||
je_size = len(i.bytes)
|
|
||||||
break
|
break
|
||||||
|
|
||||||
if i.id == X86_INS_NOP:
|
if i.id == X86_INS_NOP:
|
||||||
|
@ -76,7 +74,7 @@ if je_location:
|
||||||
shutil.copyfile(executable, executable + ".orig")
|
shutil.copyfile(executable, executable + ".orig")
|
||||||
f = open(executable, 'rb+')
|
f = open(executable, 'rb+')
|
||||||
f.seek(je_location - address_to_file)
|
f.seek(je_location - address_to_file)
|
||||||
f.write(b'\x90' * je_size) # je can be larger than 2 bytes given a large enough displacement :(
|
f.write(b'\x66\x90') # Two byte NOP
|
||||||
f.close()
|
f.close()
|
||||||
else:
|
else:
|
||||||
if found_already_patched:
|
if found_already_patched:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = discord-electron
|
pkgbase = discord-electron
|
||||||
pkgdesc = Discord using system provided electron (v31) for increased security and performance
|
pkgdesc = Discord using system provided electron (v31) for increased security and performance
|
||||||
pkgver = 0.0.59
|
pkgver = 0.0.59
|
||||||
pkgrel = 2
|
pkgrel = 1
|
||||||
url = https://discord.com
|
url = https://discord.com
|
||||||
install = discord-electron.install
|
install = discord-electron.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
@ -23,6 +23,6 @@ pkgbase = discord-electron
|
||||||
source = krisp-patcher.py
|
source = krisp-patcher.py
|
||||||
sha512sums = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
|
sha512sums = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
|
||||||
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
||||||
sha512sums = ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938
|
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
||||||
|
|
||||||
pkgname = discord-electron
|
pkgname = discord-electron
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
pkgname=discord-electron
|
pkgname=discord-electron
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
pkgver=0.0.59
|
pkgver=0.0.59
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
_electronver=31
|
_electronver=31
|
||||||
_electronname="electron${_electronver}"
|
_electronname="electron${_electronver}"
|
||||||
pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
|
pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
|
||||||
|
@ -26,7 +26,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta
|
||||||
'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
||||||
sha512sums=('43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132'
|
sha512sums=('43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132'
|
||||||
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
||||||
'ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938')
|
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
# prepare launcher script
|
# prepare launcher script
|
||||||
|
|
|
@ -41,10 +41,9 @@ found_issigned_by_discord_test = False
|
||||||
found_issigned_by_discord_je = False
|
found_issigned_by_discord_je = False
|
||||||
found_already_patched = False
|
found_already_patched = False
|
||||||
je_location = None
|
je_location = None
|
||||||
je_size = 0
|
|
||||||
|
|
||||||
# We are looking for a call to IsSignedByDiscord, followed by a test, followed by a je.
|
# We are looking for a call to IsSignedByDiscord, followed by a test, followed by a je.
|
||||||
# Then we replace the je with nops.
|
# Then we patch the je into a two byte nop.
|
||||||
|
|
||||||
md = Cs(CS_ARCH_X86, CS_MODE_64)
|
md = Cs(CS_ARCH_X86, CS_MODE_64)
|
||||||
md.detail = True
|
md.detail = True
|
||||||
|
@ -62,7 +61,6 @@ for i in md.disasm(krisp_initialize, krisp_initialize_address):
|
||||||
if found_issigned_by_discord_test:
|
if found_issigned_by_discord_test:
|
||||||
found_issigned_by_discord_je = True
|
found_issigned_by_discord_je = True
|
||||||
je_location = i.address
|
je_location = i.address
|
||||||
je_size = len(i.bytes)
|
|
||||||
break
|
break
|
||||||
|
|
||||||
if i.id == X86_INS_NOP:
|
if i.id == X86_INS_NOP:
|
||||||
|
@ -76,7 +74,7 @@ if je_location:
|
||||||
shutil.copyfile(executable, executable + ".orig")
|
shutil.copyfile(executable, executable + ".orig")
|
||||||
f = open(executable, 'rb+')
|
f = open(executable, 'rb+')
|
||||||
f.seek(je_location - address_to_file)
|
f.seek(je_location - address_to_file)
|
||||||
f.write(b'\x90' * je_size) # je can be larger than 2 bytes given a large enough displacement :(
|
f.write(b'\x66\x90') # Two byte NOP
|
||||||
f.close()
|
f.close()
|
||||||
else:
|
else:
|
||||||
if found_already_patched:
|
if found_already_patched:
|
||||||
|
|
Loading…
Reference in a new issue