Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2016-03-26 15:24:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2016-03-17 16:48:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2016-03-26 15:24:20.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 17 12:09:14 UTC 2016 - [email protected] + +- Use SHA256 by default in master, minion and proxy (bsc#955373) + Add: + * 0036-Use-SHA256-hash-type-by-default.patch + +------------------------------------------------------------------- +Wed Mar 16 15:34:26 UTC 2016 - [email protected] + +- Fix state structure compilation + Add: + * 0035-Fix-the-always-false-behavior-on-checking-state.patch +- Fix git_pillar race condition + Add: + * 0034-Fix-git_pillar-race-condition.patch + +------------------------------------------------------------------- New: ---- 0034-Fix-git_pillar-race-condition.patch 0035-Fix-the-always-false-behavior-on-checking-state.patch 0036-Use-SHA256-hash-type-by-default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.PX5Xbd/_old 2016-03-26 15:24:21.000000000 +0100 +++ /var/tmp/diff_new_pack.PX5Xbd/_new 2016-03-26 15:24:21.000000000 +0100 @@ -105,6 +105,12 @@ Patch32: 0032-Add-error-check-when-retcode-is-0-but-stderr-is-pres.patch # PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31793 Patch33: 0033-fixing-init-system-dectection-on-sles-11-refs-31617.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31836 +Patch34: 0034-Fix-git_pillar-race-condition.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31745 +Patch35: 0035-Fix-the-always-false-behavior-on-checking-state.patch +# PATCH-FIX-OPENSUSE - Upstream default hash type is set to MD5, while we require SHA256 (bsc#955373) +Patch36: 0036-Use-SHA256-hash-type-by-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: logrotate @@ -480,6 +486,9 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 %build python setup.py --salt-transport=both build ++++++ 0034-Fix-git_pillar-race-condition.patch ++++++ ++++ 963 lines (skipped) ++++++ 0035-Fix-the-always-false-behavior-on-checking-state.patch ++++++ >From bb8048d4bd842746b09dbafe3a610e0d7c3e1bc2 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <[email protected]> Date: Tue, 8 Mar 2016 16:00:26 +0100 Subject: [PATCH 35/35] Fix the always-false behavior on checking state - Fix PEP8 continuation - Keep first level away from lists. - Adjust test --- salt/utils/__init__.py | 15 +++++---------- tests/unit/utils/utils_test.py | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py index 5ee73b168349..8c8309e99f95 100644 --- a/salt/utils/__init__.py +++ b/salt/utils/__init__.py @@ -1741,7 +1741,7 @@ def gen_state_tag(low): return '{0[state]}_|-{0[__id__]}_|-{0[name]}_|-{0[fun]}'.format(low) -def check_state_result(running): +def check_state_result(running, recurse=False): ''' Check the total return value of the run and determine if the running dict has any issues @@ -1754,20 +1754,15 @@ def check_state_result(running): ret = True for state_result in six.itervalues(running): - if not isinstance(state_result, dict): - # return false when hosts return a list instead of a dict + if not recurse and not isinstance(state_result, dict): ret = False - if ret: + if ret and isinstance(state_result, dict): result = state_result.get('result', _empty) if result is False: ret = False # only override return value if we are not already failed - elif ( - result is _empty - and isinstance(state_result, dict) - and ret - ): - ret = check_state_result(state_result) + elif result is _empty and isinstance(state_result, dict) and ret: + ret = check_state_result(state_result, recurse=True) # return as soon as we got a failure if not ret: break diff --git a/tests/unit/utils/utils_test.py b/tests/unit/utils/utils_test.py index 611bfce0ed4b..261af69b59fc 100644 --- a/tests/unit/utils/utils_test.py +++ b/tests/unit/utils/utils_test.py @@ -406,7 +406,7 @@ class UtilsTestCase(TestCase): ('test_state0', {'result': True}), ('test_state', {'result': True}), ])), - ('host2', []) + ('host2', OrderedDict([])) ])) ]) } -- 2.7.2 ++++++ 0036-Use-SHA256-hash-type-by-default.patch ++++++ >From eea48a283a184a02223fc440fec54a47a5b47b62 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <[email protected]> Date: Thu, 17 Mar 2016 12:30:23 +0100 Subject: [PATCH 36/36] Use SHA256 hash type by default --- conf/master | 2 +- conf/minion | 2 +- conf/proxy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/master b/conf/master index cf05ec4..5f6beaa 100644 --- a/conf/master +++ b/conf/master @@ -474,7 +474,7 @@ syndic_user: salt # # Prior to changing this value, the master should be stopped and all Salt # caches should be cleared. -#hash_type: md5 +hash_type: sha256 # The buffer size in the file server can be adjusted here: #file_buffer_size: 1048576 diff --git a/conf/minion b/conf/minion index e17ec61..ba4111a 100644 --- a/conf/minion +++ b/conf/minion @@ -447,7 +447,7 @@ # # Warning: Prior to changing this value, the minion should be stopped and all # Salt caches should be cleared. -#hash_type: sha256 +hash_type: sha256 # The Salt pillar is searched for locally if file_client is set to local. If # this is the case, and pillar data is defined, then the pillar_roots need to diff --git a/conf/proxy b/conf/proxy index 0de6af8..77ecf3b 100644 --- a/conf/proxy +++ b/conf/proxy @@ -427,7 +427,7 @@ # # Warning: Prior to changing this value, the minion should be stopped and all # Salt caches should be cleared. -#hash_type: sha256 +hash_type: sha256 # The Salt pillar is searched for locally if file_client is set to local. If # this is the case, and pillar data is defined, then the pillar_roots need to -- 2.7.3
