diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/Manifest.gz | bin | 32025 -> 32024 bytes | |||
| -rw-r--r-- | app-admin/salt/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch | 12 | ||||
| -rw-r--r-- | app-admin/salt/files/salt-3006.3-tests.patch | 26 |
4 files changed, 0 insertions, 40 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex a1ded2e08161..a1f77961a682 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index a33aa0256aaa..5595e89afd47 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -7,14 +7,12 @@ AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30 AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc -AUX salt-3005-relax-pyzmq-dep.patch 332 BLAKE2B d22d94b7680fb81e642b83cb7d823137e7e208b43a1720b131401fb957bcb3deb6a0fe5ca87da528cdf60ac219820d259d0b03a905e17142c9cd4d939b4bacf1 SHA512 7c5b963436c3066bf8e8f528acf04ea8ddfa2a5a19adb9486f9888346d55e56fdfcd97a4a04db18d85476cb8ecc8a350343855d765387744706e43e868464f5e AUX salt-3005-tests.patch 4101 BLAKE2B 6a7d7dee4e631a7619bf1b7fa6bd08b93c0bf31342ce72f734bb645206604ffed9ae2ddae9cebe01401cbe100c224e97f18a69ede5f40a041158d1cd8878dc0f SHA512 cbc3b3d625ab8e20aa7b166dd6ddca1728c4bf562cc14d28fa684573c6ee1d42a270b0f029e5d978803a30103e7ad281d516afff66d18bf31308528fae79c00c AUX salt-3005.1-importlib-metadata-5-r1.patch 1162 BLAKE2B cbc8df0043881725eb00a6e45ccc03e25f95a6260b4a4b42343c69a6bd8edcf0bb45312644a8e6a66b50a0c4ce0aad7be454b1b8d54a786851b33c7d4b143e10 SHA512 7d2f8c86f22b238dabda0727c338e2e8d33e06a36fcccf5b3b508ac610899f2d6416d7c9e285e992f0d76fc9d04c126640b2b84a227f9a82f4973cb472a4a14a AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95475834ae917a2f6fbdbe3424c9f1e837a0e797b84e291e3530f86a2f7d2286e0070f433817ec06b2fd4d0a069b47acb1b0646653862337ece SHA512 4bc03979e1a4202d5ccb2b3159e178bc72c2a4be4297d7b9306479a5c7fe8cc81fc7d25474d80c2627e638db25e73cd4e8f7e1b25c8e15317e22986d63307823 AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67 AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec -AUX salt-3006.3-tests.patch 1379 BLAKE2B bc19d5f9ced7550e8fcd025d31fcd06c6745acba1cf1764a5831a29197c245ac0300f68d98c5175c68a0ed554a1bee701881f4e2597d3788c209536da2fbbc81 SHA512 ff2ea0a6259964ef96799f009c84e4d5cbeb01b085cf65e9b091c8cc3093e26d3b9f1d780e5ca2c632f5fa1071ddbff40cd2c2d8494276e557395ccafaddbcc3 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed diff --git a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch deleted file mode 100644 index ff47115af210..000000000000 --- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index eb4d796418..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3006.3-tests.patch b/app-admin/salt/files/salt-3006.3-tests.patch deleted file mode 100644 index 4d30608775cb..000000000000 --- a/app-admin/salt/files/salt-3006.3-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py -index e289e72dad..2abd4066c4 100644 ---- a/tests/pytests/unit/utils/event/test_event.py -+++ b/tests/pytests/unit/utils/event/test_event.py -@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError(): - event = SaltEvent(node=None) - with patch.object(event, "pusher") as mock_pusher: - with patch.object( -- salt.utils.event.log, "debug", auto_spec=True -+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True - ) as mock_log_debug: - mock_pusher.connect.side_effect = ( - salt.ext.tornado.iostream.StreamClosedError -@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error): - event = SaltEvent(node=None) - with patch.object(event, "pusher") as mock_pusher: - with patch.object( -- salt.utils.event.log, "debug", auto_spec=True -+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True - ) as mock_log_debug: - with patch.object( -- salt.utils.event.log, "error", auto_spec=True -+ salt.utils.event.log, "error", auto_spec=True, unsafe=True - ) as mock_log_error: - mock_pusher.connect.side_effect = error - event.connect_pull() |