From 4665c2250dbb1691105a00482ed841f0237bbf94 Mon Sep 17 00:00:00 2001
From: Li Zhou
Date: Tue, 26 Jan 2021 19:35:23 -0800
Subject: [PATCH] python: fix CVE-2019-9636 CVE-2019-10160 CVE-2019-9948
CVE-2019-16056 in rpm list
Python is upgraded to version 2.7.5-89 in srpm build to fix above CVEs.
Update below packages for the updated depencies of python upgrading:
python2-rpm-macros-3-34.el7.noarch.rpm
python-rpm-macros-3-34.el7.noarch.rpm
python-srpm-macros-3-34.el7.noarch.rpm
Update below packages to below versions too in rpm list:
python-2.7.5-89.el7.x86_64.rpm
python-devel-2.7.5-89.el7.x86_64.rpm
python-libs-2.7.5-89.el7.x86_64.rpm
This commit need work together with the commit
for repository starlingx/compile.
Story: 2008532
Task: 41665
Signed-off-by: Li Zhou
Change-Id: I280cbc0408b41008ec2e07f2453d20fd6226c54a
---
.../config/centos/compiler/rpms_centos.lst | 6 +++---
.../config/centos/flock/rpms_centos.lst | 6 +++---
.../config/centos/mock/rpms_centos.lst | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/centos-mirror-tools/config/centos/compiler/rpms_centos.lst b/centos-mirror-tools/config/centos/compiler/rpms_centos.lst
index 77de59f8..08d8652e 100644
--- a/centos-mirror-tools/config/centos/compiler/rpms_centos.lst
+++ b/centos-mirror-tools/config/centos/compiler/rpms_centos.lst
@@ -246,9 +246,9 @@ python3-pip-9.0.3-5.el7.noarch.rpm
python3-rpm-generators-6-2.el7.noarch.rpm
python3-rpm-macros-3-32.el7.noarch.rpm
python3-setuptools-39.2.0-10.el7.noarch.rpm
-python-2.7.5-76.el7.x86_64.rpm
-python-devel-2.7.5-76.el7.x86_64.rpm
-python-libs-2.7.5-76.el7.x86_64.rpm
+python-2.7.5-89.el7.x86_64.rpm
+python-devel-2.7.5-89.el7.x86_64.rpm
+python-libs-2.7.5-89.el7.x86_64.rpm
# qrencode-libs-3.4.1-3.el7.x86_64.rpm provided by mock
# readline-6.2-10.el7.x86_64.rpm provided by mock
readline-devel-6.2-10.el7.x86_64.rpm
diff --git a/centos-mirror-tools/config/centos/flock/rpms_centos.lst b/centos-mirror-tools/config/centos/flock/rpms_centos.lst
index 208227af..4db467ba 100644
--- a/centos-mirror-tools/config/centos/flock/rpms_centos.lst
+++ b/centos-mirror-tools/config/centos/flock/rpms_centos.lst
@@ -904,7 +904,7 @@ python2-requests-oauthlib-0.8.0-5.el7.noarch.rpm
python2-retryz-0.1.8-1.el7.noarch.rpm
python2-rfc3986-1.2.0-1.el7.noarch.rpm
python2-rjsmin-1.0.12-2.el7.x86_64.rpm
-# python2-rpm-macros-3-25.el7.noarch.rpm provided by mock
+# python2-rpm-macros-3-34.el7.noarch.rpm provided by mock
python2-rsa-3.4.1-1.el7.noarch.rpm
python2-ruamel-ordereddict-0.4.9-3.el7.x86_64.rpm
python2-ruamel-yaml-0.13.14-2.el7.x86_64.rpm
@@ -1095,7 +1095,7 @@ python-repoze-lru-0.4-3.el7.noarch.rpm
python-repoze-who-2.1-1.el7.noarch.rpm
python-retrying-1.2.3-4.el7.noarch.rpm
python-routes-2.4.1-1.el7.noarch.rpm
-# python-rpm-macros-3-25.el7.noarch.rpm provided by mock
+# python-rpm-macros-3-34.el7.noarch.rpm provided by mock
python-rtslib-2.1.fb63-13.el7.noarch.rpm
python-s3transfer-0.1.13-1.el7.noarch.rpm
python-schedutils-0.4-6.el7.x86_64.rpm
@@ -1108,7 +1108,7 @@ python-slip-dbus-0.4.0-4.el7.noarch.rpm
python-sphinx-locale-1.6.2-3.el7.noarch.rpm
python-sqlalchemy-utils-0.31.3-2.el7.noarch.rpm
python-sqlparse-0.1.18-5.el7.noarch.rpm
-# python-srpm-macros-3-25.el7.noarch.rpm provided by mock
+# python-srpm-macros-3-34.el7.noarch.rpm provided by mock
python-subprocess32-3.2.6-4.el7.x86_64.rpm
python-subunit-1.0.0-1.el7.noarch.rpm
python-swift-2.15.1-1.el7.noarch.rpm
diff --git a/centos-mirror-tools/config/centos/mock/rpms_centos.lst b/centos-mirror-tools/config/centos/mock/rpms_centos.lst
index 8590d4da..1e7c3db5 100644
--- a/centos-mirror-tools/config/centos/mock/rpms_centos.lst
+++ b/centos-mirror-tools/config/centos/mock/rpms_centos.lst
@@ -145,14 +145,14 @@ procps-ng-3.3.10-28.el7.x86_64.rpm
pth-2.0.7-23.el7.x86_64.rpm
pygpgme-0.3-9.el7.x86_64.rpm
pyliblzma-0.5.3-11.el7.x86_64.rpm
-# python-2.7.5-76.el7.x86_64.rpm
-# python-devel-2.7.5-76.el7.x86_64.rpm
-python2-rpm-macros-3-25.el7.noarch.rpm
+# python-2.7.5-89.el7.x86_64.rpm
+# python-devel-2.7.5-89.el7.x86_64.rpm
+python2-rpm-macros-3-34.el7.noarch.rpm
python-iniparse-0.4-9.el7.noarch.rpm
-# python-libs-2.7.5-76.el7.x86_64.rpm
+# python-libs-2.7.5-89.el7.x86_64.rpm
python-pycurl-7.19.0-19.el7.x86_64.rpm
-python-rpm-macros-3-25.el7.noarch.rpm
-python-srpm-macros-3-25.el7.noarch.rpm
+python-rpm-macros-3-34.el7.noarch.rpm
+python-srpm-macros-3-34.el7.noarch.rpm
python-urlgrabber-3.10-9.el7.noarch.rpm
pyxattr-0.5.1-5.el7.x86_64.rpm
qrencode-libs-3.4.1-3.el7.x86_64.rpm