From f3b64a26ed9d0b7911072adb8312c23c1c9cbd0f Mon Sep 17 00:00:00 2001
From: Mo 森 <rmnscnce@ya.ru>
Date: Mar 22 2022 02:37:50 +0000
Subject: kernel-xanmod-edge:5.17.0-xm1.0 + kernel-xanmod-exptl:5.17.0-xm1.0e20220322


---

diff --git a/dist_src/fedora-config.diff b/dist_src/fedora-config.diff
index 24576f4..71bd859 100644
--- a/dist_src/fedora-config.diff
+++ b/dist_src/fedora-config.diff
@@ -1,37 +1,22 @@
 29a30
-> # CONFIG_UAPI_HEADER_TEST is not set
-159c160,161
-< # CONFIG_IKCONFIG is not set
----
-> CONFIG_IKCONFIG=m
-> CONFIG_IKCONFIG_PROC=y
-899c901
-< CONFIG_MODULE_SIG_ALL=y
----
-> # CONFIG_MODULE_SIG_ALL is not set
-902c904
-< # CONFIG_MODULE_SIG_SHA256 is not set
----
-> CONFIG_MODULE_SIG_SHA256=y
-904,905c906,907
-< CONFIG_MODULE_SIG_SHA512=y
-< CONFIG_MODULE_SIG_HASH="sha512"
----
-> # CONFIG_MODULE_SIG_SHA512 is not set
-> CONFIG_MODULE_SIG_HASH="sha256"
-6086d6087
+> CONFIG_UAPI_HEADER_TEST=y
+6158d6158
 < # CONFIG_VIDEO_PCI_SKELETON is not set
-10152c10153
+10308c10308
 < CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 ---
 > # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
-10550,10551c10551,10552
+10659c10659
+< CONFIG_LSM_MMAP_MIN_ADDR=0
+---
+> CONFIG_LSM_MMAP_MIN_ADDR=65535
+10711,10712c10711,10712
 < CONFIG_IMA_DEFAULT_HASH_SHA1=y
 < # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
 ---
 > # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
 > CONFIG_IMA_DEFAULT_HASH_SHA256=y
-10553,10555c10554,10556
+10714,10716c10714,10716
 < CONFIG_IMA_DEFAULT_HASH="sha1"
 < # CONFIG_IMA_WRITE_POLICY is not set
 < # CONFIG_IMA_READ_POLICY is not set
@@ -39,46 +24,45 @@
 > CONFIG_IMA_DEFAULT_HASH="sha256"
 > CONFIG_IMA_WRITE_POLICY=y
 > CONFIG_IMA_READ_POLICY=y
-10557c10558
+10718c10718
 < # CONFIG_IMA_ARCH_POLICY is not set
 ---
 > CONFIG_IMA_ARCH_POLICY=y
-10562c10563
+10723c10723
 < # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
 ---
 > CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
-10567c10568
+10728c10728
 < # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 ---
 > CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
-10569,10574c10570,10571
-< CONFIG_EVM=y
-< CONFIG_EVM_ATTR_FSUUID=y
+10732,10733c10732
 < CONFIG_EVM_EXTRA_SMACK_XATTRS=y
 < CONFIG_EVM_ADD_XATTRS=y
-< # CONFIG_EVM_LOAD_X509 is not set
+---
+> # CONFIG_EVM_ADD_XATTRS is not set
+10735c10734
 < # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 ---
-> # CONFIG_EVM is not set
 > CONFIG_DEFAULT_SECURITY_SELINUX=y
-10577c10574
+10738c10737
 < CONFIG_DEFAULT_SECURITY_APPARMOR=y
 ---
 > # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-10579c10576
-< CONFIG_LSM="lockdown,yama,integrity,apparmor"
+10740c10739
+< CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 ---
 > CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock"
-10855,10856c10852
-< CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
-< CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
+10999,11000c10998
+< CONFIG_SYSTEM_REVOCATION_LIST=y
+< CONFIG_SYSTEM_REVOCATION_KEYS=""
 ---
-> # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-11031c11027
+> # CONFIG_SYSTEM_REVOCATION_LIST is not set
+11194c11192
 < # CONFIG_HEADERS_INSTALL is not set
 ---
 > CONFIG_HEADERS_INSTALL=y
-11216,11229c11212
+11387,11400c11385
 < CONFIG_SAMPLES=y
 < # CONFIG_SAMPLE_AUXDISPLAY is not set
 < # CONFIG_SAMPLE_KOBJECT is not set
diff --git a/kernel-xanmod-exptl.spec b/kernel-xanmod-exptl.spec
index 64d68af..df6a1c7 100644
--- a/kernel-xanmod-exptl.spec
+++ b/kernel-xanmod-exptl.spec
@@ -144,6 +144,9 @@ patch ./Makefile -i %{PATCH1000}
 # exptl 2021/07/08 -- use LLVM Full LTO to try and fix pagure #6
 scripts/config -e LTO_CLANG_FULL
 
+# Set kernel version string as build salt
+scripts/config --set-str BUILD_SALT "%{kverstr}"
+
 # Finalize the patched config
 make %{?_smp_mflags} EXTRAVERSION=-%{krelstr} config
 
diff --git a/kernel-xanmod.spec b/kernel-xanmod.spec
index 0d06a42..0be7a6b 100644
--- a/kernel-xanmod.spec
+++ b/kernel-xanmod.spec
@@ -126,6 +126,9 @@ find . -name "localversion*" -delete
 cp CONFIGS/xanmod/gcc/config .config_upstream
 patch .config_upstream -i %{PATCH1} -o .config
 
+# Set kernel version string as build salt
+scripts/config --set-str BUILD_SALT "%{kverstr}"
+
 # Finalize the patched config
 make %{?_smp_mflags} EXTRAVERSION=-%{krelstr} config