community/jool-{tools,modules-*}: upgrade to 4.1.10

4 files changed, 8 insertions, 96 deletions

diff --git a/community/jool-modules-lts/APKBUILD b/community/jool-modules-lts/APKBUILD
index 69189be5f2a..4a6288cce68 100644
--- a/community/jool-modules-lts/APKBUILD
+++ b/community/jool-modules-lts/APKBUILD
@@ -5,8 +5,8 @@
 # Keep _ver in sync with community/jool-tools!
 # When changing _ver we *must* bump _rel!
 _name=jool-modules
-_ver=4.1.9
-_rel=0
+_ver=4.1.10
+_rel=1
 
 # For custom kernels set $FLAVOR.
 _flavor="$FLAVOR"
@@ -96,5 +96,5 @@ _modules_install() {
 }
 
 sha512sums="
-469b0f39821ede3852ce33f46b2ea5af78a426f3c2852b330dcf546ccd1326ec6b7bc36ab371c7e3e44d987596967c3ff60f13f5a2cf54a9b3432377b0ea9819  jool-4.1.9.tar.gz
+2cd71a626fcd8f09703d66f2f6c50a7459b4b1bf03722f78e1565e71061f88d41b6055f41978f49a7632823cc9bffba4c4048d300eeef381c29451a50b802798  jool-4.1.10.tar.gz
 "
diff --git a/community/jool-modules-rpi/APKBUILD b/community/jool-modules-rpi/APKBUILD
index 8ab3450e2a9..7812adb7173 100644
--- a/community/jool-modules-rpi/APKBUILD
+++ b/community/jool-modules-rpi/APKBUILD
@@ -5,8 +5,8 @@
 # Keep _ver in sync with community/jool-tools!
 # When changing _ver we *must* bump _rel!
 _name=jool-modules
-_ver=4.1.9
-_rel=0
+_ver=4.1.10
+_rel=1
 
 # For custom kernels set $FLAVOR.
 _flavor="$FLAVOR"
@@ -95,5 +95,5 @@ _modules_install() {
 }
 
 sha512sums="
-469b0f39821ede3852ce33f46b2ea5af78a426f3c2852b330dcf546ccd1326ec6b7bc36ab371c7e3e44d987596967c3ff60f13f5a2cf54a9b3432377b0ea9819  jool-4.1.9.tar.gz
+2cd71a626fcd8f09703d66f2f6c50a7459b4b1bf03722f78e1565e71061f88d41b6055f41978f49a7632823cc9bffba4c4048d300eeef381c29451a50b802798  jool-4.1.10.tar.gz
 "
diff --git a/community/jool-tools/APKBUILD b/community/jool-tools/APKBUILD
index 4ed1926fc95..711fbb4d6ee 100644
--- a/community/jool-tools/APKBUILD
+++ b/community/jool-tools/APKBUILD
@@ -3,7 +3,7 @@
 _projname=jool
 pkgname=jool-tools
 # Keep in sync with _ver in community/jool-modules-{rpi,vanilla}!
-pkgver=4.1.9
+pkgver=4.1.10
 pkgrel=0
 pkgdesc="Userspace control tools for SIIT / NAT64 Jool"
 url="https://www.jool.mx"
@@ -16,7 +16,6 @@ subpackages="
 	$pkgname-bash-completion:bashcomp:noarch
 	"
 source="https://github.com/NICMx/Jool/releases/download/v$pkgver/$_projname-$pkgver.tar.gz
-	fix-build-new.patch
 	jool.conf
 	jool_siit.conf
 	joold.conf
@@ -62,8 +61,7 @@ bashcomp() {
 }
 
 sha512sums="
-469b0f39821ede3852ce33f46b2ea5af78a426f3c2852b330dcf546ccd1326ec6b7bc36ab371c7e3e44d987596967c3ff60f13f5a2cf54a9b3432377b0ea9819  jool-4.1.9.tar.gz
-19989867fc756d832eb19558b0ad3e52a5f2688ff5137ad5bb2ecd1427efe8c20bdf5f03e537757372c747d994ffac784dd1572f8d2dfb2216bb0aa80a146be6  fix-build-new.patch
+2cd71a626fcd8f09703d66f2f6c50a7459b4b1bf03722f78e1565e71061f88d41b6055f41978f49a7632823cc9bffba4c4048d300eeef381c29451a50b802798  jool-4.1.10.tar.gz
 4ae4c20fde75a0fdaed1c7c46ab5078297846b0734d31c7053575ff549984617a5486727c98f442125c6abfe8b170cde23ae4c24a4d6ff14b2ce31490bd46633  jool.conf
 a48c84c49c24dd6639b86393fa7870b91fa700ba1e561e2440db1f4a94f3393171407a3cc683f4fc7a26a591578ec732dd3f708c1b4c45787a6e7ec038576357  jool_siit.conf
 15758922ba83219f7edf34d93d825fcafb354b551a79f9b70e486faebcb154f55a52806aca6f7b9ec0d8277caa64a06a2525829be41c538cb3c678a78112b5e9  joold.conf
diff --git a/community/jool-tools/fix-build-new.patch b/community/jool-tools/fix-build-new.patch
deleted file mode 100644
index e2a10783a66..00000000000
--- a/community/jool-tools/fix-build-new.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Patch-Source: https://github.com/NICMx/Jool/commit/490ddb0933061cab3c2a7952dffc61789deed565
-fixes a
-/usr/lib/gcc/x86_64-alpine-linux-musl/12.2.1/../../../../x86_64-alpine-linux-musl/bin/ld: libxt_JOOL_SIIT.o: in function `_init':
-libxt_JOOL_SIIT.c:(.text+0xde): multiple definition of `_init'; /usr/lib/gcc/x86_64-alpine-linux-musl/12.2.1/../../../../lib/crti.o:/home/buildozer/aports/main/musl/src/c1b42c4a3a0324ec25877980f59db233fa420925/crt/x86_64/crti.s:4: first defined here
-collect2: error: ld returned 1 exit status
-/usr/lib/gcc/x86_64-alpine-linux-musl/12.2.1/../../../../x86_64-alpine-linux-musl/bin/ld: libxt_JOOL_SIIT.o: in function `_init':
-libxt_JOOL_SIIT.c:(.text+0xde): multiple definition of `_init'; /usr/lib/gcc/x86_64-alpine-linux-musl/12.2.1/../../../../lib/crti.o:/home/buildozer/aports/main/musl/src/c1b42c4a3a0324ec25877980f59db233fa420925/crt/x86_64/crti.s:4: first defined here
-collect2: error: ld returned 1 exit status
---
-From 490ddb0933061cab3c2a7952dffc61789deed565 Mon Sep 17 00:00:00 2001
-From: Alberto Leiva Popper <ydahhrk@gmail.com>
-Date: Fri, 27 Jan 2023 09:50:45 -0600
-Subject: [PATCH] Modernize the iptables shared object exports
-
-Fixes Debian bug 1029268:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029268
-
-man 3 dlopen:
-
-> Use of _init and _fini is now deprecated in favor of the
-> aforementioned constructors and destructors, which among other
-> advantages, permit multiple initialization and finalization functions
-> to be defined.
-
-Replace _init() with __attribute__((constructor)). Vincent Bernat
-already confirmed this works.
-
-Also returns the static keyword, which was removed during #337. I'm
-conjecturing that patch likely was a misled accident, and the current
-one should be the proper fix for both bugs. This, I'm not completely
-sure will work, but we'll see.
----
- src/usr/iptables/common.c          | 17 ++++++++++++++---
- src/usr/iptables/libxt_JOOL.c      |  1 +
- src/usr/iptables/libxt_JOOL_SIIT.c |  1 +
- 3 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/src/usr/iptables/common.c b/src/usr/iptables/common.c
-index 33b7eb018..9bf90046c 100644
---- a/src/usr/iptables/common.c
-+++ b/src/usr/iptables/common.c
-@@ -124,10 +124,21 @@ static struct xtables_target targets[] = {
- };
- 
- /*
-- * Please don't add the static modifier to this function.
-- * https://github.com/NICMx/Jool/issues/337
-+ * This function has been problematic.
-+ *
-+ * In issue #337, someone found out that removing the static keyword fixed some
-+ * Python crash: https://github.com/NICMx/Jool/issues/337. This seemed to work
-+ * fine for a while, until Debian bug #1029268 happened:
-+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029268
-+ *
-+ * Looking at the dlopen(3) manual page, it would seem both bugs were caused by
-+ * our (by now deprecated) use of the "_init" function. Turns out people
-+ * nowadays use __attribute__((constructor)) instead.
-+ *
-+ * Now that the code has been modernized, I decided to return the static
-+ * keyword. Try removing it again if someone complains.
-  */
--void _init(void)
-+static void __attribute__((constructor)) IPTABLES_MODULE_MAIN(void)
- {
- 	xtables_register_targets(targets, sizeof(targets) / sizeof(targets[0]));
- }
-diff --git a/src/usr/iptables/libxt_JOOL.c b/src/usr/iptables/libxt_JOOL.c
-index 701c8165d..e3a9385ff 100644
---- a/src/usr/iptables/libxt_JOOL.c
-+++ b/src/usr/iptables/libxt_JOOL.c
-@@ -2,4 +2,5 @@
- 
- #define IPTABLES_MODULE_NAME IPTABLES_NAT64_MODULE_NAME
- #define IPTABLES_MODULE_TYPE XT_NAT64
-+#define IPTABLES_MODULE_MAIN jool_nat64_xtables_init
- #include "common.c"
-diff --git a/src/usr/iptables/libxt_JOOL_SIIT.c b/src/usr/iptables/libxt_JOOL_SIIT.c
-index e30ca7b96..217387c90 100644
---- a/src/usr/iptables/libxt_JOOL_SIIT.c
-+++ b/src/usr/iptables/libxt_JOOL_SIIT.c
-@@ -2,4 +2,5 @@
- 
- #define IPTABLES_MODULE_NAME IPTABLES_SIIT_MODULE_NAME
- #define IPTABLES_MODULE_TYPE XT_SIIT
-+#define IPTABLES_MODULE_MAIN jool_siit_xtables_init
- #include "common.c"