Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2025-07-06 17:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.1903 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Sun Jul 6 17:03:52 2025 rev:178 rq:1290636 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2025-07-01 11:33:47.116392832 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.1903/salt.changes 2025-07-06 17:05:34.805166842 +0200 @@ -1,0 +2,9 @@ +Fri Jul 4 07:55:28 UTC 2025 - Victor Zhestkov <vzhest...@suse.com> + +- Add `minion_legacy_req_warnings` option to avoid noisy warnings +- Require M2Crypto >= 0.44.0 for SUSE Family distros + +- Added: + * add-minion_legacy_req_warnings-option-to-avoid-noisy.patch + +------------------------------------------------------------------- New: ---- add-minion_legacy_req_warnings-option-to-avoid-noisy.patch ----------(New B)---------- New:- Added: * add-minion_legacy_req_warnings-option-to-avoid-noisy.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.TyBVmo/_old 2025-07-06 17:05:42.005465118 +0200 +++ /var/tmp/diff_new_pack.TyBVmo/_new 2025-07-06 17:05:42.005465118 +0200 @@ -566,6 +566,8 @@ # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/68125 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/721 Patch175: fix-tests-issues-in-salt-shaker-environments-721.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/722 +Patch176: add-minion_legacy_req_warnings-option-to-avoid-noisy.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END @@ -679,7 +681,7 @@ BuildRequires: %{python_module msgpack-python > 0.3} BuildRequires: %{python_module pyzmq > 2.2.0} %if 0%{?suse_version} >= 1500 -BuildRequires: %{python_module M2Crypto} +BuildRequires: %{python_module M2Crypto >= 0.44.0} %else BuildRequires: %{python_module pycrypto >= 2.6.1} %endif ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.TyBVmo/_old 2025-07-06 17:05:42.109469426 +0200 +++ /var/tmp/diff_new_pack.TyBVmo/_new 2025-07-06 17:05:42.113469592 +0200 @@ -1,3 +1,3 @@ -5cd6ab3244caf6b48a954c2592659b50c9852672 +027db6671bef8be8800aed184d79a28f0318f9be (No newline at EOF) ++++++ add-minion_legacy_req_warnings-option-to-avoid-noisy.patch ++++++ >From d0ab0bfd0846e38df6c791222a364e82b52a34d9 Mon Sep 17 00:00:00 2001 From: Victor Zhestkov <vzhest...@suse.com> Date: Thu, 3 Jul 2025 17:49:35 +0200 Subject: [PATCH] Add `minion_legacy_req_warnings` option to avoid noisy warnings --- salt/channel/server.py | 2 +- tests/pytests/unit/transport/test_zeromq.py | 22 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/salt/channel/server.py b/salt/channel/server.py index abef8aa2f0..1d7cc9c577 100644 --- a/salt/channel/server.py +++ b/salt/channel/server.py @@ -819,7 +819,7 @@ class ReqServerChannel: ret["aes"] = cipher.encrypt(aes) ret["session"] = cipher.encrypt(salt.utils.stringutils.to_bytes(self.session_key(load["id"]))) - if version < 3: + if version < 3 and self.opts.get("minion_legacy_req_warnings", True): log.warning( "Minion using legacy request server protocol, please upgrade %s", load["id"], diff --git a/tests/pytests/unit/transport/test_zeromq.py b/tests/pytests/unit/transport/test_zeromq.py index 558f753778..fd0e4b1977 100644 --- a/tests/pytests/unit/transport/test_zeromq.py +++ b/tests/pytests/unit/transport/test_zeromq.py @@ -1034,7 +1034,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_key(pki_dir, master_opts, assert "Key verification failed." == excinfo.value.message -async def test_req_serv_auth_v1(pki_dir, master_opts, minion_opts): +async def test_req_serv_auth_v1(pki_dir, master_opts, minion_opts, caplog): minion_opts.update( { "master_uri": "tcp://127.0.0.1:4506", @@ -1088,8 +1088,24 @@ async def test_req_serv_auth_v1(pki_dir, master_opts, minion_opts): "token": token, "pub": pub_key, } - ret = server._auth(load, sign_messages=False) - assert "load" not in ret + with caplog.at_level(logging.WARNING): + ret = server._auth(load, sign_messages=False) + assert "Minion using legacy request server protocol, please upgrade minion" in caplog.text + assert "load" not in ret + + caplog.clear() + + with caplog.at_level(logging.WARNING), patch.dict(server.opts, {"minion_legacy_req_warnings": False}): + ret = server._auth(load, sign_messages=False) + assert "Minion using legacy request server protocol, please upgrade minion" not in caplog.text + assert "load" not in ret + + caplog.clear() + + with caplog.at_level(logging.WARNING), patch.dict(server.opts, {"minion_legacy_req_warnings": True}): + ret = server._auth(load, sign_messages=False) + assert "Minion using legacy request server protocol, please upgrade minion" in caplog.text + assert "load" not in ret async def test_req_serv_auth_v2(pki_dir, master_opts, minion_opts): -- 2.50.0
