main/linux-lts: enable FS_VERITY on all flavors

enable FS_VERITY_BUILTIN_SIGNATURES on all flavors

enable NET_REDIRECT for all architectures for which is default and
supported

13 files changed, 69 insertions, 36 deletions

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index b72857ffaa..9690ac02a6 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -223,16 +223,16 @@ _dev() {
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
 d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f  0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
-f7b994de5ab5172dcfc0f786d1a5c114ebe2801869ddbfbe9f43a849a36a1e50011a1b80ae8c8b0db032a044c19900c11637a00552c0035f172151a86c546d7a  config-lts.aarch64
-2aaaef26a52eacd0a2480db4126d09b5335a325ff3a2d4e725f51f8382c19f399fcf0f496243ef4513a159376e0b44dc122ae257c70ac33787a9e1ffb1f77203  config-lts.armv7
-61dabdfea48021e7f44d44c76c608a083132ec9f1f58ab3dd2edc189b68ebef446a9c3db9569fdd7d273b5c66f37dd7d37b7f5c5cccb4fb5cf94733ce5e33f00  config-lts.x86
-a319e5c89ebc6bce9d0f342b8b4a5303b86bdcdfb14caf90b5568627f740989df6cb5ea2ba26f081786e161ff2ac6e4a301ba66af46d31a8942e3882bd366410  config-lts.x86_64
-6ca87576699a2667d15c5a846808af300af7d400a674ef16c37c67905517b79a2bb0e6e3385da7879cb3de7c62300ff02d7d7c1c5b5448baa46ebe92fec69d66  config-lts.ppc64le
-a96a8e6f2d11a14148b17c19d899dda7fe8bed9daad0514162cc0a84645926597d3f258680c506cf028f293a969f4971dab0dff1a9d7a961118bb4f291c9fd55  config-lts.s390x
-a6c59c22d8d6683b39817711c3515168c26c9dcde05864be502705837abbc1b554477b5f794145fac8aa2da7626b2e8ab9395a16063b3970ae0fe3cee6ba2bf4  config-lts.mips64
-5ff542dbab7975167cc63738d751ef16716f3029d2713fe668870d8fe5497fe82e497dc881bee9d133259de17c796a79e13912955657423ceb746980cc1d6fa5  config-lts.mips
-e320d7994e9c3a688f55003c89eed3712b20a480706f29f9ef7da2c0db964f8d3e5cdbfd2057d3f72e3d6c278ca9c7a79669acd73463d89f810e901987408d06  config-virt.aarch64
-28a1d7e6ccf5f57a093f873660298bbbaccb13ef4f135beff2081fbad86f7a80259178a4ca3c9c181682736ec40f4e673c52dc270296aada091de91b1ec02c10  config-virt.armv7
-da32ce6224e481b76252e6e1f4ed5fa44c49e19e5c1e32e29f0f0f60b74518f11df0479ec1e470e84a318bf56e1fb990b0bf813783142eeb3601d7f1a7d8f5ee  config-virt.x86
-df9a7b78b6e077a5113ea2a9daf57abbbb7020701829a803df2e60450908677b74ef66b2b10e09ec6942ba607ed6d63d984be7ad2594fb8a7b2cd4ac3859018d  config-virt.x86_64
+bc95b8e5ec78582d1d10132b3b5ff274cf656706ab4d3bf134175fc1129e957ffd7ca1bbffeff11db437c3cdb547a5e64233030383f461ac62af5dcd02cd483f  config-lts.aarch64
+43a240f3d919a699250aef5f80775d620ccf53da038994f464cecf95d5531af0be60bb7639a25274f264f92bf11337967ae2590a99e8f33ac8458a051675035b  config-lts.armv7
+4c27c1c684df788e163916ba2beab2e2eae590025603a82018e0507826e1207d1bbb3977debe73424cfce2a975a9fe2581102642653227c0e708107e6ca1bde7  config-lts.x86
+cf728062d4fd977b737cd829fee3c2eacfd7dad33ab45caf505ab5e982f69b3df1c1bda1eceddbb8593ca5ed5fc97fc6d1355b317520c51b5b4fc6c46b84ffca  config-lts.x86_64
+b0542c282f28a689c94f7d8675e6037b1030c45af6be2db223d9cc8b3b5b9b7940133d9884309272277196a051eb59c2e4af26c753a07a8f691e2b38b4372904  config-lts.ppc64le
+6a397db7959e3ffafdd9de0a00fae24c6b3cf1492dae6193dc8cf57f259687120598633ca92bb32530fd598687d0c8894a5eb97ec6ecb8d59d459da39f6775ca  config-lts.s390x
+af57a893bea550279224d5478c699ccea3e30944b3a036e6bac09b33aae7931258b7a7b8dd193d5bcbaf1ed4160d3ad24bdf36360f4050565887e516e4f3e623  config-lts.mips64
+3b336e66b3239ff00d298d0344f7316f234aa7a455cdfcececa1cc4d7d81c8396e3b8660d4ec4baca9ae47f3beb830434631f6126eb69501c1b9b62a8354a7aa  config-lts.mips
+48ca44ccc9cf2767bf89a5ffffd6408c02151e74edb5710511d09296f3fed76d62ea4410a90c3b78b43f94f2274ca3232319405818d0946c3653ba8695e49bea  config-virt.aarch64
+b5b7fdcde21107ede68308034d9e3ab048faa56841a1bfe5362ba3e5e663d0fa1be822e3c394be447c058c58aaa366d9c68d71b87f35c1b2fad0afec6c4b69b2  config-virt.armv7
+be0c66877e7d2d987744d52669086702424c0681653a0fc6ab4c487df3b090cdd9bbbedbfd0134e4a83231971d667ff4fb2f9b8d60394ce86653ffb2cbcb0283  config-virt.x86
+46f389ba3190c917ec5dde342524345561dc4d0c6e8e1ce4c320ffbb34799734f5999b40d0707068896f1a50dbe8f84b281d70e8fb23dc19fc84947f394029f7  config-virt.x86_64
 566829f94ccce6ee98fde8338b6fd58792422f1676ed72cad9dcdd2c0e79a7e50408b7b3a967829a96f98717ad39b35d6c9007cdf58c0c22a0d6592bddf354cd  patch-5.4.33.xz"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index d244733d9c..34d44beb08 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/config-lts.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.28 Kernel Configuration
+# Linux/arm64 5.4.32 Kernel Configuration
 #
 
 #
@@ -963,6 +963,7 @@ CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -8177,7 +8178,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7
index d51c7a1264..cabc85b7a3 100644
--- a/main/linux-lts/config-lts.armv7
+++ b/main/linux-lts/config-lts.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.28 Kernel Configuration
+# Linux/arm 5.4.32 Kernel Configuration
 #
 
 #
@@ -984,6 +984,7 @@ CONFIG_FRAME_VECTOR=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -6932,7 +6933,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.mips b/main/linux-lts/config-lts.mips
index 759f244087..9bb66a9682 100644
--- a/main/linux-lts/config-lts.mips
+++ b/main/linux-lts/config-lts.mips
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.28 Kernel Configuration
+# Linux/mips 5.4.32 Kernel Configuration
 #
 
 #
@@ -2539,7 +2539,9 @@ CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 # CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.mips64 b/main/linux-lts/config-lts.mips64
index 37866c4da5..7225e721ee 100644
--- a/main/linux-lts/config-lts.mips64
+++ b/main/linux-lts/config-lts.mips64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.28 Kernel Configuration
+# Linux/mips 5.4.32 Kernel Configuration
 #
 
 #
@@ -2561,7 +2561,9 @@ CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 # CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
index 724101aeeb..1b0d20282e 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/config-lts.ppc64le
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.28 Kernel Configuration
+# Linux/powerpc 5.4.32 Kernel Configuration
 #
 
 #
@@ -3800,7 +3800,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x
index da3b2e14b3..da5a9eb694 100644
--- a/main/linux-lts/config-lts.s390x
+++ b/main/linux-lts/config-lts.s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.28 Kernel Configuration
+# Linux/s390 5.4.32 Kernel Configuration
 #
 
 #
@@ -689,6 +689,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -2720,7 +2721,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
index 55ac327d82..36eb762f83 100644
--- a/main/linux-lts/config-lts.x86
+++ b/main/linux-lts/config-lts.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.28 Kernel Configuration
+# Linux/x86 5.4.32 Kernel Configuration
 #
 
 #
@@ -920,6 +920,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -7676,7 +7677,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64
index 64803f73f1..2c1ad037fa 100644
--- a/main/linux-lts/config-lts.x86_64
+++ b/main/linux-lts/config-lts.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.28 Kernel Configuration
+# Linux/x86 5.4.32 Kernel Configuration
 #
 
 #
@@ -973,6 +973,7 @@ CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -7823,7 +7824,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/config-virt.aarch64
index 5eaed79313..a711faa1b8 100644
--- a/main/linux-lts/config-virt.aarch64
+++ b/main/linux-lts/config-virt.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.28 Kernel Configuration
+# Linux/arm64 5.4.32 Kernel Configuration
 #
 
 #
@@ -919,6 +919,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -4055,7 +4056,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-virt.armv7 b/main/linux-lts/config-virt.armv7
index 6c86a45076..fdb56a783c 100644
--- a/main/linux-lts/config-virt.armv7
+++ b/main/linux-lts/config-virt.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.28 Kernel Configuration
+# Linux/arm 5.4.32 Kernel Configuration
 #
 
 #
@@ -848,6 +848,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -3926,7 +3927,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/config-virt.x86
index 0277890d09..6b37f0be43 100644
--- a/main/linux-lts/config-virt.x86
+++ b/main/linux-lts/config-virt.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.28 Kernel Configuration
+# Linux/x86 5.4.32 Kernel Configuration
 #
 
 #
@@ -872,6 +872,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -3734,7 +3735,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/config-virt.x86_64
index 34cd7ab952..67f5afe6ff 100644
--- a/main/linux-lts/config-virt.x86_64
+++ b/main/linux-lts/config-virt.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.28 Kernel Configuration
+# Linux/x86_64 5.4.32 Kernel Configuration
 #
 
 #
@@ -925,6 +925,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -3853,7 +3854,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y