Add Linux 5.2 crypto desc flags compat fix

3 files changed, 45 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d0bafbba00b..d77f19622d19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xtables-addons-dkms
 	pkgdesc = DKMS for additional extensions for Xtables packet filter present in the Linux kernel
 	pkgver = 3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://xtables-addons.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -18,8 +18,10 @@ pkgbase = xtables-addons-dkms
 	replaces = xtables-addons-git
 	replaces = xtables-addons-multikernel
 	source = https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/xtables-addons-3.3.tar.xz
+	source = 0002-fix-deprecated-flags-field.patch
 	source = dkms.conf
 	sha256sums = efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6
+	sha256sums = 615c953786f5441c06d099dfe477aeed8a87e70334cee17369850cfdc8c3f3e3
 	sha256sums = 87546f6d100a33271086d3bc990a2a1e4de83e25fb4a048774c520f4c36729e6
 
 pkgname = xtables-addons-dkms
diff --git a/0002-fix-deprecated-flags-field.patch b/0002-fix-deprecated-flags-field.patch
new file mode 100644
index 000000000000..b71a2db84181
--- /dev/null
+++ b/0002-fix-deprecated-flags-field.patch
@@ -0,0 +1,38 @@
+Description: Add Linux 5.2 crypto desc flags compat fix
+ This adds a compat fix for the deprecated flags field in the
+ crypto shash_desc struct.  This field was deprecated by
+ linux commit 877b5691f27a1aec0d9b53095a323e45c30069e2
+ ("crypto: shash - remove shash_desc::flags")
+ .
+ Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Author: Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830063
+
+Index: xtables-addons-3.2/extensions/pknock/xt_pknock.c
+===================================================================
+--- xtables-addons-3.2.orig/extensions/pknock/xt_pknock.c
++++ xtables-addons-3.2/extensions/pknock/xt_pknock.c
+@@ -1125,7 +1125,9 @@ static int __init xt_pknock_mt_init(void
+ 
+ 	crypto.size = crypto_shash_digestsize(crypto.tfm);
+ 	crypto.desc.tfm = crypto.tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ 	crypto.desc.flags = 0;
++#endif
+ 
+ 	pde = proc_mkdir("xt_pknock", init_net.proc_net);
+ 	if (pde == NULL) {
+Index: xtables-addons-3.2/extensions/xt_SYSRQ.c
+===================================================================
+--- xtables-addons-3.2.orig/extensions/xt_SYSRQ.c
++++ xtables-addons-3.2/extensions/xt_SYSRQ.c
+@@ -114,7 +114,9 @@ static unsigned int sysrq_tg(const void
+ 	}
+ 
+ 	desc.tfm   = sysrq_tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ 	desc.flags = 0;
++#endif
+ 	ret = crypto_shash_init(&desc);
+ 	if (ret != 0)
+ 		goto hash_fail;
diff --git a/PKGBUILD b/PKGBUILD
index 62798417a6fe..cdf3358fe7b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Vladimir Kutyavin <vlkut(AT)bk(DOT)ru>
 pkgname=xtables-addons-dkms
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='DKMS for additional extensions for Xtables packet filter present in the Linux kernel'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,13 +17,16 @@ optdepends=('perl-text-csv-xs: required for building GeoIP database'
 conflicts=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 replaces=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 source=(https://sourceforge.net/projects/${pkgname%-dkms}/files/Xtables-addons/${pkgname%-dkms}-${pkgver}.tar.xz
+        0002-fix-deprecated-flags-field.patch
         dkms.conf)
 sha256sums=('efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6'
+            '615c953786f5441c06d099dfe477aeed8a87e70334cee17369850cfdc8c3f3e3'
             '87546f6d100a33271086d3bc990a2a1e4de83e25fb4a048774c520f4c36729e6')
 
 prepare() {
 	# go to builddir
 	cd "${srcdir}/xtables-addons-${pkgver}"
+	patch -p1 -i "${srcdir}/0002-fix-deprecated-flags-field.patch"
 	
 	# disable install-exec-hook (avoids useless calling of depmod -a at 'make install' stage)
 	sed -i 's/^install-exec-hook:$/dont-run:/' Makefile.am