summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jung2022-03-28 15:09:48 +0000
committerPeter Jung2022-03-28 15:09:48 +0000
commita6fbb9206234d63d571137e4f5968723c9640fff (patch)
tree0ee0962735d96c83d6dc298ee502dab912926571
parent147a383c8e7c73a43c67b73517f5b064f4fbd7fc (diff)
downloadaur-a6fbb9206234d63d571137e4f5968723c9640fff.tar.gz
5.17.1-1
-rwxr-xr-x.SRCINFO22
-rw-r--r--PKGBUILD198
2 files changed, 117 insertions, 103 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 794591aef709..0336b2211b3d 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cacule
pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.17.0
- pkgrel = 5
+ pkgver = 5.17.1
+ pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -24,7 +24,7 @@ pkgbase = linux-cacule
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.1.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/sched/0001-cacULE.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-anbox.patch
@@ -33,7 +33,7 @@ pkgbase = linux-cacule
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-btrfs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-cachy.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-cfi.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-clr.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-clearlinux.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-cpu.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-cpupower-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-fixes-miscellaneous.patch
@@ -41,10 +41,12 @@ pkgbase = linux-cacule
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-pf-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-hwmon.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-MG-LRU.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-spf-lru-patches.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-rcu.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-v4l2loopback.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-xanmod.patch
source = auto-cpu-optimization.sh
- sha256sums = 555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1
+ sha256sums = 7cd5c5d432a25f45060868ce6a8578890e550158a2f779c4a20804b551e84c24
sha256sums = 12528c68981695b4b72c6c605f0a5405f032f24540467f164d5816ffee657542
sha256sums = 33c0d70410ac7e0fccce5796aacea76838b048c79bbdc92eaf2fdbb5eabd4e0d
sha256sums = b81d81435984662cc5948e5e26389402d6803ceb4cd3fe346f632fdf4c81f9ed
@@ -53,14 +55,16 @@ pkgbase = linux-cacule
sha256sums = 1ea4823c2f0f9fc42f943703f146fa68b2c94f05aef6e284ec4d1fea56dd0572
sha256sums = 2ccacea819390dfa67251b0c211804bcc03a079a9970fd6e147bb09248e75b6f
sha256sums = fbc98ae990ef1f75ac5a11eb822e01503b5cc09b412f3b3d2e03adde04123068
- sha256sums = 8ea353787ab41f9d2566cc166d763b1cd4aa33a302df7f0f39c1a3a69aaa56e6
+ sha256sums = d027022d216dcc26ab7f47f803ee3a2aab42e6d28b5f268045a9f000547c8490
sha256sums = d8be9d58186b09cd6d8ac0633889e9483f88c59702579b26d45d0a42a906de8f
sha256sums = c92373359de38b4ac831ab69f57c6bb962a14d214beba55593616c9077003aff
sha256sums = 6d392c1ac65810c5a532f107536919e8675436b34cea421c0a6052d28cf9c84e
- sha256sums = 3439e178798812c2f6d72b2e6e596b7869f4bf9b1e6fce4688359fc6ef0303d9
- sha256sums = 0ee3af3d964de63c0f90fe4622b0b1ccfd240e547e797f3a4be8c1b1c0b0ea98
+ sha256sums = ccdc989e3600ec098060696fc87168b655ebbaaaac00d2b424f56c1697c50abb
+ sha256sums = be6a27b69fd900d533a3f818b2173b1464383abcf363cc46377f37e5274598e5
sha256sums = 9675c0ab1914bc9d31b520089bd40e8d5f311f6d481e737f7f3f6e122e7c4eb4
- sha256sums = ba9c6058daafa76dfe8585da638da6434d2f7ce65b54623a002b6581a0ad553a
+ sha256sums = 0d91172d863ffd56a676619632075b03a18416e55ed3c66f79dfcbac19eefedb
+ sha256sums = 0c71a8f1cf99f01d2f6fdafde8b5b96e1f56b686b505aa2e18396855966c11f9
+ sha256sums = 91b8eebde0f0704808b16e0c7a64be791d9c93319ecb05cb4cdb35dcce7387f3
sha256sums = 8490dd7d0b9f6731187e682e90e77fbd191533de339a008a8d5009046ef4f822
sha256sums = 66c4c8935a995f552fa612ad8d039149559144c2ea5b54f873d7eebebd5c18f6
sha256sums = 65ec9ac5b8b28d5b61df1c72498059be2e7cb1f9b965bac0e4ffed3c05520b2b
diff --git a/PKGBUILD b/PKGBUILD
index e5a47c3304da..8e26f1d61685 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,6 +73,8 @@ _lru_enable=y
### Enable DAMON
_damon=y
+_spf_enable=y
+
### Enable Linux Random Number Generator
_lrng_enable=y
@@ -99,7 +101,7 @@ _zstd_level='ultra'
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_module_level='normal'
+_zstd_level_value='normal'
# Enable zram/zswap ZSTD compression
_zstd_compression=y
@@ -112,9 +114,6 @@ _use_llvm_lto=
# Enable it for using the LLVM CFI PATCH for a better security
_use_cfi=
-## Enable PGO (patch is failing when cfi is also used)
-#_use_pgo=
-
if [ -n "$_use_llvm_lto" ]; then
pkgbase=linux-cacule-lto
@@ -122,18 +121,18 @@ else
pkgbase=linux-cacule
fi
_major=5.17
-_minor=0
+_minor=1
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
_stable=${_major}.${_minor}
#_stable=${_major}
#_stablerc=${_major}-${_rcver}
-#_srcname=linux-${_stable}
-_srcname=linux-${_major}
+_srcname=linux-${_stable}
+#_srcname=linux-${_major}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux cacULE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=5
+pkgrel=1
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@@ -156,7 +155,7 @@ source=(
"${_patchsource}/0001-btrfs-patches.patch"
"${_patchsource}/0001-cachy.patch"
"${_patchsource}/0001-cfi.patch"
- "${_patchsource}/0001-clr.patch"
+ "${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-cpupower-patches.patch"
"${_patchsource}/0001-fixes-miscellaneous.patch"
@@ -164,6 +163,8 @@ source=(
"${_patchsource}/0001-pf-patches.patch"
"${_patchsource}/0001-hwmon.patch"
"${_patchsource}/0001-MG-LRU.patch"
+ "${_patchsource}/0001-spf-lru-patches.patch"
+ "${_patchsource}/0001-rcu.patch"
"${_patchsource}/0001-v4l2loopback.patch"
"${_patchsource}/0001-xanmod.patch"
# "${_patchsource}/0001-zen-patches.patch"
@@ -369,12 +370,16 @@ prepare() {
### Enable protect mappings under memory pressure
- if [ -n "$_mm_protect" ]; then
- echo "Enabling protect file mappings under memory pressure..."
- scripts/config --set-val CONFIG_ANON_MIN_KBYTES 0
- scripts/config --set-val CONFIG_CLEAN_LOW_KBYTES 524288
- scripts/config --set-val CONFIG_CLEAN_MIN_KBYTES 0
- fi
+ if [ -n "$_mm_protect" ]; then
+ echo "Enabling protect file mappings under memory pressure..."
+ scripts/config --enable CONFIG_UNEVICTABLE_FILE
+ scripts/config --set-val CONFIG_UNEVICTABLE_FILE_KBYTES_LOW 0
+ scripts/config --set-val CONFIG_UNEVICTABLE_FILE_KBYTES_MIN 0
+ echo "Enabling protect anonymous mappings under memory pressure..."
+ scripts/config --enable CONFIG_UNEVICTABLE_ANON
+ scripts/config --set-val CONFIG_UNEVICTABLE_ANON_KBYTES_LOW 0
+ scripts/config --set-val CONFIG_UNEVICTABLE_ANON_KBYTES_MIN 0
+ fi
### Enable SPF
if [ -n "$_spf_enable" ]; then
@@ -404,52 +409,51 @@ prepare() {
### Enable Linux Random Number Generator
if [ -n "$_lrng_enable" ]; then
echo "Enabling Linux Random Number Generator ..."
- echo "Enabling Linux Random Number Generator with pfkernel config..."
- scripts/config --enable CONFIG_LRNG
- scripts/config --enable CONFIG_LRNG_OVERSAMPLE_ENTROPY_SOURCES
- scripts/config --set-val CONFIG_CONFIG_LRNG_OVERSAMPLE_ES_BITS 64
- scripts/config --set-val CONFIG_LRNG_SEED_BUFFER_INIT_ADD_BITS 128
- scripts/config --enable CONFIG_LRNG_IRQ
- scripts/config --enable CONFIG_LRNG_CONTINUOUS_COMPRESSION_ENABLED
- scripts/config --disable CONFIG_LRNG_CONTINUOUS_COMPRESSION_DISABLED
- scripts/config --enable CONFIG_LRNG_ENABLE_CONTINUOUS_COMPRESSION
- scripts/config --enable CONFIG_LRNG_SWITCHABLE_CONTINUOUS_COMPRESSION
- scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_512
- scripts/config --enable CONFIG_LRNG_COLLECTION_SIZE_1024
- scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_2048
- scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_4096
- scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_8192
- scripts/config --set-val CONFIG_LRNG_COLLECTION_SIZE 1024
- scripts/config --enable CONFIG_LRNG_HEALTH_TESTS
- scripts/config --set-val CONFIG_LRNG_RCT_CUTOFF 31
- scripts/config --set-val CONFIG_LRNG_APT_CUTOFF 325
- scripts/config --set-val CONFIG_LRNG_IRQ_ENTROPY_RATE 256
- scripts/config --enable CONFIG_LRNG_JENT
- scripts/config --set-val CONFIG_LRNG_JENT_ENTROPY_RATE 16
- scripts/config --enable CONFIG_LRNG_CPU
- scripts/config --set-val CONFIG_LRNG_CPU_ENTROPY_RATE 8
- scripts/config --enable CONFIG_LRNG_DRNG_SWITCH
- scripts/config --enable CONFIG_LRNG_KCAPI_HASH
- scripts/config --module CONFIG_LRNG_DRBG
- scripts/config --module CONFIG_LRNG_KCAPI
- scripts/config --enable CONFIG_LRNG_TESTING_MENU
- scripts/config --disable CONFIG_LRNG_RAW_HIRES_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_JIFFIES_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_IRQ_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_IRQFLAGS_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_RETIP_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_REGS_ENTROPY
- scripts/config --disable CONFIG_LRNG_RAW_ARRAY
- scripts/config --disable CONFIG_LRNG_IRQ_PERF
- scripts/config --disable CONFIG_LRNG_ACVT_HASH
- scripts/config --enable CONFIG_LRNG_RUNTIME_ES_CONFIG
- scripts/config --disable CONFIG_LRNG_RUNTIME_MAX_WO_RESEED_CONFIG
- scripts/config --disable CONFIG_LRNG_TEST_CPU_ES_COMPRESSION
- scripts/config --enable CONFIG_LRNG_SELFTEST
- scripts/config --disable CONFIG_LRNG_SELFTEST_PANIC
+ scripts/config --disable CONFIG_RANDOM_DEFAULT_IMPL
+ scripts/config --enable CONFIG_LRNG
+ scripts/config --enable CONFIG_LRNG_OVERSAMPLE_ENTROPY_SOURCES
+ scripts/config --set-val CONFIG_CONFIG_LRNG_OVERSAMPLE_ES_BITS 64
+ scripts/config --set-val CONFIG_LRNG_SEED_BUFFER_INIT_ADD_BITS 128
+ scripts/config --enable CONFIG_LRNG_IRQ
+ scripts/config --enable CONFIG_LRNG_CONTINUOUS_COMPRESSION_ENABLED
+ scripts/config --disable CONFIG_LRNG_CONTINUOUS_COMPRESSION_DISABLED
+ scripts/config --enable CONFIG_LRNG_ENABLE_CONTINUOUS_COMPRESSION
+ scripts/config --enable CONFIG_LRNG_SWITCHABLE_CONTINUOUS_COMPRESSION
+ scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_512
+ scripts/config --enable CONFIG_LRNG_COLLECTION_SIZE_1024
+ scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_2048
+ scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_4096
+ scripts/config --disable CONFIG_LRNG_COLLECTION_SIZE_8192
+ scripts/config --set-val CONFIG_LRNG_COLLECTION_SIZE 1024
+ scripts/config --enable CONFIG_LRNG_HEALTH_TESTS
+ scripts/config --set-val CONFIG_LRNG_RCT_CUTOFF 31
+ scripts/config --set-val CONFIG_LRNG_APT_CUTOFF 325
+ scripts/config --set-val CONFIG_LRNG_IRQ_ENTROPY_RATE 256
+ scripts/config --enable CONFIG_LRNG_JENT
+ scripts/config --set-val CONFIG_LRNG_JENT_ENTROPY_RATE 16
+ scripts/config --enable CONFIG_LRNG_CPU
+ scripts/config --set-val CONFIG_LRNG_CPU_ENTROPY_RATE 8
+ scripts/config --enable CONFIG_LRNG_DRNG_SWITCH
+ scripts/config --enable CONFIG_LRNG_KCAPI_HASH
+ scripts/config --module CONFIG_LRNG_DRBG
+ scripts/config --module CONFIG_LRNG_KCAPI
+ scripts/config --enable CONFIG_LRNG_TESTING_MENU
+ scripts/config --disable CONFIG_LRNG_RAW_HIRES_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_JIFFIES_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_IRQ_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_IRQFLAGS_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_RETIP_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_REGS_ENTROPY
+ scripts/config --disable CONFIG_LRNG_RAW_ARRAY
+ scripts/config --disable CONFIG_LRNG_IRQ_PERF
+ scripts/config --disable CONFIG_LRNG_ACVT_HASH
+ scripts/config --enable CONFIG_LRNG_RUNTIME_ES_CONFIG
+ scripts/config --disable CONFIG_LRNG_RUNTIME_MAX_WO_RESEED_CONFIG
+ scripts/config --disable CONFIG_LRNG_TEST_CPU_ES_COMPRESSION
+ scripts/config --enable CONFIG_LRNG_SELFTEST
+ scripts/config --disable CONFIG_LRNG_SELFTEST_PANIC
fi
-
### Selecting the ZSTD compression level
if [ "$_zstd_level" = "ultra" ]; then
echo "Enabling highest ZSTD compression ratio..."
@@ -469,36 +473,40 @@ prepare() {
exit
fi
- ### Selecting the ZSTD module compression level
- if [ "$_zstd_module_level" = "ultra" ]; then
- echo "Enabling highest ZSTD module compression ratio..."
- scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19
- scripts/config --enable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA
- scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22
- elif [ "$_zstd_module_level" = "normal" ]; then
- echo "Enabling standard ZSTD module compression ratio..."
- scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19
- scripts/config --disable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA
- else
- if [ -n "$_zstd_module_level" ]; then
- error "The value $_zstd_module_level is invalid. Choose the correct one again."
- else
- error "The value is empty. Choose the correct one again."
- fi
- error "Selecting the ZSTD module compression level failed!"
- exit
- fi
-
- ### Enable zram/zswap ZSTD compression
- if [ -n "$_zstd_compression" ]; then
- echo "Enabling zram ZSTD compression..."
- scripts/config --disable CONFIG_ZRAM_DEF_COMP_LZORLE
- scripts/config --enable CONFIG_ZRAM_DEF_COMP_ZSTD
- scripts/config --set-str CONFIG_ZRAM_DEF_COMP zstd
- echo "Enabling zswap ZSTD compression..."
- scripts/config --disable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4
- scripts/config --enable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD
- scripts/config --set-str CONFIG_ZSWAP_COMPRESSOR_DEFAULT zstd
+ ### Selecting the ZSTD modules and kernel compression level
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules compression ratio..."
+ scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19
+ scripts/config --enable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA
+ scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22
+ echo "Enabling highest ZSTD kernel compression ratio..."
+ scripts/config --set-val CONFIG_ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules compression ratio..."
+ scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19
+ scripts/config --disable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA
+ echo "Enabling standard ZSTD kernel compression ratio..."
+ scripts/config --set-val CONFIG_ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Selecting the ZSTD modules and kernel compression level failed!"
+ exit
+ fi
+
+ ### Enable zram/zswap ZSTD compression
+ if [ -n "$_zstd_swap_compression" ]; then
+ echo "Enabling zram ZSTD compression..."
+ scripts/config --disable CONFIG_ZRAM_DEF_COMP_LZORLE
+ scripts/config --enable CONFIG_ZRAM_DEF_COMP_ZSTD
+ scripts/config --set-str CONFIG_ZRAM_DEF_COMP zstd
+ echo "Enabling zswap ZSTD compression..."
+ scripts/config --disable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4
+ scripts/config --enable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD
+ scripts/config --set-str CONFIG_ZSWAP_COMPRESSOR_DEFAULT zstd
fi
@@ -676,7 +684,7 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1'
+sha256sums=('7cd5c5d432a25f45060868ce6a8578890e550158a2f779c4a20804b551e84c24'
'12528c68981695b4b72c6c605f0a5405f032f24540467f164d5816ffee657542'
'33c0d70410ac7e0fccce5796aacea76838b048c79bbdc92eaf2fdbb5eabd4e0d'
'b81d81435984662cc5948e5e26389402d6803ceb4cd3fe346f632fdf4c81f9ed'
@@ -685,14 +693,16 @@ sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1'
'1ea4823c2f0f9fc42f943703f146fa68b2c94f05aef6e284ec4d1fea56dd0572'
'2ccacea819390dfa67251b0c211804bcc03a079a9970fd6e147bb09248e75b6f'
'fbc98ae990ef1f75ac5a11eb822e01503b5cc09b412f3b3d2e03adde04123068'
- '8ea353787ab41f9d2566cc166d763b1cd4aa33a302df7f0f39c1a3a69aaa56e6'
+ 'd027022d216dcc26ab7f47f803ee3a2aab42e6d28b5f268045a9f000547c8490'
'd8be9d58186b09cd6d8ac0633889e9483f88c59702579b26d45d0a42a906de8f'
'c92373359de38b4ac831ab69f57c6bb962a14d214beba55593616c9077003aff'
'6d392c1ac65810c5a532f107536919e8675436b34cea421c0a6052d28cf9c84e'
- '3439e178798812c2f6d72b2e6e596b7869f4bf9b1e6fce4688359fc6ef0303d9'
- '0ee3af3d964de63c0f90fe4622b0b1ccfd240e547e797f3a4be8c1b1c0b0ea98'
+ 'ccdc989e3600ec098060696fc87168b655ebbaaaac00d2b424f56c1697c50abb'
+ 'be6a27b69fd900d533a3f818b2173b1464383abcf363cc46377f37e5274598e5'
'9675c0ab1914bc9d31b520089bd40e8d5f311f6d481e737f7f3f6e122e7c4eb4'
- 'ba9c6058daafa76dfe8585da638da6434d2f7ce65b54623a002b6581a0ad553a'
+ '0d91172d863ffd56a676619632075b03a18416e55ed3c66f79dfcbac19eefedb'
+ '0c71a8f1cf99f01d2f6fdafde8b5b96e1f56b686b505aa2e18396855966c11f9'
+ '91b8eebde0f0704808b16e0c7a64be791d9c93319ecb05cb4cdb35dcce7387f3'
'8490dd7d0b9f6731187e682e90e77fbd191533de339a008a8d5009046ef4f822'
'66c4c8935a995f552fa612ad8d039149559144c2ea5b54f873d7eebebd5c18f6'
'65ec9ac5b8b28d5b61df1c72498059be2e7cb1f9b965bac0e4ffed3c05520b2b')