From cb0a5e42514b29679adfde0da4890cacdc87d61787395a34c657d927e1915aee Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 8 Sep 2013 13:29:30 +0000 Subject: [PATCH] Accepting request 197877 from devel:languages:python salt 0.16.4 released salt-testing is needed in next release. (forwarded request 197876 from aboe76) OBS-URL: https://build.opensuse.org/request/show/197877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=12 --- salt-0.16.3.tar.gz | 3 --- salt-0.16.4.tar.gz | 3 +++ salt.SuSEfirewall2 | 5 +++++ salt.changes | 23 +++++++++++++++++++++++ salt.spec | 33 ++++++++++++++++++++++++++++++--- 5 files changed, 61 insertions(+), 6 deletions(-) delete mode 100644 salt-0.16.3.tar.gz create mode 100644 salt-0.16.4.tar.gz create mode 100644 salt.SuSEfirewall2 diff --git a/salt-0.16.3.tar.gz b/salt-0.16.3.tar.gz deleted file mode 100644 index 4b34c98..0000000 --- a/salt-0.16.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ab5f6835cc8217e92725c0c7e7b5d98ca2b4a5bedd001378888d4a9c3c04cdf -size 3543407 diff --git a/salt-0.16.4.tar.gz b/salt-0.16.4.tar.gz new file mode 100644 index 0000000..ee7aded --- /dev/null +++ b/salt-0.16.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa880a7008995be88e417e3639ff9326c3df73650fe3155a7dec43a3b1cb498d +size 3542126 diff --git a/salt.SuSEfirewall2 b/salt.SuSEfirewall2 new file mode 100644 index 0000000..4e3770a --- /dev/null +++ b/salt.SuSEfirewall2 @@ -0,0 +1,5 @@ +## Name: Salt Stack +## Description: Open ports for Salt Stack + +# space separated list of allowed TCP ports +TCP="4505 4506" \ No newline at end of file diff --git a/salt.changes b/salt.changes index 279e70b..c5b975f 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sat Sep 7 22:44:41 UTC 2013 - aboe76@gmail.com + +- Update 0.16.4 bugfix release: + - Multiple documentation improvements/additions + - Added the osfinger and osarch grains + - Fix bug in :mod:`hg.latest ` state + that would erroneously delete directories (:issue:`6661`) + - Fix bug related to pid not existing for + :mod:`ps.top ` (:issue:`6679`) + - Fix regression in :mod:`MySQL returner ` + (:issue:`6695`) + - Fix IP addresses grains (ipv4 and ipv6) to include all addresses + (:issue:`6656`) + - Fix regression preventing authenticated FTP (:issue:`6733`) + - Fix :mod:`file.contains ` on values + YAML parses as non-string (:issue:`6817`) + - Fix :mod:`file.get_gid `, + :mod:`file.get_uid `, and + :mod:`file.chown ` for broken symlinks + (:issue:`6826`) + - Fix comment for service reloads in service state (:issue:`6851`) + ------------------------------------------------------------------- Fri Aug 9 18:08:12 UTC 2013 - aboe76@gmail.com diff --git a/salt.spec b/salt.spec index 6965dd7..9c83ef8 100644 --- a/salt.spec +++ b/salt.spec @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: salt -Version: 0.16.3 +Version: 0.16.4 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -31,6 +30,7 @@ Source4: %{name}-master.service Source5: %{name}-syndic.service Source6: %{name}-minion.service Source7: %{name}.logrotate +Source8: %{name}.SuSEfirewall2 %if 0%{?sles_version} BuildRequires: python Requires: python @@ -43,6 +43,9 @@ BuildRequires: python-PyYAML BuildRequires: python-msgpack-python BuildRequires: python-pycrypto BuildRequires: python-pyzmq >= 2.1.9 +BuildRequires: unzip +# Disabled for now when salt-testing and salt 0.17 is available. +#BuildRequires: salt-testing Requires: logrotate Requires: python-Jinja2 Requires: python-M2Crypto @@ -50,6 +53,7 @@ Requires: python-PyYAML Requires: python-msgpack-python Requires: python-pycrypto Requires: python-pyzmq >= 2.1.9 +Requires: python-GitPython Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq %if 0%{?suse_version} >= 1210 @@ -68,6 +72,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %endif +# Disabled for now when salt-testing and salt 0.17 is available. +#%if 0%{?suse_version} != 1220 && 0%{?suse_version} != 1230 +BuildRequires: python-unittest2 +# this BR causes windows tests to happen +# clearly, that's not desired +# https://github.com/saltstack/salt/issues/3749 +BuildRequires: python-mock +BuildRequires: git +#%endif + %description Salt is a distributed remote execution system used to execute commands and query data. It was developed in order to bring the best solutions found in @@ -150,6 +164,16 @@ install -Dpm 0644 conf/master %{buildroot}%{_sysconfdir}/salt/master # ##logrotate file install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt +# +##SuSEfirewall2 file +install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt + +# Disabled for now when salt-testing and salt 0.17 is available. +#%if 0%{?suse_version} != 1220 && 0%{?suse_version} != 1230 +#%check +#export only_local_network=False +#%{__python} setup.py test --runtests-opts=-u +#%endif %preun -n salt-syndic %stop_on_removal salt-syndic @@ -239,6 +263,8 @@ install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt %{_bindir}/salt-cp %{_bindir}/salt-key %{_bindir}/salt-run +# Salt-ssh only available in salt 0.17 +#%{_bindir}/salt-ssh %{_mandir}/man1/salt-master.1.* %{_mandir}/man1/salt.1.* %{_mandir}/man1/salt-cp.1.* @@ -246,6 +272,7 @@ install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt %{_mandir}/man1/salt-run.1.* %{_sbindir}/rcsalt-master %config(noreplace) %{_sysconfdir}/init.d/salt-master +%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/master %{_sysconfdir}/salt/master.d %dir /srv/salt @@ -262,4 +289,4 @@ install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt %config(noreplace) %{_sysconfdir}/logrotate.d/salt %{python_sitelib}/* -%changelog +%changelog \ No newline at end of file