- up to 3.5

diff --git a/kernel-5.2.patch b/kernel-5.2.patch
deleted file mode 100644 (file)
index 3d21c6f..0000000
--- a/kernel-5.2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 3b8714a39207d6a7105390932586f392487217a0..e1975942f4381d393cefd4bf6ce04a00fb060122 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -21,18 +21,17 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     2
+%define                rel     1
 %define                pname   xtables-addons
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       3.3
+Version:       3.5
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
-# Source0-md5: e99ea681b7b3866a581390e1b3ea185e
-Patch0:                kernel-5.2.patch
+# Source0-md5: d9fa406635a4a0ffa647d282b0f1191c
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -111,7 +110,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %configure \