gentoo auto-resync : 19:07:2022 - 02:37:54

3 files changed, 0 insertions, 296 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 0c2609cbb970..71b598d9b950 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -13,9 +13,7 @@ AUX salt-3002.8-relax-pyzmq-dep.patch 293 BLAKE2B 7c56c7ea6124e18e6d71f1266cbdcc
 AUX salt-3002.8-tests.patch 1531 BLAKE2B 8a8b02a0ad6099aac7722d8f8edd178b27817483ef9216ca3f00078231c13d2f5e3a551539956186933200d04349e67640aa691cb7e5f35e3f6a4ce3dfb71368 SHA512 e146a04570aa9524341216547d8a55a434499eb67c4be1167a0fee778ce93c172555816a5422462648ce5431106c47840e7c0f270b6087cf84058082a1a7341a
 AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3
 AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
-AUX salt-3003-tests.patch 5792 BLAKE2B 6a383c400bfb1f261d284844dc12bfabe4fc1741c5bc840131440ea991d64e61432f4e9ac4059d5bc8680b7752c6ceed16c474d0908b53657f15560a7c6f0e8f SHA512 fdb3eef283b62da9955cbe88d7f99f889c23147d3b60af7d49e4a54f61d158903ea77ff321764e0f3aa62b38ac7045d46d9f17ccfb2870c56b8b32baa856b6a8
 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
-AUX salt-3003.3-jinja.patch 5036 BLAKE2B 7b54f79a2c24daf706cade5e3fe9470a01ddb81e2c7ac1a74d9d3f3bcc6f365562435607d6829433bfc31a5cbb8fcff603fbc183ee07ef32582b4ca1fda9f7be SHA512 e3d5db2143b7cd80bc1c0eee297ef9cc05301be43a57cd9471e28e01e405749bad1823eb992cab9267a47a1dca690c15b782c2a9dd2ab54a2b4a0375e8f75663
 AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928
 AUX salt-3003.4-relax-pyzmq-dep.patch 333 BLAKE2B 31596e398c420e04802f086e61ff59676a9687c199df0f7fcb9c7e6a804a3339e1c1960a0579cae0022f90c0e1a274aa90916b7a685239b54d47851246acbe1f SHA512 e9796a8cb0bcdc9d90f8a3d4e01d955a2ac1129edc3d572be7ddd472fd488bae933e80f6a107471c6660b61a16d9034cf4a80c7b8103a2c0b26b4392f5c70286
 AUX salt-3003.4-tests.patch 1982 BLAKE2B 920f9c7e587358cff0abf97f2dfe54ee523f82a35c238d193520e6bd30921cec993705dd93d0c8130d4794fe051e7236411afa552d311f2dcc30596c1bac2b51 SHA512 700cb7e9020383b0684898e4a6675174e552bed1ba7540cb773303ec151574707d142b888a99d5288e18236cf0d47169f1515041e4e6ca91204a0bc140f66898
diff --git a/app-admin/salt/files/salt-3003-tests.patch b/app-admin/salt/files/salt-3003-tests.patch
deleted file mode 100644
index c3562c5a4448..000000000000
--- a/app-admin/salt/files/salt-3003-tests.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-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/salt-3003.3-jinja.patch b/app-admin/salt/files/salt-3003.3-jinja.patch
deleted file mode 100644
index ec5b1ac6156f..000000000000
--- a/app-admin/salt/files/salt-3003.3-jinja.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-https://github.com/saltstack/salt/issues/61848
-https://patch-diff.githubusercontent.com/raw/saltstack/salt/pull/61856.patch
-
-Dropped a bunch of irrelevant hunks (CI files and a test not in 3003.3)
-
-From 03c2a607a0722ad5e55b6c8f8eda630be7c7fee5 Mon Sep 17 00:00:00 2001
-From: jonyhy96 <hy352144278@gmail.com>
-Date: Thu, 10 Mar 2022 10:41:48 +0800
-Subject: [PATCH 1/5] fix: jinja2 contextfuntion base on version
-
----
- salt/utils/jinja.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 4c430b5ccf32..9a1938c2d69b 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
-     return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
- 
- 
--@jinja2.contextfunction
-+if jinja2.__version__ < '3.0.0' :
-+    contextfunction = jinja2.contextfunction
-+else:
-+    contextfunction =  jinja2.pass_context
-+@contextfunction
- def show_full_context(ctx):
-     return salt.utils.data.simple_types_filter(
-         {key: value for key, value in ctx.items()}
-
-From 1aba938021b86732a211a899dc4c2a46afa488a2 Mon Sep 17 00:00:00 2001
-From: jonyhy96 <hy352144278@gmail.com>
-Date: Thu, 3 Mar 2022 16:21:17 +0800
-Subject: [PATCH 2/5] fix: jinja2 DeprecationWarning
-
----
- salt/utils/jinja.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 9a1938c2d69b..207a2cb77035 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -710,7 +710,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
- if jinja2.__version__ < '3.0.0' :
-     contextfunction = jinja2.contextfunction
- else:
--    contextfunction =  jinja2.pass_context
-+    contextfunction = jinja2.pass_context
- @contextfunction
- def show_full_context(ctx):
-     return salt.utils.data.simple_types_filter(
-
-From 7f281bbfc8efda40cfe7d607c0ddebb2fb00bd5d Mon Sep 17 00:00:00 2001
-From: Megan Wilhite <mwilhite@vmware.com>
-Date: Fri, 25 Mar 2022 08:31:24 -0600
-Subject: [PATCH 3/5] Use the correct Markup from jinja for each version
-
----
- salt/utils/jinja.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 207a2cb77035..558f063d7206 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -26,7 +26,7 @@
- import salt.utils.stringutils
- import salt.utils.url
- import salt.utils.yaml
--from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
-+from jinja2 import BaseLoader, TemplateNotFound, nodes
- from jinja2.environment import TemplateModule
- from jinja2.exceptions import TemplateRuntimeError
- from jinja2.ext import Extension
-@@ -35,6 +35,12 @@
- from salt.utils.odict import OrderedDict
- from salt.utils.versions import LooseVersion
- 
-+try:
-+    from jinja2 import Markup
-+except ImportError:
-+    # Markup moved to markupsafe in jinja>= 3.1
-+    from markupsafe import Markup
-+
- log = logging.getLogger(__name__)
- 
- __all__ = ["SaltCacheLoader", "SerializerExtension"]
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 558f063d7206..5d00b134e25f 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -713,10 +713,12 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
-     return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
- 
- 
--if jinja2.__version__ < '3.0.0' :
-+if jinja2.__version__ < "3.0.0":
-     contextfunction = jinja2.contextfunction
- else:
-     contextfunction = jinja2.pass_context
-+
-+
- @contextfunction
- def show_full_context(ctx):
-     return salt.utils.data.simple_types_filter(
-
-From 9056e636beaea7de2e3a61876ba0345e5d390973 Mon Sep 17 00:00:00 2001
-From: Megan Wilhite <mwilhite@vmware.com>
-Date: Fri, 25 Mar 2022 11:14:01 -0600
-Subject: [PATCH 5/5] Fix requested feedback
-
----
- requirements/static/ci/docs.in               |  1 +
- requirements/static/ci/py3.10/docs.txt       |  3 ++-
- requirements/static/ci/py3.6/docs.txt        |  1 +
- requirements/static/ci/py3.7/docs.txt        |  3 ++-
- requirements/static/ci/py3.8/docs.txt        |  3 ++-
- requirements/static/ci/py3.9/docs.txt        |  3 ++-
- salt/utils/jinja.py                          | 10 +++++-----
- 8 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 5d00b134e25f..aa8ebe90546c 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -36,10 +36,10 @@
- from salt.utils.versions import LooseVersion
- 
- try:
--    from jinja2 import Markup
--except ImportError:
--    # Markup moved to markupsafe in jinja>= 3.1
-     from markupsafe import Markup
-+except ImportError:
-+    # jinja < 3.1
-+    from jinja2 import Markup
- 
- log = logging.getLogger(__name__)
- 
-@@ -713,9 +713,9 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
-     return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
- 
- 
--if jinja2.__version__ < "3.0.0":
-+try:
-     contextfunction = jinja2.contextfunction
--else:
-+except AttributeError:
-     contextfunction = jinja2.pass_context
- 
-