Accepting request 375270 from systemsmanagement:saltstack:testing

- Use SHA256 by default in master, minion and proxy (bsc#955373)
  Add:
  * 0036-Use-SHA256-hash-type-by-default.patch

- 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

OBS-URL: https://build.opensuse.org/request/show/375270
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=64
This commit is contained in:
Klaus Kämpf
2016-03-19 13:46:52 +00:00
committed by Git OBS Bridge
parent 8bc8eaf64f
commit eac5c0b1cc
5 changed files with 1109 additions and 0 deletions

View File

@@ -105,6 +105,12 @@ Patch31: 0031-Only-use-LONGSIZE-in-rpm.info-if-available.-Otherwis.patch
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 @@ cp %{S:1} .
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%build
python setup.py --salt-transport=both build