updpkg: libre/linux-libre-lts 5.4.33-1

Signed-off-by: David P <megver83@parabola.nu>

5 files changed, 36 insertions, 21 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index f3deca6a5..3c76b846c 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-lts
-pkgver=5.4.28
+pkgver=5.4.33
 pkgrel=1
 pkgdesc='LTS Linux-libre'
-rcnver=5.4.24
-rcnrel=armv7-x20
+rcnver=5.4.33
+rcnrel=armv7-x22
 url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
@@ -45,6 +45,7 @@ source=(
 
   # Arch's linux-lts patches
   0001-add-sysctl-and-CONFIG-for-unprivileged_userns_clone.patch
+  sphinx-workaround.patch
 )
 source_armv7h=(
   # RCN patch (CM3 firmware deblobbed and bloatware removed)
@@ -66,7 +67,7 @@ validpgpkeys=(
 )
 sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc701cd50af49c403ef0325adfcb07e354d5e46c1be3dcdd719a7a55c963f37'
             'SKIP'
-            'ab3d0016015034875c60bf9be5490af17b0c72db1712cabb3c253ff0fc98619ad8e1a88c6bc60dd91990e1fea052604d052fc261baeea9fe9b5328cbce249f8c'
+            '0df531c7df5292454db80da5089c98ed7070ce9c90b074e5daa9f18b310d1ff3100da6e7ab0514ad15d2c1c413686fabe2cbb115a26974a699abfa547079c9e9'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -74,14 +75,15 @@ sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc
             'SKIP'
             '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
             'SKIP'
-            '68d3c778423084c906a3b4138608737e9e36ac55b2c985833c23fa37620ff55ad1a8d458fbb1c6f76ec54f72eb66401aff59accb235c06294b0cfba48565cb6d'
-            '00fc844dcbf683b16cc5f187e597451e31273f418924ac87439536c8ba2d8f4e2ed902db4a02322ffd3df389f73cda94443f8a7b8133b7af714e56cbe00c6d76'
+            '2f1d1f927245cc52091ab91e7e523cb6f91cdd435059d087c0268856d1ce8a6ec2af9295a8bdcaa018a40af0ac9a2940900f981b3df5f412a1c059f994e3bf3f'
+            '17e83ead6022662b8fb1959501fdf2869f2bbce1a3f9aaf3b84c9c54c1c180c8fbd0e21091f684d4646d8b86360803fe30d6f5953790c07096d3653cdb42a483'
             '1079d81e3eb69273022c601b50fce575b41a8042d8f91f95618ffce4cd01f948c69d52fbb2d3b05d9efe58e12fcef1b06498399dc0bda4bef38ab288047b18e1'
-            'aca591b5a2e838754e3c5fd2c0e50098ad54c2d0f990de5bf9cff8608e881daf0e37132294ed1a0e0a7b9e1c194c0b89f95da001d94febdb25a01c409060e3ac'
+            'b3347d99e5f472dfa842e76f1cb9973ff15d85c45908f7c0383d15f35964eba7c3a2f6d07bf140812b1e899636712f74645ae35298642744c3e879f77e92bd8c'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '5f196378d50dd737d727e424d8f31b7fa8a6b92ba88f0a1467ef79bc37a097160da1fc1fd5cfb4b8983f36f2afdf27eb229ec61b35a15ac2343d660eb416a230')
-sha512sums_armv7h=('a3e30f4cd4cfc30e06a7f4345c14d5ac4426cecb8b36db810effb84b03fcddc059f01562b2f426c27786ab9a5e2c970b5c2d52e6c7964aa9b63cb033c04c0877'
+            '5f196378d50dd737d727e424d8f31b7fa8a6b92ba88f0a1467ef79bc37a097160da1fc1fd5cfb4b8983f36f2afdf27eb229ec61b35a15ac2343d660eb416a230'
+            '8081673a6594e5fc2fddc98fa434e99817aa822f7136d3c14c8d465fa7b93c9ac5d3a4150a5b632e25b1dc76a814dfa19d8aede37d58b935db288465b6585c58')
+sha512sums_armv7h=('6855cabac30b5153c64b49753adbf25bd6c65ae43d6bb9b94213b353060f2fb3186ae5fbd99978b65fac622d8a732cbcdc9bdbcad23a6604d526b2a108e098f6'
                    'SKIP'
                    'b576a9c40ba59485c350f71b9234d9e71f245e25b26382bd2f67019f3309c3b5705a6020eae0a9dfccacc763fb2056a5937c0a8ff4e64f99ba1d60f0b2acb03f'
                    '85a13a274d4cbaca3ddbe8eaf883f1a1184765f8d09d6d40bb32defbe0876cb0153513e8db8671d7fc053e383ced793b74245ff29364a760e1a52bb36ebc8e85'
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 170607e91..086e962e8 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27-gnu Kernel Configuration
+# Linux/x86 5.4.33-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (Arch Linux 9.2.1+20200130-2) 9.2.1 20200130
+# Compiler: gcc (Arch Linux 9.3.0-1) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90201
+CONFIG_GCC_VERSION=90300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -1009,6 +1009,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
 
 #
@@ -4351,7 +4352,7 @@ CONFIG_SCx200_ACB=m
 CONFIG_I2C_FSI=m
 # end of I2C Hardware Bus support
 
-# CONFIG_I2C_STUB is not set
+CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index d7ba19de1..d3554e8a6 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27-gnu Kernel Configuration
+# Linux/x86 5.4.33-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (Arch Linux 9.2.1+20200130-2) 9.2.1 20200130
+# Compiler: gcc (Arch Linux 9.3.0-1) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90201
+CONFIG_GCC_VERSION=90300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -22,7 +22,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_BUILD_SALT=""
@@ -1047,6 +1046,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
 
 #
@@ -9839,7 +9839,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama"
+CONFIG_LSM="lockdown,yama"
 
 #
 # Kernel hardening options
diff --git a/libre/linux-libre-lts/linux-armv7h.preset b/libre/linux-libre-lts/linux-armv7h.preset
index 3cec18ca9..1d1169b4b 100644
--- a/libre/linux-libre-lts/linux-armv7h.preset
+++ b/libre/linux-libre-lts/linux-armv7h.preset
@@ -9,6 +9,3 @@ PRESETS=('default' 'fallback')
 default_image="/boot/initramfs-%PKGBASE%.img"
 #default_options=""
 
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-%PKGBASE%-fallback.img"
-fallback_options="-S autodetect"
diff --git a/libre/linux-libre-lts/sphinx-workaround.patch b/libre/linux-libre-lts/sphinx-workaround.patch
new file mode 100644
index 000000000..59aafa909
--- /dev/null
+++ b/libre/linux-libre-lts/sphinx-workaround.patch
@@ -0,0 +1,15 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index a8fe845832bc..2dae2e830c26 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,8 +36,8 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
+-              'kfigure', 'sphinx.ext.ifconfig', 'automarkup']
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
++              'kfigure', 'sphinx.ext.ifconfig']
+ 
+ # The name of the math extension changed on Sphinx 1.4
+ if (major == 1 and minor > 3) or (major > 1):