From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 16 Jun 2022 21:59:23 +0000 (+0200)
Subject: - up to 3.21
X-Git-Tag: auto/th/xtables-addons-3.21-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=commitdiff_plain;h=66affb5a5dc84c4b7c0cca65d66d2fc6876f4932

- up to 3.21
---

diff --git a/kernel-5.17.patch b/kernel-5.17.patch
deleted file mode 100644
index e347aff..0000000
--- a/kernel-5.17.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- xtables-addons-3.19/extensions/pknock/xt_pknock.c~	2022-02-01 18:24:03.000000000 +0100
-+++ xtables-addons-3.19/extensions/pknock/xt_pknock.c	2022-04-02 13:22:18.309078729 +0200
-@@ -277,7 +277,11 @@
- 	int ret = seq_open(file, &pknock_seq_ops);
- 	if (ret == 0) {
- 		struct seq_file *sf = file->private_data;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- 		sf->private = PDE_DATA(inode);
-+#else
-+		sf->private = pde_data(inode);
-+#endif
- 	}
- 	return ret;
- }
---- xtables-addons-3.19/extensions/xt_condition.c~	2022-02-01 18:24:03.000000000 +0100
-+++ xtables-addons-3.19/extensions/xt_condition.c	2022-04-02 13:25:17.366962445 +0200
-@@ -83,14 +83,22 @@
- 
- static int condition_proc_open(struct inode *inode, struct file *file)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- 	return single_open(file, condition_proc_show, PDE_DATA(inode));
-+#else
-+	return single_open(file, condition_proc_show, pde_data(inode));
-+#endif
- }
- 
- static ssize_t
- condition_proc_write(struct file *file, const char __user *buffer,
-                      size_t length, loff_t *loff)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- 	struct condition_variable *var = PDE_DATA(file_inode(file));
-+#else
-+	struct condition_variable *var = pde_data(file_inode(file));
-+#endif
- 	char newval;
- 
- 	if (length > 0) {
---- xtables-addons-3.19/extensions/xt_quota2.c~	2022-02-01 18:24:03.000000000 +0100
-+++ xtables-addons-3.19/extensions/xt_quota2.c	2022-04-02 13:26:27.276139534 +0200
-@@ -73,14 +73,22 @@
- 
- static int quota_proc_open(struct inode *inode, struct file *file)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- 	return single_open(file, quota_proc_show, PDE_DATA(inode));
-+#else
-+	return single_open(file, quota_proc_show, pde_data(inode));
-+#endif
- }
- 
- static ssize_t
- quota_proc_write(struct file *file, const char __user *input,
-                  size_t size, loff_t *loff)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- 	struct xt_quota_counter *e = PDE_DATA(file_inode(file));
-+#else
-+	struct xt_quota_counter *e = pde_data(file_inode(file));
-+#endif
- 	char buf[sizeof("+-18446744073709551616")];
- 
- 	if (size > sizeof(buf))
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 5b4dae9..7901ce4 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -26,13 +26,12 @@ exit 1
 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.19
+Version:	3.21
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	https://inai.de/files/xtables-addons/%{pname}-%{version}.tar.xz
-# Source0-md5:	66185eeb44e8f9b30a299ece875a694f
-Patch0:		kernel-5.17.patch
+# Source0-md5:	600717f816f53f61fd3b9416d4ef3161
 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 \