From d0ba59735cf1b1735f0c812c6ca7d375002fada3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Sep 2020 14:32:38 -0400 Subject: [PATCH 1/2] Replace certifi with an alternate version This version just uses the system cert store. --- requirements/requirements.txt | 1 - requirements/requirements_ansible.txt | 1 - requirements/requirements_ansible_git.txt | 1 + requirements/requirements_git.txt | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a63e116221..ac2d56c0fe 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -12,7 +12,6 @@ azure-common==1.1.25 # via azure-keyvault azure-keyvault==1.1.0 # via -r /awx_devel/requirements/requirements.in azure-nspkg==3.0.2 # via azure-keyvault cachetools==4.0.0 # via google-auth -certifi==2019.11.28 # via kubernetes, msrest, requests cffi==1.14.0 # via cryptography channels-redis==3.1.0 # via -r /awx_devel/requirements/requirements.in channels==2.4.0 # via -r /awx_devel/requirements/requirements.in, channels-redis diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 5f09c04b18..05355fb8b8 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -43,7 +43,6 @@ boto3==1.9.223 # via -r /awx_devel/requirements/requirements_ansible. boto==2.47.0 # via -r /awx_devel/requirements/requirements_ansible.in botocore==1.12.253 # via boto3, s3transfer cachetools==3.1.1 # via google-auth -certifi==2019.11.28 # via kubernetes, msrest, requests cffi==1.13.2 # via bcrypt, cryptography, pynacl chardet==3.0.4 # via requests colorama==0.4.3 # via azure-cli-core, knack diff --git a/requirements/requirements_ansible_git.txt b/requirements/requirements_ansible_git.txt index e69de29bb2..340cbfdcc7 100644 --- a/requirements/requirements_ansible_git.txt +++ b/requirements/requirements_ansible_git.txt @@ -0,0 +1 @@ +git+https://github.com/ansible/system-certifi.git@devel#egg=certifi diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index e69de29bb2..340cbfdcc7 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -0,0 +1 @@ +git+https://github.com/ansible/system-certifi.git@devel#egg=certifi From 85b694410b6ed7737d0930ae8aa40bd6826c9108 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Sep 2020 15:46:04 -0400 Subject: [PATCH 2/2] Adjust included licenses --- docs/licenses/certifi.txt | 21 --------------------- docs/licenses/system-certifi.txt | 6 ++++++ 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 docs/licenses/certifi.txt create mode 100644 docs/licenses/system-certifi.txt diff --git a/docs/licenses/certifi.txt b/docs/licenses/certifi.txt deleted file mode 100644 index 03b38f486d..0000000000 --- a/docs/licenses/certifi.txt +++ /dev/null @@ -1,21 +0,0 @@ -This packge contains a modified version of ca-bundle.crt: - -ca-bundle.crt -- Bundle of CA Root Certificates - -Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011# -This is a bundle of X.509 certificates of public Certificate Authorities -(CA). These were automatically extracted from Mozilla's root certificates -file (certdata.txt). This file can be found in the mozilla source tree: -http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1# -It contains the certificates in PEM format and therefore -can be directly used with curl / libcurl / php_curl, or with -an Apache+mod_ssl webserver for SSL client authentication. -Just configure this file as the SSLCACertificateFile.# - -***** BEGIN LICENSE BLOCK ***** -This Source Code Form is subject to the terms of the Mozilla Public License, -v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain -one at http://mozilla.org/MPL/2.0/. - -***** END LICENSE BLOCK ***** -@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $ \ No newline at end of file diff --git a/docs/licenses/system-certifi.txt b/docs/licenses/system-certifi.txt new file mode 100644 index 0000000000..206ebd71a8 --- /dev/null +++ b/docs/licenses/system-certifi.txt @@ -0,0 +1,6 @@ + +Copyright © 2020, Red Hat, Inc. + +This Source Code Form is subject to the terms of the Mozilla Public License, +v. 2.0. If a copy of the MPL was not distributed with this file, You can +obtain one at https://mozilla.org/MPL/2.0/.