- fix building with kernel 5.2

- rel 2

diff --git a/kernel-5.2.patch b/kernel-5.2.patch
new file mode 100644 (file)
index 0000000..3d21c6f
--- /dev/null
+++ b/kernel-5.2.patch
@@ -0,0 +1,24 @@
+--- xtables-addons-3.3/extensions/pknock/xt_pknock.c~  2019-03-07 17:24:08.000000000 +0800
++++ xtables-addons-3.3/extensions/pknock/xt_pknock.c   2019-07-12 21:47:17.646586586 +0800
+@@ -1125,7 +1125,9 @@
+ 
+       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) {
+--- xtables-addons-3.3/extensions/xt_SYSRQ.c~  2019-03-07 17:24:08.000000000 +0800
++++ xtables-addons-3.3/extensions/xt_SYSRQ.c   2019-07-12 21:48:48.456584594 +0800
+@@ -114,7 +114,9 @@
+       }
+ 
+       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/xtables-addons.spec b/xtables-addons.spec
index 472a65fcb4fa17019c36b40813741146fadddb51..3b8714a39207d6a7105390932586f392487217a0 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -21,7 +21,7 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
 %define                _enable_debug_packages  0
 %endif
 

-%define                rel     1
+%define                rel     2

 %define                pname   xtables-addons
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 %define                pname   xtables-addons
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables


@@ -32,6 +32,7 @@ License:      GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
 # Source0-md5: e99ea681b7b3866a581390e1b3ea185e
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
 # Source0-md5: e99ea681b7b3866a581390e1b3ea185e

+Patch0:                kernel-5.2.patch

 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11


@@ -110,6 +111,7 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
 
 %prep
 %setup -q -n %{pname}-%{version}

+%patch0 -p1

 
 %build
 %configure \
 
 %build
 %configure \