From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 22 Mar 2024 17:09:34 +0000 (+0100)
Subject: Xtables-addons 3.26
X-Git-Tag: v3.26^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25bd329a409662299c4466017e663a32dd38ffc6;p=thirdparty%2Fxtables-addons.git

Xtables-addons 3.26

The first Linux version to have the new SHASH stuff is Linux 4.20,
but 4.20 does not build anymore under current gcc, so it is
impractical to test, thus the requirement is bumped to the next
LT version, which is 5.4(.272) as of writing.
---

diff --git a/INSTALL.rst b/INSTALL.rst
index 58df352..3eba595 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -16,7 +16,7 @@ Supported configurations for this release
 
 * iptables >= 1.6.0
 
-* kernel-devel >= 4.16
+* kernel-devel >= 5.4
   with prepared build/output directory
 
   * ``CONFIG_NF_CONNTRACK``
diff --git a/configure.ac b/configure.ac
index 915e76a..b33057e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [3.25])
+AC_INIT([xtables-addons], [3.26])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -58,15 +58,13 @@ AS_IF([test -n "$kbuilddir"], [
 		yoff
 	], [
 		echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-		if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 2; then
+		if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 9; then
 			yon
 			echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
 			yoff
 		elif test "$kmajor" -eq 6; then
 			:
-		elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then
-			:
-		elif test "$kmajor" -eq 4 -a "$kminor" -ge 16; then
+		elif test "$kmajor" -eq 5 -a "$kminor" -ge 4; then
 			:
 		else
 			yon
diff --git a/doc/changelog.rst b/doc/changelog.rst
index f1ca0a7..8ec37a5 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,3 +1,10 @@
+v3.26 (2024-03-22)
+==================
+
+* xt_pknock: fix misuse of shash API
+* xt_SYSRQ: resolve crash, switch to new SHASH_ON_STACK
+
+
 v3.25 (2023-08-18)
 ==================