From 9c802b00424860e6db4a422466cf3a975b6e49cc Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Tue, 21 Feb 2023 00:45:35 +0200 Subject: [PATCH] upg obarun 66 over new skarnet stack fix s6-test to eltest --- obarun/66-tools/PKGBUILD | 6 +++--- obarun/66/PKGBUILD | 6 +++--- obarun/oblibs/PKGBUILD | 6 +++--- skarnet/execline/PKGBUILD | 8 ++++---- skarnet/mdevd/PKGBUILD | 6 +++--- skarnet/s6-dns/PKGBUILD | 4 ++-- skarnet/s6-linux-utils/PKGBUILD | 8 ++++---- skarnet/s6-networking/PKGBUILD | 10 +++++----- skarnet/s6-portable-utils/PKGBUILD | 11 ++++++----- skarnet/s6-rc/PKGBUILD | 8 ++++---- skarnet/s6/PKGBUILD | 8 ++++---- skarnet/skalibs/PKGBUILD | 4 ++-- skarnet/skalist.new | 11 +++++++++++ 13 files changed, 54 insertions(+), 42 deletions(-) diff --git a/obarun/66-tools/PKGBUILD b/obarun/66-tools/PKGBUILD index 149ca5f..e73e968 100644 --- a/obarun/66-tools/PKGBUILD +++ b/obarun/66-tools/PKGBUILD @@ -8,13 +8,13 @@ pkgname=66-tools pkgver=0.0.8.0 -pkgrel=04 +pkgrel=05 pkgdesc="small tools and helpers for service scripts execution" arch=(x86_64) url='https://git.obarun.org/Obarun/66-tools.git' source=("${pkgname}::git+${url}#tag=v$pkgver") -makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 'oblibs>=0.1.4.0' 'lowdown') -depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 'oblibs>=0.1.4.0' 'lowdown') +depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 'oblibs>=0.1.4.0') groups=('s6-suite') _flags=( diff --git a/obarun/66/PKGBUILD b/obarun/66/PKGBUILD index 529fe55..61f65c9 100644 --- a/obarun/66/PKGBUILD +++ b/obarun/66/PKGBUILD @@ -8,7 +8,7 @@ pkgname=66 pkgver=0.6.2.0 -pkgrel=06 +pkgrel=07 # change in uid for s6log pkgdesc="Small tools built around s6 and s6-rc programs" url='https://git.obarun.org/Obarun/66.git' @@ -16,8 +16,8 @@ source=("${pkgname}::git+${url}#tag=v$pkgver" 66.install) # direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install -depends=( 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0' 's6-rc>=0.5.3.3' 'oblibs>=0.1.4.0') -makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0' 's6-rc>=0.5.3.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') +depends=( 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-rc>=0.5.4.0' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-rc>=0.5.4.0' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') arch=(x86_64) backup=('etc/66/init.conf' diff --git a/obarun/oblibs/PKGBUILD b/obarun/oblibs/PKGBUILD index 643944b..c4a8661 100644 --- a/obarun/oblibs/PKGBUILD +++ b/obarun/oblibs/PKGBUILD @@ -9,13 +9,13 @@ pkgname=oblibs pkgdesc='Obarun C library' pkgver=0.1.4.0 -pkgrel=04 +pkgrel=05 url='https://git.obarun.org/Obarun/oblibs.git' track=tag arch=(x86_64) groups=(s6-suite) -depends=("skalibs>=2.13.0.0" "execline>=2.9.1.0") -makedepends=(git "skalibs>=2.13.0.0" "execline>=2.9.1.0") +depends=("skalibs>=2.13.1.0" "execline>=2.9.2.0") +makedepends=(git "skalibs>=2.13.1.0" "execline>=2.9.2.0") target="v${pkgver}" source=("$pkgname::git+https://git.obarun.org/Obarun/${pkgname}#${track}=${target}") diff --git a/skarnet/execline/PKGBUILD b/skarnet/execline/PKGBUILD index d4aaa33..6c8cbbd 100644 --- a/skarnet/execline/PKGBUILD +++ b/skarnet/execline/PKGBUILD @@ -7,15 +7,15 @@ # Maintainer: Eric Vidal pkgname=execline -pkgver=2.9.1.0 -_pkgver=v2.9.1.0 +pkgver=2.9.2.0 +_pkgver=v2.9.2.0 pkgrel=01 pkgdesc="An interpreter-less scripting language." arch=(x86_64) url="http://skarnet.org/software/execline/" groups=(s6-suite) -depends=('skalibs>=2.13.0.0') -makedepends=('git' 'skalibs>=2.13.0.0') +depends=('skalibs>=2.13.1.0') +makedepends=('git' 'skalibs>=2.13.1.0') # a0b46c927ebb2c60ac850964aa0b3cb28f6c8d74 refs/tags/v2.9.1.0 source=("$pkgname::git+git://git.skarnet.org/execline#tag=${_pkgver}") diff --git a/skarnet/mdevd/PKGBUILD b/skarnet/mdevd/PKGBUILD index 34061a1..f6184da 100644 --- a/skarnet/mdevd/PKGBUILD +++ b/skarnet/mdevd/PKGBUILD @@ -7,13 +7,13 @@ # Maintainer: Eric Vidal pkgname=mdevd -pkgver=0.1.6.1 +pkgver=0.1.6.2 pkgrel=01 pkgdesc="a mdev-compatible hotplug manager daemon" arch=(x86_64) url="http://skarnet.org/software/mdevd/" -makedepends=('git' 'skalibs>=2.13.0.0') -depends=('skalibs>=2.13.0.0') +makedepends=('git' 'skalibs>=2.13.1.0') +depends=('skalibs>=2.13.1.0') groups=('s6-suite') #commit=0838e7bd13c9f847c06d015d86a8a1ff403a2e8f # refs/tags/v0.1.6.1 source=("$pkgname::git+git://git.skarnet.org/mdevd#tag=v${pkgver}") diff --git a/skarnet/s6-dns/PKGBUILD b/skarnet/s6-dns/PKGBUILD index a3483e3..075a933 100644 --- a/skarnet/s6-dns/PKGBUILD +++ b/skarnet/s6-dns/PKGBUILD @@ -13,8 +13,8 @@ pkgrel=01 pkgdesc="A suite of DNS client programs and libraries for Unix systems" arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.0.0') -depends=('skalibs>=2.13.0.0') +makedepends=('git' 'skalibs>=2.13.1.0') +depends=('skalibs>=2.13.1.0') groups=(s6-suite) source=("$pkgname::git+git://git.skarnet.org/s6-dns#tag=${_pkgver}") #_commit=070fb7154e7d0d0065b701ff6c41682b5f6ab2d9 # refs/tags/v2.3.5.5 diff --git a/skarnet/s6-linux-utils/PKGBUILD b/skarnet/s6-linux-utils/PKGBUILD index 091d03d..b2cb7f3 100644 --- a/skarnet/s6-linux-utils/PKGBUILD +++ b/skarnet/s6-linux-utils/PKGBUILD @@ -8,13 +8,13 @@ pkgname=s6-linux-utils pkgdesc="A set of tiny Linux-specific utilities" -_pkgver=v2.6.0.1 -pkgver=2.6.0.1 +_pkgver=v2.6.1.0 +pkgver=2.6.1.0 pkgrel=01 url="http://skarnet.org/software/${pkgname}/" arch=(x86_64) -depends=('skalibs>=2.13.0.0') -makedepends=(git 'skalibs>=2.13.0.0') +depends=('skalibs>=2.13.1.0') +makedepends=(git 'skalibs>=2.13.1.0') groups=('s6-suite') # commit=2d46f7275ca14573f018d4951de595c3188de48d # refs/tags/v2.6.0.1 source=("$pkgname::git+git://git.skarnet.org/s6-linux-utils#tag=$_pkgver") diff --git a/skarnet/s6-networking/PKGBUILD b/skarnet/s6-networking/PKGBUILD index a468dd8..db6143b 100644 --- a/skarnet/s6-networking/PKGBUILD +++ b/skarnet/s6-networking/PKGBUILD @@ -7,14 +7,14 @@ # Maintainer: Eric Vidal pkgname=s6-networking -_pkgver=v2.5.1.2 -pkgver=2.5.1.2 -pkgrel=02 +_pkgver=v2.5.1.3 +pkgver=2.5.1.3 +pkgrel=01 pkgdesc="Small network and client-server tools" arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=(git 'skalibs>=2.13.0.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-dns>=2.3.5.3' ) -depends=('skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-dns>=2.3.5.3' ) +makedepends=(git 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-dns>=2.3.5.5' ) +depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-dns>=2.3.5.5' ) optdepends=('libressl: For build a secure communication tools') groups=(s6-suite) #_commit=4cf18919482e3495810c8e3693ea368bdc5753a1 # refs/tags/v2.5.1.2 diff --git a/skarnet/s6-portable-utils/PKGBUILD b/skarnet/s6-portable-utils/PKGBUILD index bd48617..43dbfa4 100644 --- a/skarnet/s6-portable-utils/PKGBUILD +++ b/skarnet/s6-portable-utils/PKGBUILD @@ -7,14 +7,14 @@ # Maintainer: Eric Vidal pkgname=s6-portable-utils -_pkgver=v2.2.5.1 -pkgver=2.2.5.1 +_pkgver=v2.3.0.0 +pkgver=2.3.0.0 pkgrel=01 pkgdesc="A set of tiny general Unix utilities" arch=(x86_64) url="http://skarnet.org/software/${pkgname}/" -depends=('git' 'skalibs>=2.13.0.0') -depends=('skalibs>=2.13.0.0') +depends=('git' 'skalibs>=2.13.1.0') +depends=('skalibs>=2.13.1.0') groups=(s6-suite) #_commit=cfb15f58292c012090b12c2a73a6454ec88ec915 refs/tags/v2.2.5.1 #source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#commit=$_commit") @@ -46,7 +46,7 @@ package() { cp -R doc/* $pkgdir/usr/share/doc/$pkgname/ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - + ln -sf /usr/bin/eltest $pkgdir/usr/bin/s6-test } #---- license gpg-key sha256sums ---- @@ -55,3 +55,4 @@ license=(ISC) sha256sums=(SKIP) +#sudo sed -i 's/s6-test/test/' /usr/lib/66/module/boot@/service/system/system-fsck diff --git a/skarnet/s6-rc/PKGBUILD b/skarnet/s6-rc/PKGBUILD index c20f908..129d909 100644 --- a/skarnet/s6-rc/PKGBUILD +++ b/skarnet/s6-rc/PKGBUILD @@ -7,15 +7,15 @@ # Maintainer: Eric Vidal pkgname=s6-rc -_pkgver=v0.5.3.3 -pkgver=0.5.3.3 +_pkgver=v0.5.4.0 +pkgver=0.5.4.0 pkgrel=01 pkgdesc="A dependency-based init script management system" arch=(x86_64) url="http://skarnet.org/software/${pkgname}/" #install=s6-rc.install -makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0') -depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0') +makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0') +depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0') groups=('base' 's6-suite') source=("$pkgname::git+git://git.skarnet.org/s6-rc#tag=${_pkgver}") #_commit=d8c8f84dbb09a87bcdf7764a279f2b02244078ae # refs/tags/v0.5.3.3 diff --git a/skarnet/s6/PKGBUILD b/skarnet/s6/PKGBUILD index 5542242..1939df4 100644 --- a/skarnet/s6/PKGBUILD +++ b/skarnet/s6/PKGBUILD @@ -7,14 +7,14 @@ # Maintainer: Eric Vidal pkgname=s6 -_pkgver=v2.11.2.0 -pkgver=2.11.2.0 +_pkgver=v2.11.3.0 +pkgver=2.11.3.0 pkgrel=01 pkgdesc="A process supervision suite" arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0') -depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0') +makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0') +depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0') groups=('base' 's6-suite') #_commit=24cb21d4aa3e364529d62c2c7310c189443c0843 # refs/tags/v2.11.2.0 #source=("$pkgname::git+git://git.skarnet.org/s6#commit=$_commit") diff --git a/skarnet/skalibs/PKGBUILD b/skarnet/skalibs/PKGBUILD index 52d74eb..12e90f2 100644 --- a/skarnet/skalibs/PKGBUILD +++ b/skarnet/skalibs/PKGBUILD @@ -7,8 +7,8 @@ # Maintainer: Eric Vidal pkgname=skalibs -pkgver=2.13.0.0 -_pkgver=v2.13.0.0 +pkgver=2.13.1.0 +_pkgver=v2.13.1.0 pkgrel=01 pkgdesc="A general-purpose low-level C library" arch=(x86_64) diff --git a/skarnet/skalist.new b/skarnet/skalist.new index fc5be6a..6d418c7 100644 --- a/skarnet/skalist.new +++ b/skarnet/skalist.new @@ -15,4 +15,15 @@ smtpd-starttls-proxy-0.0.1.2 (release) bcnm-0.0.1.6 (release) dnsfunnel-0.0.1.5 (release) +####### +skalibs-2.13.1.0 (minor) +nsss-0.2.0.3 (release) +execline-2.9.2.0 (minor) +s6-2.11.3.0 (minor) +s6-rc-0.5.4.0 (minor) +s6-linux-init-1.1.0.0 (major) +s6-portable-utils-2.3.0.0 (major) +s6-linux-utils-2.6.1.0 (minor) +s6-networking-2.5.1.3 (release) +mdevd-0.1.6.2 (release)