mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-04-07 03:10:15 -04:00
net-misc/jool-modules: drop 4.1.14
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
This commit is contained in:
@@ -1,2 +1 @@
|
|||||||
DIST jool-4.1.14.tar.gz 625157 BLAKE2B 459a7976d36eba0dd2fde464103dc0e43f01f287c371092140aee6b76583ef87c7b6dd252afe941ed5b5366474aa54d6351b29bb88466e96755b87f94d357cf0 SHA512 684a6bd2861fea6475388ee0940ce5318e3f871bb4cc6f01301d1ac0e30ff3f591884eb1c39e2a3ce046e1eeb03e0abb42a28aa5b3e7a5ad42b0e0d2ce8ff74d
|
|
||||||
DIST jool-4.1.15.tar.gz 634141 BLAKE2B f0ac39b4a2f5fecf3039cd02abd1d83dc25faa799bb19ddc840473e10ca2294fae3c22ef00f106e53e304442714f1589d855bee24a2fef541147e806b8f28b0b SHA512 ff76487d4d587371c8403b2f92d929d2de827cf22922794596d6997d283714b898904c73fbc4d4df1830c10977d2ea55524c7bbcb0c5ad260c979eb4818639d1
|
DIST jool-4.1.15.tar.gz 634141 BLAKE2B f0ac39b4a2f5fecf3039cd02abd1d83dc25faa799bb19ddc840473e10ca2294fae3c22ef00f106e53e304442714f1589d855bee24a2fef541147e806b8f28b0b SHA512 ff76487d4d587371c8403b2f92d929d2de827cf22922794596d6997d283714b898904c73fbc4d4df1830c10977d2ea55524c7bbcb0c5ad260c979eb4818639d1
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
PR merged https://github.com/NICMx/Jool/pull/441.patch
|
|
||||||
fix compilation in kernel v6.18
|
|
||||||
struct flowi4.tos renamed to 'dscp' and type dscp_t in commit
|
|
||||||
--- a/src/mod/common/rfc7915/6to4.c
|
|
||||||
+++ b/src/mod/common/rfc7915/6to4.c
|
|
||||||
@@ -203,7 +203,11 @@ static verdict compute_flowix64(struct xlation *state)
|
|
||||||
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(struct xlation *state)
|
|
||||||
|
|
||||||
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);
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Copyright 2024-2025 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit linux-mod-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Jool is an Open Source SIIT and NAT64 for linux"
|
|
||||||
HOMEPAGE="https://nicmx.github.io/Jool/en/index.html"
|
|
||||||
SRC_URI="https://github.com/NICMx/Jool/releases/download/v${PV}/jool-${PV}.tar.gz"
|
|
||||||
S="${WORKDIR}/jool-${PV}"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="iptables"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-fix_618.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
local modlist=(
|
|
||||||
jool_common=:src/mod/common:src/mod/common
|
|
||||||
jool=:src/mod/nat64:src/mod/nat64
|
|
||||||
jool_siit=:src/mod/siit:src/mod/siit
|
|
||||||
)
|
|
||||||
local modargs=(
|
|
||||||
KERNEL_DIR="${KV_OUT_DIR}"
|
|
||||||
MODULES_DIR="/lib/modules/${KV_FULL}"
|
|
||||||
)
|
|
||||||
use iptables || modargs+=(
|
|
||||||
CFLAGS_MODULE="-DXTABLES_DISABLED"
|
|
||||||
)
|
|
||||||
linux-mod-r1_src_compile
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user