Accepting request 399636 from systemsmanagement:saltstack:testing

OBS-URL: https://build.opensuse.org/request/show/399636
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=70

salt.spec

@@ -36,7 +36,7 @@
 %bcond_without docs
 
 Name:           salt
-Version:        2015.8.8
+Version:        2015.8.10
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
@@ -57,31 +57,22 @@ Patch3:         0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
 Patch4:         0004-do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch
 # PATCH-FIX-OPENSUSE - Upstream default hash type is set to MD5, while we require SHA256 (bsc#955373)
 Patch5:         0005-Use-SHA256-hash-type-by-default.patch
-# PATCH-FIX-UPSTREAM https://docs.saltstack.com/en/latest/topics/releases/2015.8.8.html#salt-2015-8-8-2
-Patch6:         0006-Update-to-2015.8.8.2.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/32243
-Patch7:         0007-Force-sort-the-RPM-output-to-ensure-latest-version-o.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/32068
-Patch8:         0008-Cleaner-deprecation-process-with-decorators.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32323
-Patch9:         0009-fix-sorting-by-latest-version-when-called-with-an-at.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32353
-Patch10:        0010-Prevent-metadata-download-when-getting-installed-pro.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32505
-Patch11:        0011-Check-if-EOL-is-available-in-a-particular-product-bs.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32436
-Patch12:        0012-Bugfix-salt-key-crashes-if-tries-to-generate-keys-to.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32652
-Patch13:        0013-Prevent-crash-if-pygit2-package-is-requesting-re-com.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32649
-Patch14:        0014-align-OS-grains-from-older-SLES-with-current-one-326.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32892
-Patch15:        0015-Unblock-Zypper.-Modify-environment.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33088
-Patch16:        0016-Bugfix-Restore-boolean-values-from-the-repo-configur.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/31798
+Patch6:         0006-Create-salt-proxy-instantiated-service-file.patch
 # PATCH-FIX-OPENSUSE Generate events from the Salt minion,
 #                    if Zypper has been used outside the Salt infrastructure
-Patch17:        0017-Add-SUSE-Manager-plugin.patch
+Patch7:         0007-Add-SUSE-Manager-plugin.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33464
+Patch8:         0008-Prevent-several-minion-processes-on-the-same-machine.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33469
+Patch9:         0009-checksum-validation-when-zypper-pkg.download.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33501
+Patch10:        0010-unit-tests-for-rpm.checksum-and-zypper.download.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33465
+Patch11:        0011-jobs.exit_success-allow-to-check-if-a-job-has-execut.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33432
+#                    https://github.com/saltstack/salt/pull/33581
+Patch12:        0012-Fix-pkgrepo.managed-gpgkey-argument-bsc-979448.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  logrotate
@@ -432,21 +423,17 @@ cp %{S:1} .
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+
+# This is SUSE-only patch
+%if 0%{?suse_version}
 %patch7 -p1
 %patch8 -p1
+%endif
+
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-
-# This is SUSE-only patch
-%if 0%{?suse_version}
-%patch17 -p1
-%endif
 
 %build
 python setup.py --salt-transport=both build
@@ -507,6 +494,7 @@ install -Dpm 0644 pkg/salt-master.service %{buildroot}%{_unitdir}/salt-master.se
 install -Dpm 0644 pkg/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service
 install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%{_unitdir}/salt-syndic.service
 install -Dpm 0644 pkg/salt-api.service    %{buildroot}%{_unitdir}/salt-api.service
+install -Dpm 0644 pkg/salt-proxy@.service  %{buildroot}%{_unitdir}/salt-proxy@.service
 ln -s service %{buildroot}%{_sbindir}/rcsalt-master
 ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic
 ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
@@ -631,6 +619,20 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/salt.conf || true
 %endif
 
 %post master
+if [ $1 -eq 2 ] ; then
+  # Upgrading from an earlier version.  If this is from 2014, where daemons
+  # ran as root, we need to chown some stuff to salt in order for the new
+  # version to actually work.  It seems a manual restart of salt-master may
+  # still be required, but at least this will actually work given the file
+  # ownership is correct.
+  for file in master.{pem,pub} ; do
+    [ -f /etc/salt/pki/master/$file ] && chown salt /etc/salt/pki/master/$file
+  done
+  for dir in file_lists minions jobs ; do
+    [ -d /var/cache/salt/master/$dir ] && chown -R salt:salt /var/cache/salt/master/$dir
+  done
+  true
+fi
 %if %{with systemd}
 %service_add_post salt-master.service
 %fillup_only
@@ -796,6 +798,9 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/salt.conf || true
 %defattr(-,root,root)
 %{_bindir}/salt-proxy
 %{_mandir}/man1/salt-proxy.1.gz
+%if %{with systemd}
+%{_unitdir}/salt-proxy@.service
+%endif
 
 %files master
 %defattr(-,root,root)