gentoo resync : 28.04.2021

8 files changed, 172 insertions, 57 deletions

diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4
deleted file mode 100644
index a0cb8265047d..000000000000
--- a/app-admin/salt/files/api-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-api"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-api.pid"
-name="SALT API daemon"
-retry="20"
-
-depend() {
-	use net logger
-}
diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4
deleted file mode 100644
index e07e72b0dae7..000000000000
--- a/app-admin/salt/files/master-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-master"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-master.pid"
-name="SALT master daemon"
-retry="20"
-
-depend() {
-	use net logger
-}
diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4
deleted file mode 100644
index c658ccf5c1df..000000000000
--- a/app-admin/salt/files/minion-initd-4
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-minion"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-minion.pid"
-name="SALT minion daemon"
-retry="20"
-
-depend() {
-	need net
-	use logger
-}
diff --git a/app-admin/salt/files/salt-3000.8-tests.patch b/app-admin/salt/files/salt-3000.8-tests.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-admin/salt/files/salt-3000.8-tests.patch
+++ /dev/null
diff --git a/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch b/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch
new file mode 100644
index 000000000000..f73b5a8790fd
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/modules/gentoolkitmod.py b/salt/modules/gentoolkitmod.py
+index cc78c37114..f0949d19a8 100644
+--- a/salt/modules/gentoolkitmod.py
++++ b/salt/modules/gentoolkitmod.py
+@@ -49,7 +49,7 @@ def revdep_rebuild(lib=None):
+ 
+         salt '*' gentoolkit.revdep_rebuild
+     """
+-    cmd = "revdep-rebuild -i --quiet --no-progress"
++    cmd = "revdep-rebuild -i --quiet"
+     if lib is not None:
+         cmd += " --library={0}".format(lib)
+     return __salt__["cmd.retcode"](cmd, python_shell=False) == 0
diff --git a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
new file mode 100644
index 000000000000..804b6a8704f0
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
+index 6ee6aeb002..db9aeaee95 100644
+--- a/tests/unit/modules/test_boto_apigateway.py
++++ b/tests/unit/modules/test_boto_apigateway.py
+@@ -154,6 +154,7 @@ def _has_required_botocore():
+         return True
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+     conn = None
+ 
+@@ -190,6 +191,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+         self.addCleanup(delattr, self, "utils")
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseMixin:
+     def _diff_list_dicts(self, listdict1, listdict2, sortkey):
+         """
diff --git a/app-admin/salt/files/salt-3003-tests.patch b/app-admin/salt/files/salt-3003-tests.patch
new file mode 100644
index 000000000000..c3562c5a4448
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-tests.patch
@@ -0,0 +1,139 @@
+diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py
+index 5f1cf11e24..8affb398ff 100644
+--- a/tests/integration/grains/test_core.py
++++ b/tests/integration/grains/test_core.py
+@@ -21,6 +21,7 @@ def _freebsd_or_openbsd():
+     return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd()
+ 
+ 
++@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD")
+ @pytest.mark.windows_whitelisted
+ class TestGrainsCore(ModuleCase):
+     """
+diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py
+index 2321689ef5..574de51e56 100644
+--- a/tests/integration/states/test_x509.py
++++ b/tests/integration/states/test_x509.py
+@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ==
+             first_run[key]["changes"]["Certificate"]["New"]["Not After"],
+             "%Y-%m-%d %H:%M:%S",
+         )
+-        self.assertEqual(29, (expiry - datetime.datetime.now()).days)
++        self.assertEqual(30, (expiry - datetime.datetime.now()).days)
+         self.assertTrue(os.path.exists(crtfile), "Certificate was not created.")
+ 
+         with salt.utils.files.fopen(crtfile, "r") as first_cert:
+@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ==
+             },
+         )
+         self.assertEqual(
+-            "Certificate needs renewal: 29 days remaining but it needs to be at least 90",
++            "Certificate needs renewal: 30 days remaining but it needs to be at least 90",
+             second_run[key]["changes"]["Status"]["Old"],
+         )
+         expiry = datetime.datetime.strptime(
+             second_run[key]["changes"]["Certificate"]["New"]["Not After"],
+             "%Y-%m-%d %H:%M:%S",
+         )
+-        self.assertEqual(179, (expiry - datetime.datetime.now()).days)
++        self.assertEqual(180, (expiry - datetime.datetime.now()).days)
+         with salt.utils.files.fopen(crtfile, "r") as second_cert:
+             self.assertNotEqual(
+                 cert_contents,
+diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py
+index 5424514160..0564b59593 100644
+--- a/tests/pytests/unit/modules/test_cmdmod.py
++++ b/tests/pytests/unit/modules/test_cmdmod.py
+@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154():
+ 
+ @pytest.mark.skip_on_darwin
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("does not work in sandbox environment")
+ def test_run_cwd_in_combination_with_runas():
+     """
+     cmd.run executes command in the cwd directory
+diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py
+index 4fd87d1c3f..02585a9e4e 100644
+--- a/tests/unit/ext/test_ipaddress.py
++++ b/tests/unit/ext/test_ipaddress.py
+@@ -2682,6 +2682,7 @@ class IpaddrUnitTest(TestCase):
+             "2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff",
+         )
+ 
++    @pytest.mark.skip("_cache no longer present in python3.8+")
+     def testNetworkElementCaching(self):
+         # V4 - make sure we're empty
+         self.assertNotIn("broadcast_address", self.ipv4_network._cache)
+diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py
+index 907c67f477..2429d27641 100644
+--- a/tests/unit/utils/test_parsers.py
++++ b/tests/unit/utils/test_parsers.py
+@@ -5,6 +5,7 @@
+ import os
+ import shutil
+ import tempfile
++import pytest
+ 
+ import salt.config
+ import salt.log.setup as log
+@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
+         if os.path.exists(self.log_file):
+             os.unlink(self.log_file)
+ 
++    @pytest.mark.skip("Tries to write to /var")
+     def test_jid_option(self):
+         jid = salt.utils.jid.gen_jid({})
+         args = ["--jid", jid]
+@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
+         parser.parse_args(args)
+         assert parser.options.jid == jid
+ 
++    @pytest.mark.skip("Tries to write to /var")
+     def test_jid_option_invalid(self):
+         jid = salt.utils.jid.gen_jid({}) + "A"
+         args = ["--jid", jid]
+@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
+         if os.path.exists(self.ssh_log_file):
+             os.unlink(self.ssh_log_file)
+ 
++    @pytest.mark.skip("Tries to write to /var")
+     def test_jid_option(self):
+         jid = salt.utils.jid.gen_jid({})
+         args = ["--jid", jid] + self.args
+@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
+         parser.parse_args(args)
+         assert parser.options.jid == jid
+ 
++    @pytest.mark.skip("Tries to write to /var")
+     def test_jid_option_invalid(self):
+         jid = salt.utils.jid.gen_jid({}) + "A"
+         args = ["--jid", jid] + self.args
+diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py
+index 87fc6a342c..12d4c6a073 100644
+--- a/tests/unit/utils/test_vt.py
++++ b/tests/unit/utils/test_vt.py
+@@ -20,6 +20,8 @@ import subprocess
+ import sys
+ import time
+ 
++import pytest
++
+ # Import Salt libs
+ import salt.utils
+ import salt.utils.files
+@@ -274,6 +276,7 @@ class VTTestCase(TestCase):
+         salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290"
+     )
+     @fixStdOutErrFileNoIfNeeded
++    @pytest.mark.skip("Does not work in sandbox environment")
+     def test_split_multibyte_characters_unicode(self):
+         """
+             Tests that the vt correctly handles multibyte characters that are
+@@ -341,6 +344,7 @@ class VTTestCase(TestCase):
+         salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290"
+     )
+     @fixStdOutErrFileNoIfNeeded
++    @pytest.mark.skip("Does not work in sandbox environment")
+     def test_split_multibyte_characters_shiftjis(self):
+         """
+             Tests that the vt correctly handles multibyte characters that are
diff --git a/app-admin/salt/files/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4
deleted file mode 100644
index 8908f2cfa850..000000000000
--- a/app-admin/salt/files/syndic-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-syndic"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-syndic.pid"
-name="SALT syndic daemon"
-retry="20"
-
-depend() {
-	use net logger
-}