pool/salt
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 361294 from systemsmanagement:saltstack

Browse Source 
- fix argument handling of pkg.download
  Add: 0022-fix-argument-handling-for-pkg.download.patch

- unify behavior of zypper refresh in salt
  Add: 0018-unify-behavior-of-refresh.patch
       0019-add-refresh-option-to-more-functions.patch
       0020-simplify-checking-the-refresh-paramater.patch
       0021-do-not-change-kwargs-in-refresh-while-checking-a-val.patch

- Fix crash with scheduler and runners
  Add: 0017-Fix-crash-with-scheduler-and-runners-31106.patch

- Call zypper always with --non-interactive
  Add:
  * 0015-call-zypper-with-option-non-interactive-everywhere.patch
  * 0016-write-a-zypper-command-builder-function.patch

- require rpm-python on SUSE for zypper support

- fix state return code
  Add: 0009-The-functions-in-the-state-module-that-return-a-retc.patch
- add handling of OEM products to pkg.list_products
  Add: 0010-add-handling-for-OEM-products.patch
- improve doc for list_pkgs
  Add: 0011-improve-doc-for-list_pkgs.patch
- implement pkg.version_cmp in zypper.py
  Add:
  * 0012-implement-version_cmp-for-zypper.patch
  * 0013-pylint-changes.patch
  * 0014-Check-if-rpm-python-can-be-imported.patch

- Update to 2015.8.7
  this is a small update to fix some regressions
  see https://docs.saltstack.com/en/latest/topics/releases/2015.8.7.html

- Booleans should not be strings from XML, add Unix ticks time and
  format result in a list of maps.
  Add:
  * 0008-Fix-types-in-the-output-data-and-return-just-a-list-.patch

- Stop salt-api daemon faster (bsc#963322)
  Add:
  * 0007-Force-kill-websocket-s-child-processes-faster-than-d.patch

- Do not crash on salt-key reject/delete consecutive calls.
  Add:
  * 0006-add_key-reject_key-do-not-crash-w-Permission-denied-.patch

- Update to 2015.8.5
  See https://docs.saltstack.com/en/latest/topics/releases/2015.8.5.html
  Dropped patches (all upstream):
  * 0003-List-products-consistently-across-all-SLES-systems.patch
  * 0004-Add-missing-return-data-to-scheduled-jobs.patch
  * 0005-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
  * 0006-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
  Renamed patches:
  * 0007-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
    -> 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
  * 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
    -> 0004-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
  * 0009-Fix-package-status-filtering-on-latest-version-and-i.patch
    -> 0005-Fix-package-status-filtering-on-latest-version-and-i.patch
- Update to 2015.8.4
  See https://docs.saltstack.com/en/latest/topics/releases/2015.8.4.html

- Fix latest version available comparison and implement epoch
  support in Zypper module.
  Add:
  * 0009-Fix-package-status-filtering-on-latest-version-and-i.patch

- Update patch from opensuse to upstream version.
  Update:
  * 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch

- Fix dependencies to Salt subpackages requiring release along the
  version.

- Fix pkg.latest crash.
- Fix pkg.latest SLS ID bug, when pkgs empty list is passed,
  but SLS ID still treated as a package name.
  Add:
  * 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch

- Drop:
  * -0004-zypper-check-package-header-content-for-valid-utf-8.patch
- Rename:
  * -0004-zypper-check-package-header-content-for-valid-utf-8.patch
    +0004-Add-missing-return-data-to-scheduled-jobs.patch
  * -0005-Add-missing-return-data-to-scheduled-jobs.patch
    +0004-Add-missing-return-data-to-scheduled-jobs.patch
  * -0006-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
    +0005-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
  * -0007-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
    +0006-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
- Add:
  * 0007-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch

- Rename use-forking-daemon.patch to
  0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch
- Rename use-salt-user-for-master.patch to
  0002-Run-salt-master-as-dedicated-salt-user.patch
- Rename 1efe484309a5c776974e723f3da0f5181f4bdb86.patch to
  0003-List-products-consistently-across-all-SLES-systems.patch
- Rename zypper-utf-8.patch to
  0004-zypper-check-package-header-content-for-valid-utf-8.patch
- Rename salt-2015.8-schedule-ret.patch to
  0005-Add-missing-return-data-to-scheduled-jobs.patch
- Rename salt-2015.8-pkg-zypper-attr-filtering.patch to
  0006-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
- Rename salt-2015.8-zypper-info.patch to
  0007-Bugfix-info_available-does-not-work-correctly-on-SLE.patch

OBS-URL: https://build.opensuse.org/request/show/361294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger
2016-02-24 17:43:06 +00:00
committed by Git OBS Bridge
parent 86c13548fd
commit 1592ccc37e
33 changed files with 1989 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
salt.spec
View File

@@ -36,29 +36,56 @@
%bcond_without docs
Name: salt
Version: 2015.8.3
Version: 2015.8.7
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
Group: System/Monitoring
Url: http://saltstack.org/
# Git: https://github.com/openSUSE/salt.git
Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
Source1: README.SUSE
Source2: salt-tmpfiles.d
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
Patch1: use-forking-daemon.patch
Patch1: 0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch
# PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user
Patch2: use-salt-user-for-master.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/29244
Patch3: 1efe484309a5c776974e723f3da0f5181f4bdb86.patch
# PATCH-FIX-OPENSUSE detect bad UTF-8 in package header, bsc#958350
Patch4: zypper-utf-8.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30246
Patch5: salt-2015.8-schedule-ret.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30267
Patch6: salt-2015.8-pkg-zypper-attr-filtering.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30384
Patch7: salt-2015.8-zypper-info.patch
Patch2: 0002-Run-salt-master-as-dedicated-salt-user.patch
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30424
Patch3: 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30611
Patch4: 0004-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30663
Patch5: 0005-Fix-package-status-filtering-on-latest-version-and-i.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30998
Patch6: 0006-add_key-reject_key-do-not-crash-w-Permission-denied-.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31125
Patch7: 0007-Force-kill-websocket-s-child-processes-faster-than-d.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31134
Patch8: 0008-Fix-types-in-the-output-data-and-return-just-a-list-.patch
# PATCH-FIX-UPSTREAM
Patch9: 0009-The-functions-in-the-state-module-that-return-a-retc.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31237
Patch10: 0010-add-handling-for-OEM-products.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31234
Patch11: 0011-improve-doc-for-list_pkgs.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31233
Patch12: 0012-implement-version_cmp-for-zypper.patch
Patch13: 0013-pylint-changes.patch
Patch14: 0014-Check-if-rpm-python-can-be-imported.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31305
Patch15: 0015-call-zypper-with-option-non-interactive-everywhere.patch
Patch16: 0016-write-a-zypper-command-builder-function.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31189
Patch17: 0017-Fix-crash-with-scheduler-and-runners-31106.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31378
Patch18: 0018-unify-behavior-of-refresh.patch
Patch19: 0019-add-refresh-option-to-more-functions.patch
Patch20: 0020-simplify-checking-the-refresh-paramater.patch
Patch21: 0021-do-not-change-kwargs-in-refresh-while-checking-a-val.patch
# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/31429
Patch22: 0022-fix-argument-handling-for-pkg.download.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
BuildRequires: python
@@ -123,6 +150,8 @@ Requires: python-requests >= 1.0.0
Requires: python-tornado >= 4.2.1
Requires: python-yaml
%if 0%{?suse_version}
# required for zypper.py
Requires: rpm-python
# requirements/opt.txt (not all)
Recommends: python-MySQL-python
Recommends: python-timelib
@@ -178,8 +207,8 @@ servers, handle them quickly and through a simple and manageable interface.
%package api
Summary: The api for Salt a parallel remote execution system
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name}-master = %{version}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-master = %{version}-%{release}
Requires: python-CherryPy >= 3.2.2
%description api
@@ -188,8 +217,8 @@ salt-api is a modular interface on top of Salt that can provide a variety of ent
%package cloud
Summary: Generic cloud provisioning tool for Saltstack
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name}-master = %{version}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-master = %{version}-%{release}
Requires: python-apache-libcloud
%if 0%{?suse_version}
Recommends: python-botocore
@@ -214,7 +243,7 @@ This contains the documentation of salt, it is an offline version of http://docs
%package master
Summary: The management component of Saltstack both protocols zmq and raet supported
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
%if 0%{?suse_version}
Recommends: python-pygit2 >= 0.20.3
%endif
@@ -246,7 +275,7 @@ than serially.
%package minion
Summary: The client component for Saltstack
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
%if %{with systemd}
%{?systemd_requires}
%else
@@ -265,7 +294,7 @@ Listens to the salt master and execute the commands.
%package raet
Summary: Raet Support for Saltstack
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
Requires: python-enum34
Requires: python-ioflo >= 1.1.7
Requires: python-libnacl >= 1.0.0
@@ -287,7 +316,7 @@ for trust to be established.
%package proxy
Summary: Component for salt that enables controlling arbitrary devices
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
%if %{with systemd}
%{?systemd_requires}
%else
@@ -310,8 +339,8 @@ security reasons, will not.
%package syndic
Summary: The syndic component for saltstack
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name}-master = %{version}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-master = %{version}-%{release}
%if %{with systemd}
%{?systemd_requires}
%else
@@ -331,8 +360,8 @@ the management of multiple masters at a time..
%package ssh
Summary: Management component for Saltstack with ssh protocol
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: %{name}-master = %{version}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-master = %{version}-%{release}
%if 0%{?suse_version}
Recommends: sshpass
%endif
@@ -355,7 +384,7 @@ it enables the management of minions over a ssh connection.
%package bash-completion
Summary: Bash Completion for %{name}
Group: System/Management
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
Requires: bash-completion
%if 0%{?suse_version} > 1110
BuildArch: noarch
@@ -370,7 +399,7 @@ Bash command line completion support for %{name}.
%package fish-completion
Summary: Fish Completion for %{name}
Group: System/Management
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
%if 0%{?suse_version} > 1110
BuildArch: noarch
@@ -384,7 +413,7 @@ Fish command line completion support for %{name}.
%package zsh-completion
Summary: Zsh Completion for %{name}
Group: System/Management
Requires: %{name} = %{version}
Requires: %{name} = %{version}-%{release}
Requires: zsh
%if 0%{?suse_version} > 1110
BuildArch: noarch
@@ -405,6 +434,21 @@ cp %{S:1} .
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%build
python setup.py --salt-transport=both build