From f3534956944da8db35c33514a652be8f9744a616 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Wed, 22 Jun 2022 11:40:31 +0530 Subject: [PATCH] runit: added patch to change default service path --- srcpkgs/runit/patches/default_svdir.patch | 76 +++++++++++++++++++++++ srcpkgs/runit/template | 4 +- 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/runit/patches/default_svdir.patch diff --git a/srcpkgs/runit/patches/default_svdir.patch b/srcpkgs/runit/patches/default_svdir.patch new file mode 100644 index 000000000000..e94f327788ee --- /dev/null +++ b/srcpkgs/runit/patches/default_svdir.patch @@ -0,0 +1,76 @@ +Set default service path to /var/service + +--- runit-2.1.2/src/sv.c ++++ runit-2.1.2/src/sv.c +@@ -32,7 +32,7 @@ + char *progname; + char *action; + char *acts; +-char *varservice ="/service/"; ++char *varservice ="/var/service/"; + char **service; + char **servicex; + unsigned int services; +--- runit-2.1.2/man/sv.8 ++++ runit-2.1.2/man/sv.8 +@@ -30,7 +30,7 @@ + .I service + doesn't start with a dot or slash and doesn't end with a slash, it is + searched in the default services directory +-.IR /service/ , ++.IR /var/service/ , + otherwise relative to the current directory. + .P + .I command +@@ -232,7 +232,7 @@ + .TP + .B SVDIR + The environment variable $SVDIR overrides the default services directory +-.IR /service/ . ++.IR /var/service/ . + .TP + .B SVWAIT + The environment variable $SVWAIT overrides the default 7 seconds to wait +--- runit-2.1.2/man/runsvchdir.8 ++++ runit-2.1.2/man/runsvchdir.8 +@@ -27,13 +27,13 @@ + .IR dir . + .P + Normally +-.I /service ++.I /var/service + is a symlink to + .IR current , + and + .BR runsvdir (8) + is running +-.IR /service/ . ++.IR /var/service/ . + .SH EXIT CODES + .B runsvchdir + prints an error message and exits 111 on error. +--- runit-2.1.2/man/utmpset.8 ++++ runit-2.1.2/man/utmpset.8 +@@ -34,7 +34,7 @@ + .I finish + scripts, e.g.: + .P +- $ cat /service/getty-5/finish ++ $ cat /var/service/getty-5/finish + #!/bin/sh + exec utmpset \-w tty5 + $ +--- runit-2.1.2/man/runsv.8 ++++ runit-2.1.2/man/runsv.8 +@@ -157,9 +157,9 @@ + .IR service /log/supervise/control. + .P + Example: to send a TERM signal to the socklog-unix service, either do +- # sv term /service/socklog-unix ++ # sv term /var/service/socklog-unix + or +- # printf t >/service/socklog-unix/supervise/control ++ # printf t >/var/service/socklog-unix/supervise/control + .P + .BR printf (1) + usually blocks if no diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template index 68b400c1ef5c..36bbb3cae6c5 100644 --- a/srcpkgs/runit/template +++ b/srcpkgs/runit/template @@ -1,7 +1,7 @@ # Template file for 'runit' pkgname=runit version=2.1.2 -revision=11 +revision=12 build_style="gnu-makefile" wrksrc="admin" build_wrksrc="${pkgname}-${version}/src" @@ -25,8 +25,6 @@ pre_build() { echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld - # set default service path to /var/service - sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c # change type short to gid_t for getgroups(2) and setgroups(2) sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c }