From a5d4b85a67b3660e8768ab9bdfc30a5405fa1ff4 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 10 May 2017 22:37:08 +0000 Subject: [PATCH 1/2] - update to 2.3.1 RC1 (package version 2.3.0.1): * SECURITY (MODERATE): fix for CVE-2017-7481, in which data for lookup plugins used as variables was not being correctly marked as "unsafe". OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=84 --- ansible-2.3.0.0.tar.gz | 3 --- ansible-2.3.1.0-0.1.rc1.tar.gz | 3 +++ ansible.changes | 8 ++++++++ ansible.spec | 7 ++++--- 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 ansible-2.3.0.0.tar.gz create mode 100644 ansible-2.3.1.0-0.1.rc1.tar.gz diff --git a/ansible-2.3.0.0.tar.gz b/ansible-2.3.0.0.tar.gz deleted file mode 100644 index 175941f..0000000 --- a/ansible-2.3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458 -size 4251730 diff --git a/ansible-2.3.1.0-0.1.rc1.tar.gz b/ansible-2.3.1.0-0.1.rc1.tar.gz new file mode 100644 index 0000000..389fe67 --- /dev/null +++ b/ansible-2.3.1.0-0.1.rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5054b7eaeab4eb0a03a69c173cfd55aac256f1ec430cc8d9976b80a252ac544b +size 4146189 diff --git a/ansible.changes b/ansible.changes index 964a006..aebb4c3 100644 --- a/ansible.changes +++ b/ansible.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 10 22:35:24 UTC 2017 - lars@linux-schulserver.de + +- update to 2.3.1 RC1 (package version 2.3.0.1): + * SECURITY (MODERATE): fix for CVE-2017-7481, in which data for + lookup plugins used as variables was not being correctly marked + as "unsafe". + ------------------------------------------------------------------- Tue Mar 28 08:30:35 UTC 2017 - michael@stroeder.com diff --git a/ansible.spec b/ansible.spec index 269986e..756d79a 100644 --- a/ansible.spec +++ b/ansible.spec @@ -19,13 +19,14 @@ Name: ansible -Version: 2.3.0.0 +Version: 2.3.0.1 Release: 0 +%define realversion 2.3.1.0-0.1.rc1 Summary: Radically simple IT automation License: GPL-3.0 Group: Development/Languages/Python Url: http://ansible.com/ -Source: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz +Source: https://releases.ansible.com/ansible/ansible-%{realversion}.tar.gz Source99: ansible-rpmlintrc @@ -80,7 +81,7 @@ task-execution, and multinode orchestration - including trivializing things like zero downtime rolling updates with load balancers. %prep -%setup -q -n ansible-%{version} +%setup -q -n ansible-2.3.1.0 %build python setup.py build From 3f7c7f18a2813dfd75ba666b81e0cc48a407cf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Wed, 7 Jun 2017 20:41:17 +0000 Subject: [PATCH 2/2] Accepting request 501809 from home:elimat:branches:systemsmanagement - update to 2.3.1.0 (final) - clean-up of spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/501809 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=86 --- ansible-2.3.1.0-0.1.rc1.tar.gz | 3 -- ansible-2.3.1.0.tar.gz | 3 ++ ansible.changes | 6 ++++ ansible.spec | 52 +++++++++++++++------------------- 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 ansible-2.3.1.0-0.1.rc1.tar.gz create mode 100644 ansible-2.3.1.0.tar.gz diff --git a/ansible-2.3.1.0-0.1.rc1.tar.gz b/ansible-2.3.1.0-0.1.rc1.tar.gz deleted file mode 100644 index 389fe67..0000000 --- a/ansible-2.3.1.0-0.1.rc1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5054b7eaeab4eb0a03a69c173cfd55aac256f1ec430cc8d9976b80a252ac544b -size 4146189 diff --git a/ansible-2.3.1.0.tar.gz b/ansible-2.3.1.0.tar.gz new file mode 100644 index 0000000..e80f773 --- /dev/null +++ b/ansible-2.3.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 +size 4263357 diff --git a/ansible.changes b/ansible.changes index aebb4c3..c0645f6 100644 --- a/ansible.changes +++ b/ansible.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 07 20:51:30 UTC 2017 - matthias.eliasson@gmail.com + +- update to 2.3.1.0 (final) +- clean up of spec file with spec-cleaner + ------------------------------------------------------------------- Wed May 10 22:35:24 UTC 2017 - lars@linux-schulserver.de diff --git a/ansible.spec b/ansible.spec index 756d79a..020f943 100644 --- a/ansible.spec +++ b/ansible.spec @@ -18,38 +18,40 @@ # +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif Name: ansible -Version: 2.3.0.1 +Version: 2.3.1.0 Release: 0 -%define realversion 2.3.1.0-0.1.rc1 Summary: Radically simple IT automation License: GPL-3.0 Group: Development/Languages/Python Url: http://ansible.com/ -Source: https://releases.ansible.com/ansible/ansible-%{realversion}.tar.gz - +Source: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz Source99: ansible-rpmlintrc - +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} -%if 0%{?suse_version} >= 01130 -BuildRequires: python-paramiko -Requires: python-paramiko -BuildRequires: python-Jinja2 -Requires: python-Jinja2 -BuildRequires: python-PyYAML -Requires: python-PyYAML -BuildRequires: python-pycrypto >= 2.6 -Requires: python-pycrypto >= 2.6 -%endif BuildRequires: python-devel BuildRequires: python-setuptools Requires: python-setuptools +Recommends: python-dnspython Recommends: python-dopy Recommends: python-pywinrm Recommends: sshpass -Recommends: python-dnspython +%if 0%{?suse_version} >= 01130 +BuildRequires: python-Jinja2 +BuildRequires: python-PyYAML +BuildRequires: python-paramiko +BuildRequires: python-pycrypto >= 2.6 +Requires: python-Jinja2 +Requires: python-PyYAML +Requires: python-paramiko +Requires: python-pycrypto >= 2.6 +%endif %endif - # RHEL == 6 %if 0%{?rhel} == 6 Requires: python-crypto2.6 @@ -66,15 +68,7 @@ Requires: python-paramiko Requires: python-setuptools %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch -%endif - -%description +%description Ansible is a radically simple IT automation system. It handles configuration-management, application deployment, cloud provisioning, ad-hoc task-execution, and multinode orchestration - including trivializing things @@ -89,9 +83,9 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -mkdir -p %{buildroot}/etc/ansible/ -cp examples/hosts %{buildroot}/etc/ansible/ -cp examples/ansible.cfg %{buildroot}/etc/ansible/ +mkdir -p %{buildroot}%{_sysconfdir}/ansible/ +cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/ +cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ mkdir -p %{buildroot}/%{_mandir}/man1/ cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ mkdir -p %{buildroot}/%{_datadir}/ansible