rpm/python-httplib2
SHA256
1
0
Fork 0
forked from pool/python-httplib2
Code Pull Requests Activity

- Don't ship private copy of Mozilla NSS certs, use system certs

Browse Source 
instead (bnc#761162)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=17
This commit is contained in:
Sascha Peilicke 2012-06-20 11:42:51 +00:00 committed by Git OBS Bridge
parent 7a36ed553e
commit 9e561e42a6
3 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
httplib2-use-system-certs.patch Normal file
View File

@ -0,0 +1,45 @@
Only in a/python2/httplib2: cacerts.txt
diff -ru a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
--- a/python2/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100
+++ b/python2/httplib2/__init__.py 2012-06-20 13:30:39.524140796 +0200
@@ -180,9 +180,8 @@
# requesting that URI again.
DEFAULT_MAX_REDIRECTS = 5
-# Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# Use system-wide CA certificates:
+CA_CERTS = '/etc/ssl/ca-bundle.pem'
# Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
Only in b/python2/httplib2: .__init__.py.swp
Only in a/python3/httplib2: cacerts.txt
diff -ru a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
--- a/python3/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100
+++ b/python3/httplib2/__init__.py 2012-06-20 13:30:22.156140376 +0200
@@ -119,9 +119,8 @@
# Which headers are hop-by-hop headers by default
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")
+# Use system-wide CA certificates:
+CA_CERTS = '/etc/ssl/ca-bundle.pem'
def _get_end2end_headers(response):
hopbyhop = list(HOP_BY_HOP)
Only in b/python3/httplib2: .__init__.py.swp
diff -ru a/setup.py b/setup.py
--- a/setup.py 2012-03-02 21:12:34.000000000 +0100
+++ b/setup.py 2012-06-20 13:28:26.560137617 +0200
@@ -63,7 +63,6 @@
""",
package_dir=pkgdir,
packages=['httplib2'],
- package_data={'httplib2': ['*.txt']},
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Web Environment',

6
python-httplib2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 20 11:41:56 UTC 2012 - saschpe@suse.de
- Don't ship private copy of Mozilla NSS certs, use system certs
instead (bnc#761162)
-------------------------------------------------------------------
Tue Jun 5 09:56:01 UTC 2012 - cstender@opensuse.org

19
python-httplib2.spec
View File

@ -24,14 +24,17 @@ Summary: A Python HTTP client library
License: MIT
Group: Development/Libraries/Python
Source0: httplib2-%{version}.tar.gz
# PATCH-FIX-OPENSUSE: Don't ship private copy of Mozilla NSS certs, use system certs instead (bnc#761162)
Patch0: httplib2-use-system-certs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ca-certificates
BuildRequires: python-devel
%if 0%{?suse_version}
%py_requires
%if 0%{?suse_version} > 1110
Requires: ca-certificates
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
BuildArch: noarch
%endif
%endif
%description
A comprehensive HTTP client library that supports many features
@ -39,15 +42,17 @@ left out of other HTTP libraries.
%prep
%setup -q -n httplib2-%{version}
%patch0 -p1
%build
python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%files -f INSTALLED_FILES
%files
%defattr(-,root,root)
%doc CHANGELOG README
%doc README
%{python_sitelib}/*
%changelog