diff --git a/LICENSE b/LICENSE index 03dd86f..ec4bbf7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,22 @@ ISC License modified: -Copyleft (c) 2021-2023 by joborun-linux joborun@disroot.org -Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") -Copyright (c) 1995-2003 by Internet Software Consortium +Copyright © 1995-2003 by Internet Software Consortium +Copyright © 2004-2010 by Internet Systems Consortium, Inc. ("ISC") +Copyleft © 2021-2023 by joborun-linux joborun@disroot.org -Permission to use, copy, modify, and/or distribute this software for any purpose to individuals or collectives but not -to corporations or other "legal entities" with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. -Any corporations or other "legal entities" must seek written approval for using, copying, modifying, and/or distributing, this software. +Permission to use, copy, modify, and/or distribute this software for +any purpose to individuals or collectives but not to corporations or +other "legal entities" with or without fee is hereby granted, provided +that the above copyright notice and this permission notice appear in +all copies. Any corporations or other "legal entities" must seek +written approval for using, copying, modifying, and/or distributing, +this software. -THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/jobo66/PKGBUILD b/jobo66/PKGBUILD index e319ea0..09e1a75 100644 --- a/jobo66/PKGBUILD +++ b/jobo66/PKGBUILD @@ -8,8 +8,7 @@ pkgname=jobo66 pkgdesc="installs minimal s6 & 66 needed software equivalent to the runit setup on joborun to boot w/ s6/66 and provide user level service supervision" pkgver=0.1.1 -pkgrel=01 -source=(jobo66.txt jobo66.install) +pkgrel=03 makedepends=(glibc sh) groups=('s6-suite' 'jobo66') backup=('etc/66/jobo66.txt') @@ -18,6 +17,8 @@ optdepends=('lvm2-66serv: lvm service' 'openntpd-66serv: an alternative to ntp' 'dhcpcd-66serv: works well with wpa_supplicant' 'ntpclient-66serv: a very small but effective ntp service by Skarnet') +source=(jobo66.txt) +install=jobo66.install package() { depends=(skalibs execline s6 s6-dns s6-linux-utils s6-networking s6-portable-utils s6-rc @@ -30,10 +31,13 @@ package() { mkdir -p $pkgdir/usr/bin ## replaces runit functionality when opensysusers is replaced by obsysusers ln -s /usr/bin/obsysusers $pkgdir/usr/bin/sysusers +# post-install/post-upgrade in jobo66 makes sure that the directory and contents +# if existing belong to s6log:log and not root:root +# This must be a bug in 66 allowing some process under some conditions to allow +# root to write into the directory + mkdir -p $pkgdir/var/log/66 } -install=jobo66.install - # See the observice repository (pkg -Sl observice) for all the Obarun service files available # See also additional or more minimalistic and runit like services for 66 from mobinmob # https://codeberg.org/mobinmob/66-voidlinux and https://osdn.net/projects/avyssos/ @@ -44,7 +48,6 @@ arch=(x86_64) license=('ISC') -sha256sums=(39c75848713bb50f782844bb790dc2ec76b104fe15c2e272ee622a559319220e # jobo66.txt - d109d7d2b3bfa6959142906e6e5a3c7df4d9d1d71e7a6853a5c113dc6169ccad) # jobo66.install +sha256sums=(39c75848713bb50f782844bb790dc2ec76b104fe15c2e272ee622a559319220e) # jobo66.txt -## 85680dcf9001949ecd802aff3309370c8985113536a93db492705c2cbb7eef06 jobo66-0.1.1-01-x86_64.pkg.tar.lz +## aafe54bb284711920cee20f30a650abd489b46f86afe6864b64c33c14a481828 jobo66-0.1.1-03-x86_64.pkg.tar.lz diff --git a/jobo66/jobo66.install b/jobo66/jobo66.install index d938333..a7acab3 100644 --- a/jobo66/jobo66.install +++ b/jobo66/jobo66.install @@ -5,6 +5,10 @@ post_install() { echo "1 This is a metapackage for joborun's boot-66serv to replace boot@-66serv by Obarun" echo "Read more on the cohabitation of runit and 66" more /etc/66/jobo66.txt + echo "some bug in 66 allows the root of the system to write or take ownership in /var/log/66" + echo "which shouldn't happen, so we are making sure if it has it is reverted back to s6log:log" + mkdir -p /var/log/66 + chown -R s6log:log /var/log/66 } post_upgrade() {