rpms/python-httplib2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

certfile.patch: use /etc/pki/tls not /etc/ssl/certs, patch py3

Browse Source
This commit is contained in:
Adam Williamson 2015-01-12 18:04:41 -08:00
parent e091ca992c
commit 4ec5e02d1c
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python-httplib2.certfile.patch
View File

@ -9,8 +9,23 @@ diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/ht
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") - os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# CA_CERTS = os.path.join( +# CA_CERTS = os.path.join(
+# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") +# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# We use fedora ca bundle file instead, to preserve backward compability. +# Use Fedora system-wide shared certificate store for security, consistency.
+ CA_CERTS = "/etc/ssl/certs/ca-bundle.crt" + CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
# Which headers are hop-by-hop headers by default # Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
--- httplib2-0.9/python3/httplib2/__init__.py 2014-04-14 05:52:57.000000000 -0700
+++ httplib2-0.9/python3/httplib2/__init__.py.new 2015-01-12 17:22:19.815505848 -0800
@@ -124,8 +124,10 @@
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
# Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+#CA_CERTS = os.path.join(
+# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# Use Fedora system-wide shared certificate store for security, consistency.
+CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
def _get_end2end_headers(response):
hopbyhop = list(HOP_BY_HOP)

8
python-httplib2.spec
View File

@ -10,12 +10,15 @@
Name: python-httplib2 Name: python-httplib2
Version: 0.9 Version: 0.9
Release: 4%{?dist} Release: 5%{?dist}
Summary: A comprehensive HTTP client library Summary: A comprehensive HTTP client library
Group: System Environment/Libraries Group: System Environment/Libraries
License: MIT License: MIT
URL: https://pypi.python.org/pypi/httplib2 URL: https://pypi.python.org/pypi/httplib2
Source0: https://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz Source0: https://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz
# See also the 'locater plugin' system httplib2 now allows, and
# https://github.com/dreamhost/httplib2-ca_certs_locater
# It's kind of problematic, though: https://github.com/jcgregorio/httplib2/issues/293
Patch1: %{name}.certfile.patch Patch1: %{name}.certfile.patch
Patch2: %{name}.getCertHost.patch Patch2: %{name}.getCertHost.patch
Patch3: %{name}.rfc2459.patch Patch3: %{name}.rfc2459.patch
@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%endif # with_python3 %endif # with_python3
%changelog %changelog
* Mon Jan 12 2015 Adam Williamson <awilliam@redhat.com> - 0.9-5
- certfile.patch: use /etc/pki/tls not /etc/ssl/certs, patch python3 too
* Mon Jun 30 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 0.9-4 * Mon Jun 30 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 0.9-4
- Replace python-setuptools-devel BR with python-setuptools - Replace python-setuptools-devel BR with python-setuptools