From feb3a637b4a9de65ea0c8d4c524868dd51aeada80a23b5b9e0bc72f464fd151f Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 26 Sep 2015 10:57:24 +0000 Subject: [PATCH] Accepting request 333890 from home:TheBlackCat:branches:devel:languages:python Update to version 2015.9.6.2 OBS-URL: https://build.opensuse.org/request/show/333890 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-certifi?expand=0&rev=3 --- certifi-14.05.14.tar.gz | 3 --- certifi-2015.9.6.2.tar.gz | 3 +++ ...on-certifi-shipped-requests-cabundle.patch | 10 ++++---- python-certifi.changes | 15 ++++++++++++ python-certifi.spec | 24 ++++++++++--------- 5 files changed, 36 insertions(+), 19 deletions(-) delete mode 100644 certifi-14.05.14.tar.gz create mode 100644 certifi-2015.9.6.2.tar.gz diff --git a/certifi-14.05.14.tar.gz b/certifi-14.05.14.tar.gz deleted file mode 100644 index 998e407..0000000 --- a/certifi-14.05.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 -size 168608 diff --git a/certifi-2015.9.6.2.tar.gz b/certifi-2015.9.6.2.tar.gz new file mode 100644 index 0000000..8832eac --- /dev/null +++ b/certifi-2015.9.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 +size 368588 diff --git a/python-certifi-shipped-requests-cabundle.patch b/python-certifi-shipped-requests-cabundle.patch index 2793c33..d6a3962 100644 --- a/python-certifi-shipped-requests-cabundle.patch +++ b/python-certifi-shipped-requests-cabundle.patch @@ -1,11 +1,11 @@ ---- a/certifi/core.py.orig 2014-05-16 16:50:08.000000000 +0200 -+++ b/certifi/core.py 2014-12-22 12:28:19.529632069 +0100 -@@ -13,7 +13,7 @@ +--- a/certifi/core.py.orig ++++ b/certifi/core.py +@@ -21,7 +21,7 @@ def where(): f = os.path.split(__file__)[0] - return os.path.join(f, 'cacert.pem') + return "/etc/ssl/ca-bundle.pem" - if __name__ == '__main__': - print(where()) + + def old_where(): diff --git a/python-certifi.changes b/python-certifi.changes index 0ab6d0c..80baa3c 100644 --- a/python-certifi.changes +++ b/python-certifi.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Sep 26 10:27:12 UTC 2015 - toddrme2178@gmail.com + +- Update to version 2015.9.6.2: + * Actually ship weak cert bundle. + * Provide old cert bundle. + * Use secure roots by default. + * Update scripts to use mkcert.org + * Concatenate the two roots + * Add the needed 1024-bit roots + * Move mkcert output to non-core file +- Fix dependencies on SLES 11 +- Certifi is released under MPL-2.0; fix the license tag +- Rebase python-certifi-shipped-requests-cabundle.patch + ------------------------------------------------------------------- Wed Apr 22 13:31:54 UTC 2015 - mcihar@suse.cz diff --git a/python-certifi.spec b/python-certifi.spec index 85bc927..7699b59 100644 --- a/python-certifi.spec +++ b/python-certifi.spec @@ -16,24 +16,26 @@ Name: python-certifi -Version: 14.05.14 +Version: 2015.9.6.2 Release: 0 -License: ISC +License: MPL-2.0 Summary: Python package for providing Mozilla's CA Bundle -Url: http://python-requests.org +Url: https://pypi.python.org/pypi/certifi Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/c/certifi/certifi-%{version}.tar.gz # PATCH-FIX-SUSE -- prefer SUSE certificates -Patch0: python-certifi-shipped-requests-cabundle.patch +Patch0: python-certifi-shipped-requests-cabundle.patch BuildRequires: python-devel -BuildRequires: python-setuptools -%if 0%{?suse_version} -Requires: ca-certificates -%endif +BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else +BuildRequires: ca-certificates +Requires: ca-certificates +%endif +%else BuildArch: noarch %endif @@ -46,7 +48,7 @@ derived from Mozilla Firefox's canonical set. %prep %setup -q -n certifi-%{version} -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} > 1110 %patch0 -p1 %endif @@ -55,7 +57,7 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} > 1110 rm %{buildroot}/%{python_sitelib}/certifi/cacert.pem %endif