From 7f796ca520611c2cced6e79086d6fc5c92c5cb47 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sun, 19 Mar 2023 10:23:56 +0300 Subject: [PATCH 1/4] tini. --- hardware/virtualization/tini/actions.py | 18 +++++------------- hardware/virtualization/tini/pspec.xml | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/hardware/virtualization/tini/actions.py b/hardware/virtualization/tini/actions.py index 82a0bba0d8..6e301fc11e 100644 --- a/hardware/virtualization/tini/actions.py +++ b/hardware/virtualization/tini/actions.py @@ -1,18 +1,10 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright 2018 TUBITAK/UEKAE -# Licensed under the GNU General Public License, version 2. -# See the file http://www.gnu.org/copyleft/gpl.txt. +# Licensed under the GNU General Public License, version 3. +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import cmaketools -from pisi.actionsapi import get - -# WorkDir = "" -# NoStrip = "/" +from pisi.actionsapi import cmaketools, pisitools def setup(): cmaketools.configure() @@ -23,8 +15,8 @@ def build(): def install(): pisitools.dobin("tini") pisitools.dobin("tini-static") - + # symlink docker-init (nice integration with docker) pisitools.dosym("/usr/bin/tini-static", "/usr/bin/docker-init") - + pisitools.dodoc("LICENSE", "README*", "VERSION") diff --git a/hardware/virtualization/tini/pspec.xml b/hardware/virtualization/tini/pspec.xml index 58d40dcc33..6f553dd507 100644 --- a/hardware/virtualization/tini/pspec.xml +++ b/hardware/virtualization/tini/pspec.xml @@ -8,17 +8,16 @@ Ertuğrul Erata ertugrulerata@gmail.com - GPLv2 + MIT app:console - A tiny but valid `init` for containers - A tiny but valid `init` for containers - https://github.com/krallin/tini/archive/v0.18.0.tar.gz + A tiny but valid `init` for containers. + All Tini does is spawn a single child (Tini is meant to be run in a container), and wait for it to exit all the while reaping zombies and performing signal forwarding. + https://github.com/krallin/tini/archive/refs/tags/v0.19.0.tar.gz - cmake - tini-cmake-fixes.patch + @@ -31,6 +30,13 @@ + + 2023-03-18 + 0.19.0 + Version bump. + fury + uglyside@yandex.ru + 2020-03-19 0.18.0 From cb25059fce3938bc5ddd305fe899d9063a381cab Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sun, 19 Mar 2023 10:26:06 +0300 Subject: [PATCH 2/4] aufs-util no longer required. --- hardware/virtualization/docker/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index b4470b6315..95dabf33f3 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -34,7 +34,7 @@ docker git - aufs-util + sqlite device-mapper btrfs-progs From 825f1ba4a9343040fa1e1abda8f73c91d16937e9 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sun, 19 Mar 2023 10:39:14 +0300 Subject: [PATCH 3/4] iptables fix missing dir. --- network/filter/iptables/actions.py | 1 + network/filter/iptables/pspec.xml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/network/filter/iptables/actions.py b/network/filter/iptables/actions.py index 415ac13043..b8e4bb6a8c 100644 --- a/network/filter/iptables/actions.py +++ b/network/filter/iptables/actions.py @@ -33,4 +33,5 @@ def install(): pisitools.insinto("/usr/include/libiptc", "include/libiptc/*.h") pisitools.dodir("/var/lib/iptables") + pisitools.dodir("/var/lock/subsys") pisitools.dodir("/etc/iptables") diff --git a/network/filter/iptables/pspec.xml b/network/filter/iptables/pspec.xml index 76ab1f4285..c2b36e883f 100644 --- a/network/filter/iptables/pspec.xml +++ b/network/filter/iptables/pspec.xml @@ -69,6 +69,13 @@ + + 2023-03-19 + 1.8.9 + Fix missing dir. + Mustafa Cinasal + muscnsl@gmail.com + 2023-01-13 1.8.9 From 814eb8852bd244edcc7c263c037137078cee2980 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sun, 19 Mar 2023 11:16:54 +0300 Subject: [PATCH 4/4] tini no longer required. --- hardware/virtualization/docker/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index 95dabf33f3..a864099a20 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -45,7 +45,7 @@ libtool-ltdl runc containerd - tini + /etc