Protocolary updates for release 4.1.7

NICMx · Jan 27, 2022 · 1c1267f · 1c1267f
1 parent 04ef98d
commit 1c1267f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 69 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 Jool - SIIT and NAT64 for Linux
-Copyright (C) 2021  NIC Mexico <[email protected]>
+Copyright (C) 2022  NIC Mexico <[email protected]>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([Jool], [4.1.6], [[email protected]])
+AC_INIT([Jool], [4.1.7], [[email protected]])
 AC_CONFIG_SRCDIR([src/common/xlat.h])
 AM_INIT_AUTOMAKE([subdir-objects])
 LT_PREREQ([2.4.6])

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,7 +1,7 @@
 markdown: kramdown
 baseurl: /Jool
 repository-url: https://github.com/NICMx/Jool
-latest-version: 4.1.6
+latest-version: 4.1.7
 
 rfc-siit: https://tools.ietf.org/html/rfc7915
 draft-siit-eam: https://tools.ietf.org/html/rfc7757

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -59,7 +59,7 @@
 	<div id="footer">
 		<div class="logo-tec"><a href="http://www.itesm.mx"><img src="../images/logo-tec.png" alt="logo-tec" /></a></div>
 		<div class="logo-nic"><a href="http://www.nicmexico.mx/"><img src="../images/logo-nic.png" alt="logo-nic" /></a></div>
-		<p class="legal">&copy;Jool 2021&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>
+		<p class="legal">&copy;Jool 2022&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>
 	</div>
 
 	<script>

diff --git a/docs/en/download.md b/docs/en/download.md
@@ -28,10 +28,11 @@ Jool 4.2 is a compliant SIIT, Stateful NAT64 and MAP-T.
 
 Jool 4.1 is a [compliant SIIT and Stateful NAT64](intro-jool.html#compliance).
 
-Currently, 4.1.6 is the most mature version of Jool.
+Currently, 4.1.7 is the most mature version of Jool.
 
 | Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb |
 |--------------|---------|---------|-------------------|------------|------|
+| 2022-01-27   | **4.1.7** | [Download]({{ page.url-dl }}/v4.1.7/jool-4.1.7.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.7/jool-4.1.7.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.7" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.7/jool-dkms_4.1.7-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.7/jool-tools_4.1.7-1_amd64.deb) (amd64 only) |
 | 2021-12-10   | **4.1.6** | [Download]({{ page.url-dl }}/v4.1.6/jool-4.1.6.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.6/jool-4.1.6.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.6" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.6/jool-dkms_4.1.6-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.6/jool-tools_4.1.6-1_amd64.deb) (amd64 only) |
 | 2021-02-19   | 4.1.5 | [Download]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.5" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.5/jool-dkms_4.1.5-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.5/jool-tools_4.1.5-1_amd64.deb) (amd64 only) |
 | 2020-10-07   | 4.1.4 | [Download]({{ page.url-dl }}/v4.1.4/jool-4.1.4.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.4/jool-4.1.4.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.4" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.4/jool-dkms_4.1.4-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.4/jool-tools_4.1.4-1_amd64.deb) (amd64 only) |

diff --git a/docs/en/index.md b/docs/en/index.md
@@ -20,10 +20,10 @@ Jool is an Open Source [SIIT and NAT64](intro-xlat.html) for Linux.
 
 ## Status
 
-- The most mature version is [4.1.6](download.html#41x).
+- The most mature version is [4.1.7](download.html#41x).
 - The second release candidate for version [4.2.0](download.html#42x) is also available now.
 
-Due to a temporary resource shortage, the project's development has slowed down to essential maintenance. No new features are expected to be developed during the first half of 2021 (at least), but bugfixing and support will remain active.
+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.
 
 -------------------
 
@@ -35,30 +35,9 @@ Due to a temporary resource shortage, the project's development has slowed down
 
 ## Latest News
 
-### 2021-12-10
+### 2022-01-27
 
-Version 4.1.6 has been released. Changelog:
+Version 4.1.7 has been released:
 
-- [#362](https://github.com/NICMx/Jool/issues/362): Fix joold in kernels 5.10+.
-- [#363](https://github.com/NICMx/Jool/issues/363): Improve performance of EAMT table insertions during atomic configuration.
-- [#364](https://github.com/NICMx/Jool/pull/364): Tweak the TCP state machine so [`--handle-rst-during-fin-rcv`](https://www.jool.mx/en/usr-flags-global.html#handle-rst-during-fin-rcv) works in both translation directions (IPv4 -> IPv6, IPv6 -> IPv4).
-- [#368](https://github.com/NICMx/Jool/issues/368): Fix kernel crash during `pool4 flush`.
-- [#369](https://github.com/NICMx/Jool/issues/369): Fix localhost traffic on Netfilter SIIT mode.
-- [#370](https://github.com/NICMx/Jool/issues/370): Fix ICMP errors bounced back as responses from echo requests or echo replies.
-- Update the [kernel support table](intro-jool.html#compatibility).
-
-The second release candidate for version 4.2.0 is also available. Changelog:
-
-- Patch some [MAP-T address translation bugs](https://github.com/NICMx/Jool/commit/5f19e8a7efcbb4e9df708405c0b4e77d1bbbaec3).
-- [Clean](https://github.com/NICMx/Jool/commit/5a46e74e5e1dd03fb62aaa13fac38c5ac1446de7) [up](https://github.com/NICMx/Jool/commit/b7e8ea876a6d155f4d59fe0b0645efadadbf2f08) [unit](https://github.com/NICMx/Jool/commit/6c06470e9bb04c2ce3ea92053d847d674838064d) [tests](https://github.com/NICMx/Jool/commit/76929f81ed720635066223c2b99d165c7cd01d1a).
-- [Internal API cleanups](https://github.com/NICMx/Jool/commit/41e3ca69459ae2ab461fdf2c106d1e9bf47d51ff).
-
-As a reminder, here's the MAP-T documentation:
-
-- [Early introduction to MAP-T](intro-xlat.html#map-t)
-- [Detailed explanation of MAP-T](map-t.html)
-- [Jool MAP-T tutorial](run-mapt.html)
-- The code:
-	- [tar.gz](https://github.com/NICMx/Jool/releases/download/v4.2.0-rc2/jool-4.2.0.rc2.tar.gz)
-	- Debian packages: [kernel](https://github.com/NICMx/Jool/releases/download/v4.2.0-rc2/jool-dkms_4.2.0.rc2-1_all.deb), [userspace](https://github.com/NICMx/Jool/releases/download/v4.2.0-rc2/jool-tools_4.2.0.rc2-1_amd64.deb)
+- [#372](https://github.com/NICMx/Jool/issues/372): iptables dependency now optional.
 
diff --git a/src/common/xlat.h b/src/common/xlat.h
@@ -9,8 +9,8 @@
  */
 #define JOOL_VERSION_MAJOR 4
 #define JOOL_VERSION_MINOR 1
-#define JOOL_VERSION_REV 6
-#define JOOL_VERSION_DEV 1
+#define JOOL_VERSION_REV 7
+#define JOOL_VERSION_DEV 0
 
 /** See http://stackoverflow.com/questions/195975 */
 #define STR_VALUE(arg) #arg

diff --git a/src/mod/common/rfc7915/4to6.h b/src/mod/common/rfc7915/4to6.h
@@ -10,12 +10,6 @@
 
 #include "mod/common/rfc7915/common.h"
 
-#ifdef XTABLES_DISABLED
-#pragma message("Xtables disabled")
-#else
-#pragma message("Xtables enabled")
-#endif
-
 extern const struct translation_steps ttp46_steps;
 
 #endif /* SRC_MOD_COMMON_RFC7915_4TO6_H_ */
diff --git a/src/mod/nat64/jool.c b/src/mod/nat64/jool.c
@@ -93,12 +93,6 @@ static int __init nat64_init(void)
 	pr_debug("%s", banner);
 	pr_debug("Inserting NAT64 Jool...\n");
 
-#ifdef XTABLES_DISABLED
-	pr_info("(Xtables disabled)\n");
-#else
-	pr_info("(Xtables enabled)\n");
-#endif
-
 	/* Careful with the order */
 
 	error = register_pernet_subsys(&joolns_ops);

diff --git a/src/mod/siit/jool_siit.c b/src/mod/siit/jool_siit.c
@@ -59,12 +59,6 @@ static int __init siit_init(void)
 
 	pr_debug("Inserting SIIT Jool...\n");
 
-#ifdef XTABLES_DISABLED
-	pr_info("(Xtables disabled)\n");
-#else
-	pr_info("(Xtables enabled)\n");
-#endif
-
 	/* Careful with the order */
 
 	error = register_pernet_subsys(&joolns_ops);

diff --git a/src/usr/argp/main.c b/src/usr/argp/main.c
@@ -639,12 +639,6 @@ int jool_main(int argc, char **argv)
 	char *iname = NULL;
 	struct jool_result result;
 
-#ifdef XTABLES_DISABLED
-	printf("(Xtables disabled)\n");
-#else
-	printf("(Xtables enabled)\n");
-#endif
-
 	if (argc == 1)
 		return show_help(argv[0]);
 

diff --git a/src/usr/argp/wargp/instance.c b/src/usr/argp/wargp/instance.c
@@ -165,12 +165,6 @@ struct add_args {
 	struct wargp_prefix6 pool6;
 };
 
-#ifdef XTABLES_DISABLED
-#pragma message("Xtables disabled")
-#else
-#pragma message("Xtables enabled")
-#endif
-
 static struct wargp_option add_opts[] = {
 	WARGP_INAME(struct add_args, iname, "add"),
 	{

diff --git a/src/usr/joold/joold.8 b/src/usr/joold/joold.8
@@ -1,6 +1,6 @@
 .\" Manpage for jool's session synchronization daemon.
 
-.TH joold 8 2021-12-10 v4.1.6 "NAT64 Jool's Session Synchronization Daemon"
+.TH joold 8 2022-01-27 v4.1.7 "NAT64 Jool's Session Synchronization Daemon"
 
 .SH NAME
 joold - Userspace Session Synchronization (SS) daemon for NAT64 Jool.
@@ -159,7 +159,7 @@ If you want to mail us instead, use [email protected].
 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.
 
 .SH COPYRIGHT
-Copyright 2021 NIC Mexico.
+Copyright 2022 NIC Mexico.
 .br
 License: GPLv2 (GNU GPL version 2)
 .br

diff --git a/src/usr/nat64/jool.8 b/src/usr/nat64/jool.8
@@ -1,7 +1,7 @@
 .\" Manpage for jool's userspace app.
 .\" Report bugs to [email protected].
 
-.TH jool 8 2021-12-10 v4.1.6 "NAT64 Jool's Userspace Client"
+.TH jool 8 2022-01-27 v4.1.7 "NAT64 Jool's Userspace Client"
 
 .SH NAME
 jool - Interact with NAT64 Jool (the kernel module).
@@ -415,7 +415,7 @@ Our issue tracker is https://github.com/NICMx/Jool/issues.
 If you want to mail us instead, use [email protected].
 
 .SH COPYRIGHT
-Copyright 2021 NIC Mexico.
+Copyright 2022 NIC Mexico.
 .br
 License: GPLv2 (GNU GPL version 2)
 .br

diff --git a/src/usr/siit/jool_siit.8 b/src/usr/siit/jool_siit.8
@@ -1,7 +1,7 @@
 .\" Manpage for jool's userspace app.
 .\" Report bugs to [email protected].
 
-.TH jool_siit 8 2021-12-10 v4.1.6 "SIIT Jool's Userspace Client"
+.TH jool_siit 8 2022-01-27 v4.1.7 "SIIT Jool's Userspace Client"
 
 .SH NAME
 jool_siit - Interact with SIIT Jool (the kernel module).
@@ -321,7 +321,7 @@ Our issue tracker is https://github.com/NICMx/Jool/issues.
 If you want to mail us instead, use [email protected].
 
 .SH COPYRIGHT
-Copyright 2021 NIC Mexico.
+Copyright 2022 NIC Mexico.
 .br
 License: GPLv2 (GNU GPL version 2)
 .br