Skip to content

Commit 5afde37

Browse files
ydahhrkydahhrk
committed
Protocolary updates for release 4.1.14
1 parent 62f2c18 commit 5afde37

File tree

16 files changed

+35
-38
lines changed

16 files changed

+35
-38
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ You might also want to see [contact info](https://nicmx.github.io/Jool/en/contac
8383

8484
```
8585
Jool - SIIT and NAT64 for Linux
86-
Copyright (C) 2024 NIC Mexico <[email protected]>
86+
Copyright (C) 2025 NIC Mexico <[email protected]>
8787
8888
This program is free software; you can redistribute it and/or
8989
modify it under the terms of the GNU General Public License

‎configure.ac

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.68])
5-
AC_INIT([Jool], [4.1.13], [[email protected]])
5+
AC_INIT([Jool], [4.1.14], [[email protected]])
66
AC_CONFIG_SRCDIR([src/common/xlat.h])
77
AM_INIT_AUTOMAKE([subdir-objects])
88
LT_PREREQ([2.4.6])
@@ -81,12 +81,13 @@ LT_INIT
8181
AC_CONFIG_MACRO_DIRS([m4])
8282

8383
# Spit out the makefiles.
84-
AC_OUTPUT(Makefile
84+
AC_CONFIG_FILES([Makefile
8585
src/common/Makefile
8686
src/usr/Makefile
8787
src/usr/util/Makefile
8888
src/usr/nl/Makefile
8989
src/usr/argp/Makefile
9090
src/usr/siit/Makefile
9191
src/usr/nat64/Makefile
92-
src/usr/joold/Makefile)
92+
src/usr/joold/Makefile])
93+
AC_OUTPUT

‎docs/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
markdown: kramdown
22
baseurl: /Jool
33
repository-url: https://github.com/NICMx/Jool
4-
latest-version: 4.1.13
4+
latest-version: 4.1.14
55

66
rfc-siit: https://tools.ietf.org/html/rfc7915
77
draft-siit-eam: https://tools.ietf.org/html/rfc7757

‎docs/_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<div id="footer">
6060
<div class="logo-tec"><a href="http://www.itesm.mx"><img src="../images/logo-tec.png" alt="logo-tec" /></a></div>
6161
<div class="logo-nic"><a href="http://www.nicmexico.mx/"><img src="../images/logo-nic.png" alt="logo-nic" /></a></div>
62-
<p class="legal">&copy;Jool 2024&nbsp; &#124; &nbsp; <a href="../doc/AP_Jool.pdf" style="color:white;">Privacy Notice</a>&nbsp; &#124; &nbsp; <a href="../doc/20180123_TU_Jool.pdf" style="color:white;">Terms of Use</a></p>
62+
<p class="legal">&copy;Jool 2025&nbsp; &#124; &nbsp; <a href="../doc/AP_Jool.pdf" style="color:white;">Privacy Notice</a>&nbsp; &#124; &nbsp; <a href="../doc/20180123_TU_Jool.pdf" style="color:white;">Terms of Use</a></p>
6363
</div>
6464
</body>
6565
</html>

‎docs/en/download.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ url-dl: https://github.com/NICMx/Jool/releases/download
1616

1717
Jool 4.1 is a [compliant SIIT and Stateful NAT64](intro-jool.html#compliance).
1818

19-
Currently, 4.1.13 is the most mature version of Jool.
19+
Currently, 4.1.14 is the most mature version of Jool.
2020

2121
| Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb |
2222
|--------------|---------|---------|-------------------|------------|------|
23+
| 2025-04-14 | **4.1.14** | [Download]({{ page.url-dl }}/v4.1.14/jool-4.1.14.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.14/jool-4.1.14.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.14" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.14/jool-dkms_4.1.14-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.14/jool-tools_4.1.14-1_amd64.deb) (amd64 only) |
2324
| 2024-08-23 | **4.1.13** | [Download]({{ page.url-dl }}/v4.1.13/jool-4.1.13.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.13/jool-4.1.13.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.13" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.13/jool-dkms_4.1.13-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.13/jool-tools_4.1.13-1_amd64.deb) (amd64 only) |
2425
| 2024-06-22 | 4.1.12 | [Download]({{ page.url-dl }}/v4.1.12/jool-4.1.12.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.12/jool-4.1.12.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.12" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.12/jool-dkms_4.1.12-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.12/jool-tools_4.1.12-1_amd64.deb) (amd64 only) |
2526
| 2023-12-22 | 4.1.11 | [Download]({{ page.url-dl }}/v4.1.11/jool-4.1.11.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.11/jool-4.1.11.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.11" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.11/jool-dkms_4.1.11-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.11/jool-tools_4.1.11-1_amd64.deb) (amd64 only) |

‎docs/en/index.md

+6-13
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,17 @@ Jool is an Open Source [SIIT and NAT64](intro-xlat.html) for Linux.
2222

2323
> ![Warning](../images/warning.svg) The project's development has slowed down to essential maintenance. Bugfixing and support will remain active, but there will be no new features in the foreseeable future.
2424
25-
- The most mature version is [4.1.13](download.html#41x).
25+
- The most mature version is [4.1.14](download.html#41x).
2626
- **jool.mx is no longer maintained. Please use https://nicmx.github.io/Jool instead.**
2727

2828
-------------------
2929

3030
## Latest News
3131

32-
### 2024-08-23
32+
### 2025-04-14
3333

34-
Version 4.1.13 has been released. Bugfixes:
34+
Version 4.1.14 has been released. Bugfixes:
3535

36-
- [#410](https://github.com/NICMx/Jool/issues/410):
37-
1. Move `joold` to [`jool session proxy`](usr-flags-session.html#proxy)
38-
2. Move `jool joold advertise` to [`jool session advertise`](usr-flags-session.html#advertise)
39-
- [Debian#1074120](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074120): Fix implementation of kernel modules' `make distclean`
40-
- [#421](https://github.com/NICMx/Jool/issues/421): [`jool session follow`](usr-flags-session.html#follow)
41-
- [#422](https://github.com/NICMx/Jool/pull/422): Patch compilation on 32-bit architectures
42-
- [e8c49da](https://github.com/NICMx/Jool/commit/e8c49daaa5ae2fc5e75ad4bf7079b815775f1a50): Allow pool6 with prefix length ≠ 96 on joold
43-
- [78812d6](https://github.com/NICMx/Jool/commit/78812d66d5b1b7e3ae767b24a1e12bd9dc5b2eab): Deprecate and no-op `--ss-flush-asap`
44-
- [80760bb](https://github.com/NICMx/Jool/commit/80760bbc6e972cad0ea3ecff7d6452077b0222f4): Stop the userspace client from killing itself when the kernel module sends an unknown stat
45-
- [5150753](https://github.com/NICMx/Jool/commit/51507535de7d621263544237485bed3085ae3643): Drop `XTABLES_DISABLED`. (The kernel module now automatically detects whether the kernel was compiled with xtables support. The userspace client still needs to be told with `./configure --with-xtables=no`.)
36+
- [#424](https://github.com/NICMx/Jool/issues/424), [#432](https://github.com/NICMx/Jool/issues/432): Fix `--iptables`
37+
- Add support for Linux 6.12, 6.13, 6.14 and RHEL 9.5
38+
- [62f2c18](https://github.com/NICMx/Jool/commit/62f2c18dba3cd9616030c4fe0fcf39c67c56d7de): Disable joold debug syslogs by default

‎docs/en/intro-jool.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ Please [let us know]({{ site.repository-url }}/issues) if you find additional co
4848

4949
| Jool version | Supported Linux kernels (mainline) | Supported Linux kernels (RHEL) |
5050
|-------------------------------------|--------------------------------------|--------------------------------|
51-
| [main]({{ site.repository-url }}) | 5.15 - 5.19&#42;,<br />6.0 - 6.11(-rc2) | RHEL 9.0 - 9.5&#42; |
52-
| [4.1.13](download.html#41x) | 5.15 - 5.19&#42;,<br />6.0 - 6.11(-rc2) | RHEL 9.0 - 9.4&#42; |
51+
| [main]({{ site.repository-url }}) | 5.15 - 5.19&#42;,<br />6.0 - 6.15-rc2 | RHEL 9.0 - 9.5&#42; |
52+
| [4.1.14](download.html#41x) | 5.15 - 5.19&#42;,<br />6.0 - 6.15-rc2 | RHEL 9.0 - 9.5&#42; |
53+
| [4.1.13](download.html#41x) | 5.15 - 5.19&#42;,<br />6.0 - 6.11-rc2 | RHEL 9.0 - 9.4&#42; |
5354
| [4.1.12](download.html#41x) | 4.19 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.10 | RHEL 8.9 - 8.10,<br />RHEL 9.0 - 9.4 |
5455
| [4.1.11](download.html#41x) | 4.18 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.7 | RHEL 8.6 - 8.9,<br />RHEL 9.0 - 9.3 |
5556
| [4.1.10](download.html#41x) | 4.14 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.3 | RHEL 8.6 - 8.7,<br />RHEL 9.0 - 9.3 |

‎src/common/xlat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
#define JOOL_VERSION_MAJOR 4
1111
#define JOOL_VERSION_MINOR 1
12-
#define JOOL_VERSION_REV 13
12+
#define JOOL_VERSION_REV 14
1313
#define JOOL_VERSION_DEV 0
1414

1515
/** See http://stackoverflow.com/questions/195975 */

‎src/mod/common/db/bib/pkt_queue.c

-5
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@ void pktqueue_rm(struct pktqueue *queue, struct ipv4_transport_addr *src4)
150150
}
151151
}
152152

153-
/**
154-
* Returns > 0 if node.session.*4 > session.*4.
155-
* Returns < 0 if node.session.*4 < session.*4.
156-
* Returns 0 if node.session.*4 == session.*4.
157-
*/
158153
static int compare_simple(const struct pktqueue_session *node,
159154
const struct ipv6_transport_addr *addr)
160155
{

‎src/mod/common/packet.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,13 @@ static inline l4_protocol pkt_l4_proto(const struct packet *pkt)
278278
return pkt->l4_proto;
279279
}
280280

281-
/* Incompatible with subsequent fragments, l4_proto must be TCP. */
281+
/* Incompatible with subsequent fragments, l4_proto must be UDP. */
282282
static inline struct udphdr *pkt_udp_hdr(const struct packet *pkt)
283283
{
284284
return udp_hdr(pkt->skb);
285285
}
286286

287-
/* Incompatible with subsequent fragments, l4_proto must be UDP. */
287+
/* Incompatible with subsequent fragments, l4_proto must be TCP. */
288288
static inline struct tcphdr *pkt_tcp_hdr(const struct packet *pkt)
289289
{
290290
return tcp_hdr(pkt->skb);

‎src/mod/common/timer.c

+4
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,9 @@ int jtimer_setup(void)
6363
*/
6464
void jtimer_teardown(void)
6565
{
66+
#if LINUX_VERSION_AT_LEAST(6, 2, 0, 9, 3)
67+
timer_delete_sync(&timer);
68+
#else
6669
del_timer_sync(&timer);
70+
#endif
6771
}

‎src/usr/joold/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
bin_PROGRAMS = joold
55
joold_SOURCES = \
66
joold.c \
7-
json.c json.h
7+
json.c json.h \
8+
log.h
89

910
joold_CFLAGS = ${WARNINGCFLAGS}
1011
joold_CFLAGS += -I${top_srcdir}/src

‎src/usr/joold/joold.8

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Manpage for jool's session synchronization daemon.
22

3-
.TH joold 8 2024-08-23 v4.1.13 "NAT64 Jool's Session Synchronization Daemon"
3+
.TH joold 8 2025-04-14 v4.1.14 "NAT64 Jool's Session Synchronization Daemon"
44

55
.SH NAME
66
joold - Userspace Session Synchronization (SS) daemon for NAT64 Jool.
@@ -188,7 +188,7 @@ https://github.com/NICMx/Jool/issues
188188
To be perfectly honest, the main reason why fixing this isn't in the radar is because joold is giving me the impression that nobody is using it.
189189

190190
.SH COPYRIGHT
191-
Copyright 2024 NIC Mexico.
191+
Copyright 2025 NIC Mexico.
192192
.br
193193
License: GPLv2 (GNU GPL version 2)
194194
.br

‎src/usr/nat64/jool.8

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Manpage for jool's userspace app.
22

3-
.TH jool 8 2024-08-23 v4.1.13 "NAT64 Jool's Userspace Client"
3+
.TH jool 8 2025-04-14 v4.1.14 "NAT64 Jool's Userspace Client"
44

55
.SH NAME
66
jool - Interact with NAT64 Jool (the kernel module).
@@ -444,7 +444,7 @@ NIC Mexico & ITESM
444444
https://github.com/NICMx/Jool/issues
445445

446446
.SH COPYRIGHT
447-
Copyright 2024 NIC Mexico.
447+
Copyright 2025 NIC Mexico.
448448
.br
449449
License: GPLv2 (GNU GPL version 2)
450450
.br

‎src/usr/siit/jool_siit.8

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Manpage for jool's userspace app.
22

3-
.TH jool_siit 8 2024-08-23 v4.1.13 "SIIT Jool's Userspace Client"
3+
.TH jool_siit 8 2025-04-14 v4.1.14 "SIIT Jool's Userspace Client"
44

55
.SH NAME
66
jool_siit - Interact with SIIT Jool (the kernel module).
@@ -319,7 +319,7 @@ NIC Mexico & ITESM
319319
https://github.com/NICMx/Jool/issues
320320

321321
.SH COPYRIGHT
322-
Copyright 2024 NIC Mexico.
322+
Copyright 2025 NIC Mexico.
323323
.br
324324
License: GPLv2 (GNU GPL version 2)
325325
.br

‎test/graybox/configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ AM_INIT_AUTOMAKE([subdir-objects])
55

66
AC_PROG_CC
77
PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.1)
8-
AC_OUTPUT(Makefile usr/Makefile)
8+
AC_CONFIG_FILES([Makefile usr/Makefile])
9+
AC_OUTPUT

0 commit comments

Comments
 (0)