aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-devel@skarnet.org>2021-01-10 19:15:18 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-01-10 17:27:55 -0300
commit770f99f03e8c691d167d272c504c198329178854 (patch)
treeea124e116f1a04c8df5da93a0a416c0ada9a6cfc
parente757582f2cf8e3b721d2b2c5aa7dddddc72912d1 (diff)
downloadaports-770f99f03e8c691d167d272c504c198329178854.tar.gz
aports-770f99f03e8c691d167d272c504c198329178854.tar.bz2
aports-770f99f03e8c691d167d272c504c198329178854.tar.xz
main/s6: upgrade to 2.10.0.0
-rw-r--r--main/s6/APKBUILD8
-rw-r--r--main/s6/s6-svscanboot4
2 files changed, 6 insertions, 6 deletions
diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index 6bd7626a76..6f5fb80699 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=s6
-pkgver=2.9.2.0
-pkgrel=1
+pkgver=2.10.0.0
+pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite."
url="https://skarnet.org/software/$pkgname/"
arch="all"
@@ -45,6 +45,6 @@ ipcserver() {
amove $_ipcserver_binaries
}
-sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz
-871ca1f86b354b7c63ce1d3bef8794627e176f993144ed67a17d0a069f5ac2164d94aba980711f61ad349dcd4fe2bf928195f2121a75e611c9897d73f1af12a0 s6-svscanboot
+sha512sums="a3b6603ff7144a41d15e85bbfabc78656a52c0fad18e4195619a9a2c1a84adb84d736bcaa3f082d98dd11d3ac4d4d40988d1206ebaa33a0f9125b29fe380b6f7 s6-2.10.0.0.tar.gz
+bcb503c64fe4644b8f33775e94f03f08e422854247d14c9ff85f5d593b37fb2373fadf373da4226a1e2f4eba17a99fdcd40acb3645f8533f2f3e1a55c984f053 s6-svscanboot
e7f4fcdc04fc7f72df4419018d048e14f80d50d01ebc284b6d208d6bada3201ca91be0a110930618a26fb0e6bcc1603de01467f6f1dc635c8dcae60f1a0b1b9b s6.initd"
diff --git a/main/s6/s6-svscanboot b/main/s6/s6-svscanboot
index 2b41d29160..6f3f5b7871 100644
--- a/main/s6/s6-svscanboot
+++ b/main/s6/s6-svscanboot
@@ -8,7 +8,7 @@ foreground { redirfd -w 2 /dev/null ln -sf /bin/false ${1}/.s6-svscan/crash }
if
{
redirfd -w 1 ${1}/.s6-svscan/finish
- heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"${1}/s6-svscan-log\"\n"
+ heredoc 0 "#!/bin/execlineb -P\ns6-svc -x -- \"${1}/s6-svscan-log\"\n"
cat
}
if { chmod 0755 ${1}/.s6-svscan/finish }
@@ -29,4 +29,4 @@ if { chmod 0755 ${1}/s6-svscan-log/run }
redirfd -r 0 /dev/null
redirfd -wnb 1 ${1}/s6-svscan-log/fifo
fdmove -c 2 1
-s6-svscan -St0 ${1}
+s6-svscan -- ${1}