SHA256
1
0
forked from pool/salt

Accepting request 636187 from home:mdinca:branches:systemsmanagement:saltstack

- Prepend current directory when path is just filename (bsc#1095942)
- Integration of MSI authentication for azurearm
- Adds fix for SUSE Expanded Support os grain detection
- Fixes 509x remote signing
- Fix for StringIO import in Python2
- Use Adler32 algorithm to compute string checksums (bsc#1102819)
- Only do reverse DNS lookup on IPs for salt-ssh (bsc#1104154)
- Add support for Python 3.7
- Fix license macro to build on SLE12SP2
- Decode file contents for python2 (bsc#1102013)
- Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413)
- Fix mine.get not returning data - workaround for #48020 (bsc#1100142)
- Added:
  * change-stringio-import-in-python2-to-import-the-clas.patch
  * integration-of-msi-authentication-with-azurearm-clou.patch
  * x509-fixes-for-remote-signing-106.patch
  * fix-for-suse-expanded-support-detection.patch
  * only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch
  * prepend-current-directory-when-path-is-just-filename.patch
  * add-support-for-python-3.7.patch
  * decode-file-contents-for-python2-bsc-1102013.patch
  * fix-mine.get-not-returning-data-workaround-for-48020.patch
  * x509-fixes-111.patch
  * use-adler32-algorithm-to-compute-string-checksums.patch
- Modified:
  * fix-for-sorting-of-multi-version-packages-bsc-109717.patch

OBS-URL: https://build.opensuse.org/request/show/636187
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=129
This commit is contained in:
Bo Maryniuk
2018-09-17 14:18:45 +00:00
committed by Git OBS Bridge
parent 7966fde1ef
commit c0d7cc4bb8
15 changed files with 2374 additions and 1 deletions

View File

@@ -126,6 +126,30 @@ Patch29: remove-old-hack-when-reporting-multiversion-packages.patch
Patch30: add-engine-relaying-libvirt-events.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/48781
Patch31: avoid-incomprehensive-message-if-crashes.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/48765
Patch32: fix-mine.get-not-returning-data-workaround-for-48020.patch
# PATCH-FIX_OPENSUSE bsc#1097174 and bsc#1097413
Patch33: fix-for-sorting-of-multi-version-packages-bsc-109717.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/48863
Patch34: decode-file-contents-for-python2-bsc-1102013.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49052
Patch35: add-support-for-python-3.7.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/48771
Patch36: only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49277
Patch37: prepend-current-directory-when-path-is-just-filename.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49063
Patch38: integration-of-msi-authentication-with-azurearm-clou.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49538
Patch39: fix-for-suse-expanded-support-detection.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49508
Patch40: x509-fixes-for-remote-signing-106.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49555
Patch41: change-stringio-import-in-python2-to-import-the-clas.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/48812
Patch42: use-adler32-algorithm-to-compute-string-checksums.patch
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/49497
Patch43: x509-fixes-111.patch
# BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -615,6 +639,18 @@ cp %{S:5} ./.travis.yml
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch41 -p1
%patch42 -p1
%patch43 -p1
%build
%if 0%{?build_py2}
@@ -1256,8 +1292,12 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%{_mandir}/man1/salt-call.1.gz
%{_mandir}/man1/spm.1.gz
%config(noreplace) %{_sysconfdir}/logrotate.d/salt
%if 0%{?suse_version} < 1500
%doc LICENSE AUTHORS README.rst HACKING.rst README.SUSE
%else
%license LICENSE
%doc AUTHORS README.rst HACKING.rst README.SUSE
%endif
#
%dir %attr(0750, root, salt) %{_sysconfdir}/salt
%dir %attr(0750, root, salt) %{_sysconfdir}/salt/pki