upg runit runit-rc

This commit is contained in:
joborun linux 2023-09-27 22:30:00 +03:00
parent e281aaac2d
commit e09cdb6fed
15 changed files with 113 additions and 66 deletions

View file

@ -6,6 +6,9 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
# We thank both the Artix and Void Linux developer teams for the inspiration and work
#src-url="https://git.disroot/org/joborun/runit-rc"
_url="https://git.disroot.org/joborun-pkg/repos/raw/branch/main"
pkgname=runit-rc
pkgver=20230911
pkgrel=01
@ -17,7 +20,7 @@ optdepends=('lvm2-runit: LVM support for runit'
'smbnetfs: to mount netfs volumes on stage1')
provides=('init-rc')
conflicts=('init-rc')
source=("runit-rc.11092023.tar.xz")
source=("$pkgname.tar.xz::$_url/$pkgname.$pkgver.tar.xz")
build() {
cd ${pkgname}
@ -48,5 +51,5 @@ license=('BSD')
sha256sums=(2f74e667ee9a33c8b30c3267fe4c4a239ed8c6b68ae13dc8821be1b9de338ff5) # runit-rc.11092023.tar.xz
## ac475aedf91193c581e296243c0501b196d0e00b1a7a26a1e96bf4032b8ab0fc runit-rc-20230911-01-x86_64.pkg.tar.lz
## 5397d3ac085e4575723ceff838645e5b40854253c1f062a78c261deb87ceaee7 runit-rc-20230911-01-x86_64.pkg.tar.lz

View file

@ -1 +1 @@
rm -rf {src,pkg}
rm -rf {src,pkg,runit-rc.tar.xz}

View file

@ -1,5 +1,5 @@
[Trigger]
Type = File
Type = Path
Operation = Install
Operation = Upgrade
Target = usr/lib/binfmt.d/*.conf

View file

@ -1,5 +1,5 @@
[Trigger]
Type = File
Type = Path
Operation = Install
Operation = Upgrade
Target = etc/sysctl.d/*.conf

View file

@ -1,44 +1,37 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname"
# Maintainer : Chris Cromer <chris@cromer.cl>
# Maintainer : Muhammad Herdiansyah <koni@artixlinux.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
#src-url="https://git.disroot/org/joborun/runit-joborun"
_url=https://gitea.artixlinux.org/artix/runit-artix
_pkgname=runit-artix
_pkgver=20200825
_url="https://git.disroot.org/joborun-pkg/repos/raw/branch/main"
_pkgname="runit-joborun"
_pkgver="20230911"
# Many thanks to the artix team members Konimex & c-cromer for refining
# runit's adoption to Arch.
# After the changes that took place on 9/2020 we decided to stay
# with the old Gentoo opentmpfiles and opensysusers and not adopt the
# large systemd counterparts.
# Since runit's development has stopped years ago for reaching its goals
# 100% we will leave it as is ourselves. So both runit & runit-rc are
# the last releases before that change.
# set default service path to /run/runit/service
_servicedir=/run/runit/service
pkgname=runit
pkgver=2.1.2
pkgrel=023
pkgrel=024
pkgdesc='a cross-platform Unix init scheme with service supervision'
arch=('x86_64')
groups=(base)
url='http://smarden.org/runit/'
depends=('runit-rc' 'joborun66')
makedepends=('git')
makedepends=('sh')
backup=('etc/rc.local' 'etc/rc.shutdown')
optdepends=('runit-bash-completions: Runit completions for Bash')
install=runit.install
provides=('svc-manager')
conflicts=('svc-manager')
source=("$url/${pkgname}-${pkgver}.tar.gz"
"${_pkgname}-${_pkgver}.tar.gz::${_url}/archive/${_pkgver}.tar.gz"
provides=('svc-manager' 'eudev-runit')
conflicts=('svc-manager' 'eudev-runit')
replaces=('eudev-runit')
source=("http://smarden.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"runit-joborun.tar.xz::$_url/$_pkgname-$_pkgver.tar.xz"
"halt.c"
"shutdown"
"clearmem.patch"
'chpst.patch'
"svlogd.patch"
"utmpset-time_t.patch"
"runit-hook"
@ -56,6 +49,7 @@ prepare() {
patch -p1 -i "${srcdir}/clearmem.patch"
patch -p1 -i "${srcdir}/svlogd.patch"
patch -p1 -i "${srcdir}/utmpset-time_t.patch"
patch -p1 -i "${srcdir}/chpst.patch"
}
build() {
@ -104,19 +98,39 @@ package() {
sed -n '/To the extent/,/0/p' README.md > "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('BSD')
b2sums=('101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9'
#cc394e8675f16929f7eea36d44844af9baacf42abbe2d54bc6e8abdba6314876a540c313d6484f2db662801f838e36c4b473aa98e671347d8a313597f34fe46b # runit-artix-20210904.tar.gz
SKIP
'4008be93260a5df13f1d1199864c9f5e724643a670d69ed3ee980f35a83cad8bd97bb09614a7847d991b4ac0434ed563a3c5af6a74297b9590ad0e5b47749219'
'e782155bd99bd4cd049a88fa9c0bfbd1d4ef4c61669e97a6b3d482c9ab52666ad736d38ccfc4486a152fd8446ab9703f99ff5ccef9ded3ba055aa412ec18de3a'
'af632c732ec8e3942fc27e6450cb04fc539ca4a91bc1ea8e926784922acf8455b00725a082686475e13605a1d897ce17e7fd3bb975f48ffa9619daaaf2774911'
'c6197f9a6b1ffcd2f210186cfec11ea7267f9671f0ad52f40c2b2d83ad1f62a2128883c589e0b25a1d36752b3491fd67e058aca6ab476098594498b88176b892'
'd95fdfd7bdad77e540d0c168c0ddc4b17bda1831d4321b5c6f9793247fbe272623425b23faa82756175aef96ae9b4eed9191271ae773831cc62a153a65fd0c3f'
'f9e06e60901fd4762468a778866a7d9bf860ef5ee07965b104566e09b5fd8775a9f597708632f429a41b19629543084fec10276b1f4d8c6ef09b06b90f2910c4'
'28c687dca9442c73bbc944c92b5a7b8466ceaadb379a7478c13d11604e68ef206558b427bc1714b8410f934b457cab0d36d13fe78ff681095d1cafbe8c0ad236'
'4335a92d20b0f1916137e87d47bcb0b3d9157480a2aafb847daefba912defc3e45cd86ffeaf092ca40478eb8ad08617bcb88d790a4bdd3ea574941968e379501'
'8ebbaed9dd9f608025da75448688ebce137d25260b512682d658a8cb2512009467773014ca194c973115af98f0bbaae14d38528494b433e73b6e06516ba0cc9a'
'3d8a7dfcf6a98bd4b6d379a3175d4f61422eaa91fe8b2a4fd6fbfc06d6c92c2e68f768ca438310530f9cb119a1de797d9f02da422d5d487272d7cf951c4fa9f8'
'081dbd1873d8a41b65820949ae24715b209b1c38957b6f8934c0eb48019a586cd505e11e2cad0bb2657a0d1792a748bc5d9d71147a8b42a3274c8335ded3030a')
sha256sums=(6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 # runit-2.1.2.tar.gz
b68169c7bc3b51e5466726b267d7dd5f7c97b29521525b386aeed6e1e90faeed # runit-joborun.tar.xz
a9e4b3e09fb72fd44e62f052fd2302d6fcde64a112d53037febd221564e62b1a # halt.c
7f11c5cab16f10178612b6a81d37184c25c4426b9c2d5d3f8ef7ed7ab2b52c56 # shutdown
19b5e99135f153d07052f2dff707430af9faeabc717a5740ea58a8a783f609de # clearmem.patch
68b364b6e65f39903f2c928387ed30008d91c1e36d6315456845bef6882f3c85 # chpst.patch
9cf269264c0713975be1b3bc9dd3b5b3bb1e2078ac596527370a902d8d025a5a # svlogd.patch
527f68f501cc9eb4bbab33f8ad374822624342c7d74b5c795efe4aac6b3f170a # utmpset-time_t.patch
201cf7e03d400195c461face4ec29559bbfe3308e6d291a7633a9d1632e99410 # runit-hook
a3e95c60b616ae0a85690d0251924b084f85166cfbd7c037377cfe67b3baaf1b # runit-install.hook
b85ae57b50a323fd5b11c3584b1b34f723b38d769ea238ab3c27429f2f4fb7b9 # runit-remove.hook
3248e86fe739aaff412f5b4f77b689f690fac1c0e9e634a0305cc3f517d41338 # 30-binfmt.hook
af91ca198fc402f39faf9e62b8da56e47f5cda9ce3d61c43fcf5b24f59fbbf5a) # 30-sysctl.hook
## ac63645856bad711b5c35cc92ce1ac36314abe2d92b199c8ee59f47f5d0a78ac runit-2.1.2-024-x86_64.pkg.tar.lz
sha256sums=(6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 # runit-2.1.2.tar.gz
60435808bdaf2478776bc31e7509a30e037f67990db3f92602064696401d49df # runit-artix-20200825.tar.gz
a9e4b3e09fb72fd44e62f052fd2302d6fcde64a112d53037febd221564e62b1a # halt.c
7f11c5cab16f10178612b6a81d37184c25c4426b9c2d5d3f8ef7ed7ab2b52c56 # shutdown
19b5e99135f153d07052f2dff707430af9faeabc717a5740ea58a8a783f609de # clearmem.patch
9cf269264c0713975be1b3bc9dd3b5b3bb1e2078ac596527370a902d8d025a5a # svlogd.patch
527f68f501cc9eb4bbab33f8ad374822624342c7d74b5c795efe4aac6b3f170a # utmpset-time_t.patch
4fd0751bce6cefff13ea24f3dd5ea8c91db7090170668736d9ff132aad07c6b8 # runit-hook
87c2eef83dceb42c5f10f31cbdba07e4751a2165b18ad00dd2f3a5819456d271 # runit-install.hook
dc583a40ce68d33e2c1b1039527427f941568a0189014f564afcfc02b01232c8 # runit-remove.hook
20d0c5297f20f5f48d9bad24203603f7768c2dc2085b51eafac45dc62aa7ac4c # 30-binfmt.hook
7b1c4928483df7715a3a897f82baccf4552a3f9b61fba87139aad80addf53202) # 30-sysctl.hook

View file

@ -3,29 +3,31 @@
_url=https://gitea.artixlinux.org/artix/runit-artix
_pkgname=runit-artix
_pkgver=20200825
_pkgver=20210904
# set default service path to /run/runit/service
_servicedir=/run/runit/service
pkgname=runit
pkgver=2.1.2
pkgrel=22
pkgrel=31
pkgdesc='a cross-platform Unix init scheme with service supervision'
arch=('x86_64')
url='http://smarden.org/runit/'
license=('BSD')
depends=('runit-rc')
makedepends=('git')
backup=('etc/rc.local' 'etc/rc.shutdown')
optdepends=('runit-bash-completions: Runit completions for Bash')
install=runit.install
provides=('svc-manager')
conflicts=('svc-manager')
provides=('svc-manager' 'eudev-runit')
conflicts=('svc-manager' 'eudev-runit')
replaces=('eudev-runit')
source=("http://smarden.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"${_pkgname}-${_pkgver}.tar.gz::${_url}/archive/${_pkgver}.tar.gz"
"halt.c"
"shutdown"
"clearmem.patch"
'chpst.patch'
"svlogd.patch"
"utmpset-time_t.patch"
"runit-hook"
@ -33,18 +35,19 @@ source=("http://smarden.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"runit-remove.hook"
"30-binfmt.hook"
"30-sysctl.hook")
sha256sums=('6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18'
'60435808bdaf2478776bc31e7509a30e037f67990db3f92602064696401d49df'
'a9e4b3e09fb72fd44e62f052fd2302d6fcde64a112d53037febd221564e62b1a'
'7f11c5cab16f10178612b6a81d37184c25c4426b9c2d5d3f8ef7ed7ab2b52c56'
'19b5e99135f153d07052f2dff707430af9faeabc717a5740ea58a8a783f609de'
'9cf269264c0713975be1b3bc9dd3b5b3bb1e2078ac596527370a902d8d025a5a'
'527f68f501cc9eb4bbab33f8ad374822624342c7d74b5c795efe4aac6b3f170a'
'4fd0751bce6cefff13ea24f3dd5ea8c91db7090170668736d9ff132aad07c6b8'
'87c2eef83dceb42c5f10f31cbdba07e4751a2165b18ad00dd2f3a5819456d271'
'dc583a40ce68d33e2c1b1039527427f941568a0189014f564afcfc02b01232c8'
'20d0c5297f20f5f48d9bad24203603f7768c2dc2085b51eafac45dc62aa7ac4c'
'7b1c4928483df7715a3a897f82baccf4552a3f9b61fba87139aad80addf53202')
b2sums=('101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9'
'2c7ee7b3945a553ec93244ca9f023f4ad0d6816079f10bcc0d6a3d740d22fd57deddbc42f8db9d44aba117bba08046b8a0f6fefbe51f7d5fbb03b825b0169b4a'
'4008be93260a5df13f1d1199864c9f5e724643a670d69ed3ee980f35a83cad8bd97bb09614a7847d991b4ac0434ed563a3c5af6a74297b9590ad0e5b47749219'
'e782155bd99bd4cd049a88fa9c0bfbd1d4ef4c61669e97a6b3d482c9ab52666ad736d38ccfc4486a152fd8446ab9703f99ff5ccef9ded3ba055aa412ec18de3a'
'af632c732ec8e3942fc27e6450cb04fc539ca4a91bc1ea8e926784922acf8455b00725a082686475e13605a1d897ce17e7fd3bb975f48ffa9619daaaf2774911'
'c6197f9a6b1ffcd2f210186cfec11ea7267f9671f0ad52f40c2b2d83ad1f62a2128883c589e0b25a1d36752b3491fd67e058aca6ab476098594498b88176b892'
'd95fdfd7bdad77e540d0c168c0ddc4b17bda1831d4321b5c6f9793247fbe272623425b23faa82756175aef96ae9b4eed9191271ae773831cc62a153a65fd0c3f'
'f9e06e60901fd4762468a778866a7d9bf860ef5ee07965b104566e09b5fd8775a9f597708632f429a41b19629543084fec10276b1f4d8c6ef09b06b90f2910c4'
'28c687dca9442c73bbc944c92b5a7b8466ceaadb379a7478c13d11604e68ef206558b427bc1714b8410f934b457cab0d36d13fe78ff681095d1cafbe8c0ad236'
'4335a92d20b0f1916137e87d47bcb0b3d9157480a2aafb847daefba912defc3e45cd86ffeaf092ca40478eb8ad08617bcb88d790a4bdd3ea574941968e379501'
'8ebbaed9dd9f608025da75448688ebce137d25260b512682d658a8cb2512009467773014ca194c973115af98f0bbaae14d38528494b433e73b6e06516ba0cc9a'
'3d8a7dfcf6a98bd4b6d379a3175d4f61422eaa91fe8b2a4fd6fbfc06d6c92c2e68f768ca438310530f9cb119a1de797d9f02da422d5d487272d7cf951c4fa9f8'
'081dbd1873d8a41b65820949ae24715b209b1c38957b6f8934c0eb48019a586cd505e11e2cad0bb2657a0d1792a748bc5d9d71147a8b42a3274c8335ded3030a')
prepare() {
# set default service path to /run/runit/service
@ -55,6 +58,7 @@ prepare() {
patch -p1 -i "${srcdir}/clearmem.patch"
patch -p1 -i "${srcdir}/svlogd.patch"
patch -p1 -i "${srcdir}/utmpset-time_t.patch"
patch -p1 -i "${srcdir}/chpst.patch"
}
build() {

2
runit/README.md Normal file
View file

@ -0,0 +1,2 @@
# runit

15
runit/chpst.patch Normal file
View file

@ -0,0 +1,15 @@
Ensure optarg is incremented strictly before it is read from.
https://skarnet.org/lists/supervision/2971.html
--- runit-2.1.2/src/chpst.c.orig
+++ runit-2.1.2/src/chpst.c
@@ -308,7 +308,8 @@
case 'n':
switch (*optarg) {
case '-':
- if (optarg[scan_ulong(++optarg, &ul)]) usage(); nicelvl =ul;
+ ++optarg;
+ if (optarg[scan_ulong(optarg, &ul)]) usage(); nicelvl =ul;
nicelvl *=-1;
break;
case '+': ++optarg;

View file

@ -1 +1 @@
rm -rf {src,pkg,runit*tar.gz}
rm -rf {src,pkg,runit*.gz,runit*.xz}

View file

@ -1,2 +1,4 @@
runit-rc git
runit-rc
joborun66
opentmpfiles

View file

@ -9,7 +9,7 @@ runit_live() {
svc_help(){
echo " ==> Start/stop/restart a service:"
echo " sv <service> <start/stop/restart>"
echo " sv <start/stop/restart> <service>"
}
svc_add_help(){

View file

@ -1,5 +1,5 @@
[Trigger]
Type = File
Type = Path
Operation = Install
Operation = Upgrade
Target = etc/runit/sv/*

View file

@ -1,5 +1,5 @@
[Trigger]
Type = File
Type = Path
Operation = Remove
Target = etc/runit/sv/*

6
runit/sums Normal file
View file

@ -0,0 +1,6 @@
chpst.patch
runit-hook
runit-install.hook
runit-remove.hook
30-binfmt.hook
30-sysctl.hook

View file

@ -1,5 +1,6 @@
real 0m18.835s
user 0m7.733s
sys 0m1.121s
real 0m15.084s
user 0m3.378s
sys 0m0.904s