lkrg-dkms: Fix compilation with kernels >= 5.9

2 files changed, 20 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3160e395d0b3..aa3db0921a7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lkrg-dkms
 	pkgdesc = Linux Kernel Runtime Guard (DKMS)
 	pkgver = 0.8.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.openwall.com/lkrg/
 	arch = any
 	license = GPL2
@@ -11,6 +11,9 @@ pkgbase = lkrg-dkms
 	source = fix_cryptohash_58.patch::https://github.com/openwall/lkrg/commit/b459b334e6a1020732541840957ffefb2d1873df.patch
 	source = fix_cryptohash_non_rhel_kernels.patch::https://github.com/openwall/lkrg/commit/8d926b99fea47fa01e1d563b2ae71fb21cc42867.patch
 	source = fix_native_write_cr4_58.patch::https://github.com/openwall/lkrg/commit/671b079eb985d6b2b24fb943f39cdf48bfce62d6.patch
+	source = fix_put_seccomp_filter_59.patch::https://github.com/openwall/lkrg/commit/c7d427de476920f0585532ad57ee4280f083bf7f.patch
+	source = fix_dynamically_resolve__module_address_and__module_text_address_59.patch::https://github.com/openwall/lkrg/commit/24d7117647d0f2406faba7fba19ccc3d1b82d859.patch
+	source = fix_umh_check_59.patch::https://github.com/openwall/lkrg/commit/07ff9e969f2507f9d5203c6ef531b4891cae06db.patch
 	source = dkms.conf
 	validpgpkeys = 297AD21CF86C948081520C1805C027FD4BDC136E
 	sha512sums = 38dd9e4d3b5a3011a23b94ca6e63ce61816a98e329eb8e5f127928d42e7ba3fa0acf2679d00327c77a1bc1e351200916a22a54a1a6b17297d0affc466a1e5e74
@@ -18,6 +21,9 @@ pkgbase = lkrg-dkms
 	sha512sums = 68d330534004184164b27f71b3f42a647bb92b37a6313be41b52da5e2b77a6306f350f238c6fa9df2eec1bbf31e31900ee651646ce2a50e879ea279bc2ce6b2d
 	sha512sums = a0e47a8ce892e782029151dff91788c9292089d30f8d53924948e1c72da33a6baf38022e49b07dd9bcad375013102d8e17f0bbff85d3e713cac3efa3ea80f323
 	sha512sums = a28f772466c2fe0116001401f0e5b4fb5b856968e958d56c4e461ac31ebb44dca93f3d09b86a145d7606d87db7d4ee92264bd62dea624653f32e4ac3d8f2fe0a
+	sha512sums = ddebc116af48599ae61c21a970597e098b5e7653aa50efc20b6b2d86a112f0cc3d8a51893b6c941bdd44c6422920b2751893169f2410e158b7a29475094098b3
+	sha512sums = 9f375e60e11d5f75dcd00c636f48b32044f953fd3732aa3ac8c0672fafa4d1c942930d7b81e4aeba140e0432b59f0b894b8aebc3be2a8578da7881e0520cff33
+	sha512sums = 40e475e8a54223e59d10046adf80d28ded36094e6fdc635a3fe38e1c7ed3b77fb47e58f8f82d3a85dd55aa277de5ac7a477998b2381cc7afa58914751a8140a0
 	sha512sums = 2b4dd1787d318820b3bd3117ec0e5a57148ea67156ff27718d143d99e152fec0ce973b4f09c90889d4a72bca81a76f9b170580d27e5c3d54ab1dadebe4d85d72
 
 pkgname = lkrg-dkms
diff --git a/PKGBUILD b/PKGBUILD
index d6f2e319cfd1..44f8e8a1653f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgbase=lkrg
 pkgname=lkrg-dkms
 pkgver=0.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Linux Kernel Runtime Guard (DKMS)'
 arch=('any')
 url='https://www.openwall.com/lkrg/'
@@ -14,12 +14,21 @@ source=("${url}/${_pkgbase}-${pkgver}.tar.gz"
         'fix_cryptohash_non_rhel_kernels.patch::https://github.com/openwall/lkrg/commit/8d926b99fea47fa01e1d563b2ae71fb21cc42867.patch'
         # And doesn't export native_write_cr4 anymore
         'fix_native_write_cr4_58.patch::https://github.com/openwall/lkrg/commit/671b079eb985d6b2b24fb943f39cdf48bfce62d6.patch'
+        # Linux 5.9 changed the put_seccomp_filter() API
+        'fix_put_seccomp_filter_59.patch::https://github.com/openwall/lkrg/commit/c7d427de476920f0585532ad57ee4280f083bf7f.patch'
+        # __module_address and __module_text_address need to be dynamically resolved on 5.9+
+        'fix_dynamically_resolve__module_address_and__module_text_address_59.patch::https://github.com/openwall/lkrg/commit/24d7117647d0f2406faba7fba19ccc3d1b82d859.patch'
+        # UMH in-memory files check has changed in 5.9+
+        'fix_umh_check_59.patch::https://github.com/openwall/lkrg/commit/07ff9e969f2507f9d5203c6ef531b4891cae06db.patch'
         'dkms.conf')
 sha512sums=('38dd9e4d3b5a3011a23b94ca6e63ce61816a98e329eb8e5f127928d42e7ba3fa0acf2679d00327c77a1bc1e351200916a22a54a1a6b17297d0affc466a1e5e74'
             'SKIP'
             '68d330534004184164b27f71b3f42a647bb92b37a6313be41b52da5e2b77a6306f350f238c6fa9df2eec1bbf31e31900ee651646ce2a50e879ea279bc2ce6b2d'
             'a0e47a8ce892e782029151dff91788c9292089d30f8d53924948e1c72da33a6baf38022e49b07dd9bcad375013102d8e17f0bbff85d3e713cac3efa3ea80f323'
             'a28f772466c2fe0116001401f0e5b4fb5b856968e958d56c4e461ac31ebb44dca93f3d09b86a145d7606d87db7d4ee92264bd62dea624653f32e4ac3d8f2fe0a'
+            'ddebc116af48599ae61c21a970597e098b5e7653aa50efc20b6b2d86a112f0cc3d8a51893b6c941bdd44c6422920b2751893169f2410e158b7a29475094098b3'
+            '9f375e60e11d5f75dcd00c636f48b32044f953fd3732aa3ac8c0672fafa4d1c942930d7b81e4aeba140e0432b59f0b894b8aebc3be2a8578da7881e0520cff33'
+            '40e475e8a54223e59d10046adf80d28ded36094e6fdc635a3fe38e1c7ed3b77fb47e58f8f82d3a85dd55aa277de5ac7a477998b2381cc7afa58914751a8140a0'
             '2b4dd1787d318820b3bd3117ec0e5a57148ea67156ff27718d143d99e152fec0ce973b4f09c90889d4a72bca81a76f9b170580d27e5c3d54ab1dadebe4d85d72')
 validpgpkeys=('297AD21CF86C948081520C1805C027FD4BDC136E')
 depends=('dkms')
@@ -34,6 +43,9 @@ prepare() {
   patch --forward --strip=1 --input="${srcdir}/fix_cryptohash_58.patch"
   patch --forward --strip=1 --input="${srcdir}/fix_cryptohash_non_rhel_kernels.patch"
   patch --forward --strip=1 --input="${srcdir}/fix_native_write_cr4_58.patch"
+  patch --forward --strip=1 --input="${srcdir}/fix_put_seccomp_filter_59.patch"
+  patch --forward --strip=1 --input="${srcdir}/fix_dynamically_resolve__module_address_and__module_text_address_59.patch"
+  patch --forward --strip=1 --input="${srcdir}/fix_umh_check_59.patch"
 }
 
 package() {