From 0d3d567b93c5b11a15abe3c904065afd9c30f32c Mon Sep 17 00:00:00 2001 From: joborun Date: Wed, 7 Feb 2024 02:11:54 +0200 Subject: [PATCH] upg curl expat rebuild skarnet stack for 66-EOL --- curl/PKGBUILD | 11 +++++---- curl/PKGBUILD-arch | 3 ++- curl/deps | 4 ++-- expat/PKGBUILD | 18 +++++++++------ expat/PKGBUILD-arch | 27 ++++++++++++---------- expat/time | 8 ++++--- skarnet/execline/PKGBUILD | 15 +++++++------ skarnet/execline/time | 6 ++--- skarnet/mdevd/PKGBUILD | 14 ++++++------ skarnet/note | 36 ++++++++++++++++++++++++++++++ skarnet/s6-dns/PKGBUILD | 14 ++++++------ skarnet/s6-linux-utils/PKGBUILD | 13 +++++------ skarnet/s6-linux-utils/time | 8 ++++--- skarnet/s6-networking/PKGBUILD | 14 ++++++------ skarnet/s6-portable-utils/PKGBUILD | 16 ++++++------- skarnet/s6-portable-utils/time | 7 +++--- skarnet/s6-rc/PKGBUILD | 15 ++++++------- skarnet/s6/PKGBUILD | 16 ++++++------- skarnet/s6/time | 6 ++--- skarnet/skalibs/PKGBUILD | 12 +++++----- 20 files changed, 155 insertions(+), 108 deletions(-) create mode 100644 skarnet/note diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 610bc8e..603a6cf 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -10,7 +10,7 @@ pkgname=(curl libcurl-compat libcurl-gnutls) _tag='8cd1397d3c5c9b1526c8d74530266a7a9a22294b' # git rev-parse v${_tag_name} _tag_name='8_6_0' pkgver="${_tag_name//_/.}" -pkgrel=02 +pkgrel=03 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' url='https://curl.se' #options=(debug) # uncomment this to produce debug package @@ -26,6 +26,7 @@ _backports=( ) _reverts=( + '9a90c9dd64d2f03601833a70786d485851bd1b53' ) prepare() { @@ -178,9 +179,7 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg sha256sums=(SKIP) -## -## -## df76d1dd76f5984f126c31036246c0c96f8e29ebe2cf78ad5852b9c3816449c6 curl-8.6.0-02-x86_64.pkg.tar.lz -## 281a5c9f35fd5635a793ec92c4ecfb61c9a6a9583be4779e080166b49a1add3e libcurl-compat-8.6.0-02-x86_64.pkg.tar.lz -## 762335ebece5bc62d7944f943ebf736a2a1346e27bb9e8f2b63405351bb4f084 libcurl-gnutls-8.6.0-02-x86_64.pkg.tar.lz +## a4ec134c55f71d408e6c4d36e08e17504a37d28a7598980a786c8aa7dcf8b02a curl-8.6.0-03-x86_64.pkg.tar.lz +## ae5dbd27ba5230a919b5d6899a7d30359d2129eabf6b5dfec8ad17af9af9f886 libcurl-compat-8.6.0-03-x86_64.pkg.tar.lz +## d70250248b85b6cb541db0ceaba0325806a03d4968cb5351861c310a93489a95 libcurl-gnutls-8.6.0-03-x86_64.pkg.tar.lz diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 16a8320..ead834c 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -9,7 +9,7 @@ pkgname=(curl libcurl-compat libcurl-gnutls) _tag='8cd1397d3c5c9b1526c8d74530266a7a9a22294b' # git rev-parse v${_tag_name} _tag_name='8_6_0' pkgver="${_tag_name//_/.}" -pkgrel=2 +pkgrel=3 pkgdesc='command line tool and library for transferring data with URLs' arch=('x86_64') url='https://curl.se/' @@ -33,6 +33,7 @@ _backports=( ) _reverts=( + '9a90c9dd64d2f03601833a70786d485851bd1b53' ) prepare() { diff --git a/curl/deps b/curl/deps index 3c9dddf..8dd8685 100644 --- a/curl/deps +++ b/curl/deps @@ -2,6 +2,6 @@ patchelf git autoconf automake - - libnghttp3 + + diff --git a/expat/PKGBUILD b/expat/PKGBUILD index ec6b0ea..d5c741b 100644 --- a/expat/PKGBUILD +++ b/expat/PKGBUILD @@ -6,10 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=expat -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=01 pkgdesc='An XML parser library' -arch=('x86_64') url="https://libexpat.github.io/" depends=(glibc filesystem) makedepends=(cmake ) @@ -27,21 +26,26 @@ build() { } check() { - make VERBOSE=1 -C build test + ctest --test-dir build --output-on-failure + } package() { - make VERBOSE=1 DESTDIR="$pkgdir" -C build install + DESTDIR="$pkgdir" cmake --install build install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" install -vDm 644 $pkgname-$pkgver/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(MIT) validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping -sha256sums=(6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67 # expat-2.5.0.tar.bz2 - 9bd7e10b55a5117cf86195e79b349d001292c2760128ce6fc554e2e77d35e55a) # expat-2.5.0.tar.bz2.asc +sha256sums=(ff60e6a6b6ce570ae012dc7b73169c7fdf4b6bf08c12ed0ec6f55736b78d85ba # expat-2.6.0.tar.bz2 + 90b1f917b283caa45e1ee7f39d0d0e65b8d94fa8d2533084f1e5b6b097daea57) # expat-2.6.0.tar.bz2.asc + +## 4677a2bb0c8cbfff09bcf5302ac77703e6580d56fb0bac2c05b0479f44e55e1e expat-2.6.0-01-x86_64.pkg.tar.lz diff --git a/expat/PKGBUILD-arch b/expat/PKGBUILD-arch index c4dafbc..d15557a 100644 --- a/expat/PKGBUILD-arch +++ b/expat/PKGBUILD-arch @@ -4,7 +4,7 @@ # Contributor: Judd Vinet pkgname=expat -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=1 pkgdesc="An XML parser library" arch=(x86_64) @@ -13,29 +13,32 @@ license=(MIT) depends=(glibc) makedepends=(cmake) provides=(libexpat.so) -options=(debug) source=(https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/$pkgname-$pkgver.tar.bz2{,.asc}) -sha512sums=('22fd904d75aab7506a85c03519b9cf79e44898c8e1ba6abf6cb7f95de71b8e63a7e2d5cf4395e3627d46035ea29342b3e631a8809fef8aad3f59976dc075ad17' +sha512sums=('116587256c8b5a477e56e2dc5a4d0c3c580b43727dd93685e044057c196779d348ee50adf53dd060c305e06855ad7fe9492f1ad69c175063dfc8babf71c1d032' 'SKIP') -b2sums=('15a5dcd3af17995fb4299301710b38d609c1fe7a8d6a6284581fedd96e89e0c16526d0342fb55773ac9d678cd65dc5cdb1532c764eeb3a20ccdf1e168b96e337' +b2sums=('c823bc6078c8dc2a71c88a5b93cee596d966c83125e267691c4be536da59f73f238ed31326f4fda899ef1c0a268cc798e714012f44853174e05fe7569853628f' 'SKIP') validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping build() { - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -W no-dev \ - -B build \ - -S $pkgname-$pkgver - make VERBOSE=1 -C build + local cmake_options=( + -B build + -D CMAKE_BUILD_TYPE=None + -D CMAKE_INSTALL_PREFIX=/usr + -S $pkgname-$pkgver + -W no-dev + ) + + cmake "${cmake_options[@]}" + cmake --build build --verbose } check() { - make VERBOSE=1 -C build test + ctest --test-dir build --output-on-failure } package() { - make VERBOSE=1 DESTDIR="$pkgdir" -C build install + DESTDIR="$pkgdir" cmake --install build install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" install -vDm 644 $pkgname-$pkgver/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" } diff --git a/expat/time b/expat/time index 9cf5304..b4e9345 100644 --- a/expat/time +++ b/expat/time @@ -1,4 +1,6 @@ -real 0m13.585s -user 0m32.498s -sys 0m1.384s + +real 0m28.598s +user 0m27.198s +sys 0m1.899s + diff --git a/skarnet/execline/PKGBUILD b/skarnet/execline/PKGBUILD index 82ed582..14d93c0 100644 --- a/skarnet/execline/PKGBUILD +++ b/skarnet/execline/PKGBUILD @@ -1,19 +1,19 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=execline pkgver=2.9.3.0 _pkgver=v2.9.3.0 -pkgrel=02 -pkgdesc="An interpreter-less scripting language." +pkgrel=03 +pkgdesc="An interpreter-less scripting language - Last ver that works with 66-EOL" url="http://skarnet.org/software/execline/" -groups=(s6-suite) -depends=('skalibs>=2.13.1.1') -makedepends=('git' 'skalibs>=2.13.1.1') +groups=(66-EOL) +depends=('skalibs=2.13.1.1') +makedepends=('git' 'skalibs=2.13.1.1') # a0b46c927ebb2c60ac850964aa0b3cb28f6c8d74 refs/tags/v2.9.1.0 ## if you wanted a specific tag source=("$pkgname::git+git://git.skarnet.org/execline#tag=${_pkgver}") @@ -53,4 +53,5 @@ license=('ISC') sha256sums=(SKIP) -## a7745d8b9bbec2c8eb5516da4944ff9bfc78a1934545cdb7122b72608bf76560 execline-2.9.3.0-02-x86_64.pkg.tar.lz +## d14e8223dc98b0fec8049d8521826be202c8aa7cf966c326dcea18b0456ca269 execline-2.9.3.0-03-x86_64.pkg.tar.lz + diff --git a/skarnet/execline/time b/skarnet/execline/time index f882114..549de4c 100644 --- a/skarnet/execline/time +++ b/skarnet/execline/time @@ -1,6 +1,6 @@ -real 0m14.556s -user 0m7.118s -sys 0m1.810s +real 0m10.267s +user 0m7.311s +sys 0m1.659s diff --git a/skarnet/mdevd/PKGBUILD b/skarnet/mdevd/PKGBUILD index c489a9d..244d1f0 100644 --- a/skarnet/mdevd/PKGBUILD +++ b/skarnet/mdevd/PKGBUILD @@ -1,18 +1,18 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=mdevd pkgver=0.1.6.2 -pkgrel=02 -pkgdesc="a mdev-compatible hotplug manager daemon" +pkgrel=03 +pkgdesc="a mdev-compatible hotplug manager daemon - Last ver that works with 66-EOL" url="http://skarnet.org/software/mdevd/" -makedepends=('git' 'skalibs>=2.13.1.1') -depends=('skalibs>=2.13.1.1') -groups=('s6-suite') +makedepends=('git' 'skalibs=2.13.1.1') +depends=('skalibs=2.13.1.1') +groups=('66-EOL') #commit=0838e7bd13c9f847c06d015d86a8a1ff403a2e8f # refs/tags/v0.1.6.1 source=("$pkgname::git+git://git.skarnet.org/mdevd#tag=v${pkgver}") @@ -47,4 +47,4 @@ license=(ISC) sha256sums=(SKIP) -## d784948ce8d8003c154d9ce741794e158af0482e94706a544dfca512eebd22d3 mdevd-0.1.6.2-02-x86_64.pkg.tar.lz +## d9ae98a579840709fa52eb1aa25d287c50509c47c691efa3327fcda35552f823 mdevd-0.1.6.2-03-x86_64.pkg.tar.lz diff --git a/skarnet/note b/skarnet/note new file mode 100644 index 0000000..5a22ecb --- /dev/null +++ b/skarnet/note @@ -0,0 +1,36 @@ +This is the final version suite of s6/skalibs that 66 could be built +before the new 66 2024 release which will be based on the latest +skarnet stack. We are making adjustments for those who may dislike +the new version and want to keep the older. + +We are also placing the old version of s6 and 66 in jobcomm as +secondary in importance software while runit is kept in jobcore. + +Please note that all trees and service structure formed on the +early version of 66 will be lost once moving to the new and +vice versa if you move back to the early one. + +We are calling this suite of s6 + 66 the (66-EOL) for End Of Life +while the next version will be called (66-NL) for Next Life + +Coexistence with runit will remain unaffected with either suites. + +66-EOL versions are as follows: + +jobcore/skalibs 2.13.1.1-02 (66-EOL) +jobcore/s6 2.11.3.2-02 (66-EOL) +jobcore/s6-rc 0.5.4.1-02 (66-EOL) +jobcore/mdevd 0.1.6.2-03 (66-EOL) +jobcore/s6-dns 2.3.5.5-03 (66-EOL) +jobcore/s6-linux-utils 2.6.1.2-02 (66-EOL) +jobcore/s6-networking 2.5.1.3-03 (66-EOL) +jobcore/s6-portable-utils 2.3.0.2-02 (66-EOL) + +jobcore/oblibs 0.1.4.0-07 (66-EOL) +jobcore/66 0.6.2.0-09 (66-EOL) +jobcore/66-tools 0.0.8.0-08 (66-EOL) +jobcore/boot-66serv 2.4.1-07 (66-EOL) +jobcore/boot@-66serv 99.99-02 (66-EOL) +jobcore/execline 2.9.3.0-03 (66-EOL) +jobcore/jobo66 0.1.1-04 (66-EOL) + diff --git a/skarnet/s6-dns/PKGBUILD b/skarnet/s6-dns/PKGBUILD index 9a739e0..be275cd 100644 --- a/skarnet/s6-dns/PKGBUILD +++ b/skarnet/s6-dns/PKGBUILD @@ -1,19 +1,19 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6-dns pkgver=2.3.5.5 _pkgver=v2.3.5.5 -pkgrel=02 -pkgdesc="A suite of DNS client programs and libraries for Unix systems" +pkgrel=03 +pkgdesc="A suite of DNS client programs and libraries for Unix systems - Last ver that works with 66-EOL" url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.1.1') -depends=('skalibs>=2.13.1.1') -groups=(s6-suite) +makedepends=('git' 'skalibs=2.13.1.1') +depends=('skalibs=2.13.1.1') +groups=(66-EOL) source=("$pkgname::git+git://git.skarnet.org/s6-dns#tag=${_pkgver}") #_commit=070fb7154e7d0d0065b701ff6c41682b5f6ab2d9 # refs/tags/v2.3.5.5 #source=("$pkgname::git+git://git.skarnet.org/s6-dns#commit=$_commit") @@ -55,4 +55,4 @@ license=(ISC) sha256sums=(SKIP) -## 8589604bbfd820312c8723315a55ed42e087b7d36fc4250dc5c7545b87e82aff s6-dns-2.3.5.5-02-x86_64.pkg.tar.lz +## 29162bb899da3944cb8b41440505e7f22877ba7c1548f8fb102c45083c7ebfd0 s6-dns-2.3.5.5-03-x86_64.pkg.tar.lz diff --git a/skarnet/s6-linux-utils/PKGBUILD b/skarnet/s6-linux-utils/PKGBUILD index 73357c8..7a47ec2 100644 --- a/skarnet/s6-linux-utils/PKGBUILD +++ b/skarnet/s6-linux-utils/PKGBUILD @@ -6,15 +6,14 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6-linux-utils -pkgdesc="A set of tiny Linux-specific utilities" +pkgdesc="A set of tiny Linux-specific utilities - Last ver that works with 66-EOL" _pkgver=v2.6.1.2 pkgver=2.6.1.2 -pkgrel=01 +pkgrel=02 url="http://skarnet.org/software/${pkgname}/" -depends=('skalibs>=2.13.1.1') -makedepends=(git 'skalibs>=2.13.1.1') -groups=('s6-suite') -# commit=2d46f7275ca14573f018d4951de595c3188de48d # refs/tags/v2.6.0.1 +depends=('skalibs=2.13.1.1') +makedepends=(git 'skalibs=2.13.1.1') +groups=('66-EOL') source=("$pkgname::git+git://git.skarnet.org/s6-linux-utils#tag=$_pkgver") _pkgver() { @@ -54,4 +53,4 @@ license=(ISC) sha256sums=(SKIP) -## ded98ac99e70563cf28ea5c4b3a9a8df58c1fa17ba39cf3dd122edf0b75e9226 s6-linux-utils-2.6.1.2-01-x86_64.pkg.tar.lz +## 987efdc4f9ae1483c97e313e6a25a455843460c77fbdfa7cbe857f6810821dc0 s6-linux-utils-2.6.1.2-02-x86_64.pkg.tar.lz diff --git a/skarnet/s6-linux-utils/time b/skarnet/s6-linux-utils/time index 819e796..c74cda7 100644 --- a/skarnet/s6-linux-utils/time +++ b/skarnet/s6-linux-utils/time @@ -1,4 +1,6 @@ -real 0m9.584s -user 0m3.883s -sys 0m0.506s + +real 0m5.241s +user 0m3.172s +sys 0m0.689s + diff --git a/skarnet/s6-networking/PKGBUILD b/skarnet/s6-networking/PKGBUILD index 41e91a3..7817be6 100644 --- a/skarnet/s6-networking/PKGBUILD +++ b/skarnet/s6-networking/PKGBUILD @@ -1,20 +1,20 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6-networking _pkgver=v2.5.1.3 pkgver=2.5.1.3 -pkgrel=02 -pkgdesc="Small network and client-server tools" +pkgrel=03 +pkgdesc="Small network and client-server tools - Last ver that works with 66-EOL" url="http://skarnet.org/software/s6/" -makedepends=(git 'skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-dns>=2.3.5.5' ) -depends=('skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-dns>=2.3.5.5' ) +makedepends=(git 'skalibs=2.13.1.1' 'execline=2.9.3.0' 's6=2.11.3.2' 's6-dns=2.3.5.5' ) +depends=('skalibs=2.13.1.1' 'execline=2.9.3.0' 's6=2.11.3.2' 's6-dns=2.3.5.5' ) optdepends=('libressl: For build a secure communication tools') -groups=(s6-suite) +groups=(66-EOL) #_commit=4cf18919482e3495810c8e3693ea368bdc5753a1 # refs/tags/v2.5.1.2 #source=("$pkgname::git+git://git.skarnet.org/s6-networking#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6-networking#tag=${_pkgver}") @@ -58,4 +58,4 @@ license=('ISC') sha256sums=(SKIP) -## a4088a0e705368bfed8b205fcdba7aa77aad7da777006b0d707e2e399636ba17 s6-networking-2.5.1.3-02-x86_64.pkg.tar.lz +## eab1cbc2725ed15144cbcdea42fc5102bd9c5a59e70a28e91769c314e54099e7 s6-networking-2.5.1.3-03-x86_64.pkg.tar.lz diff --git a/skarnet/s6-portable-utils/PKGBUILD b/skarnet/s6-portable-utils/PKGBUILD index ac53c3c..6067d91 100644 --- a/skarnet/s6-portable-utils/PKGBUILD +++ b/skarnet/s6-portable-utils/PKGBUILD @@ -1,20 +1,19 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/sharnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/sharnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6-portable-utils _pkgver=v2.3.0.2 pkgver=2.3.0.2 -pkgrel=01 -pkgdesc="A set of tiny general Unix utilities" +pkgrel=02 +pkgdesc="A set of tiny general Unix utilities - Last ver that works with 66-EOL" url="http://skarnet.org/software/${pkgname}/" -depends=('git' 'skalibs>=2.13.1.1') -depends=('skalibs>=2.13.1.1') -groups=(s6-suite) -#_commit=cfb15f58292c012090b12c2a73a6454ec88ec915 refs/tags/v2.2.5.1 +depends=('git' 'skalibs=2.13.1.1') +depends=('skalibs=2.13.1.1') +groups=(66-EOL) #source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#tag=${_pkgver}") @@ -57,4 +56,5 @@ sha256sums=(SKIP) #sudo sed -i 's/s6-test/test/' /usr/lib/66/module/boot@/service/system/system-fsck -## 0e221af16be962eb9e55863bd6b4d5d6fa4740b970231cca74b27f54e85381b1 s6-portable-utils-2.3.0.2-01-x86_64.pkg.tar.lz +## 12b41c15b678c24dbed4ff9f1357e19ed33b541e0e4a3191bba511891a851eb4 s6-portable-utils-2.3.0.2-02-x86_64.pkg.tar.lz + diff --git a/skarnet/s6-portable-utils/time b/skarnet/s6-portable-utils/time index 25bed39..b63992c 100644 --- a/skarnet/s6-portable-utils/time +++ b/skarnet/s6-portable-utils/time @@ -1,5 +1,6 @@ -real 0m4.471s -user 0m7.036s -sys 0m1.053s +real 0m8.427s +user 0m5.206s +sys 0m1.366s + diff --git a/skarnet/s6-rc/PKGBUILD b/skarnet/s6-rc/PKGBUILD index 4b29491..a0f35d1 100644 --- a/skarnet/s6-rc/PKGBUILD +++ b/skarnet/s6-rc/PKGBUILD @@ -1,22 +1,21 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6-rc _pkgver=v0.5.4.1 pkgver=0.5.4.1 -pkgrel=01 -pkgdesc="A dependency-based init script management system" +pkgrel=02 +pkgdesc="A dependency-based init script management system - Last ver that works with 66-EOL" url="http://skarnet.org/software/${pkgname}/" #install=s6-rc.install -makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.2.0' 's6>=2.11.3.2') -depends=('skalibs>=2.13.1.1' 'execline>=2.9.2.0' 's6>=2.11.3.2') -groups=('base' 's6-suite') +makedepends=('git' 'skalibs=2.13.1.1' 'execline=2.9.3.0' 's6=2.11.3.2') +depends=('skalibs=2.13.1.1' 'execline=2.9.3.0' 's6=2.11.3.2') +groups=('66-EOL') source=("$pkgname::git+git://git.skarnet.org/s6-rc#tag=${_pkgver}") -#_commit=d8c8f84dbb09a87bcdf7764a279f2b02244078ae # refs/tags/v0.5.3.3 #source=("$pkgname::git+git://git.skarnet.org/s6-rc#commit=$_commit") _pkgver() { @@ -57,4 +56,4 @@ license=(ISC) sha256sums=(SKIP) -## 00b06113c52164441f4f298d59e5df2559746e2339a9cc0eee9f7e8ac50eb4cf s6-rc-0.5.4.1-01-x86_64.pkg.tar.lz +## 44de64a167906d243c79c8ca80c606e261b228b234c9e266378676681adaf88b s6-rc-0.5.4.1-02-x86_64.pkg.tar.lz diff --git a/skarnet/s6/PKGBUILD b/skarnet/s6/PKGBUILD index fbf5b6f..171017e 100644 --- a/skarnet/s6/PKGBUILD +++ b/skarnet/s6/PKGBUILD @@ -1,20 +1,19 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=s6 _pkgver=v2.11.3.2 pkgver=2.11.3.2 -pkgrel=01 -pkgdesc="A process supervision suite" +pkgrel=02 +pkgdesc="A process supervision suite - Last ver that works with 66-EOL" url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.2.0') -depends=('skalibs>=2.13.1.1' 'execline>=2.9.2.0') -groups=('base' 's6-suite') -#_commit=24cb21d4aa3e364529d62c2c7310c189443c0843 # refs/tags/v2.11.2.0 +makedepends=('git' 'skalibs=2.13.1.1' 'execline=2.9.3.0') +depends=('skalibs=2.13.1.1' 'execline=2.9.3.0') +groups=('66-EOL') #source=("$pkgname::git+git://git.skarnet.org/s6#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6#tag=${_pkgver}") @@ -55,4 +54,5 @@ license=(ISC) sha256sums=(SKIP) -## 037cfcc5cfda0d226861ea11d0fb6ff47a7fd5ee240b7180a85e7297c84c4013 s6-2.11.3.2-01-x86_64.pkg.tar.lz +## 2faa9d423378e8f0e1d741c2e65eef7d28a749539dea337bfdf6a904287598a4 s6-2.11.3.2-02-x86_64.pkg.tar.lz + diff --git a/skarnet/s6/time b/skarnet/s6/time index 18848aa..01428f2 100644 --- a/skarnet/s6/time +++ b/skarnet/s6/time @@ -1,6 +1,6 @@ -real 0m25.313s -user 0m13.044s -sys 0m2.901s +real 0m20.290s +user 0m13.752s +sys 0m2.651s diff --git a/skarnet/skalibs/PKGBUILD b/skarnet/skalibs/PKGBUILD index e4ee0c4..a63bd30 100644 --- a/skarnet/skalibs/PKGBUILD +++ b/skarnet/skalibs/PKGBUILD @@ -1,20 +1,20 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=skalibs pkgver=2.13.1.1 _pkgver=v2.13.1.1 -pkgrel=01 -pkgdesc="A general-purpose low-level C library" +pkgrel=02 +pkgdesc="A general-purpose low-level C library - Last ver that works with 66-EOL" url="http://www.skarnet.org/software/skalibs/" -groups=('base' 's6-suite') +groups=(66-EOL) makedepends=('git') source=("$pkgname::git+git://git.skarnet.org/skalibs#tag=v${pkgver}") -# ea786d9a88c5cdd3faef8662e614d1c293fd48ad refs/tags/v2.13.0.0 +# 9476bb47403dd058681ceeb6459817e044cc6f1c refs/tags/v2.13.1.1 #source=("$pkgname::git+git://git.skarnet.org/skalibs#commit=$_commit") _pkgver() { @@ -49,4 +49,4 @@ license=('ISC') sha256sums=(SKIP) -## 18a42c5bf7dabe52c93f04e8e339539a46bf8688dfaaf5d8e12a9703e58818e1 skalibs-2.13.1.1-01-x86_64.pkg.tar.lz +## 2165d45c8ce3fbf45b92379cd2dbdf11755b714ee899cbb0df51328331a0f472 skalibs-2.13.1.1-02-x86_64.pkg.tar.lz