Accepting request 540260 from systemsmanagement:saltstack:products:unstable.py3

- Update to 2017.7.2 See https://docs.saltstack.com/en/latest/topics/releases/2017.7.2.html - Added: * enable-with-salt-version-parameter-for-setup.py-scri.patch - Removed: * add-a-salt-minion-service-control-file.patch * add-clean_id-function-to-salt.utils.verify.py.patch * add-options-for-dockerng.patch * add-ssh-option-to-salt-ssh.patch * add-unit-test-for-skip-false-values-from-preferred_i.patch * add-yum-plugin.patch * add-zypp-notify-plugin.patch * adding-salt-minion-watchdog-for-sysv-systems-rhel6-a.patch * adding-support-for-installing-patches-in-yum-dnf-exe.patch * avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch * bugfix-jobs-scheduled-to-run-at-a-future-time-stay-p.patch * bugfix-unable-to-use-127-as-hostname.patch * catching-error-when-pidfile-cannot-be-deleted.patch * change-travis-configuration-file-to-use-salt-toaster.patch * check-if-byte-strings-are-properly-encoded-in-utf-8.patch * clean-up-change-attribute-from-interface-dict.patch * do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch * enables-salt-minion-watchdog-on-init.d-script-for-sy.patch * escape-the-os.sep.patch * fix-for-delete_deployment-in-kubernetes-module.patch * fix-format-error-bsc-1043111.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-regression-in-file.get_managed-add-unit-tests.patch * fix-salt-summary-to-count-not-responding-minions-cor.patch OBS-URL: https://build.opensuse.org/request/show/540260 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=98
2017-11-10 07:17:55 +00:00 · 2017-11-10 07:17:55 +00:00 · e628fd1d19
commit e628fd1d19
parent 08133114a1
21 changed files with 1158 additions and 838 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+_service:tar_scm:package-1510227540.833ce8accd.tar filter=lfs diff=lfs merge=lfs -text
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+<services>
+  <service name="tar_scm">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/opensuse/salt.git</param>
+    <param name="exclude">.git</param>
+    <param name="filename">package</param>
+    <param name="revision">openSUSE-2017.7.2-python3-only</param>
+  </service>
+  <service name="extract_file">
+    <param name="archive">*package*.tar</param>
+    <param name="files">
+      */obs/*
+      */scripts/suse/zypper/plugins/commit/zyppnotify
+    </param>
+  </service>
+  <service name="verify_file">
+    <param name="file">_service:extract_file:salt-2017.7.2.tar.gz</param>
+    <param name="verifier">sha256</param>
+    <param name="checksum">ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840</param>
+  </service>
+</services>
--- a/_service:extract_file:README.SUSE
+++ b/_service:extract_file:README.SUSE
--- a/_service:extract_file:bugfix-always-return-a-string-list-on-unknown-job-ta.patch
+++ b/_service:extract_file:bugfix-always-return-a-string-list-on-unknown-job-ta.patch
@ -1,7 +1,7 @@
 From 49a4e807fb1cb844cec7b7c11b37f6c276f899e4 Mon Sep 17 00:00:00 2001
 From: Bo Maryniuk <bo@suse.de>
 Date: Mon, 9 Oct 2017 17:57:48 +0200
-Subject: [PATCH] Bugfix: always return a string "list" on unknown job
+Subject: [PATCH 5/6] Bugfix: always return a string "list" on unknown job
 target type.

 ---
@ -66,4 +66,3 @@ index 3f4ef296a2..4dbf0d2c6f 100644
 -- 
 2.14.2

-
--- a/_service:extract_file:enable-with-salt-version-parameter-for-setup.py-scri.patch
+++ b/_service:extract_file:enable-with-salt-version-parameter-for-setup.py-scri.patch
@ -2,7 +2,7 @@ From 1949261a504fd01e057b41126d78f142f4977204 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
 Date: Fri, 6 Oct 2017 17:12:15 +0100
-Subject: [PATCH] Enable '--with-salt-version' parameter for setup.py
+Subject: [PATCH 6/6] Enable '--with-salt-version' parameter for setup.py
 script

 ---
@ -73,4 +73,3 @@ index effdc2f230..519f753401 100755
 -- 
 2.14.2

-
--- a/_service:extract_file:html.tar.bz2
+++ b/_service:extract_file:html.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4033a19f562875d4124d5f18fffb485cbbb1a256996b4a8019ac4f32064657be
+size 6413238
--- a/_service:extract_file:introduce-process_count_max-minion-configuration-par.patch
+++ b/_service:extract_file:introduce-process_count_max-minion-configuration-par.patch
@ -1,7 +1,7 @@
-From dd3490c7e56a0aca17f73dde1684d469fe5582df Mon Sep 17 00:00:00 2001
+From cb472e1f0fc18a554e0de9e3fe6bbe16557957ee Mon Sep 17 00:00:00 2001
 From: Silvio Moioli <smoioli@suse.de>
 Date: Wed, 20 Sep 2017 14:33:33 +0200
-Subject: [PATCH] Introduce process_count_max minion configuration
+Subject: [PATCH 4/6] Introduce process_count_max minion configuration
 parameter

 This allows users to limit the number of processes or threads a minion
@ -25,10 +25,10 @@ process_count_max: disable by default
 5 files changed, 87 insertions(+), 3 deletions(-)

 diff --git a/conf/minion b/conf/minion
-index b1122c9e52..6d2b43da1b 100644
+index 6cae043295..4a3cddcbd1 100644
 --- a/conf/minion
 +++ b/conf/minion
-@@ -671,6 +671,12 @@
+@@ -689,6 +689,12 @@
 # for a full explanation.
 #multiprocessing: True
 
@ -42,10 +42,10 @@ index b1122c9e52..6d2b43da1b 100644
 #####         Logging settings       #####
 ##########################################
 diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
-index 5cc72f1daf..b935f86656 100644
+index 5c92b932ab..19e9026dd8 100644
 --- a/doc/ref/configuration/minion.rst
 +++ b/doc/ref/configuration/minion.rst
-@@ -2179,6 +2179,23 @@ executed in a thread.
+@@ -2352,6 +2352,23 @@ executed in a thread.
 
     multiprocessing: True
 
@ -70,7 +70,7 @@ index 5cc72f1daf..b935f86656 100644
 .. _minion-logging-settings:
 
 diff --git a/salt/config/__init__.py b/salt/config/__init__.py
-index b5b7f2a1f7..e843d8c79d 100644
+index 0f06f9ccca..668051a789 100644
 --- a/salt/config/__init__.py
 +++ b/salt/config/__init__.py
@@ -328,6 +328,9 @@ VALID_OPTS = {
@ -92,10 +92,10 @@ index b5b7f2a1f7..e843d8c79d 100644
     'mine_return_job': False,
     'mine_interval': 60,
 diff --git a/salt/minion.py b/salt/minion.py
-index 3c5046ee93..9e7301aafa 100644
+index 394b11a2e8..33cbb8fa0a 100644
 --- a/salt/minion.py
 +++ b/salt/minion.py
-@@ -1288,6 +1288,7 @@ class Minion(MinionBase):
+@@ -1290,6 +1290,7 @@ class Minion(MinionBase):
                 self._send_req_async(load, timeout, callback=lambda f: None)  # pylint: disable=unexpected-keyword-arg
         return True
 
@ -103,7 +103,7 @@ index 3c5046ee93..9e7301aafa 100644
     def _handle_decoded_payload(self, data):
         '''
         Override this method if you wish to handle the decoded data
-@@ -1319,6 +1320,15 @@ class Minion(MinionBase):
+@@ -1321,6 +1322,15 @@ class Minion(MinionBase):
                 self.functions, self.returners, self.function_errors, self.executors = self._load_modules()
                 self.schedule.functions = self.functions
                 self.schedule.returners = self.returners
@ -208,4 +208,3 @@ index 535dfeedfc..6c9dca13cd 100644
 -- 
 2.14.2

-
--- a/_service:extract_file:list_pkgs-add-parameter-for-returned-attribute-selec.patch
+++ b/_service:extract_file:list_pkgs-add-parameter-for-returned-attribute-selec.patch
@ -1,7 +1,7 @@
-From 2996d5ab680b2b3c243a2216e13326750bc37ac8 Mon Sep 17 00:00:00 2001
+From ca7031e5223bb3bd35c31211d29177f05ed5e304 Mon Sep 17 00:00:00 2001
 From: Silvio Moioli <smoioli@suse.de>
 Date: Thu, 13 Jul 2017 15:59:01 +0200
-Subject: [PATCH] list_pkgs: add parameter for returned attribute selection
+Subject: [PATCH 1/6] list_pkgs: add parameter for returned attribute selection
 (bsc#1052264)

 zypper.list_pkgs:
@ -77,7 +77,7 @@ index 928dccae7d..a9f396b212 100644
 +        full_version += '-{0}'.format(release)
 +    return full_version
 diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
-index e659d1b79c..8ffc63a74e 100644
+index 0af6a811f4..8b63bff4a3 100644
 --- a/salt/modules/yumpkg.py
 +++ b/salt/modules/yumpkg.py
@@ -17,7 +17,6 @@ Support for YUM/DNF
@ -88,7 +88,7 @@ index e659d1b79c..8ffc63a74e 100644
 import datetime
 import fnmatch
 import itertools
-@@ -584,15 +583,35 @@ def version_cmp(pkg1, pkg2, ignore_epoch=False):
+@@ -595,15 +594,35 @@ def version_cmp(pkg1, pkg2, ignore_epoch=False):
 
 def list_pkgs(versions_as_list=False, **kwargs):
     '''
@ -126,7 +126,7 @@ index e659d1b79c..8ffc63a74e 100644
     '''
     versions_as_list = salt.utils.is_true(versions_as_list)
     # not yet implemented or not applicable
-@@ -600,17 +619,14 @@ def list_pkgs(versions_as_list=False, **kwargs):
+@@ -611,17 +630,14 @@ def list_pkgs(versions_as_list=False, **kwargs):
             for x in ('removed', 'purge_desired')]):
         return {}
 
@ -148,7 +148,7 @@ index e659d1b79c..8ffc63a74e 100644
     output = __salt__['cmd.run'](cmd,
                                  python_shell=False,
                                  output_loglevel='trace')
-@@ -620,15 +636,25 @@ def list_pkgs(versions_as_list=False, **kwargs):
+@@ -631,15 +647,25 @@ def list_pkgs(versions_as_list=False, **kwargs):
             osarch=__grains__['osarch']
         )
         if pkginfo is not None:
@ -183,7 +183,7 @@ index e659d1b79c..8ffc63a74e 100644
 
 
 def list_repo_pkgs(*args, **kwargs):
-@@ -1205,11 +1231,42 @@ def install(name=None,
+@@ -1221,11 +1247,42 @@ def install(name=None,
 
         .. versionadded:: 2014.7.0
 
@ -226,7 +226,7 @@ index e659d1b79c..8ffc63a74e 100644
     '''
     repo_arg = _get_repo_options(**kwargs)
     exclude_arg = _get_excludes_option(**kwargs)
-@@ -1238,10 +1295,11 @@ def install(name=None,
+@@ -1254,10 +1311,11 @@ def install(name=None,
             log.warning('"version" parameter will be ignored for multiple '
                         'package targets')
 
@ -240,7 +240,7 @@ index e659d1b79c..8ffc63a74e 100644
 
     to_install = []
     to_downgrade = []
-@@ -1544,7 +1602,7 @@ def install(name=None,
+@@ -1560,7 +1618,7 @@ def install(name=None,
                 errors.append(out['stdout'])
 
     __context__.pop('pkg.list_pkgs', None)
@ -787,6 +787,5 @@ index f3403e6e1c..41f3845646 100644
     def test_list_patches(self):
         '''
 -- 
-2.12.2
-
+2.14.2

--- a/_service:extract_file:multiprocessing-minion-option-documentation-fixes.patch
+++ b/_service:extract_file:multiprocessing-minion-option-documentation-fixes.patch
@ -1,7 +1,7 @@
-From 6c5b8be3d14814903abc70b5605c87277dad39db Mon Sep 17 00:00:00 2001
+From 461654496d36a264903057a8255aec4eb700e506 Mon Sep 17 00:00:00 2001
 From: Silvio Moioli <smoioli@suse.de>
 Date: Wed, 20 Sep 2017 14:32:47 +0200
-Subject: [PATCH] multiprocessing minion option: documentation fixes
+Subject: [PATCH 3/6] multiprocessing minion option: documentation fixes

 ---
 doc/man/salt.7                   | 1 +
@ -21,10 +21,10 @@ index d6cfe937a1..86c463b771 100644
 Default: \fBTrue\fP
 .sp
 diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
-index cd554268c1..5cc72f1daf 100644
+index e0f349931c..5c92b932ab 100644
 --- a/doc/ref/configuration/minion.rst
 +++ b/doc/ref/configuration/minion.rst
-@@ -2164,11 +2164,14 @@ Thread Settings
+@@ -2337,11 +2337,14 @@ Thread Settings
 
 .. conf_minion:: multiprocessing
 
@ -44,4 +44,3 @@ index cd554268c1..5cc72f1daf 100644
 -- 
 2.14.2

-
--- a/_service:extract_file:salt-2017.7.2.tar.gz
+++ b/_service:extract_file:salt-2017.7.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840
+size 11471191
--- a/_service:extract_file:salt-tmpfiles.d
+++ b/_service:extract_file:salt-tmpfiles.d
--- a/_service:extract_file:salt.changes
+++ b/_service:extract_file:salt.changes
--- a/_service:extract_file:salt.spec
+++ b/_service:extract_file:salt.spec
@ -1,7 +1,7 @@
 #
 # spec file for package salt
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
 %else
 %bcond_with    systemd
 %endif
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %if 0%{?suse_version} > 1110
 %bcond_without bash_completion
 %bcond_without fish_completion
@ -42,64 +42,59 @@ Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Management
 Url:            http://saltstack.org/
-Source:         https://github.com/saltstack/salt/archive/v%{version}.tar.gz
+# Git: https://github.com/openSUSE/salt.git
+Source0:        salt-2017.7.2.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
 Source3:        html.tar.bz2
 Source4:        update-documentation.sh
 Source5:        travis.yml
+Source6:        zyppnotify

-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/42310
-#                    https://github.com/saltstack/salt/pull/42718
-#                    https://github.com/saltstack/salt/pull/43195
-#                    https://github.com/saltstack/salt/pull/43214
-#                    https://github.com/saltstack/salt/pull/43281
 Patch1:         list_pkgs-add-parameter-for-returned-attribute-selec.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43441
-Patch2:         use-home-to-get-the-user-home-directory-instead-usin.patch 
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43663
+Patch2:         use-home-to-get-the-user-home-directory-instead-usin.patch
 Patch3:         multiprocessing-minion-option-documentation-fixes.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43669
 Patch4:         introduce-process_count_max-minion-configuration-par.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/
 Patch5:         bugfix-always-return-a-string-list-on-unknown-job-ta.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43955
 Patch6:         enable-with-salt-version-parameter-for-setup.py-scri.patch

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  logrotate
-BuildRequires:  python
-BuildRequires:  python-devel
+BuildRequires:  python3
+BuildRequires:  python3-devel
 # requirements/base.txt
 %if 0%{?rhel}
-BuildRequires:  python-jinja2
+BuildRequires:  python3-jinja2
 %else
-BuildRequires:  python-Jinja2
+BuildRequires:  python3-Jinja2
 %endif
-BuildRequires:  python-futures >= 2.0
-BuildRequires:  python-markupsafe
-BuildRequires:  python-msgpack-python > 0.3
-BuildRequires:  python-psutil
-BuildRequires:  python-requests >= 1.0.0
-BuildRequires:  python-tornado >= 4.2.1
-BuildRequires:  python-yaml
+BuildRequires:  python3-futures >= 2.0
+BuildRequires:  python3-MarkupSafe
+BuildRequires:  python3-msgpack-python > 0.3
+BuildRequires:  python3-psutil
+BuildRequires:  python3-requests >= 1.0.0
+BuildRequires:  python3-tornado >= 4.2.1
+BuildRequires:  python3-PyYAML

 # requirements/zeromq.txt
-BuildRequires:  python-pycrypto >= 2.6.1
-BuildRequires:  python-pyzmq >= 2.2.0
+BuildRequires:  python3-pycrypto >= 2.6.1
+BuildRequires:  python3-pyzmq >= 2.2.0
 %if %{with test}
 # requirements/dev_python27.txt
-BuildRequires:  python-boto >= 2.32.1
-BuildRequires:  python-mock
-BuildRequires:  python-moto >= 0.3.6
-BuildRequires:  python-pip
-BuildRequires:  python-salt-testing >= 2015.2.16
-BuildRequires:  python-unittest2
-BuildRequires:  python-xml
+BuildRequires:  python3-boto >= 2.32.1
+BuildRequires:  python3-mock
+BuildRequires:  python3-moto >= 0.3.6
+BuildRequires:  python3-pip
+BuildRequires:  python3-salt-testing >= 2015.2.16
+BuildRequires:  python3-unittest2
+BuildRequires:  python3-xml
 %endif
 %if %{with builddocs}
-BuildRequires:  python-sphinx
+BuildRequires:  python3-sphinx
+%endif
+%if 0%{?suse_version} > 1020
+BuildRequires:  fdupes
 %endif

 Requires(pre):  %{_sbindir}/groupadd
@ -116,49 +111,49 @@ Requires(pre):  dbus-1
 Requires(pre):  dbus
 %endif

-Requires:       logrotate
 Requires:       procps
-Requires:       python
+Requires:       logrotate
+Requires:       python3
 #
 %if ! 0%{?suse_version} > 1110
-Requires:       python-certifi
+Requires:       python3-certifi
 %endif
 # requirements/base.txt
 %if 0%{?rhel}
-Requires:       python-jinja2
-Requires:       yum
+Requires:  python3-jinja2
+Requires:  yum
 %if 0%{?rhel} == 6
-Requires:       yum-plugin-security
+Requires:  yum-plugin-security
 %endif
 %else
-Requires:       python-Jinja2
+Requires:  python3-Jinja2
 %endif
-Requires:       python-futures >= 2.0
-Requires:       python-markupsafe
-Requires:       python-msgpack-python > 0.3
-Requires:       python-psutil
-Requires:       python-requests >= 1.0.0
-Requires:       python-tornado >= 4.2.1
-Requires:       python-yaml
+Requires:       python3-futures >= 2.0
+Requires:       python3-MarkupSafe
+Requires:       python3-msgpack-python > 0.3
+Requires:       python3-psutil
+Requires:       python3-requests >= 1.0.0
+Requires:       python3-tornado >= 4.2.1
+Requires:       python3-PyYAML
 %if 0%{?suse_version}
 # required for zypper.py
-Requires:       rpm-python
+Requires:       python3-rpm
 Requires(pre):  libzypp(plugin:system) >= 0
-Requires:       zypp-plugin-python
+Requires:       python3-zypp-plugin
 # requirements/opt.txt (not all)
 # Suggests:     python-MySQL-python  ## Disabled for now, originally Recommended
-Suggests:       python-timelib
-Suggests:       python-gnupg
+Suggests:       python3-timelib
+Suggests:       python3-gnupg
 # requirements/zeromq.txt
 %endif
-Requires:       python-pycrypto >= 2.6.1
-Requires:       python-pyzmq >= 2.2.0
+Requires:       python3-pycrypto >= 2.6.1
+Requires:       python3-pyzmq >= 2.2.0
 #
 %if 0%{?suse_version}
 # python-xml is part of python-base in all rhel versions
-Requires:       python-xml
-Suggests:       python-Mako
-Recommends:     python-netaddr
+Requires:       python3-xml
+Suggests:       python3-Mako
+Recommends:     python3-netaddr
 %endif

 %if %{with systemd}
@ -204,7 +199,7 @@ Summary:        The api for Salt a parallel remote execution system
 Group:          System/Management
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-master = %{version}-%{release}
-Requires:       python-CherryPy >= 3.2.2
+Requires:       python3-CherryPy >= 3.2.2

 %description api
 salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system.
@ -214,10 +209,10 @@ Summary:        Generic cloud provisioning tool for Saltstack
 Group:          System/Management
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-master = %{version}-%{release}
-Requires:       python-apache-libcloud
+Requires:       python3-apache-libcloud
 %if 0%{?suse_version}
-Recommends:     python-botocore
-Recommends:     python-netaddr
+Recommends:     python3-botocore
+Recommends:     python3-netaddr
 %endif

 %description cloud
@ -240,7 +235,7 @@ Summary:        The management component of Saltstack with zmq protocol supporte
 Group:          System/Management
 Requires:       %{name} = %{version}-%{release}
 %if 0%{?suse_version}
-Recommends:     python-pygit2 >= 0.20.3
+Recommends:     python3-pygit2 >= 0.20.3
 %endif
 %ifarch %{ix86} x86_64
 %if 0%{?suse_version}
@ -402,7 +397,7 @@ Zsh command line completion support for %{name}.
 %setup -q -n salt-%{version}
 cp %{S:1} .
 cp %{S:5} ./.travis.yml
-
+cp %{S:6} ./zyppnotify
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@ -411,14 +406,13 @@ cp %{S:5} ./.travis.yml
 %patch6 -p1

 %build
-%{__python} setup.py --with-salt-version=%{version} --salt-transport=both build
-cp ./build/lib/salt/_version.py ./salt
+%{__python3} setup.py --salt-transport=both build

 %if %{with docs} && %{without builddocs}
 # extract docs from the tarball
 mkdir -p doc/_build
 pushd doc/_build/
-tar -xvf %{S:3}
+tar xfv %{S:3}
 popd
 %endif

@ -428,7 +422,7 @@ cd doc && make html && rm _build/html/.buildinfo && rm _build/html/_images/proxy
 %endif

 %install
-%{__python} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
+%{__python3} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
 ## create missing directories
 install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/master.d
 install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/minion.d
@ -471,24 +465,24 @@ install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/pki/minion
 ## Install Zypper plugins only on SUSE machines
 %if 0%{?suse_version}
 install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
-install scripts/suse/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%{__install} zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
 %endif

 # Install Yum plugins only on RH machines
 %if 0%{?fedora} || 0%{?rhel}
 install -Dd %{buildroot}%{_prefix}/share/yum-plugins
 install -Dd %{buildroot}/etc/yum/pluginconf.d
-install scripts/suse/yum/plugins/yumnotify.py %{buildroot}%{_prefix}/share/yum-plugins
-install scripts/suse/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.d
+%{__install} scripts/yum/plugins/yumnotify.py %{buildroot}%{_prefix}/share/yum-plugins
+%{__install} scripts/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.d
 %endif

 ## install init and systemd scripts
 %if %{with systemd}
-install -Dpm 0644 pkg/suse/salt-master.service %{buildroot}%{_unitdir}/salt-master.service
+install -Dpm 0644 pkg/salt-master.service %{buildroot}%{_unitdir}/salt-master.service
 %if 0%{?suse_version}
 install -Dpm 0644 pkg/suse/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service
 %else
-install -Dpm 0644 pkg/suse/salt-minion.service.rhel7 %{buildroot}%{_unitdir}/salt-minion.service
+install -Dpm 0644 pkg/salt-minion.service.rhel7 %{buildroot}%{_unitdir}/salt-minion.service
 %endif
 install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%{_unitdir}/salt-syndic.service
 install -Dpm 0644 pkg/suse/salt-api.service    %{buildroot}%{_unitdir}/salt-api.service
@ -513,7 +507,7 @@ ln -sf %{_initddir}/salt-api %{buildroot}%{_sbindir}/rcsalt-api

 ## Install sysV salt-minion watchdog for SLES11 and RHEL6
 %if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
-install -Dpm 0755 scripts/suse/watchdog/salt-daemon-watcher %{buildroot}%{_bindir}/salt-daemon-watcher
+install -Dpm 0755 scripts/watchdog/salt-daemon-watcher %{buildroot}%{_bindir}/salt-daemon-watcher
 %endif 

 #
@ -526,12 +520,8 @@ install -Dpm 0640 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud
 install -Dpm 0640 conf/cloud.profiles %{buildroot}%{_sysconfdir}/salt/cloud.profiles
 install -Dpm 0640 conf/cloud.providers %{buildroot}%{_sysconfdir}/salt/cloud.providers
 #
-## install logrotate file (for RHEL6 we use without sudo)
-%if 0%{?rhel} > 6 || 0%{?suse_version}
-install -Dpm 0644  pkg/suse/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt
-%else
+## install logrotate file
 install -Dpm 0644  pkg/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt
-%endif
 #
 ## install SuSEfirewall2 rules
 install -Dpm 0644  pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
@ -550,21 +540,22 @@ install -Dpm 0644 pkg/fish-completions/* %{buildroot}%{fish_completions_dir}
 %endif

 %if 0%{?suse_version} > 1020
-%fdupes %{buildroot}/%{_prefix}
+%fdupes %{buildroot}%{_docdir}
+%fdupes %{buildroot}%{python3_sitelib}
 %endif

 %check
 %if %{with test}
-python setup.py test --runtests-opts=-u
+python3 setup.py test --runtests-opts=-u
 %endif

 %pre
 S_HOME="/var/lib/salt"
 S_PHOME="/srv/salt"
-getent passwd salt | grep -q $S_PHOME && usermod -d $S_HOME salt
+getent passwd salt | grep $S_PHOME >/dev/null && usermod -d $S_HOME salt
 getent group salt >/dev/null || %{_sbindir}/groupadd -r salt
 getent passwd salt >/dev/null || %{_sbindir}/useradd -r -g salt -d $S_HOME -s /bin/false -c "salt-master daemon" salt
-if [ -d "$S_PHOME/.ssh" ]; then
+if [[ -d "$S_PHOME/.ssh" ]]; then
    mv $S_PHOME/.ssh $S_HOME
 fi

@ -879,8 +870,8 @@ fi
 %config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/cloud.profiles
 %config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/cloud.providers
 %dir               %attr(0750, root, salt) %{_localstatedir}/cache/salt/cloud
-%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
-%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
+%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
+%attr(755,root,root)%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
 %{_mandir}/man1/salt-cloud.1.*

 %files ssh
@ -991,9 +982,9 @@ fi
 %{_mandir}/man1/salt-call.1.gz
 %{_mandir}/man1/spm.1.gz
 %config(noreplace) %{_sysconfdir}/logrotate.d/salt
-%{python_sitelib}/*
-%exclude %{python_sitelib}/salt/cloud/deploy/*.sh
-%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/*.sh
+%{python3_sitelib}/*
+%exclude %{python3_sitelib}/salt/cloud/deploy/*.sh
+%attr(755,root,root)%{python3_sitelib}/salt/cloud/deploy/*.sh
 %doc LICENSE AUTHORS README.rst HACKING.rst README.SUSE
 #
 %dir        %attr(0750, root, salt) %{_sysconfdir}/salt
--- a/_service:extract_file:travis.yml
+++ b/_service:extract_file:travis.yml
--- a/_service:extract_file:update-documentation.sh
+++ b/_service:extract_file:update-documentation.sh
@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# Update html.tar.bz2 documentation tarball
+# Author: Bo Maryniuk <bo@suse.de>
+#
+
+function check_env() {
+    for cmd in "sphinx-build" "make" "quilt"; do
+	if [ -z "$(which $cmd 2>/dev/null)" ]; then
+	    echo "Error: '$cmd' is missing."
+	    exit 1;
+	fi
+    done
+}
+
+function quilt_setup() {
+    quilt setup salt.spec
+    cd $1
+    quilt push -a
+}
+
+function build_docs() {
+    cd $1
+    make html
+    rm _build/html/.buildinfo
+    cd _build/html
+    chmod -R -x+X *
+    cd ..
+    tar cvf - html | bzip2 > /tmp/html.tar.bz2
+}
+
+function write_changelog() {
+    mv salt.changes salt.changes.previous
+    TIME=$(date -u +'%a %b %d %T %Z %Y')
+    MAIL=$1
+    SEP="-------------------------------------------------------------------"
+    cat <<EOF > salt.changes
+$SEP
+$TIME - $MAIL
+
+- Updated html.tar.bz2 documentation tarball.
+
+EOF
+    cat salt.changes.previous >> salt.changes
+    rm salt.changes.previous
+}
+
+if [ -z "$1" ]; then
+    echo "Usage: $0 <your e-mail>"
+    exit 1;
+fi
+
+check_env;
+START=$(pwd)
+SRC_DIR="salt-$(cat salt.spec | grep ^Version: | cut -d: -f2 | sed -e 's/[[:blank:]]//g')";
+quilt_setup $SRC_DIR
+build_docs doc
+
+cd $START
+rm -rf $SRC_DIR
+mv /tmp/html.tar.bz2 $START
+
+echo "Done"
+echo "---------------"
--- a/_service:extract_file:use-home-to-get-the-user-home-directory-instead-usin.patch
+++ b/_service:extract_file:use-home-to-get-the-user-home-directory-instead-usin.patch
@ -1,8 +1,8 @@
-From 2dfd28560f3825dc512822ba9d01d67070d5175b Mon Sep 17 00:00:00 2001
+From 418bcf80ca263c5523e701801e97bae60fdf9b35 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
 Date: Mon, 11 Sep 2017 19:57:28 +0200
-Subject: [PATCH] Use $HOME to get the user home directory instead using
+Subject: [PATCH 2/6] Use $HOME to get the user home directory instead using
 '~' char

 ---
@ -24,6 +24,5 @@ index 480361fe23..00174c072f 100644
 
     if [ ! -d "$(dirname ${_salt_cache_functions})" ]; then
 -- 
-2.12.2
-
+2.14.2

--- a/59
+++ b/59
@ -0,0 +1,59 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2016 SUSE Linux LLC
+# All Rights Reserved.
+#
+# Author: Bo Maryniuk <bo@suse.de>
+
+import sys
+import os
+import hashlib
+
+from zypp_plugin import Plugin
+
+
+class DriftDetector(Plugin):
+    """
+    Return diff of the installed packages outside the Salt.
+    """
+    def __init__(self):
+        Plugin.__init__(self)
+        self.ck_path = "/var/cache/salt/minion/rpmdb.cookie"
+        self.rpm_path = "/var/lib/rpm/Packages"
+
+    def _get_mtime(self):
+        '''
+        Get the modified time of the RPM Database.
+        Returns:
+            Unix ticks
+        '''
+        return os.path.exists(self.rpm_path) and int(os.path.getmtime(self.rpm_path)) or 0
+
+    def _get_checksum(self):
+        '''
+        Get the checksum of the RPM Database.
+        Returns:
+            hexdigest
+        '''
+        digest = hashlib.md5()
+        with open(self.rpm_path, "rb") as rpm_db_fh:
+            while True:
+                buff = rpm_db_fh.read(0x1000)
+                if not buff:
+                    break
+                digest.update(buff)
+
+        return digest.hexdigest()
+
+    def PLUGINEND(self, headers, body):
+        """
+        Hook when plugin closes Zypper's transaction.        
+        """
+        if 'SALT_RUNNING' not in os.environ:
+            with open(self.ck_path, 'w') as ck_fh:
+                ck_fh.write('{chksum} {mtime}\n'.format(chksum=self._get_checksum(), mtime=self._get_mtime()))
+
+        self.ack()
+
+
+DriftDetector().main()
--- a/_service:tar_scm:package-1510227540.833ce8accd.tar
+++ b/_service:tar_scm:package-1510227540.833ce8accd.tar
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:015fd10afd3c52128ee5e9d861df10e04fff8c76053ba3fb118187c034e9e2d5
+size 67747840
--- a/html.tar.bz2
+++ b/html.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b82846ed4005af7655290cd9bdc62c1d4912d4809acaca2ff37ebff0960b18c
-size 1250836
--- a/update-documentation.sh
+++ b/update-documentation.sh
@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# Update html.tar.bz2 documentation tarball
-# Author: Bo Maryniuk <bo@suse.de>
-#
-
-NO_SPHINX_PARAM="--without-sphinx"
-
-function build_virtenv() {
-    virtualenv --system-site-packages $1
-    source $1/bin/activate
-    pip install --upgrade pip
-    if [ -z "$2" ]; then
-	pip install -I Sphinx
-    fi
-}
-
-function check_env() {
-    if [[ -z "$1" || "$1" != "$NO_SPHINX_PARAM" ]] && [ ! -z "$(which sphinx-build 2>/dev/null)" ]; then
-	cat <<EOF
-You've installed Spinx globally. But it might be outdated or
-clash with the version I am going to install into the temporary
-virtual environment from PIP.
-
-Please consider to remove Sphinx from your system, perhaps?
-Or pass me "$NO_SPHINX_PARAM" param so I will try reusing yours
-and see what happens. :)
-
-EOF
-	exit 1;
-    fi
-
-    for cmd in "make" "quilt" "virtualenv" "pip"; do
-	if [ -z "$(which $cmd 2>/dev/null)" ]; then
-	    echo "Error: '$cmd' is still missing. Install it, please."
-	    exit 1;
-	fi
-    done
-}
-
-function quilt_setup() {
-    quilt setup salt.spec
-    cd $1
-    quilt push -a
-}
-
-function build_docs() {
-    cd $1
-    make html
-    rm _build/html/.buildinfo
-    cd _build/html
-    chmod -R -x+X *
-    cd ..
-    tar cvf - html | bzip2 > $2/html.tar.bz2
-}
-
-function write_changelog() {
-    mv salt.changes salt.changes.previous
-    TIME=$(date -u +'%a %b %d %T %Z %Y')
-    MAIL=$1
-    SEP="-------------------------------------------------------------------"
-    cat <<EOF > salt.changes
-$SEP
-$TIME - $MAIL
-
- Updated html.tar.bz2 documentation tarball.
-
-EOF
-    cat salt.changes.previous >> salt.changes
-    rm salt.changes.previous
-}
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 <your e-mail> [--without-sphinx]"
-    exit 1;
-fi
-
-check_env $2;
-
-START=$(pwd)
-V_ENV="sphinx_doc_gen"
-V_TMP=$(mktemp -d)
-
-for f in "salt.spec" "salt*tar.gz"; do
-    cp -v $f $V_TMP
-done
-
-cd $V_TMP;
-build_virtenv $V_ENV $2;
-
-SRC_DIR="salt-$(cat salt.spec | grep ^Version: | cut -d: -f2 | sed -e 's/[[:blank:]]//g')";
-quilt_setup $SRC_DIR
-build_docs doc $V_TMP
-
-cd $START
-mv $V_TMP/html.tar.bz2 $START
-rm -rf $V_TMP
-
-echo "Done"
-echo "---------------"
--- a/v2017.7.2.tar.gz
+++ b/v2017.7.2.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9f9dd9ddd129ddadadf963178383b50c32283aeb1c338d9c23cc01b11722db2
-size 11483585