Xtables-addons 3.11

build: bump supported kernel version to 5.9
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2025-09-20 19:44:56 +02:00 · 2020-09-06 16:35:13 +02:00 · 2020-08-31 15:04:54 +02:00 · 2020-08-31 15:04:43 +02:00 · 2020-08-31 13:03:48 +02:00 · 2020-08-30 13:39:53 +02:00
8 changed files with 33 additions and 10 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-

 ACLOCAL_AMFLAGS  = -I m4
-SUBDIRS          = extensions geoip
+SUBDIRS          = extensions extensions/ACCOUNT extensions/pknock geoip

 man_MANS := xtables-addons.8

--- a/Makefile.mans.in
+++ b/Makefile.mans.in
@@ -40,4 +40,4 @@ targets.man: .manpages.lst ${wcman_targets}
 	$(call man_run,${wlist_targets})

 clean:
-	rm -f xtables-addons.8 matches.man targets.man
+	rm -f xtables-addons.8 matches.man targets.man .manpages.lst
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [3.9])
+AC_INIT([xtables-addons], [3.11])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -27,7 +27,7 @@ fi
 AC_CHECK_HEADERS([linux/netfilter/x_tables.h], [],
 	[AC_MSG_ERROR([You need to have linux/netfilter/x_tables.h, see INSTALL file for details])])
 PKG_CHECK_MODULES([libxtables], [xtables >= 1.6.0])
-xtlibdir="$(pkg-config --variable=xtlibdir xtables)"
+xtlibdir="$($PKG_CONFIG --variable=xtlibdir xtables)"

 AC_ARG_WITH([xtlibdir],
 	AS_HELP_STRING([--with-xtlibdir=PATH],
@@ -57,7 +57,7 @@ if test -n "$kbuilddir"; then
 		echo "WARNING: Version detection did not succeed. Continue at own luck.";
 	else
 		echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-		if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 6; then
+		if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 9; then
 			echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
 		elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then
 			:
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,13 @@
+v3.11 (2020-09-06)
+==================
+- Support for up to Linux 5.9
+
+
+v3.10 (2020-07-28)
+==================
+- Support for up to Linux 5.8
+
+
 v3.9 (2020-02-25)
 =================
 - Support for Linux 5.6 procfs changes
--- a/extensions/ACCOUNT/xt_ACCOUNT.c
+++ b/extensions/ACCOUNT/xt_ACCOUNT.c
@@ -28,6 +28,9 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+#include <linux/sockptr.h>
+#endif
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
 #include <net/netns/generic.h>
@@ -879,7 +882,12 @@ static int ipt_acc_handle_get_data(struct ipt_acc_net *ian,
 }

 static int ipt_acc_set_ctl(struct sock *sk, int cmd,
-			void *user, unsigned int len)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+			   void *user,
+#else
+			   sockptr_t arg,
+#endif
+			   unsigned int len)
 {
 	struct net *net = sock_net(sk);
 	struct ipt_acc_net *ian = net_generic(net, ipt_acc_net_id);
@@ -898,7 +906,12 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd,
 			break;
 		}

-		if (copy_from_user(&handle, user, len)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+		if (copy_from_user(&handle, user, len))
+#else
+		if (copy_from_sockptr(&handle, arg, len))
+#endif
+		{
 			printk("ACCOUNT: ipt_acc_set_ctl: copy_from_user failed for "
 				"IPT_SO_SET_HANDLE_FREE\n");
 			break;
--- a/extensions/libxt_DNETMAP.man
+++ b/extensions/libxt_DNETMAP.man
@@ -46,7 +46,7 @@ Contains the binding table for the given \fIsubnet/mask\fP. Each line contains
 \fBprenat address\fR, \fBpostnat address\fR, \fBttl\fR (seconds until the entry
 times out), \fBlasthit\fR (last hit to the entry in seconds relative to system
 boot time). Please note that the \fBttl\fR and \fBlasthit\fR entries contain an
-'\fBS\fR' in case of a static binding.
+\(oq\fBS\fR\(cq in case of a static binding.
 .TP
 \fB/proc/net/xt_DNETMAP/\fR\fIsubnet\fR\fB_\fR\fImask\fR\fB_stat\fR
 Contains statistics for a given \fIsubnet/mask\fP. The line contains four
--- a/extensions/pknock/Makefile.am
+++ b/extensions/pknock/Makefile.am
@@ -5,4 +5,4 @@ AM_CFLAGS   = ${regular_CFLAGS} ${libxtables_CFLAGS}

 include ../../Makefile.extra

-noinst_PROGRAMS = pknlusr
+sbin_PROGRAMS = pknlusr
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "" "" "v3.9 (2020-02-25)"
+.TH xtables-addons 8 "" "" "v3.11 (2020-09-06)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets
Author	SHA1	Message	Date
Jan Engelhardt	20e1b669fc	Xtables-addons 3.11	2020-09-06 16:35:13 +02:00
Jeremy Sowden	e4784832ed	build: bump supported kernel version to 5.9 Signed-off-by: Jeremy Sowden <jeremy@azazel.net>	2020-08-31 15:04:54 +02:00
Jeremy Sowden	48e30a0990	xt_ACCOUNT: update prototype of nf_sockopt_ops::set callback In 5.9, the `void __user` parameter has been replaced by a `sockptr`. Update `ipt_acc_set_ctl` appropriately. Signed-off-by: Jeremy Sowden <jeremy@azazel.net>	2020-08-31 15:04:43 +02:00
Helmut Grohne	ea588d0b9c	build: do not hard-code pkg-config Use $PKG_CONFIG in configure.ac in order to allow it to be overridden. Fixes cross-compilation. Signed-off-by: Jeremy Sowden <jeremy@azazel.net>	2020-08-31 13:03:48 +02:00
Jeremy Sowden	96460646e9	build: clean some extra build artifacts. Makefile.mans creates .manpages.lst, but does not remove it. Add it to the `clean` target. Signed-off-by: Jeremy Sowden <jeremy@azazel.net>	2020-08-30 13:39:53 +02:00
Jan Engelhardt	2cb4b2bec6	build: do build & install userspace programs for xt_ACCOUNT and xt_pknock	2020-08-30 13:36:10 +02:00
Jan Engelhardt	37f19c6b96	Xtables-addons 3.10	2020-07-28 10:02:34 +02:00
Jeremy Sowden	73b96e25e4	doc: fix quoted string in libxt_DNETMAP manpage In roff, lines beginning with a single quote are control lines. In the libxt_DNETMAP man-page there is a single-quoted string at the beginning of a line, which troff tries and fails to interpret as a macro: troff: <standard input>:49: warning: macro 'S'' not defined This means that the line is not output. Replace the single quotes with the appropriate escape-sequences. Fixes: v2.3~9 ("doc: spelling and grammar corrections to DNETMAP") Signed-off-by: Jeremy Sowden <jeremy@azazel.net>	2020-07-28 10:02:26 +02:00