Move to latest versions

2 files changed, 46 insertions, 46 deletions

diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile
index 8b4f6e8..1417b22 100644
--- a/sub/dropbear/Makefile
+++ b/sub/dropbear/Makefile
@@ -1,5 +1,5 @@
 
-DROPBEAR_VERSION ?= 2025.87
+DROPBEAR_VERSION ?= 2025.89
 # DROPBEAR_VERSION ?= 2024.85  # previous working version
 DROPBEAR_SITE := https://mirror.dropbear.nl/mirror/releases
 # DROPBEAR_SITE := https://matt.ucc.asn.au/dropbear/releases
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index 9af0fd2..e613650 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -1,57 +1,57 @@
 
-SKALIBS_VERSION := 6b8878ed9df46954d49d82bcc091c02a6a1a349e
-# SKALIBS_VERSION := v2.14.4.0
+SKALIBS_VERSION := 3502b31fb0b7f19fa681d4444f1e6b97d5be0cea
+# SKALIBS_VERSION := v2.14.5.0
 
-NSSS_VERSION := af43918b5c8605770af2b895ac9869a0773588b3
-# NSSS_VERSION := v0.2.1.0
+NSSS_VERSION := 9505a88682b9dbbdf4e6afd60cde94e5be197886
+# NSSS_VERSION := v0.2.1.1
 
-UTMPS_VERSION := 303a139e04436058ac9c8ca3cfc9b55df9ae66f2
-# UTMPS_VERSION := v0.1.3.0
+UTMPS_VERSION := c79ac86f0c819340d4a56b2151fb4808b6356d7f
+# UTMPS_VERSION := v0.1.3.2
 
-EXECLINE_VERSION := b9eb768dc8a61251a0c39fb3845d898338892587
-# EXECLINE_VERSION := v2.9.7.0
+EXECLINE_VERSION := 588cf3120765c542020ba6a9504d0cdbd3b82afd
+# EXECLINE_VERSION := v2.9.8.0
 
-S6_VERSION := 07a793bc3b40d690da98dbf4436ac4503061e0fe
-# S6_VERSION := v2.13.2.0
+S6_VERSION := 373368003fcb932c8654086fc66881ad34e4ced0
+# S6_VERSION := v2.14.0.0
 
-S6_RC_VERSION := 09ccd3128f2296d3a0cd1602e64caf06cf22c64f
-# S6_RC_VERSION := v0.5.6.0
+S6_RC_VERSION := 84ed647a78bb7a90582c2a1d7a68aaf8db3b296d
+# S6_RC_VERSION := v0.6.0.0
 
-S6_LINUX_INIT_VERSION := 445c07024609de545795e16035a4a1ab12586561
-# S6_LINUX_INIT_VERSION := v1.1.3.0
+S6_LINUX_INIT_VERSION := fef5a089c5fd31fad9b915d73df70e9e8f0a3c02
+# S6_LINUX_INIT_VERSION := v1.2.0.0
 
-S6_PORTABLE_UTILS_VERSION := bc7c571125e245bb5a08578e3b31752fc7335460
-# S6_PORTABLE_UTILS_VERSION := v2.3.1.0
+S6_FRONTEND_VERSION := d831d111b8176875cd0e83de798d6c3f5ec593c6
+# S6_FRONTEND_VERSION := v0.0.1.0
 
-S6_LINUX_UTILS_VERSION := 7cdb6a63f20f1abc96738ebf7b97effcae5bfd4b
-# S6_LINUX_UTILS_VERSION := v2.6.3.0
+S6_PORTABLE_UTILS_VERSION := 93f521eb8c444dea0ae297e9f961a950c93d9575
+# S6_PORTABLE_UTILS_VERSION := v2.3.1.1
 
-S6_DNS_VERSION := 2f3ccc92df447cc5705e6013e61c1e4bd75d393e
-# S6_DNS_VERSION := v2.4.1.0
+S6_LINUX_UTILS_VERSION := a061afdfbcf6f617ccfaaf7574cbd78bc06a28fe
+# S6_LINUX_UTILS_VERSION := v2.6.4.0
 
-S6_NETWORKING_VERSION := 70eaae07db27291d918aaf84f1c08bc0ac744534
-# S6_NETWORKING_VERSION := v2.7.1.0
+S6_DNS_VERSION := 8b27fed89fe3607e0bbfb86f93c51888deade6e7
+# S6_DNS_VERSION := v2.4.1.1
 
-MDEVD_VERSION := 777100e73376d0977ee4300b5580670edb6df08f
-# MDEVD_VERSION := v0.1.7.0
+S6_NETWORKING_VERSION := f9dd94e40b93bc3b68f951317919c99ea2cb62c5
+# S6_NETWORKING_VERSION := v2.7.2.0
 
-TIPIDEE_VERSION := f0b2ad1b2023bc04f3add106c63533d19b878d78
-# TIPIDEE_VERSION := v0.0.6.0
+MDEVD_VERSION := be99b4554611b44acc6a3501843aa8af086c073c
+# MDEVD_VERSION := v0.1.8.0
 
-SHIBARI_VERSION := 5f04bdbd146462cbcfaab84ec1667f0c2cf7de11
-# SHIBARI_VERSION := v0.0.2.0
+TIPIDEE_VERSION := 0c8c659e9e3c7e0378562b8ddc4583ca6431a2c7
+# TIPIDEE_VERSION := v0.0.7.0
 
-BCNM_VERSION := 4ac05cd949282651c182a9c36ff508cba72d1978
-# BCNM_VERSION := v0.0.2.0
+SHIBARI_VERSION := 209cca0b20e4e4a74bab8378502cd3028d8afa51
+# SHIBARI_VERSION := v0.0.2.1
 
-DNSFUNNEL_VERSION := 9b3435c02f1e731deda2d958c5dcfbc1e66fa1b2
-# DNSFUNNEL_VERSION := v0.0.3.0
+BCNM_VERSION := fad1291d004397261db645293e9a45676015b863
+# BCNM_VERSION := v0.0.2.1
 
-APASTE_VERSION := 287ecb751f0a949a3dd41354b090daf638233ade
-# APASTE_VERSION := v0.0.3.0
+DNSFUNNEL_VERSION := 51030e93f82f02418e3dabca6afea37b14cac36a
+# DNSFUNNEL_VERSION := v0.0.3.1
 
-S6_FRONTEND_VERSION := 31c208b970599588b00837294871fa4e4eeb01de
-# S6_FRONTEND_VERSION := v0.0.1.0
+APASTE_VERSION := b829fb79265869563408e97dcd45049112824fad
+# APASTE_VERSION := v0.0.3.1
 
 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
@@ -63,8 +63,9 @@ EXECLINE_DEPENDENCIES := SKALIBS NSSS
 S6_DEPENDENCIES := SKALIBS EXECLINE NSSS
 S6_RC_DEPENDENCIES := SKALIBS EXECLINE S6
 S6_LINUX_INIT_DEPENDENCIES := SKALIBS NSSS UTMPS EXECLINE S6
+S6_FRONTEND_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_RC S6_LINUX_INIT
 S6_PORTABLE_UTILS_DEPENDENCIES := SKALIBS
-S6_LINUX_UTILS_DEPENDENCIES := SKALIBS NSSS
+S6_LINUX_UTILS_DEPENDENCIES := SKALIBS NSSS EXECLINE
 S6_DNS_DEPENDENCIES := SKALIBS
 S6_NETWORKING_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_DNS
 MDEVD_DEPENDENCIES := SKALIBS NSSS
@@ -73,7 +74,6 @@ 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
@@ -82,6 +82,7 @@ EXECLINE_CATEGORY := admin
 S6_CATEGORY := admin
 S6_RC_CATEGORY := admin
 S6_LINUX_INIT_CATEGORY := admin
+S6_FRONTEND_CATEGORY := admin
 S6_PORTABLE_UTILS_CATEGORY := admin
 S6_LINUX_UTILS_CATEGORY := admin
 S6_DNS_CATEGORY := web
@@ -92,7 +93,6 @@ 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
@@ -101,8 +101,9 @@ EXECLINE_TOKEN := execline
 S6_TOKEN := s6-supervise
 S6_RC_TOKEN := s6-rc
 S6_LINUX_INIT_TOKEN := s6-linux-init-maker
-S6_PORTABLE_UTILS_TOKEN := s6-ln
-S6_LINUX_UTILS_TOKEN := s6-ps
+S6_FRONTEND_TOKEN := s6-frontend
+S6_PORTABLE_UTILS_TOKEN := s6-portable-utils
+S6_LINUX_UTILS_TOKEN := s6-linux-utils
 S6_DNS_TOKEN := s6-dnsip
 S6_NETWORKING_TOKEN := s6-tlsd-io
 MDEVD_TOKEN := mdevd
@@ -111,18 +112,18 @@ 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_OPTIONS := --enable-slashpackage --enable-nsss --enable-pkgconfig $(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 --with-sysdep-procselfexe=/proc/self/exe
 NSSS_OPTIONS := --enable-libc-includes
 UTMPS_OPTIONS := --enable-libc-includes --enable-utmp
 EXECLINE_OPTIONS := --disable-pedantic-posix --enable-multicall
-S6_OPTIONS :=
+S6_OPTIONS := --enable-aliases-daemontools --enable-aliases-runit 
 S6_RC_OPTIONS :=
 S6_LINUX_INIT_OPTIONS := --enable-utmps
+S6_FRONTEND_OPTIONS :=
 S6_PORTABLE_UTILS_OPTIONS := --enable-multicall
 S6_LINUX_UTILS_OPTIONS := --enable-multicall
 S6_DNS_OPTIONS :=
@@ -133,7 +134,6 @@ 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