Skip to content

Commit

Permalink
CVE fix for ansible (#1546)
Browse files Browse the repository at this point in the history
Co-authored-by: Pawel Winogrodzki <[email protected]>
  • Loading branch information
2 people authored and jslobodzian committed Oct 20, 2021
1 parent 4b6e72f commit 9bb8841
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 18 deletions.
4 changes: 2 additions & 2 deletions SPECS/ansible/ansible.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"ansible-2.9.18.tar.gz": "55fee77729eab2dce854c94a7b6998f0fcb7b9a053bdaa7eb4057f01a0d5d93c"
"ansible-2.9.23.tar.gz": "b7ca0fac00dd09e11bf69eb40da1405881b466ad2adb88e7aee3e2387e66f9ad"
}
}
}
37 changes: 23 additions & 14 deletions SPECS/ansible/ansible.spec
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

Summary: Configuration-management, application deployment, cloud provisioning system
Name: ansible
Version: 2.9.18
Version: 2.9.23
Release: 1%{?dist}
License: GPLv3+
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Development/Libraries
URL: https://www.ansible.com
Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
BuildRequires: python-setuptools
BuildRequires: python2
BuildRequires: python2-libs
Requires: python2
# Required for %check
Requires: python2-devel
Requires: python2-libs
BuildRequires: python3-setuptools
BuildRequires: python3
BuildRequires: python3-libs
%if %{with_check}
BuildRequires: python3-devel
BuildRequires: python3-pip
%endif

Requires: python3
Requires: python3-libs

BuildArch: noarch

%description
Expand All @@ -25,22 +30,26 @@ Ansible is a radically simple IT automation system. It handles configuration-man
%setup -q

%build
python2 setup.py build
python3 setup.py build

%install
python2 setup.py install -O1 --skip-build \
--root %{buildroot}
python3 setup.py install -O1 --root %{buildroot}

%check
python2 setup.py test
pip3 install tox
cd build/lib/ansible_test/_data && tox

%files
%defattr(-, root, root)
%license licenses
%{_bindir}/*
%{python2_sitelib}/*
%{python3_sitelib}/*

%changelog
* Fri Oct 15 2021 Bala <[email protected]> - 2.9.23-1
- Upgrade to version 2.9.23, which resolves CVE-2021-3583, CVE-2020-14330 and CVE-2021-20228
- Switching to building with Python 3 to fix tests.

* Tue Jun 15 2021 Nicolas Ontiveros <[email protected]> - 2.9.18-1
- Upgrade to version 2.9.18, which resolves CVE-2021-20191 and CVE-2021-20178

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"type": "other",
"other": {
"name": "ansible",
"version": "2.9.18",
"downloadUrl": "https://releases.ansible.com/ansible/ansible-2.9.18.tar.gz"
"version": "2.9.23",
"downloadUrl": "https://releases.ansible.com/ansible/ansible-2.9.23.tar.gz"
}
}
},
Expand Down

0 comments on commit 9bb8841

Please sign in to comment.