Update to latest versions

Signed-off-by: Laurent Bercot <ska@appnovation.com>

7 files changed, 53 insertions, 49 deletions

diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile
index 71faa0d..02bd535 100644
--- a/sub/bearssl/Makefile
+++ b/sub/bearssl/Makefile
@@ -1,7 +1,5 @@
 
 BEARSSL_NAME := bearssl
-# latest version from 2022-06-22
-#BEARSSL_VERSION := 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
 # latest version from 2024-06-12
 BEARSSL_VERSION := 3c040368f6791553610e362401db1efff4b4c5b8
 BEARSSL_URLDIR := https://www.bearssl.org/git
diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile
index dddc6c4..8b4f6e8 100644
--- a/sub/dropbear/Makefile
+++ b/sub/dropbear/Makefile
@@ -1,7 +1,6 @@
 
-#DROPBEAR_VERSION ?= 2024.84
-DROPBEAR_VERSION ?= 2024.85
-# DROPBEAR_VERSION ?= 2020.81  # previous working version
+DROPBEAR_VERSION ?= 2025.87
+# DROPBEAR_VERSION ?= 2024.85  # previous working version
 DROPBEAR_SITE := https://mirror.dropbear.nl/mirror/releases
 # DROPBEAR_SITE := https://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_CONF_STATIC := $(if $(filter true,$(TARGET_STATIC)),--enable-static,)
diff --git a/sub/e2fsprogs/Makefile b/sub/e2fsprogs/Makefile
index 8ec99e6..e03e5e4 100644
--- a/sub/e2fsprogs/Makefile
+++ b/sub/e2fsprogs/Makefile
@@ -1,6 +1,6 @@
 
 E2FSPROGS_NAME := e2fsprogs
-E2FSPROGS_VERSION := 1.47.1
+E2FSPROGS_VERSION := 1.47.2
 E2FSPROGS_URLDIR := https://kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_TAREXT := tar.xz
 E2FSPROGS_TARLETTER := J
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile
index 65f23b9..df4ca54 100644
--- a/sub/kernel/Makefile
+++ b/sub/kernel/Makefile
@@ -15,7 +15,7 @@ $(OUTPUT)/build-build/.lh_kernel_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERS
 	exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/src $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/linux-$(KERNEL_VERSION)
 	cd $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION) && setuidgid $(NORMALUSER) tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz
 	exec setuidgid $(NORMALUSER) mv -f $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/linux-$(KERNEL_VERSION) $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/src
-	exec setuidgid $(NORMALUSER) sh -c 'for i in `ls -1 sub/kernel | grep "\.patch$$"` ; do patch -d $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/src -p1 < sub/kernel/$$i ; done'
+	exec setuidgid $(NORMALUSER) sh -c 'for i in `ls -1 sub/kernel | grep "\.patch$$"` ; do ( cd $(OUTPUT)/build-build/opt/linux-$(KERNEL_VERSION)/src && patch -p1 < $(WD)/sub/kernel/$$i ) ; done'
 	exec setuidgid $(NORMALUSER) touch $@
 
 $(OUTPUT)/build-build/.lh_kernel_headers_installed: $(OUTPUT)/build-build/.lh_kernel_unpacked
@@ -26,7 +26,7 @@ $(OUTPUT)/build-build/.lh_kernel_headers_installed: $(OUTPUT)/build-build/.lh_ke
 $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
 	exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-$(TRIPLE)/kernel
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz
-	exec setuidgid $(NORMALUSER) sh -c 'for i in `ls -1 sub/kernel | grep "\.patch$$"` ; do patch -d $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) -p1 < sub/kernel/$$i ; done'
+	exec setuidgid $(NORMALUSER) sh -c 'for i in `ls -1 sub/kernel | grep "\.patch$$"` ; do ( cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) && patch -p1 < $(WD)/sub/kernel/$$i ) ; done'
 	exec setuidgid $(NORMALUSER) s6-touch $@
 
 $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_configured: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_unpacked $(KERNEL_CONFIG) | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile
index a8c6146..2e43b8c 100644
--- a/sub/kmod/Makefile
+++ b/sub/kmod/Makefile
@@ -1,8 +1,8 @@
 
 KMOD_NAME := kmod
-#KMOD_VERSION := 32
+# pin to 33, 34+ needs meson (34 pretends to still support autotools but it's broken)
 KMOD_VERSION := 33
-KMOD_URLDIR := https://kernel.org/pub/linux/utils/kernel/$(KMOD_NAME)
+KMOD_URLDIR := https://mirrors.edge.kernel.org/pub/linux/utils/kernel/$(KMOD_NAME)
 KMOD_TAREXT := tar.xz
 KMOD_TARLETTER := J
 
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index b8814c6..9af0fd2 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -1,56 +1,59 @@
 
-SKALIBS_VERSION := 18290598b001146c684d5b67762007fee0182071
-# SKALIBS_VERSION := v2.14.3.0
+SKALIBS_VERSION := 6b8878ed9df46954d49d82bcc091c02a6a1a349e
+# SKALIBS_VERSION := v2.14.4.0
 
-NSSS_VERSION := 058cb099026db5839fb62da38570a9066fc3e280
-# NSSS_VERSION := v0.2.0.5
+NSSS_VERSION := af43918b5c8605770af2b895ac9869a0773588b3
+# NSSS_VERSION := v0.2.1.0
 
-# UTMPS_VERSION := bb5f31c4d294f26cd3d4d03bd540f0dd0526b810
-UTMPS_VERSION := v0.1.2.2
+UTMPS_VERSION := 303a139e04436058ac9c8ca3cfc9b55df9ae66f2
+# UTMPS_VERSION := v0.1.3.0
 
-EXECLINE_VERSION := 7966e2038925e3be60e82402673dcf080b6b3a89
-# EXECLINE_VERSION := v2.9.6.1
+EXECLINE_VERSION := b9eb768dc8a61251a0c39fb3845d898338892587
+# EXECLINE_VERSION := v2.9.7.0
 
-S6_VERSION := 83af5922365b2c6e9decc7c8d6168deb76994e85
-# S6_VERSION := v2.13.1.0
+S6_VERSION := 07a793bc3b40d690da98dbf4436ac4503061e0fe
+# S6_VERSION := v2.13.2.0
 
-S6_RC_VERSION := 7ea129564e5df90963fe0d3302dd3244050fa3af
-# S6_RC_VERSION := v0.5.5.0
+S6_RC_VERSION := 09ccd3128f2296d3a0cd1602e64caf06cf22c64f
+# S6_RC_VERSION := v0.5.6.0
 
-S6_LINUX_INIT_VERSION := 69f6e33e931e0302c94ceea83c691644d64a943d
-# S6_LINUX_INIT_VERSION := v1.1.2.1
+S6_LINUX_INIT_VERSION := 445c07024609de545795e16035a4a1ab12586561
+# S6_LINUX_INIT_VERSION := v1.1.3.0
 
-S6_PORTABLE_UTILS_VERSION := 133a98cfccabd660afe2d59c142e0f83ebd88b28
-# S6_PORTABLE_UTILS_VERSION := v2.3.0.4
+S6_PORTABLE_UTILS_VERSION := bc7c571125e245bb5a08578e3b31752fc7335460
+# S6_PORTABLE_UTILS_VERSION := v2.3.1.0
 
-S6_LINUX_UTILS_VERSION := 8de20625f671a4c45abfc46821651476cf6d5fe6
-# S6_LINUX_UTILS_VERSION := v2.6.2.1
+S6_LINUX_UTILS_VERSION := 7cdb6a63f20f1abc96738ebf7b97effcae5bfd4b
+# S6_LINUX_UTILS_VERSION := v2.6.3.0
 
-S6_DNS_VERSION := 0d15ddfe8aaa1faf94a3734091c70739fcbb28e4
-# S6_DNS_VERSION := v2.3.8.0
+S6_DNS_VERSION := 2f3ccc92df447cc5705e6013e61c1e4bd75d393e
+# S6_DNS_VERSION := v2.4.1.0
 
-S6_NETWORKING_VERSION := f7965cf9e2f22d94b33aec470479f31cedc2e4f8
-# S6_NETWORKING_VERSION := v2.7.0.4
+S6_NETWORKING_VERSION := 70eaae07db27291d918aaf84f1c08bc0ac744534
+# S6_NETWORKING_VERSION := v2.7.1.0
 
-MDEVD_VERSION := 80460c48ad1553dcb3396a70ccd86e9194371277
-# MDEVD_VERSION := v0.1.6.5
+MDEVD_VERSION := 777100e73376d0977ee4300b5580670edb6df08f
+# MDEVD_VERSION := v0.1.7.0
 
-TIPIDEE_VERSION := 9cbb088ed47e72665efd40c9cabef37be77edd40
-# TIPIDEE_VERSION := v0.0.5.1
+TIPIDEE_VERSION := f0b2ad1b2023bc04f3add106c63533d19b878d78
+# TIPIDEE_VERSION := v0.0.6.0
 
-SHIBARI_VERSION := 6fbe5f610abf1dada9f94672643d5fc6c01d4cfc
-# SHIBARI_VERSION := v0.0.1.2
+SHIBARI_VERSION := 5f04bdbd146462cbcfaab84ec1667f0c2cf7de11
+# SHIBARI_VERSION := v0.0.2.0
 
-BCNM_VERSION := 16107f18da64ac348026b8bfcf3ed39e9ff5d558
-# BCNM_VERSION := v0.0.1.8
+BCNM_VERSION := 4ac05cd949282651c182a9c36ff508cba72d1978
+# BCNM_VERSION := v0.0.2.0
 
-DNSFUNNEL_VERSION := ff4f1c3e5bdee68fe0baebd55b9b55e7e9b99e5a
-# DNSFUNNEL_VERSION := v0.0.2.0
+DNSFUNNEL_VERSION := 9b3435c02f1e731deda2d958c5dcfbc1e66fa1b2
+# DNSFUNNEL_VERSION := v0.0.3.0
 
-APASTE_VERSION := 9456f992cc1f9afc221c61ad9010d9c9eddfa240
-# APASTE_VERSION := v0.0.2.1
+APASTE_VERSION := 287ecb751f0a949a3dd41354b090daf638233ade
+# APASTE_VERSION := v0.0.3.0
 
-SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD TIPIDEE SHIBARI BCNM DNSFUNNEL APASTE
+S6_FRONTEND_VERSION := 31c208b970599588b00837294871fa4e4eeb01de
+# S6_FRONTEND_VERSION := v0.0.1.0
+
+SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD TIPIDEE SHIBARI BCNM DNSFUNNEL APASTE S6_FRONTEND
 SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS
 
 SKALIBS_DEPENDENCIES :=
@@ -70,6 +73,7 @@ SHIBARI_DEPENDENCIES := SKALIBS S6 S6_DNS
 BCNM_DEPENDENCIES := SKALIBS
 DNSFUNNEL_DEPENDENCIES := SKALIBS S6_DNS
 APASTE_DEPENDENCIES := SKALIBS S6_NETWORKING
+S6_FRONTEND_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_RC S6_LINUX_INIT
 
 SKALIBS_CATEGORY := prog
 NSSS_CATEGORY := admin
@@ -88,6 +92,7 @@ SHIBARI_CATEGORY := web
 BCNM_CATEGORY := admin
 DNSFUNNEL_CATEGORY := web
 APASTE_CATEGORY := web
+S6_FRONTEND_CATEGORY := admin
 
 SKALIBS_TOKEN := libskarnet.a.xyzzy
 NSSS_TOKEN := nsssd-unix
@@ -106,13 +111,14 @@ SHIBARI_TOKEN := shibari-server-udp
 BCNM_TOKEN := bcnm-waitif
 DNSFUNNEL_TOKEN := dnsfunneld
 APASTE_TOKEN := apaste
+S6_FRONTEND_TOKEN := s6-frontend-config-preprocess
 
 SKAWARE_ENV := $(if $(filter true,$(TARGET_STATIC)),,env LDFLAGS=-Wl,-rpath-link,$(OUTPUT)/rootfs/library.so)
 SKAWARE_OPTIONS := --enable-slashpackage --enable-nsss $(if $(filter true,$(TARGET_STATIC)),--enable-static-libc --disable-shared,--enable-shared --disable-allstatic)
-SKAWARE_BUILD_OPTIONS := --enable-slashpackage --disable-shared --enable-allstatic 
-SKALIBS_OPTIONS := --with-default-path=/command:/usr/bin:/bin --with-sysdep-devurandom=yes --with-sysdep-grndinsecure=no --with-sysdep-posixspawnearlyreturn=no
+SKAWARE_BUILD_OPTIONS := --enable-slashpackage --disable-shared --enable-allstatic
+SKALIBS_OPTIONS := --with-default-path=/command:/usr/bin:/bin --with-sysdep-devurandom=yes --with-sysdep-grndinsecure=no --with-sysdep-posixspawnearlyreturn=no --with-sysdep-procselfexe=/proc/self/exe
 NSSS_OPTIONS := --enable-libc-includes
-UTMPS_OPTIONS := --enable-libc-includes
+UTMPS_OPTIONS := --enable-libc-includes --enable-utmp
 EXECLINE_OPTIONS := --disable-pedantic-posix --enable-multicall
 S6_OPTIONS :=
 S6_RC_OPTIONS :=
@@ -127,6 +133,7 @@ SHIBARI_OPTIONS :=
 BCNM_OPTIONS :=
 DNSFUNNEL_OPTIONS :=
 APASTE_OPTIONS :=
+S6_FRONTEND_OPTIONS := --enable-aliases-daemontools --enable-aliases-runit 
 
 $(OUTPUT)/build-$(TRIPLE)/s6-networking-$(S6_NETWORKING_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed
 
diff --git a/sub/xz/Makefile b/sub/xz/Makefile
index a355fd4..3e3cdf7 100644
--- a/sub/xz/Makefile
+++ b/sub/xz/Makefile
@@ -1,6 +1,6 @@
 
 XZ_NAME := xz
-XZ_VERSION := 5.4.1
+XZ_VERSION := 5.8.1
 XZ_URLDIR := https://tukaani.org/$(XZ_NAME)
 XZ_TAREXT := tar.xz
 XZ_TARLETTER := J