Xtables-addons 3.6

build: add support for Linux 5.4
2025-09-20 19:44:56 +02:00 · 2019-11-20 22:50:04 +01:00 · 2019-11-20 22:45:18 +01:00
5 changed files with 17 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.la
 *.lo
 *.loT
+*.mod
 *.o
 .cache.mk
 .deps/
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [3.5])
+AC_INIT([xtables-addons], [3.6])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,12 @@ HEAD
 ====


+v3.6 (2019-11-20)
+=================
+Enhancements:
+- support for up to Linux 5.4
+
+
 v3.5 (2019-09-10)
 =================
 Enhancements:
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -205,7 +205,11 @@ static void tarpit_tcp4(struct net *net, struct sk_buff *oldskb,
 		return;

 	/* This packet will not be the same as the other: clear nf fields */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+	nf_reset_ct(nskb);
+#else
 	nf_reset(nskb);
+#endif
 	skb_nfmark(nskb) = 0;
 	skb_init_secmark(nskb);
 	skb_shinfo(nskb)->gso_size = 0;
@@ -346,7 +350,11 @@ static void tarpit_tcp6(struct net *net, struct sk_buff *oldskb,
 	}

 	/* This packet will not be the same as the other: clear nf fields */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+	nf_reset_ct(nskb);
+#else
 	nf_reset(nskb);
+#endif
 	skb_nfmark(nskb) = 0;
 	skb_init_secmark(nskb);
 	skb_shinfo(nskb)->gso_size = 0;
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "" "" "v3.5 (2019-09-10)"
+.TH xtables-addons 8 "" "" "v3.6 (2019-11-20)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets
Author	SHA1	Message	Date
Jan Engelhardt	7ad14b7150	Xtables-addons 3.6	2019-11-20 22:50:04 +01:00
Paolo Pisati	0cc51e6b35	build: add support for Linux 5.4	2019-11-20 22:45:18 +01:00