From 7fc0d5460f06d2bf7d25d10b3a22753c529a4f1f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 12 Mar 2020 18:05:41 +0000 Subject: [PATCH] Upgrade `psutil` to v5.6.6 because of CVE-2019-18874 https://github.com/advisories/GHSA-qfc5-mcwq-26q8 --- pkg/osx/req.txt | 2 +- pkg/windows/req.txt | 2 +- requirements/static/py2.7/darwin.txt | 2 +- requirements/static/py2.7/linux.txt | 2 +- requirements/static/py2.7/windows.txt | 2 +- requirements/static/py3.4/linux.txt | 2 +- requirements/static/py3.5/darwin.txt | 2 +- requirements/static/py3.5/linux.txt | 2 +- requirements/static/py3.5/windows.txt | 2 +- requirements/static/py3.6/darwin.txt | 2 +- requirements/static/py3.6/linux.txt | 2 +- requirements/static/py3.6/windows.txt | 2 +- requirements/static/py3.7/darwin.txt | 2 +- requirements/static/py3.7/linux.txt | 2 +- requirements/static/py3.7/windows.txt | 2 +- requirements/static/windows.in | 1 - 16 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index e65ac89f3ef4..8ac69e559855 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -16,7 +16,7 @@ linode-python==1.1.1 Mako==1.0.7 markupsafe==1.1.1 msgpack-python==0.5.6 -psutil==5.6.1 +psutil==5.6.6 pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt index 8b443e1717ea..01f52b0a4a36 100644 --- a/pkg/windows/req.txt +++ b/pkg/windows/req.txt @@ -16,7 +16,7 @@ lxml==4.3.0 Mako==1.0.7 markupsafe==1.1.1 msgpack-python==0.5.6 -psutil==5.6.1 +psutil==5.6.6 pyasn1==0.4.5 pycparser==2.19 pycryptodomex==3.8.1 diff --git a/requirements/static/py2.7/darwin.txt b/requirements/static/py2.7/darwin.txt index 1139683ede15..b4fe2d704289 100644 --- a/requirements/static/py2.7/darwin.txt +++ b/requirements/static/py2.7/darwin.txt @@ -84,7 +84,7 @@ pathlib2==2.3.3 # via importlib-metadata, importlib-resources, pytest, pathtools==0.1.2 # via watchdog pluggy==0.13.1 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py2.7/linux.txt b/requirements/static/py2.7/linux.txt index b6bab5e0f61b..9871900ce41a 100644 --- a/requirements/static/py2.7/linux.txt +++ b/requirements/static/py2.7/linux.txt @@ -79,7 +79,7 @@ pathlib2==2.3.3 # via importlib-metadata, pytest pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py2.7/windows.txt b/requirements/static/py2.7/windows.txt index 446e3c2cda7e..961e6e836b42 100644 --- a/requirements/static/py2.7/windows.txt +++ b/requirements/static/py2.7/windows.txt @@ -72,7 +72,7 @@ pathlib2==2.3.3 # via importlib-metadata, pytest pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.4/linux.txt b/requirements/static/py3.4/linux.txt index 4bc5ed8cc941..c2133f0bba13 100644 --- a/requirements/static/py3.4/linux.txt +++ b/requirements/static/py3.4/linux.txt @@ -69,7 +69,7 @@ pathlib2==2.3.3 # via importlib-metadata, pytest pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index ac0428620424..0b1aba1a7cfb 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -75,7 +75,7 @@ pathlib2==2.3.3 # via pytest pathtools==0.1.2 # via watchdog pluggy==0.13.1 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.5/linux.txt b/requirements/static/py3.5/linux.txt index c3611cfbcc7e..bb69ef0737d9 100644 --- a/requirements/static/py3.5/linux.txt +++ b/requirements/static/py3.5/linux.txt @@ -69,7 +69,7 @@ pathlib2==2.3.3 # via pytest pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.5/windows.txt b/requirements/static/py3.5/windows.txt index 3c07a12f239a..a9e4335c5e55 100644 --- a/requirements/static/py3.5/windows.txt +++ b/requirements/static/py3.5/windows.txt @@ -62,7 +62,7 @@ pathlib2==2.3.3 # via pytest pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index a6dd0a120b7c..f535ab50668d 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -74,7 +74,7 @@ paramiko==2.4.2 # via junos-eznc, ncclient, scp pathtools==0.1.2 # via watchdog pluggy==0.13.1 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.6/linux.txt b/requirements/static/py3.6/linux.txt index 247bdc6e2bee..1ab63ea04db5 100644 --- a/requirements/static/py3.6/linux.txt +++ b/requirements/static/py3.6/linux.txt @@ -68,7 +68,7 @@ paramiko==2.4.2 pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.6/windows.txt b/requirements/static/py3.6/windows.txt index 1c9b6903c676..157ef96eb25e 100644 --- a/requirements/static/py3.6/windows.txt +++ b/requirements/static/py3.6/windows.txt @@ -61,7 +61,7 @@ patch==1.16 pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 935b110db2c1..bcb24aa1d741 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -73,7 +73,7 @@ paramiko==2.4.2 # via junos-eznc, ncclient, scp pathtools==0.1.2 # via watchdog pluggy==0.13.1 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.7/linux.txt b/requirements/static/py3.7/linux.txt index 17e9bc785ae5..b3df974f3edf 100644 --- a/requirements/static/py3.7/linux.txt +++ b/requirements/static/py3.7/linux.txt @@ -68,7 +68,7 @@ paramiko==2.4.2 pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/py3.7/windows.txt b/requirements/static/py3.7/windows.txt index 06c36960b3cd..56ae414bcffb 100644 --- a/requirements/static/py3.7/windows.txt +++ b/requirements/static/py3.7/windows.txt @@ -61,7 +61,7 @@ patch==1.16 pathtools==0.1.2 # via watchdog pluggy==0.13.0 # via pytest portend==2.4 # via cherrypy -psutil==5.6.1 +psutil==5.6.6 py==1.8.0 # via pytest pyaml==19.4.1 # via moto pyasn1-modules==0.2.4 # via google-auth diff --git a/requirements/static/windows.in b/requirements/static/windows.in index 4f45539cf41b..cb98c814e707 100644 --- a/requirements/static/windows.in +++ b/requirements/static/windows.in @@ -19,7 +19,6 @@ patch pygit2 python-etcd>0.4.2 msgpack-python >= 0.4.2, != 0.5.5 -psutil pyopenssl python-gnupg pyvmomi