From 518aa62a0f3e2e95ce5a55d794cc533ae47659a3ab96f8516a9415b1b489d642 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 9 Dec 2015 18:53:52 +0000 Subject: [PATCH] Accepting request 347822 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/347822 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=52 --- salt-2015.8.1.tar.gz | 3 --- salt-2015.8.3.tar.gz | 3 +++ salt.changes | 45 ++++++++++++++++++++++++++++++++++ salt.spec | 10 +++++--- use-salt-user-for-master.patch | 15 ++++++------ 5 files changed, 63 insertions(+), 13 deletions(-) delete mode 100644 salt-2015.8.1.tar.gz create mode 100644 salt-2015.8.3.tar.gz diff --git a/salt-2015.8.1.tar.gz b/salt-2015.8.1.tar.gz deleted file mode 100644 index 65e80f1..0000000 --- a/salt-2015.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 -size 6527650 diff --git a/salt-2015.8.3.tar.gz b/salt-2015.8.3.tar.gz new file mode 100644 index 0000000..6c8691f --- /dev/null +++ b/salt-2015.8.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a +size 6757678 diff --git a/salt.changes b/salt.changes index dc59c12..52cf3ce 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Tue Dec 1 22:04:14 UTC 2015 - aboe76@gmail.com + +- Updated to salt 2015.8.3 bugfix release +- remove the following patches because upstream merged them: + - 4b9302d79455d6a586b7cad1d7990cb22e7bc62e.patch + - os_grain.patch + - zypper_pkgrepo.patch +- more details at: https://docs.saltstack.com/en/latest/topics/releases/2015.8.3.html + +------------------------------------------------------------------- +Mon Nov 30 17:19:06 UTC 2015 - mrueckert@suse.de + +- added 4b9302d79455d6a586b7cad1d7990cb22e7bc62e.patch: + fixes a regression introduced in 2015.8.2, which was actually + holding back the release. Downgrade is not an option as we need + the leap fixes. + +------------------------------------------------------------------- +Thu Nov 26 13:46:55 UTC 2015 - mrueckert@suse.de + +- it shouldnt be >= 1110 but just > 1110 + +------------------------------------------------------------------- +Wed Nov 25 13:43:16 UTC 2015 - mrueckert@suse.de + +- require pmtools on sle11 to get dmidecode + +------------------------------------------------------------------- +Fri Nov 20 23:52:14 UTC 2015 - mrueckert@suse.de + +- update use-salt-user-for-master.patch: + First step to make the syndic also run as salt user. + +------------------------------------------------------------------- +Fri Nov 13 21:56:35 UTC 2015 - aboe76@gmail.com + +- Updated to bugfix release 2015.8.2 +- os_grain.patch fix the "os" grain on SLES11SP4 +- zypper_pkgrepo.patch fix the priority and humanname pkgrepo args for the + zypper backend + + for more details: + https://docs.saltstack.com/en/2015.8/topics/releases/2015.8.2.html + ------------------------------------------------------------------- Thu Oct 15 09:43:16 UTC 2015 - mrueckert@suse.de diff --git a/salt.spec b/salt.spec index de33eed..3d8b27b 100644 --- a/salt.spec +++ b/salt.spec @@ -36,7 +36,7 @@ %bcond_without docs Name: salt -Version: 2015.8.1 +Version: 2015.8.3 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -47,7 +47,7 @@ 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 -# PATCH-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user +# PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user Patch2: use-salt-user-for-master.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: logrotate @@ -69,8 +69,8 @@ BuildRequires: python-yaml # BuildRequires: python-cherrypy >= 3.2.2 %if %{with raet} # requirements/raet.txt -BuildRequires: python-libnacl >= 1.0.0 BuildRequires: python-ioflo >= 1.1.7 +BuildRequires: python-libnacl >= 1.0.0 BuildRequires: python-raet >= 0.6.0 %endif # requirements/zeromq.txt @@ -210,7 +210,11 @@ Recommends: python-pygit2 >= 0.20.3 %endif %ifarch %{ix86} x86_64 %if 0%{?suse_version} +%if 0%{?suse_version} > 1110 Requires: dmidecode +%else +Requires: pmtools +%endif %endif %endif %if %{with systemd} diff --git a/use-salt-user-for-master.patch b/use-salt-user-for-master.patch index 7ee332a..988d390 100644 --- a/use-salt-user-for-master.patch +++ b/use-salt-user-for-master.patch @@ -1,20 +1,21 @@ -Index: salt-2015.8.0/conf/master +Index: salt-2015.8.2/conf/master =================================================================== ---- salt-2015.8.0.orig/conf/master -+++ salt-2015.8.0/conf/master -@@ -25,7 +25,7 @@ +--- salt-2015.8.2.orig/conf/master ++++ salt-2015.8.2/conf/master +@@ -25,7 +25,8 @@ # permissions to allow the specified user to run the master. The exception is # the job cache, which must be deleted if this user is changed. If the # modified files cause conflicts, set verify_env to False. -#user: root +user: salt ++syndic_user: salt # Max open files # -Index: salt-2015.8.0/pkg/salt-common.logrotate +Index: salt-2015.8.2/pkg/salt-common.logrotate =================================================================== ---- salt-2015.8.0.orig/pkg/salt-common.logrotate -+++ salt-2015.8.0/pkg/salt-common.logrotate +--- salt-2015.8.2.orig/pkg/salt-common.logrotate ++++ salt-2015.8.2/pkg/salt-common.logrotate @@ -1,4 +1,5 @@ /var/log/salt/master { + su salt salt