jool: update to 4.1.15

Changelog: https://github.com/NICMx/Jool/releases/tag/v4.1.15
- Add support for kernels 6.15-6.18
- Add support for RHEL 9.6, 9.7

Drops 200-fix-compilation-in-v6.18.patch as upstream accepted

Signed-off-by: Goetz Goerisch <redacted>

diff --git a/net/jool/Makefile b/net/jool/Makefile
index 50dc1f25afe4f23f870984f8b06e35a85035e856..ccf7da0e634c0bc1fc8211a8507b43aed294a146 100644 (file)
--- a/net/jool/Makefile
+++ b/net/jool/Makefile
@@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=jool
-PKG_VERSION:=4.1.14
-PKG_RELEASE:=3
+PKG_VERSION:=4.1.15
+PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/NICMx/Jool.git
-PKG_SOURCE_VERSION:=5afde37abf68df63c4beda091dfbeb2967d3ce80
-PKG_MIRROR_HASH:=af483e5d35cea029dca11fc20c048334b9b9e84cfdca10921bfdd9d63779aadd
+PKG_SOURCE_VERSION:=b2ef294103bbcf8eccfaee97dcb41721995e2b0a
+PKG_MIRROR_HASH:=e21d41a87dc419472356aefcdea681014311a3c93c4e1b1d6bbd8d2cd1fc4e97
 
 PKG_BUILD_DIR=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 PKG_BUILD_PARALLEL:=1

diff --git a/net/jool/patches/200-fix-compilation-in-v6.18.patch b/net/jool/patches/200-fix-compilation-in-v6.18.patch
deleted file mode 100644 (file)
index 01b948e..0000000
--- a/net/jool/patches/200-fix-compilation-in-v6.18.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 89bd7a029b3ed81ac3b4e582b4049d2ea8722970 Mon Sep 17 00:00:00 2001
-From: Tj <tj.iam.tj@proton.me>
-Date: Mon, 1 Dec 2025 18:24:47 +0000
-Subject: [PATCH] Fix compilation in v6.18
-
-struct flowi4.tos renamed to 'dscp' and type dscp_t in commit
-1bec9d0c0046fe4e2bfb6a1c5aadcb5d56cdb0fb
----
- src/mod/common/rfc7915/6to4.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/src/mod/common/rfc7915/6to4.c
-+++ b/src/mod/common/rfc7915/6to4.c
-@@ -203,7 +203,11 @@ static verdict compute_flowix64(struct x
-       hdr6 = pkt_ip6_hdr(&state->in);
- 
-       flow4->flowi4_mark = state->in.skb->mark;
-+#if LINUX_VERSION_AT_LEAST(6, 18, 0, 0, 0)
-+      flow4->flowi4_dscp = xlat_tos(&state->jool.globals, hdr6);
-+#else
-       flow4->flowi4_tos = xlat_tos(&state->jool.globals, hdr6);
-+#endif
-       flow4->flowi4_scope = RT_SCOPE_UNIVERSE;
-       flow4->flowi4_proto = xlat_proto(hdr6);
-       /*
-@@ -645,7 +649,11 @@ static verdict ttp64_ipv4_external(struc
- 
-       hdr4->version = 4;
-       hdr4->ihl = 5;
-+#if LINUX_VERSION_AT_LEAST(6, 18, 0, 0, 0)
-+      hdr4->tos = flow4->flowi4_dscp;
-+#else
-       hdr4->tos = flow4->flowi4_tos;
-+#endif
-       hdr4->tot_len = cpu_to_be16(state->out.skb->len);
-       generate_ipv4_id(state, hdr4, hdr_frag);
-       hdr4->frag_off = xlat_frag_off(hdr_frag, state);