diff --git a/certifi-2016.9.26-remove-bundle-cert.patch b/certifi-2016.9.26-remove-bundle-cert.patch deleted file mode 100644 index e665e8a..0000000 --- a/certifi-2016.9.26-remove-bundle-cert.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- certifi-2016.9.26/certifi/core.py 2016-12-28 12:58:47.917774691 -0800 -+++ certifi-2016.9.26/certifi/core.py.new 2016-12-28 13:04:18.631100213 -0800 -@@ -13,24 +13,27 @@ - - class DeprecatedBundleWarning(DeprecationWarning): - """ -- The weak security bundle is being deprecated. Please bother your service -- provider to get them to stop using cross-signed roots. -+ The weak security bundle is being deprecated upstream. In this Fedora -+ package, there *is* no weak security bundle, you will get the shared -+ system certificate trust bundle from both where() and old_where(). -+ Please bother your service provider to get them to stop using -+ cross-signed roots. - """ - - - def where(): - f = os.path.split(__file__)[0] - -- return os.path.join(f, 'cacert.pem') -+ return "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" - - - def old_where(): - warnings.warn( -- "The weak security bundle is being deprecated.", -+ "Weak security bundle is deprecated upstream, doesn't exist on Fedora", - DeprecatedBundleWarning - ) - f = os.path.split(__file__)[0] -- return os.path.join(f, 'weak.pem') -+ return "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" - - if __name__ == '__main__': - print(where()) diff --git a/certifi-2018.10.15-use-system-cert.patch b/certifi-2018.10.15-use-system-cert.patch new file mode 100644 index 0000000..7b9b7b1 --- /dev/null +++ b/certifi-2018.10.15-use-system-cert.patch @@ -0,0 +1,15 @@ +diff -ur certifi-2018.10.15-origen/certifi/core.py certifi-2018.10.15/certifi/core.py +--- certifi-2018.10.15-origen/certifi/core.py 2018-10-23 20:04:40.667440554 +0000 ++++ certifi-2018.10.15/certifi/core.py 2018-10-23 20:07:23.147549208 +0000 +@@ -19,9 +19,9 @@ + + + def where(): +- f = os.path.dirname(__file__) ++ #f = os.path.dirname(__file__) + +- return os.path.join(f, 'cacert.pem') ++ return os.path.join("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem") + + + def old_where(): diff --git a/python-certifi.spec b/python-certifi.spec index ed8f260..56f7783 100644 --- a/python-certifi.spec +++ b/python-certifi.spec @@ -9,7 +9,7 @@ License: MPLv2.0 #https://www.mozilla.org/MPL/2.0/ URL: http://certifi.io/en/latest/ Source0: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Patch1: certifi-2016.9.26-remove-bundle-cert.patch +Patch1: certifi-2018.10.15-use-system-cert.patch BuildArch: noarch # Force requeriments to this file provides vi the ca-certificates @@ -98,6 +98,7 @@ find %{_builddir}/%{pypi_name}-%{version} -name '*.py' \ %changelog * Tue Oct 23 2018 William Moreno Reyes - 2018.10.15-1 - Update to release: 2018.10.15 +- Update patch to point to system certificates * Fri Jul 13 2018 Fedora Release Engineering - 2016.9.26-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild