* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
@ 2024-02-07 16:10 ` dataCobra
2024-02-07 16:48 ` dataCobra
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-07 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 11668 bytes --]
From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:36:37 +0100
Subject: [PATCH 01/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:38:02 +0100
Subject: [PATCH 02/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:39:02 +0100
Subject: [PATCH 03/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:39:52 +0100
Subject: [PATCH 04/10] 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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:40:34 +0100
Subject: [PATCH 05/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:41:59 +0100
Subject: [PATCH 06/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:42:51 +0100
Subject: [PATCH 07/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:43:27 +0100
Subject: [PATCH 08/10] 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 <orphan@voidlinux.org>"
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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:44:08 +0100
Subject: [PATCH 09/10] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:09:58 +0100
Subject: [PATCH 10/10] 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"
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
2024-02-07 16:10 ` [PR PATCH] [Updated] " dataCobra
@ 2024-02-07 16:48 ` dataCobra
2024-02-07 16:56 ` dataCobra
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-07 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 18600 bytes --]
From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <orphan@voidlinux.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 f2b6082685c5fd40fb79527f056bcb86f4164f1b Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:46:38 +0100
Subject: [PATCH 12/14] 66: update to 0.7.0.0.
---
srcpkgs/66/patches/shutdown_posixsh.diff | 27 ------------------------
srcpkgs/66/template | 9 ++++----
2 files changed, 5 insertions(+), 31 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..5acea6a5ee8f4 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
@@ -17,8 +18,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
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 43db6e5897586cae44cbee7ac35068788912c34b Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:47:43 +0100
Subject: [PATCH 13/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 <mobinmob@disroot.org>"
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
From eb0ea43ff5f8e8665eb93ff65f55b24cd36691b7 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:48:35 +0100
Subject: [PATCH 14/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"
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
2024-02-07 16:10 ` [PR PATCH] [Updated] " dataCobra
2024-02-07 16:48 ` dataCobra
@ 2024-02-07 16:56 ` dataCobra
2024-02-07 17:00 ` dataCobra
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-07 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932481318
Comment:
Since `66` has not stable release yet available for the the current version of s6, I've decided to go with the preprod for testing the build.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (2 preceding siblings ...)
2024-02-07 16:56 ` dataCobra
@ 2024-02-07 17:00 ` dataCobra
2024-02-07 17:03 ` dataCobra
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-07 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932487268
Comment:
There are only conflicts with a few other packages:
```
66 and runit-void conflict for
/usr/bin/init
66-doc and erlang conflict for
/usr/share/man/man1/start.1
66-doc and tree conflict for
/usr/share/man/man1/tree.1
Error: Process completed with exit code 1.
```
Would like to have some feedback if void team members how we want to go about that.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (3 preceding siblings ...)
2024-02-07 17:00 ` dataCobra
@ 2024-02-07 17:03 ` dataCobra
2024-02-07 18:42 ` mobinmob
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-07 17:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932487268
Comment:
There are only conflicts with a few other packages:
```
66 and runit-void conflict for
/usr/bin/init
66-doc and erlang conflict for
/usr/share/man/man1/start.1
66-doc and tree conflict for
/usr/share/man/man1/tree.1
Error: Process completed with exit code 1.
```
Would like to have some feedback from the void team members how we want to go about that.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (4 preceding siblings ...)
2024-02-07 17:03 ` dataCobra
@ 2024-02-07 18:42 ` mobinmob
2024-02-07 18:44 ` mobinmob
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-07 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932655231
Comment:
> There are only conflicts with a few other packages:
>
> ```
> 66 and runit-void conflict for
> /usr/bin/init
> 66-doc and erlang conflict for
> /usr/share/man/man1/start.1
> 66-doc and tree conflict for
> /usr/share/man/man1/tree.1
> Error: Process completed with exit code 1.
> ```
I believe that every single one of them should be renamed. The init should also be altered, it will not work ootb - you can also move it to the skel dir, it is a bug to have under /usr/bin by default. I will report it upstream.
I plan to add these to my PR, I hope we can collaborate...
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (5 preceding siblings ...)
2024-02-07 18:42 ` mobinmob
@ 2024-02-07 18:44 ` mobinmob
2024-02-07 19:05 ` mobinmob
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-07 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932655231
Comment:
> There are only conflicts with a few other packages:
>
> ```
> 66 and runit-void conflict for
> /usr/bin/init
> 66-doc and erlang conflict for
> /usr/share/man/man1/start.1
> 66-doc and tree conflict for
> /usr/share/man/man1/tree.1
> Error: Process completed with exit code 1.
> ```
I believe that every single one of them should be renamed. The init should also be altered, it will not work ootb - you can also move it to the skel dir, it is a bug to have under /usr/bin by default. I will report it upstream.
I plan to add these to my existing PR, (https://github.com/void-linux/void-packages/pull/47177) I hope we can collaborate...
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (6 preceding siblings ...)
2024-02-07 18:44 ` mobinmob
@ 2024-02-07 19:05 ` mobinmob
2024-02-08 6:39 ` [PR PATCH] [Updated] " dataCobra
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-07 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1932655231
Comment:
> There are only conflicts with a few other packages:
>
> ```
> 66 and runit-void conflict for
> /usr/bin/init
> 66-doc and erlang conflict for
> /usr/share/man/man1/start.1
> 66-doc and tree conflict for
> /usr/share/man/man1/tree.1
> Error: Process completed with exit code 1.
> ```
I believe that every single one of them should be renamed. The init should also be altered, it will not work ootb - you can also move it to the skel dir, it is a bug to have under /usr/bin by default. I will report it upstream.
I plan to add these to my existing PR, (https://github.com/void-linux/void-packages/pull/47177) I hope we can collaborate - I can close it, you have done more work here...
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (7 preceding siblings ...)
2024-02-07 19:05 ` mobinmob
@ 2024-02-08 6:39 ` dataCobra
2024-02-08 18:40 ` mobinmob
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-08 6:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 19033 bytes --]
From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <orphan@voidlinux.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (8 preceding siblings ...)
2024-02-08 6:39 ` [PR PATCH] [Updated] " dataCobra
@ 2024-02-08 18:40 ` mobinmob
2024-02-10 9:36 ` [PR PATCH] [Updated] " dataCobra
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-08 18:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1934724927
Comment:
You can add the following to post_install() to fix the file conflicts:
```
mv "${DESTDIR}"/usr/bin/init "${DESTDIR}"/etc/66/init
mv "${DESTDIR}"/usr/share/man/man1/start.1 \
"${DESTDIR}"/usr/share/man/man1/66_start.1
mv "${DESTDIR}"/usr/share/man/man1/tree.1 \
"${DESTDIR}"/usr/share/man/man1/66_tree.1
```
The manpages can be all renamed to `66_$manpage` or `66-$manpage`.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (9 preceding siblings ...)
2024-02-08 18:40 ` mobinmob
@ 2024-02-10 9:36 ` dataCobra
2024-02-10 10:36 ` dataCobra
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-10 9:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 19659 bytes --]
From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <orphan@voidlinux.org>"
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <datacobra@thinkbot.de>
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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
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 97d5b70d11521a6bf057a25530343a52e94648a1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 10:35:49 +0100
Subject: [PATCH 13/14] 66: update to 0.7.0.0.
---
srcpkgs/66/patches/shutdown_posixsh.diff | 27 ------------------------
srcpkgs/66/template | 20 +++++++++++-------
2 files changed, 12 insertions(+), 35 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..a6d2e40a23593 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 <mobinmob@disroot.org>"
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"
@@ -28,7 +28,6 @@ system_accounts="_s6log"
make_dirs="/var/log/66 0750 _s6log _s6log"
pre_configure() {
-
# Clean the default $PATH for service scripts
vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
"${wrksrc}/skel/init.conf"
@@ -37,6 +36,11 @@ pre_configure() {
post_install() {
vdoc README.md
vlicense LICENSE
+ mv "${DESTDIR}"/usr/bin/init "${DESTDIR}"/etc/66/init
+ mv "${DESTDIR}"/usr/share/man/man1/start.1 \
+ "${DESTDIR}"/usr/share/man/man1/66_start.1
+ mv "${DESTDIR}"/usr/share/man/man1/tree.1 \
+ "${DESTDIR}"/usr/share/man/man1/66_tree.1
}
66-doc_package() {
From 196b3a51248b3ffe5ff49f4a553396aab67f253e Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 10:36:22 +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 <mobinmob@disroot.org>"
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
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (10 preceding siblings ...)
2024-02-10 9:36 ` [PR PATCH] [Updated] " dataCobra
@ 2024-02-10 10:36 ` dataCobra
2024-02-10 10:38 ` dataCobra
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-10 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 22174 bytes --]
From cc6a945d99981a1ca45e2aa96dbc458f9124b554 Mon Sep 17 00:00:00 2001
From: Benedikt Brinkmann <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:36:37 +0100
Subject: [PATCH 01/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:38:02 +0100
Subject: [PATCH 02/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:39:02 +0100
Subject: [PATCH 03/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:39:52 +0100
Subject: [PATCH 04/16] 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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:40:34 +0100
Subject: [PATCH 05/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:41:59 +0100
Subject: [PATCH 06/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:42:51 +0100
Subject: [PATCH 07/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:43:27 +0100
Subject: [PATCH 08/16] 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 <orphan@voidlinux.org>"
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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 16:44:08 +0100
Subject: [PATCH 09/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:09:58 +0100
Subject: [PATCH 10/16] 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 <datacobra@thinkbot.de>
Date: Wed, 7 Feb 2024 17:45:58 +0100
Subject: [PATCH 11/16] 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 <mobinmob@disroot.org>"
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 <datacobra@thinkbot.de>
Date: Thu, 8 Feb 2024 07:32:15 +0100
Subject: [PATCH 12/16] 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 97d5b70d11521a6bf057a25530343a52e94648a1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 10:35:49 +0100
Subject: [PATCH 13/16] 66: update to 0.7.0.0.
---
srcpkgs/66/patches/shutdown_posixsh.diff | 27 ------------------------
srcpkgs/66/template | 20 +++++++++++-------
2 files changed, 12 insertions(+), 35 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..a6d2e40a23593 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 <mobinmob@disroot.org>"
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"
@@ -28,7 +28,6 @@ system_accounts="_s6log"
make_dirs="/var/log/66 0750 _s6log _s6log"
pre_configure() {
-
# Clean the default $PATH for service scripts
vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
"${wrksrc}/skel/init.conf"
@@ -37,6 +36,11 @@ pre_configure() {
post_install() {
vdoc README.md
vlicense LICENSE
+ mv "${DESTDIR}"/usr/bin/init "${DESTDIR}"/etc/66/init
+ mv "${DESTDIR}"/usr/share/man/man1/start.1 \
+ "${DESTDIR}"/usr/share/man/man1/66_start.1
+ mv "${DESTDIR}"/usr/share/man/man1/tree.1 \
+ "${DESTDIR}"/usr/share/man/man1/66_tree.1
}
66-doc_package() {
From 196b3a51248b3ffe5ff49f4a553396aab67f253e Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 10:36:22 +0100
Subject: [PATCH 14/16] 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 <mobinmob@disroot.org>"
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
From 7529d44f3c667f7c8f0f70721556c64c9caade1f Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 11:33:46 +0100
Subject: [PATCH 15/16] s6-networking-man-pages: update to 2.7.0.1.1.
---
srcpkgs/s6-networking-man-pages/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 7a09aeb9f640f..e5cc6b41631a8 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,15 +1,15 @@
# Template file for 's6-networking-man-pages'
pkgname=s6-networking-man-pages
-version=2.5.1.3.1
+version=2.7.0.1.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
short_desc="Mdoc versions of the documentation for the s6-networking suite"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
-homepage="https://github.com/flexibeast/s6-networking-man-pages"
-distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz"
-checksum=6cff17453dc7946a2a5b94b8a4a48965db6c52c6000420acaedd443f9d069e8f
+homepage="https://git.sr.ht/~flexibeast/s6-networking-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
+checksum=163d85bcc682114a6aefef3ddcff1fd3376c52ca488730c95ca96f32ccd76fc1
post_install() {
vlicense LICENSE
From f11c0f9ad790440e6bc3f310c2b96fac910f6c7f Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 10 Feb 2024 11:35:26 +0100
Subject: [PATCH 16/16] New package: s6-rc-man-pages-0.5.4.2.1
---
srcpkgs/s6-rc-man-pages/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/s6-rc-man-pages/template
diff --git a/srcpkgs/s6-rc-man-pages/template b/srcpkgs/s6-rc-man-pages/template
new file mode 100644
index 0000000000000..817e4bc5d9a9d
--- /dev/null
+++ b/srcpkgs/s6-rc-man-pages/template
@@ -0,0 +1,15 @@
+# Template file for 's6-rc-man-pages'
+pkgname=s6-rc-man-pages
+version=0.5.4.2.1
+revision=1
+build_style=gnu-makefile
+short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://git.sr.ht/~flexibeast/s6-rc-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/s6-rc-man-pages/archive/v${version}.tar.gz"
+checksum=b26354fd682adb6951ea607c04695c429734d17f7524d0b7c381d877cec96fa9
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (11 preceding siblings ...)
2024-02-10 10:36 ` dataCobra
@ 2024-02-10 10:38 ` dataCobra
2024-02-10 10:39 ` dataCobra
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-10 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1936968051
Comment:
Still missing some of the man-pages provided by flexibeast.
Also it looks like some man-pages are not provided for the current version.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (12 preceding siblings ...)
2024-02-10 10:38 ` dataCobra
@ 2024-02-10 10:39 ` dataCobra
2024-02-10 10:44 ` dataCobra
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-10 10:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1936968051
Comment:
Still missing some of the man-pages provided by flexibeast.
Also it looks like some man-pages are not provided for the current version.
Here is a list of man-pages (not all relevant for this PR):
-> https://git.sr.ht/~flexibeast/?search=man-pages
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (13 preceding siblings ...)
2024-02-10 10:39 ` dataCobra
@ 2024-02-10 10:44 ` dataCobra
2024-02-17 13:37 ` [PR PATCH] [Updated] " dataCobra
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-10 10:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1936969231
Comment:
Another thing that bugs me a little bit is that a some package templates are not really following the same structure as the majority.
So a refactoring needs to be done too. This is especially important with this amount of packages that have a relation to another.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (14 preceding siblings ...)
2024-02-10 10:44 ` dataCobra
@ 2024-02-17 13:37 ` dataCobra
2024-02-17 13:53 ` dataCobra
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-17 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages s6
https://github.com/void-linux/void-packages/pull/48582
s6*: updating the whole stack of packages.
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
A patch file from https://github.com/void-linux/void-packages/pull/48582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-48582.patch --]
[-- Type: text/x-diff, Size: 28859 bytes --]
From beae3536e921509d112f75383d8454b168974c0e Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 13:55:58 +0100
Subject: [PATCH 01/18] skalibs: update to 2.14.1.1.
---
common/shlibs | 2 +-
srcpkgs/skalibs/template | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..4b2749136d02c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2322,7 +2322,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..5cadaa1fa8fa3 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,20 +1,18 @@
# 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
- --enable-force-devr
- --datadir=/usr/share/$pkgname --libdir=/usr/lib
- --bindir=/usr/bin --dynlibdir=/usr/lib
- --with-sysdep-devurandom=yes"
+ --enable-force-devr --datadir=/usr/share/$pkgname --libdir=/usr/lib
+ --bindir=/usr/bin --dynlibdir=/usr/lib --with-sysdep-devurandom=yes"
short_desc="General purpose libraries for building software from skarnet.org"
maintainer="mobinmob <mobinmob@disroot.org>"
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
+distfiles="https://skarnet.org/software/skalibs/skalibs-${version}.tar.gz"
+checksum=b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3
post_install() {
vlicense COPYING LICENSE
From 2a32860f650bd29afd7c50f07133728084c17009 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 13:57:52 +0100
Subject: [PATCH 02/18] 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 3e2d7e5c3d52526fc5683f6c83ebbe135759ce71 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:00:44 +0100
Subject: [PATCH 03/18] execline: update to 2.9.4.0.
---
srcpkgs/execline/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 09c48090eec69..46a65027cfe3b 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,12 +1,11 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- $(vopt_if static --enable-static-libc)
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib $(vopt_if static --enable-static-libc)
$(vopt_if multicall --enable-multicall)"
makedepends="skalibs-devel"
short_desc="Non-interactive scripting language"
@@ -14,8 +13,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
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
+distfiles="https://skarnet.org/software/execline/execline-${version}.tar.gz"
+checksum=9ab55d561539dfa76ff4a97906fa995fc4a288e3de5225cb1a9d8fa9e9ebc49b
CFLAGS="-fPIC"
From f62c8df5b3ebeaecf2346e9c7c60c7ac5f2fa20a Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:01:23 +0100
Subject: [PATCH 04/18] execline-man-pages: update to 2.9.4.0.1.
---
srcpkgs/execline-man-pages/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 26c5f1f45c08e..1d23413d5f996 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,15 +1,15 @@
# Template file for 'execline-man-pages'
pkgname=execline-man-pages
-version=2.9.2.0.2
+version=2.9.4.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
short_desc="Mdoc versions of the documentation for the execline suite"
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
+homepage="https://git.sr.ht/~flexibeast/execline-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/execline-man-pages/archive/v${version}.tar.gz"
+checksum=96ab14161b4b6a912b03144be174e80c4d6560d1299b11c6b7ac9e47141f9400
post_install() {
vlicense LICENSE
From 8622fa924fe30e21c69957b211e2f007ff9250f0 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:04:39 +0100
Subject: [PATCH 05/18] s6: update to 2.12.0.3.
---
srcpkgs/s6/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index ecc407c70fa31..3484658fc4cf6 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,12 +1,11 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- --exec-prefix=/usr
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib --exec-prefix=/usr
$(vopt_if static --enable-static-libc)"
makedepends="execline-devel skalibs-devel"
short_desc="Small suite of programs for UNIX, designed to allow process supervision"
@@ -15,7 +14,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 35702ee771fbb7872cba8c45fab47a49ebcc6f6b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:05:05 +0100
Subject: [PATCH 06/18] 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..570ededd9d767 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 <mobinmob@disroot.org>"
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/v${version}.tar.gz"
+checksum=64fe52743d122d6f110967bf4b3311a82b35e6e5d7be03e8bdc15b31fb31516f
post_install() {
vlicense LICENSE
From cfc8d314f3aabbbbe1f38be791f921d72e200764 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:08:32 +0100
Subject: [PATCH 07/18] s6-rc: update to 0.5.4.2.
---
srcpkgs/s6-rc/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 0e894c661b418..258741869c6ca 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,21 +1,20 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- $(vopt_if static --enable-static-libc)"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib $(vopt_if static --enable-static-libc)"
makedepends="execline-devel skalibs-devel s6-devel"
-depends="s6>=2.9.0.0_1 execline>=2.5.2.0_1"
+depends="s6>=2.12.0.0_1 execline>=2.9.4.0_1"
short_desc="Service manager of the s6 init system"
maintainer="Duncaen <duncaen@voidlinux.org>"
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
+distfiles="https://skarnet.org/software/s6-rc/s6-rc-${version}.tar.gz"
+checksum=00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982
build_options="static"
desc_option_static="Build static binaries"
From dd84ae494f78f77a8e858b964df67b7d708d5a11 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:09:12 +0100
Subject: [PATCH 08/18] New package: s6-rc-man-pages-0.5.4.2.1
---
srcpkgs/s6-rc-man-pages/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/s6-rc-man-pages/template
diff --git a/srcpkgs/s6-rc-man-pages/template b/srcpkgs/s6-rc-man-pages/template
new file mode 100644
index 0000000000000..817e4bc5d9a9d
--- /dev/null
+++ b/srcpkgs/s6-rc-man-pages/template
@@ -0,0 +1,15 @@
+# Template file for 's6-rc-man-pages'
+pkgname=s6-rc-man-pages
+version=0.5.4.2.1
+revision=1
+build_style=gnu-makefile
+short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://git.sr.ht/~flexibeast/s6-rc-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/s6-rc-man-pages/archive/v${version}.tar.gz"
+checksum=b26354fd682adb6951ea607c04695c429734d17f7524d0b7c381d877cec96fa9
+
+post_install() {
+ vlicense LICENSE
+}
From 752dd61c6f355cd4d2153a2a9a0dae773b43d2cd Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:13:10 +0100
Subject: [PATCH 09/18] s6-portable-utils: update to 2.3.0.3.
---
srcpkgs/s6-portable-utils/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 89d9709c50689..d3a58ae5e8442 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,12 +1,11 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- $(vopt_if static '--enable-static-libc')
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib $(vopt_if static '--enable-static-libc')
$(vopt_if multicall '--enable-multicall')"
makedepends="skalibs-devel"
short_desc="Tiny portable generic utilities (s6-cat, s6-chmod, etc.)"
@@ -14,8 +13,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
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
+distfiles="https://skarnet.org/software/s6-portable-utils/s6-portable-utils-${version}.tar.gz"
+checksum=3e4492055d160c25fb90153f0efc277d7d52bf981bbe3ea2e9dfe51c493561ff
build_options="static multicall"
desc_option_static="Build static binaries"
From 80e6ee0e93dae7b676ba84b8ff21a54407ec68ab Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:13:50 +0100
Subject: [PATCH 10/18] s6-portable-utils-man-pages: update to 2.3.0.3.1.
---
srcpkgs/s6-portable-utils-man-pages/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template
index b2046de61116f..e03f11f069923 100644
--- a/srcpkgs/s6-portable-utils-man-pages/template
+++ b/srcpkgs/s6-portable-utils-man-pages/template
@@ -1,15 +1,15 @@
# Template file for 's6-portable-utils-man-pages'
pkgname=s6-portable-utils-man-pages
-version=2.3.0.0.1
+version=2.3.0.3.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
short_desc="Documentation for s6-portable-utils in mdoc(7) format"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
-homepage="https://github.com/flexibeast/s6-portable-utils-man-pages"
-distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz"
-checksum=1e1e5c53550bb11a2d7c12c1c745be9b1a68846a868bb8b3671d70450084c120
+homepage="https://git.sr.ht/~flexibeast/s6-portable-utils-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/s6-portable-utils-man-pages/archive/v${version}.tar.gz"
+checksum=763a1609aefc118adeb48eac0f88db79d49456721bbb8e53e359b0ced86853e2
post_install() {
vlicense LICENSE
From 2ea0ba668ccbbf3498eac39df935bb55f0f77185 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:19:40 +0100
Subject: [PATCH 11/18] s6-dns: update to 2.3.7.1.
---
srcpkgs/s6-dns/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 7f243bc2ec826..7bd91ed211582 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,19 +1,19 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- $(vopt_if static --enable-static-libc)"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib $(vopt_if static --enable-static-libc)"
makedepends="execline-devel skalibs-devel"
short_desc="Suite of DNS client programs and libraries for Unix systems"
maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-dns"
-distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=56979b5d5125c38071a80b5e3df0d4a6b2a7c52bb863a2410b6e3d797ffe1ee8
+changelog="https://skarnet.org/software/s6-dns/upgrade.html"
+distfiles="https://skarnet.org/software/s6-dns/s6-dns-${version}.tar.gz"
+checksum=cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d
build_options="static"
From bd74060b4452012e3d8c9e5a71c733229d63c6d7 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:21:17 +0100
Subject: [PATCH 12/18] s6-networking: update to 2.7.0.2.
---
srcpkgs/s6-networking/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 133dc65c5697a..6536d00c593bf 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)
@@ -15,8 +15,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://skarnet.org/software/s6-networking/s6-networking-${version}.tar.gz"
+checksum=c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1
build_options="bearssl libtls static"
build_options_default="bearssl"
From faca1abb7e1413e6d4cb7c29023b670e1f462431 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:22:08 +0100
Subject: [PATCH 13/18] s6-networking-man-pages: update to 2.7.0.1.1.
---
srcpkgs/s6-networking-man-pages/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 7a09aeb9f640f..e5cc6b41631a8 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,15 +1,15 @@
# Template file for 's6-networking-man-pages'
pkgname=s6-networking-man-pages
-version=2.5.1.3.1
+version=2.7.0.1.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
short_desc="Mdoc versions of the documentation for the s6-networking suite"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
-homepage="https://github.com/flexibeast/s6-networking-man-pages"
-distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz"
-checksum=6cff17453dc7946a2a5b94b8a4a48965db6c52c6000420acaedd443f9d069e8f
+homepage="https://git.sr.ht/~flexibeast/s6-networking-man-pages"
+distfiles="https://git.sr.ht/~flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
+checksum=163d85bcc682114a6aefef3ddcff1fd3376c52ca488730c95ca96f32ccd76fc1
post_install() {
vlicense LICENSE
From 5f70034167d191185bc8893fcc95e9599b2acc54 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:24:07 +0100
Subject: [PATCH 14/18] s6-linux-utils: update to 2.6.2.0.
---
srcpkgs/s6-linux-utils/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index fc4863803178d..169755e2a48db 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,21 +1,21 @@
# 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
--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') "
+ $(vopt_if multicall '--enable-multicall')"
makedepends="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=2accb5a443dd04203a6358534bdcf0dd369aceb4733e322612c2b8329260b7a2
+distfiles="https://skarnet.org/software/s6-linux-utils/s6-linux-utils-${version}.tar.gz"
+checksum=8f944633ca87d3d23e0f03c9c383d1502d508c9bac16d38c3fbf723a5eab2bb7
build_options="static multicall"
desc_option_static="Build static binaries"
From 0f32c91ab0c000f43f8fdfe20ec26ea5124adcb6 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:25:33 +0100
Subject: [PATCH 15/18] oblibs: update to 0.2.0.1.
---
common/shlibs | 2 +-
srcpkgs/oblibs/template | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4b2749136d02c..9731a6f3e1c49 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3596,7 +3596,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..f1e87111931c4 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,16 +1,17 @@
# 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 <mobinmob@disroot.org>"
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"
+changelog="https://git.obarun.org/Obarun/oblibs/-/blob/master/NEWS.md"
+distfiles="https://git.obarun.org/Obarun/oblibs/-/archive/${version}/oblibs-${version}.tar.gz"
+checksum=bf36c266167502d6d73ebf9e5119564f9aea063b6d8a9cba9422fd61f91a9427
post_install() {
vlicense LICENSE
From 7827377386397867e29743c08f07706c98ec8adc Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:26:44 +0100
Subject: [PATCH 16/18] mdevd: update to 0.1.6.3.
---
srcpkgs/mdevd/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index 15690b0ead373..9fcf9f64fc2c8 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,12 +1,11 @@
# 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
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- $(vopt_if static --enable-static-libc)"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib $(vopt_if static --enable-static-libc)"
makedepends="skalibs-devel"
short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,7 +13,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 0d3268284fe3cdc8ee4d8fbf8d439d7685dc0e0b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:35:31 +0100
Subject: [PATCH 17/18] 66: update to 0.7.0.0.
---
srcpkgs/66/patches/shutdown_posixsh.diff | 27 ------------------------
srcpkgs/66/template | 23 +++++++++-----------
2 files changed, 10 insertions(+), 40 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..0220e465c9494 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,24 +1,21 @@
# Template file for '66'
pkgname=66
-version=0.6.2.0
-revision=4
+version=0.7.0.0
+revision=1
build_style=configure
configure_args="--prefix=/usr
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib
- --with-s6-log-timestamp=iso
- --with-s6-log-user=_s6log
- --with-system-dir=/etc/66/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib --with-s6-log-timestamp=iso
+ --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 <mobinmob@disroot.org>"
license="ISC"
-homepage="http://web.obarun.org/software/"
+homepage="https://git.obarun.org/Obarun/66"
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}/66-${version}.tar.bz2"
+checksum=9c396b26697b7b16f4cf8bf70ecf45bda944080d09e558b4ed11aa931d39d37e
patch_args="-Np1"
conf_files="/etc/66/init.conf"
@@ -28,7 +25,6 @@ system_accounts="_s6log"
make_dirs="/var/log/66 0750 _s6log _s6log"
pre_configure() {
-
# Clean the default $PATH for service scripts
vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
"${wrksrc}/skel/init.conf"
@@ -37,6 +33,7 @@ pre_configure() {
post_install() {
vdoc README.md
vlicense LICENSE
+ mv "${DESTDIR}"/usr/bin/init "${DESTDIR}"/etc/66/init
}
66-doc_package() {
From 33751e194ea6ae4086ce63f88f6db9756fd461f7 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 17 Feb 2024 14:36:06 +0100
Subject: [PATCH 18/18] 66-tools: update to 0.1.0.1.
---
srcpkgs/66-tools/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 7536c2ba76aa7..ad2c4ab58736d 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
@@ -12,10 +12,10 @@ makedepends="oblibs-devel execline-devel skalibs-devel"
short_desc="Small tools and helpers for service scripts execution"
maintainer="mobinmob <mobinmob@disroot.org>"
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
+homepage="https://git.obarun.org/Obarun/66-tools"
+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
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (15 preceding siblings ...)
2024-02-17 13:37 ` [PR PATCH] [Updated] " dataCobra
@ 2024-02-17 13:53 ` dataCobra
2024-02-17 14:13 ` mobinmob
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: dataCobra @ 2024-02-17 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1950211513
Comment:
Today the **66** stable release 0.7.0.0 was released. :tada:
I took the time not only to update package `66`, but also to add/update the missing packages and generalize all related packages for readability.
The next step should be the test of the packages.
Afterward we can go forward to work on and build PR #45578
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (16 preceding siblings ...)
2024-02-17 13:53 ` dataCobra
@ 2024-02-17 14:13 ` mobinmob
2024-02-17 14:19 ` mobinmob
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-17 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1950220258
Comment:
> Today the **66** stable release 0.7.0.0 was released. 🎉
>
> I took the time not only to update package `66`, but also to add/update the missing packages and generalize all related packages for readability.
>
> The next step should be the test of the packages.
>
> Afterward we can go forward to work on and build PR #45578
For anyone who wants to help (outside of @dataCobra who is aware of this):
The work for PR #45578 is happening on:
1. the [void-66-services gh repo](https://github.com/mobinmob/void-66-services) (services and doc)
2. the 66[-voidlinux repo on codeberg](https://codeberg.org/mobinmob/66-voidlinux) (templates and helper scripts) and
3. my fork of boot-66serv repo for adjusting the upstream to voidlinux - [voidlinux-dev branch.](https://git.obarun.org/mobinmob/boot-66serv/-/commits/voidlinux-dev)
PRs/MRs are welcome.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (17 preceding siblings ...)
2024-02-17 14:13 ` mobinmob
@ 2024-02-17 14:19 ` mobinmob
2024-05-18 1:46 ` github-actions
2024-06-01 1:50 ` [PR PATCH] [Closed]: " github-actions
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2024-02-17 14:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-1950220258
Comment:
> Today the **66** stable release 0.7.0.0 was released. 🎉
>
> I took the time not only to update package `66`, but also to add/update the missing packages and generalize all related packages for readability.
>
> The next step should be the test of the packages.
>
> Afterward we can go forward to work on and build PR #45578
For anyone who wants to help (outside of @dataCobra who is aware of this):
The work for PR #45578 is happening on:
1. the [void-66-services gh repo](https://github.com/mobinmob/void-66-services) (services and doc) ([relevant PR](https://github.com/mobinmob/void-66-services/pull/199)),
2. the 66[-voidlinux repo on codeberg](https://codeberg.org/mobinmob/66-voidlinux) (templates and helper scripts) and
3. my fork of boot-66serv repo for adjusting the upstream to voidlinux - [voidlinux-dev branch.](https://git.obarun.org/mobinmob/boot-66serv/-/commits/voidlinux-dev)
PRs/MRs are welcome.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (18 preceding siblings ...)
2024-02-17 14:19 ` mobinmob
@ 2024-05-18 1:46 ` github-actions
2024-06-01 1:50 ` [PR PATCH] [Closed]: " github-actions
20 siblings, 0 replies; 22+ messages in thread
From: github-actions @ 2024-05-18 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/48582#issuecomment-2118561822
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Closed]: s6*: updating the whole stack of packages.
2024-02-07 15:51 [PR PATCH] s6*: updating the whole stack of packages dataCobra
` (19 preceding siblings ...)
2024-05-18 1:46 ` github-actions
@ 2024-06-01 1:50 ` github-actions
20 siblings, 0 replies; 22+ messages in thread
From: github-actions @ 2024-06-01 1:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
There's a closed pull request on the void-packages repository
s6*: updating the whole stack of packages.
https://github.com/void-linux/void-packages/pull/48582
Description:
#### Testing the changes
- I tested the changes in this PR: **Not yet**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
Setting up an update of all packages s6 related.
^ permalink raw reply [flat|nested] 22+ messages in thread