diff --git a/ansible-2.5.1.tar.gz b/ansible-2.5.1.tar.gz deleted file mode 100644 index a3cb71d..0000000 --- a/ansible-2.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51f0c9411344741fb4f6dd8757e0fb6a52c4dcf53a1bfbbfee413e067e65001a -size 10100358 diff --git a/ansible-2.5.5.tar.gz b/ansible-2.5.5.tar.gz new file mode 100644 index 0000000..60ff4de --- /dev/null +++ b/ansible-2.5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7e5aae60c0e76c824bf8a410fe247b5c4afcfaee272f6283b4f996d237e365a +size 10150862 diff --git a/ansible.changes b/ansible.changes index fc2beff..493264b 100644 --- a/ansible.changes +++ b/ansible.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Jun 15 13:49:23 UTC 2018 - kbabioch@suse.com + +- Update to 2.5.5 + - Fixed the honouration of the no_log option with failed task iterations + (CVE-2018-10855 boo#1097775) + - Bufixes: + - Changed the admin_users config option to not include "admin" by default + as admin is frequently used for a non-privileged account + - aws_s3 - add async support to the action plugin + - aws_s3 - fix decrypting vault files + - ec2_ami - cast the device_mapping volume size to an int + - eos_logging - fix idempotency issues + - cache plugins - A cache timeout of 0 means the cache will not expire. + - ios_logging - fix idempotency issues + - ios/nxos/eos_config - don't retrieve config in running_config when config is provided for diff + - nxos_banner - fix multiline banner issue + - nxos terminal plugin - fix output truncation + - nxos_l3_interface - fix no switchport issue with loopback and svi interfaces + - nxos_snapshot - fix compare_option +- Applied spec-cleaner + ------------------------------------------------------------------- Tue Apr 24 15:32:37 UTC 2018 - lars@linux-schulserver.de diff --git a/ansible.spec b/ansible.spec index 5ab33d0..a45bee9 100644 --- a/ansible.spec +++ b/ansible.spec @@ -2,8 +2,6 @@ # spec file for package ansible # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright 2013 by Lars Vogdt -# Copyright 2014 by Boris Manojlovic # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,29 +21,40 @@ %else BuildArch: noarch %endif +%if 0%{?fedora} >= 18 +%define __python python2 +BuildRequires: python-devel +BuildRequires: python-setuptools +Requires: PyYAML +Requires: python-httplib2 +Requires: python-jinja2 +Requires: python-keyczar +Requires: python-paramiko +Requires: python-setuptools +Requires: python-six +Requires: sshpass +%endif Name: ansible -Version: 2.5.1 +Version: 2.5.5 Release: 0 Summary: Software automation engine License: GPL-3.0-or-later Group: Development/Languages/Python -Url: http://ansible.com/ +URL: http://ansible.com/ Source: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz Source99: ansible-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build - # SuSE/openSuSE %if 0%{?suse_version} BuildRequires: python-devel BuildRequires: python-setuptools +Requires: python-setuptools Recommends: python-dnspython Recommends: python-dopy -Recommends: python-pywinrm -Recommends: sshpass Recommends: python-httplib2 Recommends: python-keyczar +Recommends: python-pywinrm Recommends: python-six -Requires: python-setuptools +Recommends: sshpass %if 0%{?suse_version} >= 01130 BuildRequires: python-Jinja2 BuildRequires: python-PyYAML @@ -58,7 +67,6 @@ Requires: python-passlib Requires: python-pycrypto >= 2.6 %endif %endif - # RHEL <=5 %if 0%{?rhel} && 0%{?rhel} <= 5 BuildRequires: python26-devel @@ -89,21 +97,8 @@ Requires: python-crypto %endif # RHEL >=7 %if 0%{?rhel} >= 7 -Requires: python2-cryptography BuildRequires: perl(Exporter) -%endif -%if 0%{?fedora} >= 18 -BuildRequires: python-devel -BuildRequires: python-setuptools -Requires: PyYAML -Requires: python-httplib2 -Requires: python-jinja2 -Requires: python-keyczar -Requires: python-paramiko -Requires: python-setuptools -Requires: python-six -Requires: sshpass -%define __python %{__python2} +Requires: python2-cryptography %endif %description @@ -118,10 +113,10 @@ find . -name .git_keep -delete find contrib/ -type f -exec chmod 644 {} + %build -%{__python} setup.py build +python setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/ansible/ cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/ @@ -131,8 +126,8 @@ cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ mkdir -p %{buildroot}/%{_datadir}/ansible %files -%defattr(-,root,root,-) -%doc COPYING *.rst contrib examples changelogs +%license COPYING +%doc *.rst contrib examples changelogs %{_bindir}/ansible %{_bindir}/ansible-config %{_bindir}/ansible-connection @@ -144,15 +139,15 @@ mkdir -p %{buildroot}/%{_datadir}/ansible %{_bindir}/ansible-pull %{_bindir}/ansible-vault %{python_sitelib}/* -%{_mandir}/man1/ansible.1* -%{_mandir}/man1/ansible-config.1* -%{_mandir}/man1/ansible-console.1* -%{_mandir}/man1/ansible-doc.1* -%{_mandir}/man1/ansible-galaxy.1* -%{_mandir}/man1/ansible-inventory.1* -%{_mandir}/man1/ansible-playbook.1* -%{_mandir}/man1/ansible-pull.1* -%{_mandir}/man1/ansible-vault.1* +%{_mandir}/man1/ansible.1%{?ext_man} +%{_mandir}/man1/ansible-config.1%{?ext_man} +%{_mandir}/man1/ansible-console.1%{?ext_man} +%{_mandir}/man1/ansible-doc.1%{?ext_man} +%{_mandir}/man1/ansible-galaxy.1%{?ext_man} +%{_mandir}/man1/ansible-inventory.1%{?ext_man} +%{_mandir}/man1/ansible-playbook.1%{?ext_man} +%{_mandir}/man1/ansible-pull.1%{?ext_man} +%{_mandir}/man1/ansible-vault.1%{?ext_man} %dir %{_sysconfdir}/ansible %config(noreplace) %{_sysconfdir}/ansible/ansible.cfg %config(noreplace) %{_sysconfdir}/ansible/hosts