diff --git a/SPECS/ansible/ansible.signatures.json b/SPECS/ansible/ansible.signatures.json index 39781562b8c..b99b3e3c888 100644 --- a/SPECS/ansible/ansible.signatures.json +++ b/SPECS/ansible/ansible.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ansible-2.9.18.tar.gz": "55fee77729eab2dce854c94a7b6998f0fcb7b9a053bdaa7eb4057f01a0d5d93c" + "ansible-2.9.23.tar.gz": "b7ca0fac00dd09e11bf69eb40da1405881b466ad2adb88e7aee3e2387e66f9ad" } -} \ No newline at end of file +} diff --git a/SPECS/ansible/ansible.spec b/SPECS/ansible/ansible.spec index da595b2898f..e2478c1b5b2 100644 --- a/SPECS/ansible/ansible.spec +++ b/SPECS/ansible/ansible.spec @@ -1,7 +1,8 @@ -%{!?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 @@ -9,13 +10,17 @@ 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 @@ -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 - 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 - 2.9.18-1 - Upgrade to version 2.9.18, which resolves CVE-2021-20191 and CVE-2021-20178 diff --git a/SPECS/redis/CVE-2020-14147.patch b/SPECS/redis/CVE-2020-14147.patch deleted file mode 100644 index 7648c5e5ed6..00000000000 --- a/SPECS/redis/CVE-2020-14147.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/deps/lua/src/lua_struct.c b/deps/lua/src/lua_struct.c -index 4d5f027..c58c8e7 100644 ---- a/deps/lua/src/lua_struct.c -+++ b/deps/lua/src/lua_struct.c -@@ -89,12 +89,14 @@ typedef struct Header { - } Header; - - --static int getnum (const char **fmt, int df) { -+static int getnum (lua_State *L, const char **fmt, int df) { - if (!isdigit(**fmt)) /* no number? */ - return df; /* return default value */ - else { - int a = 0; - do { -+ if (a > (INT_MAX / 10) || a * 10 > (INT_MAX - (**fmt - '0'))) -+ luaL_error(L, "integral size overflow"); - a = a*10 + *((*fmt)++) - '0'; - } while (isdigit(**fmt)); - return a; -@@ -115,9 +117,9 @@ static size_t optsize (lua_State *L, char opt, const char **fmt) { - case 'f': return sizeof(float); - case 'd': return sizeof(double); - case 'x': return 1; -- case 'c': return getnum(fmt, 1); -+ case 'c': return getnum(L, fmt, 1); - case 'i': case 'I': { -- int sz = getnum(fmt, sizeof(int)); -+ int sz = getnum(L, fmt, sizeof(int)); - if (sz > MAXINTSIZE) - luaL_error(L, "integral size %d is larger than limit of %d", - sz, MAXINTSIZE); -@@ -150,7 +152,7 @@ static void controloptions (lua_State *L, int opt, const char **fmt, - case '>': h->endian = BIG; return; - case '<': h->endian = LITTLE; return; - case '!': { -- int a = getnum(fmt, MAXALIGN); -+ int a = getnum(L, fmt, MAXALIGN); - if (!isp2(a)) - luaL_error(L, "alignment %d is not a power of 2", a); - h->align = a; diff --git a/SPECS/redis/CVE-2021-21309.nopatch b/SPECS/redis/CVE-2021-21309.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/redis/CVE-2021-3470.patch b/SPECS/redis/CVE-2021-3470.patch deleted file mode 100644 index 4fb0cd21623..00000000000 --- a/SPECS/redis/CVE-2021-3470.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/zmalloc.c b/src/zmalloc.c -index dd655620ca69..972db79d7ab7 100644 ---- a/src/zmalloc.c -+++ b/src/zmalloc.c -@@ -177,9 +177,6 @@ void *zrealloc(void *ptr, size_t size) { - size_t zmalloc_size(void *ptr) { - void *realptr = (char*)ptr-PREFIX_SIZE; - size_t size = *((size_t*)realptr); -- /* Assume at least that all the allocations are padded at sizeof(long) by -- * the underlying allocator. */ -- if (size&(sizeof(long)-1)) size += sizeof(long)-(size&(sizeof(long)-1)); - return size+PREFIX_SIZE; - } - size_t zmalloc_usable(void *ptr) { diff --git a/SPECS/redis/redis.signatures.json b/SPECS/redis/redis.signatures.json index f28719a9e29..c3fbe419bce 100644 --- a/SPECS/redis/redis.signatures.json +++ b/SPECS/redis/redis.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "redis-5.0.5.tar.gz": "2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375" + "redis-5.0.14.tar.gz": "3ea5024766d983249e80d4aa9457c897a9f079957d0fb1f35682df233f997f32" } } \ No newline at end of file diff --git a/SPECS/redis/redis.spec b/SPECS/redis/redis.spec index f4c1acd0d5a..22971edf752 100644 --- a/SPECS/redis/redis.spec +++ b/SPECS/redis/redis.spec @@ -1,7 +1,7 @@ Summary: advanced key-value store Name: redis -Version: 5.0.5 -Release: 7%{?dist} +Version: 5.0.14 +Release: 1%{?dist} License: BSD URL: https://redis.io/ Group: Applications/Databases @@ -9,11 +9,7 @@ Vendor: Microsoft Corporation Distribution: Mariner Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz Patch0: redis-conf.patch -Patch1: CVE-2020-14147.patch Patch2: disable_active_defrag_big_keys.patch -# CVE-2021-21309 affects 32-bit executables only. Mariner always builds with -m64 and does not support 32-bit architectures. -Patch3: CVE-2021-21309.nopatch -Patch4: CVE-2021-3470.patch BuildRequires: gcc BuildRequires: systemd @@ -76,7 +72,6 @@ exit 0 /sbin/ldconfig %systemd_postun_with_restart redis.service - %files %defattr(-,root,root) %license COPYING @@ -88,31 +83,47 @@ exit 0 %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf %changelog +* Mon Oct 18 2021 Neha Agarwal 5.0.14-1 +- Update version for CVE-2021-32626, CVE-2021-32627, CVE-2021-32628, CVE-2021-32675, CVE-2021-32687, CVE-2021-32762, CVE-2021-41099 + * Fri Apr 09 2021 Suresh Babu Chalamalasetty 5.0.5-7 - Add patch for CVE-2021-3470 + * Thu Mar 11 2021 Mateusz Malisz 5.0.5-6 - Add nopatch for CVE-2021-21309. + * Wed Mar 03 2021 Andrew Phelps 5.0.5-5 - Add patch to remove an unreliable test. License verified. + * Fri Oct 23 2020 Henry Li 5.0.5-4 - Add patch to resolve CVE-2020-14147 + * Sat May 09 2020 Nick Samson 5.0.5-3 - Added %%license line automatically + * Tue Sep 03 2019 Mateusz Malisz 5.0.5-2 - Initial CBL-Mariner import from Photon (license: Apache2). + * Mon Jul 22 2019 Shreyas B. 5.0.5-1 - Updated to version 5.0.5. + * Tue Sep 11 2018 Keerthana K 4.0.11-1 - Updated to version 4.0.11. + * Thu Dec 28 2017 Divya Thaluru 3.2.8-5 - Fixed the log file directory structure + * Mon Sep 18 2017 Alexey Makhalov 3.2.8-4 - Remove shadow from requires and use explicit tools for post actions + * Wed May 31 2017 Siju Maliakkal 3.2.8-3 - Fix DB persistence,log file,grace-ful shutdown issues + * Tue May 16 2017 Siju Maliakkal 3.2.8-2 - Added systemd service unit + * Wed Apr 5 2017 Siju Maliakkal 3.2.8-1 - Updating to latest version + * Mon Oct 3 2016 Dheeraj Shetty 3.2.4-1 - initial version diff --git a/cgmanifest.json b/cgmanifest.json index 9c65b15f4fb..9a0f5eb79a8 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -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" } } }, @@ -6955,8 +6955,8 @@ "type": "other", "other": { "name": "redis", - "version": "5.0.5", - "downloadUrl": "http://download.redis.io/releases/redis-5.0.5.tar.gz" + "version": "5.0.14", + "downloadUrl": "http://download.redis.io/releases/redis-5.0.14.tar.gz" } } },