From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:36:37 +0100 Subject: [PATCH 01/14] skalibs: update to 2.14.1.1. --- common/shlibs | 2 +- srcpkgs/skalibs/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 61e838157b2ab..c6322a0de1280 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2321,7 +2321,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.13 skalibs-2.13.0.0_1 +libskarnet.so.2.14 skalibs-2.14.1.1_1 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1 libtidy.so.58 libtidy5-5.8.0_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 185177eb4165c..706f6be05063c 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.13.1.0 +version=2.14.1.1 revision=1 build_style=configure configure_args="--libdir=/usr/lib --enable-static --enable-shared @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/skalibs/" changelog="https://skarnet.org/software/skalibs/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b3c48938c7fba4b19a8b0dce6e7a11427717a0901160bb62cfc6823f8ac86d92 +checksum=b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3 post_install() { vlicense COPYING LICENSE From f1c19baa05f633e1012b3f07bf17403708a3de43 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:38:02 +0100 Subject: [PATCH 02/14] execline: update to 2.9.4.0. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index 09c48090eec69..7d19bbbb6e9e8 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.9.2.0 +version=2.9.4.0 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=9365012558a1e3c019cafc6eb574b0f5890495fb02652f20efdd782d577b1601 +checksum=9ab55d561539dfa76ff4a97906fa995fc4a288e3de5225cb1a9d8fa9e9ebc49b CFLAGS="-fPIC" From fe0515a6535445756e7bb0bb463ed9df21ecd92b Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:39:02 +0100 Subject: [PATCH 03/14] s6: update to 2.12.0.3. --- srcpkgs/s6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index ecc407c70fa31..94bc62a6366fc 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,6 +1,6 @@ # Template file for 's6' pkgname=s6 -version=2.11.3.0 +version=2.12.0.3 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=0ef2de80c40b603d58bf65ec5dd9f0bb1f227d35f311e8948d9e30f81efb5b81 +checksum=800d31226f6c25cdd3ec0b65240f80b56ce5ec137341d0a8d154e77638e58103 build_options="static" desc_option_static="Build static binaries" From b4af9b5059728ff277c4b6807c8e099870200100 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:39:52 +0100 Subject: [PATCH 04/14] s6-man-pages: update to 2.12.0.3.1. --- srcpkgs/s6-man-pages/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template index 66af4d4914e20..0840bc6afdd4b 100644 --- a/srcpkgs/s6-man-pages/template +++ b/srcpkgs/s6-man-pages/template @@ -1,14 +1,14 @@ # Template file for 's6-man-pages' pkgname=s6-man-pages -version=2.11.3.0.1 +version=2.12.0.3.1 revision=1 build_style=gnu-makefile short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)" maintainer="mobinmob " license="ISC" -homepage="https://github.com/flexibeast/s6-man-pages" -distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz" -checksum=223e7c843e3996338efe1aee8d2779ae5b4b30e9140fd625021dda5c403b88be +homepage="https://git.sr.ht/~flexibeast/s6-man-pages" +distfiles="https://git.sr.ht/~flexibeast/s6-man-pages/archive/v2.12.0.3.1.tar.gz" +checksum=64fe52743d122d6f110967bf4b3311a82b35e6e5d7be03e8bdc15b31fb31516f post_install() { vlicense LICENSE From ea5a7df830c62aa21bed9702a77fa897c967d7d1 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:40:34 +0100 Subject: [PATCH 05/14] s6-rc: update to 0.5.4.2. --- srcpkgs/s6-rc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template index 0e894c661b418..57cbf9c21a4cc 100644 --- a/srcpkgs/s6-rc/template +++ b/srcpkgs/s6-rc/template @@ -1,6 +1,6 @@ # Template file for 's6-rc' pkgname=s6-rc -version=0.5.4.1 +version=0.5.4.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-rc/" changelog="https://skarnet.org/software/s6-rc/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=d7268cab7c5423305cf9598a33d4fcdab8a315952b3ec80f79c85b8cb76158f6 +checksum=00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 build_options="static" desc_option_static="Build static binaries" From fcbe019a52ff1fb696ca2b520a4463358d8c29b6 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:41:59 +0100 Subject: [PATCH 06/14] s6-linux-utils: update to 2.6.2.0. --- srcpkgs/s6-linux-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template index fc4863803178d..4af3dce216c68 100644 --- a/srcpkgs/s6-linux-utils/template +++ b/srcpkgs/s6-linux-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-linux-utils' pkgname=s6-linux-utils -version=2.6.1.0 +version=2.6.2.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --includedir=/usr/include @@ -15,7 +15,7 @@ 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=2accb5a443dd04203a6358534bdcf0dd369aceb4733e322612c2b8329260b7a2 +checksum=8f944633ca87d3d23e0f03c9c383d1502d508c9bac16d38c3fbf723a5eab2bb7 build_options="static multicall" desc_option_static="Build static binaries" From ec79e0b41113201a9545e9b378cde42f98bc17bc Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:42:51 +0100 Subject: [PATCH 07/14] s6-portable-utils: update to 2.3.0.3. --- srcpkgs/s6-portable-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template index 89d9709c50689..915988bd666e1 100644 --- a/srcpkgs/s6-portable-utils/template +++ b/srcpkgs/s6-portable-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-portable-utils' pkgname=s6-portable-utils -version=2.3.0.0 +version=2.3.0.3 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=1e9066c430c1cb39a3a7b7004cd379ffebe566bd3d698db18de6125783002005 +checksum=3e4492055d160c25fb90153f0efc277d7d52bf981bbe3ea2e9dfe51c493561ff build_options="static multicall" desc_option_static="Build static binaries" From b9b2dc175d7e76ef76bb63ddb87d8f804ba5148c Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:43:27 +0100 Subject: [PATCH 08/14] s6-dns: update to 2.3.7.1. --- srcpkgs/s6-dns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index 7f243bc2ec826..5ac6ec015b90a 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -1,6 +1,6 @@ # Template file for 's6-dns' pkgname=s6-dns -version=2.3.5.5 +version=2.3.7.1 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib @@ -13,7 +13,7 @@ maintainer="Orphaned " license="ISC" homepage="https://skarnet.org/software/s6-dns" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=56979b5d5125c38071a80b5e3df0d4a6b2a7c52bb863a2410b6e3d797ffe1ee8 +checksum=cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d build_options="static" From 95300daa8b3d9b637c2a8d0aa0ef01d6aac99ef0 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 16:44:08 +0100 Subject: [PATCH 09/14] s6-networking: update to 2.7.0.2. --- srcpkgs/s6-networking/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 133dc65c5697a..59a58c3c615b6 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,6 +1,6 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.5.1.3 +version=2.7.0.2 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="${homepage}/${pkgname}-${version}.tar.gz" -checksum=a09e43c959ff9e0caa8ff4002608e73c0f57f87f04a8d9c24e6c9afefe45e977 +checksum=c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1 build_options="bearssl libtls static" build_options_default="bearssl" From 9efd0e5a1e1dd9a66887f58cecd08d975c5baf09 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 17:09:58 +0100 Subject: [PATCH 10/14] nsss: update to 0.2.0.4. --- srcpkgs/nsss/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template index ae3cac748266d..6af49abb29079 100644 --- a/srcpkgs/nsss/template +++ b/srcpkgs/nsss/template @@ -1,6 +1,6 @@ # Template file for 'nsss' pkgname=nsss -version=0.2.0.3 +version=0.2.0.4 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=b1e397ed5b327611a7c2c8c1dc60e91fef353c54fead464f887720bc0914148e +checksum=39b504f85bd8f6b523d334e5cfa62c02a395db35991b75f206df0abbd6761aad build_options="static" From 605d2790de6c1075bae9c1f93315912bd50ff254 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Wed, 7 Feb 2024 17:45:58 +0100 Subject: [PATCH 11/14] oblibs: update to 0.2.0.1. --- common/shlibs | 2 +- srcpkgs/oblibs/template | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index c6322a0de1280..3c10f2ae09370 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3595,7 +3595,7 @@ libltc.so.11 libltc-1.3.1_1 libvpd-2.2.so.2 libvpd-2.2.6_1 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1 liblcf.so.0 liblcf-0.6.0_1 -liboblibs.so.0.1 oblibs-0.1.1.1_1 +liboblibs.so.0.2 oblibs-0.2.1.0_1 libaal-1.0.so.7 libaal-1.0.7_1 libaal-minimal.so.0 libaal-1.0.7_1 libcli.so.1.9 libcli-1.9.8.4_1 diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template index 15cc98f4d089b..ff6a5a4bbe36a 100644 --- a/srcpkgs/oblibs/template +++ b/srcpkgs/oblibs/template @@ -1,16 +1,16 @@ # Template file for 'oblibs' pkgname=oblibs -version=0.1.4.0 -revision=3 +version=0.2.1.0 +revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps" makedepends="skalibs-devel execline-devel" short_desc="Obarun library" maintainer="mobinmob " license="ISC" -homepage="https://framagit.org/Obarun/oblibs" -distfiles="https://framagit.org/Obarun/oblibs/-/archive/v${version}/${pkgname}-v${version}.tar.bz2" -checksum=0ebb6024b9b2c737b0e065e2d49a98965db116c04caff4289acde332316b781a +homepage="https://git.obarun.org/Obarun/oblibs" +distfiles="https://git.obarun.org/Obarun/oblibs/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=bf36c266167502d6d73ebf9e5119564f9aea063b6d8a9cba9422fd61f91a9427 post_install() { vlicense LICENSE From b68a254cb9f9d8b58c5092a1e43e8923382699b8 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Thu, 8 Feb 2024 07:32:15 +0100 Subject: [PATCH 12/14] mdevd: update to 0.1.6.3. --- srcpkgs/mdevd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template index 15690b0ead373..46f6f4d5472ed 100644 --- a/srcpkgs/mdevd/template +++ b/srcpkgs/mdevd/template @@ -1,6 +1,6 @@ # Template file for 'mdevd' pkgname=mdevd -version=0.1.6.2 +version=0.1.6.3 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=ac2fcf9004f07904592c5894e2c401e15bb027ecf37bcb8ea661e2a7993447be +checksum=f6ecf0ef7cd48d04efc75acb2dad967d850bc8815bdb0098f1c9ef043394d430 build_options="static" desc_option_static="Build static binaries" From 352f74f49e61038dea062c29daee7409542ae031 Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Thu, 8 Feb 2024 07:34:42 +0100 Subject: [PATCH 13/14] 66: update to 0.7.0.0. --- srcpkgs/66/patches/shutdown_posixsh.diff | 27 ------------------------ srcpkgs/66/template | 14 ++++++------ 2 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/66/patches/shutdown_posixsh.diff diff --git a/srcpkgs/66/patches/shutdown_posixsh.diff b/srcpkgs/66/patches/shutdown_posixsh.diff deleted file mode 100644 index c89983519291d..0000000000000 --- a/srcpkgs/66/patches/shutdown_posixsh.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/skel/shutdown b/skel/shutdown -index 0f59623855bc8e8ad260eeeb57a090f88b26b5d1..b39f0f0decb9b8e27c65ba59b3891482f326a876 100755 ---- a/skel/shutdown -+++ b/skel/shutdown -@@ -28,18 +28,18 @@ Time must be one of these formats: [ now | [+]mins | hh:mm ] where: - mins or +mins : relative time; triggers the shutdown sequence after mins minutes. - hh:mm : absolute time; triggers the shutdown sequence when the time hh:mm occurs. - --See also 66-shutdown program to more features. -+See also 66-shutdown program for more features. - EOF - exit 111 - } - - die() { -- printf "${PROG}:fatal: options must be set first\n" >&1 -+ printf "%s:fatal: options must be set first\n" "${PROG}" >&1 - usage - } - --[ -z ${1} ] && die -+[ -z "${1}" ] && die - --[ ${1:0:1} != '-' ] && die -+[ "${1%%"${1#?}"}" != '-' ] && die - - 66-shutdown "${@}" diff --git a/srcpkgs/66/template b/srcpkgs/66/template index 89677d007138d..3571b2c752aae 100644 --- a/srcpkgs/66/template +++ b/srcpkgs/66/template @@ -1,7 +1,8 @@ # Template file for '66' pkgname=66 -version=0.6.2.0 -revision=4 +version=0.7.0.0 +revision=1 +_subver=preprod-rev2 build_style=configure configure_args="--prefix=/usr --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps @@ -10,15 +11,14 @@ configure_args="--prefix=/usr --with-s6-log-user=_s6log --with-system-dir=/etc/66/lib" hostmakedepends="pkg-config lowdown" -makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel" -depends="s6-rc" -short_desc="Small tools built around s6 and s6-rc programs" +makedepends="oblibs-devel skalibs-devel execline-devel s6-devel" +short_desc="Service manager based on s6 for init and service supervision" maintainer="mobinmob " license="ISC" homepage="http://web.obarun.org/software/" changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/upgrade.md" -distfiles="https://git.obarun.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2" -checksum=f63600e9f8e53211e421707aae7f98d2fa9d1b0d0b4b39162cf180df12b99c28 +distfiles="https://git.obarun.org/Obarun/66/-/archive/${version}-${_subver}/66-${version}-${_subver}.tar.bz2" +checksum=ee84c1b6214278585065789b8527a505199f338e7b928fa4429794d260049388 patch_args="-Np1" conf_files="/etc/66/init.conf" From b389006bde9e05198a21878a3528dffa8d3fe00d Mon Sep 17 00:00:00 2001 From: Benedikt Brinkmann Date: Thu, 8 Feb 2024 07:39:12 +0100 Subject: [PATCH 14/14] 66-tools: update to 0.1.0.1. --- srcpkgs/66-tools/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template index 7536c2ba76aa7..6a6bb2978b56e 100644 --- a/srcpkgs/66-tools/template +++ b/srcpkgs/66-tools/template @@ -1,7 +1,7 @@ # Template file for '66-tools' pkgname=66-tools -version=0.0.8.0 -revision=3 +version=0.1.0.1 +revision=1 build_style=configure configure_args="--prefix=/usr --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps @@ -13,9 +13,9 @@ short_desc="Small tools and helpers for service scripts execution" maintainer="mobinmob " license="ISC" homepage="http://web.obarun.org/software/index.html" -changelog="https://framagit.org/Obarun/66-tools/-/raw/master/doc/upgrade.md" -distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz" -checksum=58f072ce1bbc6b6440046d3dc860ca31bb3f39801d09853141006dd5f7041dbb +changelog="https://git.obarun.org/Obarun/66-tools/-/raw/master/doc/upgrade.md" +distfiles="https://git.obarun.org/Obarun/66-tools/-/archive/${version}/66-tools-${version}.tar.gz" +checksum=88205786acaaf4d3c4b49a182b0ae36f9da64117612cdecb89cad72d9be4eb4a post_install() { vlicense LICENSE