Update skarnet base libraries

common/shlibs

@@ -2546,8 +2546,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
 libgnunettransportapplication.so.0 gnunet-0.12.2_1
 libgnunettransportcore.so.0 gnunet-0.12.2_1
 libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.14 skalibs-2.14.0.0_1
-libskarnet.so.2.14 skalibs-2.14.4.0_1
+libskarnet.so.2.15 skalibs-2.15.0.0_1
 libKF6BalooWidgets.so.6 baloo-widgets-24.02.0_1
 libtidy.so.58 libtidy5-5.8.0_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1

srcpkgs/66-tools/template

@@ -1,7 +1,7 @@
 # Template file for '66-tools'
 pkgname=66-tools
 version=0.1.2.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

srcpkgs/66/patches/ftrigr-api.patch

@@ -0,0 +1,68 @@
+From c1e4f838ac444aa49c16e65c47334315385e5ab1 Mon Sep 17 00:00:00 2001
+From: Komeil Parseh <komeilparseh@disroot.org>
+Date: Sat, 27 Jun 2026 20:33:15 +0330
+Subject: [PATCH] fix sanitize_init build with newer s6
+
+Update ftrigr types and subscription handling to match the current s6
+ftrigr API.
+
+---
+ src/lib66/sanitize/sanitize_init.c | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/src/lib66/sanitize/sanitize_init.c b/src/lib66/sanitize/sanitize_init.c
+index 1fbd1c0..c98581b 100644
+--- a/src/lib66/sanitize/sanitize_init.c
++++ b/src/lib66/sanitize/sanitize_init.c
+@@ -78,7 +78,7 @@ void sanitize_init(service_graph_t *g, uint32_t flag)
+     resolve_service_t toclean[g->g.nvertexes], tosubscribe[g->g.nvertexes] ;
+     vertex_t *c, *tmp ;
+     resolve_service_t *pres ;
+-    ftrigr_t fifo = FTRIGR_ZERO ;
++    ftrigr fifo = FTRIGR_ZERO ;
+     ss_state_t sta = STATE_ZERO ;
+     bool earlier = false, isstarted = false ;
+     s6_fdholder_t a = S6_FDHOLDER_ZERO ;
+@@ -209,11 +209,11 @@ void sanitize_init(service_graph_t *g, uint32_t flag)
+      * */
+     if (!FLAGS_ISSET(flag, GRAPH_WANT_EARLIER) && nsubscribe) {
+
+-        uint16_t ids[nsubscribe] ;
++        uint32_t ids[nsubscribe] ;
+         unsigned int nids = 0, fake = 0 ;
+         tain deadline ;
+
+-        memset(ids, 0, nsubscribe * sizeof(uint16_t)) ;
++        memset(ids, 0, nsubscribe * sizeof(uint32_t)) ;
+
+         tain_now_set_stopwatch_g() ;
+         /** TODO
+@@ -230,22 +230,21 @@ void sanitize_init(service_graph_t *g, uint32_t flag)
+         for (pos = 0 ; pos < nsubscribe ; pos++) {
+
+             if (tosubscribe[pos].type == E_PARSER_TYPE_CLASSIC && !tosubscribe[pos].earlier) {
+-
+                 fake = pos ;
+                 char *sa = tosubscribe[pos].sa.s ;
+                 char *eventdir = sa + tosubscribe[pos].live.eventdir ;
+
+                 log_trace("subcribe to fifo: ", eventdir) ;
+                 /** unsubscribe automatically, options is 0 */
+-                ids[nids] = ftrigr_subscribe_g(&fifo, eventdir, "s", 0, &deadline) ;
+-
+-                if (!ids[nids++]) {
++                if (!ftrigr_subscribe_g(&fifo, &ids[nids], 0, 0, eventdir, "s", &deadline)) {
+                     cleanup(toclean, ntoclean) ;
+                     log_dieusys(LOG_EXIT_SYS, "subcribe to fifo: ", eventdir) ;
+                 }
++                ++nids ;
+             }
+         }
+
++
+         if (nids) {
+
+             state_set_flag(&sta, STATE_FLAGS_TORELOAD, STATE_FLAGS_TRUE) ;
+-- 
+2.54.0
+

srcpkgs/66/template

@@ -1,6 +1,6 @@
 # Template file for '66'
 pkgname=66
-version=0.8.2.1
+version=0.8.2.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr
@@ -18,7 +18,7 @@ license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/66-upgrade.md"
 distfiles="https://git.obarun.org/Obarun/66/-/archive/${version}/66-${version}.tar.bz2"
-checksum=89e45665e44e0d20d623283448ed52cd1377ce04e84081a6a831b36ac5a18d51
+checksum=14665d078b50a07db6dd0d4a4df0e54b177d6b42719aec834aca1bc7ed93f2e1
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

srcpkgs/execline-man-pages/template

@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.9.2.0.2
+version=2.9.3.0.3
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=bc8ce8814b1e2c3b4b66dfb35cff8c38364877fe90f0b6fe4446dce130d43355
+checksum=d390a3e4c67b7d63a3507954bc43708c7c753b8b921c426d191e97711a073ba9
 
 post_install() {
 	vlicense LICENSE

srcpkgs/execline/template

@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.9.7.0
+version=2.9.9.1
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=73c9160efc994078d8ea5480f9161bfd1b3cf0b61f7faab704ab1898517d0207
+checksum=be63533297a93c36fd267195117b4e668687a526f834517a8db47d85b6c7ec6a
 
 CFLAGS="-fPIC"
 

srcpkgs/mdevd/template

@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.7.0
+version=0.1.8.2
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=ec966eec39879f33c785343373021c44f887c836a08fcaf1d63412e3bdbfca32
+checksum=ce1ae0149b6a57a34f608218fd6181aa6aa68135cac2f4d931b5b417b072e244
 
 build_options="static"
 desc_option_static="Build static binaries"

srcpkgs/nsss/template

@@ -1,6 +1,6 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.2.1.0
+version=0.2.1.2
 revision=1
 # Only available for musl
 archs="*-musl"
@@ -16,7 +16,7 @@ license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=f221a31c1cee881e992a86dfe296332253c7a9fc65f60d88829cc8e8948420f4
+checksum=ccaa73e90509f3fa5b52af85d90203ba628c16c9daed34c542679ae7681f1067
 
 build_options="static"
 

srcpkgs/oblibs/template

@@ -1,7 +1,7 @@
 # Template file for 'oblibs'
 pkgname=oblibs
 version=0.3.4.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
 makedepends="skalibs-devel execline-devel"

srcpkgs/s6-dns/template

@@ -1,6 +1,6 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.4.1.0
+version=2.4.1.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
@@ -13,7 +13,7 @@ maintainer="Komeil Parseh <komeilparseh@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/s6-dns"
 distfiles="https://skarnet.org/software/s6-dns/s6-dns-${version}.tar.gz"
-checksum=b6308519f109a67469c4aaafa9df1f009ad0961fa798ffc38f895587e6935729
+checksum=0618d8830fce63ee17b7f55e49428069c85c97a1710827a7b2349b660cd33a4e
 
 build_options="static"
 

srcpkgs/s6-frontend-doc

@@ -0,0 +1 @@
+s6-frontend

srcpkgs/s6-frontend/template

@@ -0,0 +1,34 @@
+# Template file for 's6-frontend'
+pkgname=s6-frontend
+version=0.0.1.2
+revision=1
+build_style=configure
+configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
+ --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static '--enable-static-libc')
+ $(vopt_if multicall '--enable-multicall')"
+makedepends="skalibs-devel execline-devel s6-devel s6-linux-init-devel s6-rc-devel"
+short_desc="High-level frontend utilities for s6 and s6-rc"
+maintainer="Komeil Parseh <komeilparseh@disroot.org>"
+license="ISC"
+homepage="https://skarnet.org/software/s6-frontend/"
+distfiles="https://git.skarnet.org/cgit/s6-frontend/snapshot/${pkgname}-${version}.tar.gz"
+checksum=c101c515832c977ebf0fe8f9934a348d279869cfb2161669ba53d9a178c4888b
+
+build_options="static"
+desc_option_static="Link binaries against static libc"
+
+post_install() {
+	vlicense COPYING
+	vdoc README
+	vcopy "doc/*" usr/share/doc/${pkgname}
+}
+
+s6-frontend-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

srcpkgs/s6-linux-init-devel

@@ -0,0 +1 @@
+s6-linux-init

srcpkgs/s6-linux-init-man-pages/template

@@ -1,11 +1,11 @@
 # Template file for 's6-linux-init-man-pages'
 pkgname=s6-linux-init-man-pages
-version=1.1.2.0.1
+version=1.1.2.1.1
 revision=1
 build_style=gnu-makefile
 short_desc="Ports of the HTML documentation for the s6-linux-init to mdoc(7)"
 maintainer="Komeil Parseh <komeilparseh@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://git.sr.ht/~flexibeast/s6-linux-init-man-pages"
 distfiles="https://git.sr.ht/~flexibeast/s6-linux-init-man-pages/archive/v${version}.tar.gz"
-checksum=be552ce7aa45ce5849e4f3437da1a5c42602cc9c8c6f40ca5bd3c510cb7ffbf9
+checksum=2bb513b86fef97a6d42b713a2aec9d92ccec72023ec5e3ce45b68eada52793a8

srcpkgs/s6-linux-init/template

@@ -1,6 +1,6 @@
 # Template file for 's6-linux-init'
 pkgname=s6-linux-init
-version=1.1.3.0
+version=1.2.0.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-linux-init/"
 changelog="https://skarnet.org/software/s6-linux-init/upgrade.html/"
 distfiles="https://skarnet.org/software/s6-linux-init/s6-linux-init-${version}.tar.gz"
-checksum=d11b596b719ac134f77eb19450907d1fe6d84b4adc36d44ef748dbe55487b3ed
+checksum=72d59b13683d1390f7df9a286be467e73293416021af9fa1023c9293ec5c7d7c
 
 conflicts="66-init runit-void"
 
@@ -37,6 +37,14 @@ post_install() {
 	vcopy "doc/*" usr/share/doc/${pkgname}
 }
 
+s6-linux-init-devel_package() {
+	short_desc="Library and headers for s6-linux-init"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+	}
+}
+
 s6-linux-init-doc_package() {
 	short_desc="Documentation for s6"
 	depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-man-pages"

srcpkgs/s6-linux-utils/template

@@ -1,21 +1,21 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.6.3.0
+version=2.6.4.1
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin
  $(vopt_if static '--enable-static-libc')
  $(vopt_if multicall '--enable-multicall') "
-makedepends="skalibs-devel"
+makedepends="execline-devel skalibs-devel"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://skarnet.org/software/s6-linux-utils"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=7e249c36c73b99ebfc1f9a9a4c318be76b461ebc53d3952de9064ccfab400739
+checksum=16e1a5b5a2b4a98674b4a9719612adb79588e3c20c4083360278ea38f2d32129
 
 build_options="static multicall"
 desc_option_static="Build static binaries"

srcpkgs/s6-networking/template

@@ -1,6 +1,6 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.7.1.0
+version=2.8.0.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
@@ -16,7 +16,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-networking"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/s6-networking/s6-networking-${version}.tar.gz"
-checksum=a7b33497e72921a59d4c1fc67ce5cc74bd065e09105bf1a79f1fc73cf9a06592
+checksum=ac4f65840fcec1624f7bf9c632fb40553851bc902957ff956b2a1f2281a45cd4
 
 build_options="bearssl libtls static"
 build_options_default="bearssl"

srcpkgs/s6-portable-utils/template

@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.3.1.0
+version=2.3.1.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=04244aa87ae2c412d4999769b5e73cb428afba0c2e8aa9215b3a36e7be2a80f9
+checksum=cfb90186d0c0eb204e1e5c6f9379e99413c546bccf38bb6e76177f82371aa3aa
 
 build_options="static multicall"
 desc_option_static="Build static binaries"

srcpkgs/s6-rc/template

@@ -1,6 +1,6 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.6.0
+version=0.6.1.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-rc/"
 changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=81277f6805e8d999ad295bf9140a909943b687ffcfb5aa3c4efd84b1a574586e
+checksum=b54f226a35be1ee56a228bf1a4c39437f072bc64e69dbf356e733e606a86402d
 
 build_options="static"
 desc_option_static="Build static binaries"
@@ -25,7 +25,7 @@ post_install() {
 	vdoc README
 	vcopy "doc/*" usr/share/doc/${pkgname}
 	vmkdir usr/share/examples/${pkgname}
-	vcopy "examples/source/*" usr/share/examples/${pkgname}/
+	vcopy "examples/*" usr/share/examples/${pkgname}/
 }
 
 s6-rc-devel_package() {

srcpkgs/s6/template

@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.13.2.0
+version=2.15.0.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=c5114b8042716bb70691406931acb0e2796d83b41cbfb5c8068dce7a02f99a45
+checksum=27dff73d626285540133e075e75887087f5117fd51de59503ef7d29e96f69e4c
 
 build_options="static"
 desc_option_static="Build static binaries"