From 1bfa27607323d24e52cb16c2a8544df2cafcb503 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 14 Oct 2024 23:25:05 -0700
Subject: [PATCH] community/runit: install binaries to /usr/sbin
Also added a change to initd script to test for the socklog command in PATH rather than at a hardcoded location
Part of
---
community/runit/APKBUILD | 10 +++++-----
community/runit/runit.initd | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/community/runit/APKBUILD b/community/runit/APKBUILD
index 3b4c6eed7320..a60bfc784944 100644
--- a/community/runit/APKBUILD
+++ b/community/runit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=runit
pkgver=2.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="UNIX init scheme with service supervision"
url="http://smarden.org/runit/"
arch="all"
@@ -22,11 +22,11 @@ build() {
}
package() {
- install -d "$pkgdir"/sbin "$pkgdir"/usr/bin
+ install -d "$pkgdir"/usr/sbin "$pkgdir"/usr/bin
for i in chpst runit runit-init runsv runsvchdir runsvdir sv svlogd utmpset; do
- install -m755 "$i" "$pkgdir"/sbin/$i
+ install -m755 "$i" "$pkgdir"/usr/sbin/$i
done
- ln -sfv /sbin/runsvdir "$pkgdir"/usr/bin/runsvdir
+ ln -sfv /usr/sbin/runsvdir "$pkgdir"/usr/bin/runsvdir
install -Dm644 -t "$pkgdir"/usr/share/man/man8 ../man/*.8
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/runitd
install -Dm644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/$pkgname
@@ -39,5 +39,5 @@ cedfe6d3505aca754ff11d791055f023a7be42e2fbdd2e4964b3460692474371a72363cf181ae2df
11d623dad3ab4189e2b76deff0df671e28f8c1db4b3f9b0fb756e8d16cc396980c832ed88c0b091e5a0f9efe0023438e109645ab54908c8c80339b7cce172a50 misleading-indentation.patch
7107da162f7c13e1483f17bf04a844c23a8d1b81ef982c3d956a4c0e23b2a20e415850f0b95999b1eb1e04638284884948937377756ca080037bd6455e3301e8 run-service-dir.patch
88d1efcf366add7803ed026ec8e693b271c842d4e3d5a52587b7ead96266ee27b4ceb1b2696551243f0d9efa93199a07231d2b37186ce1535e9a6b9d90192909 README.alpine
-a3e82785650dbb0a96454ae29635012022bd3a705318bdb56a4430a2f487f4aa17661fb1a87fce56ca535b6a526a618a7673ad66848d5fffb47f5795cdcbf18b runit.initd
+35361669730187247d0dc12cdae85e5c79ba5043e9dcf46fcf7366fdd12b916b3488fc51e0b25c844466a0107e7fa133530c19976ca0880696e414e9b0d05a1b runit.initd
"
diff --git a/community/runit/runit.initd b/community/runit/runit.initd
index 257ae605128c..29f006f815b4 100644
--- a/community/runit/runit.initd
+++ b/community/runit/runit.initd
@@ -1,6 +1,6 @@
#!/sbin/openrc-run
-command="/sbin/runsvdir"
+command="/usr/sbin/runsvdir"
command_args="/etc/service"
pidfile="/run/${SVCNAME}.pid"
command_background="true"
@@ -10,7 +10,7 @@ retry="SIGHUP/5"
depend() {
need localmount
after firewall
- if [ -x /sbin/socklog ]; then
+ if command -v socklog 2>/dev/null; then
provide logger
fi
}
--
GitLab