diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7e7f634..0000000 --- a/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -httplib2-0.4.0.tar.gz -/httplib2-0.7.2.tar.gz -/httplib2-0.7.4.tar.gz - -/httplib2-0.7.6.tar.gz -/httplib2-0.7.7.tar.gz -/httplib2-0.9.tar.gz -/httplib2-0.9.1.tar.gz -/httplib2-0.9.2.tar.gz -/httplib2-0.10.3.tar.gz -/httplib2-0.11.3.tar.gz -/httplib2-0.13.0.tar.gz -/httplib2-0.13.1.tar.gz -/httplib2-0.14.0.tar.gz -/httplib2-0.15.0.tar.gz -/httplib2-0.16.0.tar.gz -/httplib2-0.17.0.tar.gz -/httplib2-0.17.1.tar.gz -/httplib2-0.17.2.tar.gz -/httplib2-0.17.3.tar.gz -/httplib2-0.17.4.tar.gz -/httplib2-0.18.0.tar.gz -/httplib2-0.18.1.tar.gz -/httplib2-0.19.0.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c9933e8 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +python-httplib2 package is retired on c9s for CS-568 diff --git a/python-httplib2.certfile.patch b/python-httplib2.certfile.patch deleted file mode 100644 index 3d6ab21..0000000 --- a/python-httplib2.certfile.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/python2/httplib2/certs.py b/python2/httplib2/certs.py -index 59d1ffc..a2e7513 100644 ---- a/python2/httplib2/certs.py -+++ b/python2/httplib2/certs.py -@@ -23,6 +23,7 @@ BUILTIN_CA_CERTS = os.path.join( - os.path.dirname(os.path.abspath(__file__)), "cacerts.txt" - ) - -+FEDORA_CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt" - - def where(): - env = os.environ.get("HTTPLIB2_CA_CERTS") -@@ -35,7 +36,7 @@ def where(): - return custom_ca_locater_where() - if certifi_available: - return certifi_where() -- return BUILTIN_CA_CERTS -+ return FEDORA_CA_CERTS - - - if __name__ == "__main__": -diff --git a/python3/httplib2/certs.py b/python3/httplib2/certs.py -index 59d1ffc..2708393 100644 ---- a/python3/httplib2/certs.py -+++ b/python3/httplib2/certs.py -@@ -23,6 +23,8 @@ BUILTIN_CA_CERTS = os.path.join( - os.path.dirname(os.path.abspath(__file__)), "cacerts.txt" - ) - -+FEDORA_CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt" -+ - - def where(): - env = os.environ.get("HTTPLIB2_CA_CERTS") -@@ -35,7 +37,7 @@ def where(): - return custom_ca_locater_where() - if certifi_available: - return certifi_where() -- return BUILTIN_CA_CERTS -+ return FEDORA_CA_CERTS - - - if __name__ == "__main__": -diff --git a/tests/test_cacerts_from_env.py b/tests/test_cacerts_from_env.py -index cb2bd9f..0fed4d5 100644 ---- a/tests/test_cacerts_from_env.py -+++ b/tests/test_cacerts_from_env.py -@@ -7,6 +7,7 @@ import httplib2 - - - CA_CERTS_BUILTIN = os.path.join(os.path.dirname(httplib2.__file__), "cacerts.txt") -+FEDORA_CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt" - CERTIFI_CERTS_FILE = "unittest_certifi_file" - CUSTOM_CA_CERTS = "unittest_custom_ca_certs" - -@@ -32,7 +33,7 @@ def ca_certs_tmpfile(clean_env): - @mock.patch("httplib2.certs.certifi_available", False) - @mock.patch("httplib2.certs.custom_ca_locater_available", False) - def test_certs_file_from_builtin(clean_env): -- assert httplib2.certs.where() == CA_CERTS_BUILTIN -+ assert httplib2.certs.where() == FEDORA_CA_CERTS - - - @mock.patch("httplib2.certs.certifi_available", False) -@@ -44,7 +45,7 @@ def test_certs_file_from_environment(ca_certs_tmpfile): - with pytest.raises(RuntimeError): - httplib2.certs.where() - os.environ.pop("HTTPLIB2_CA_CERTS") -- assert httplib2.certs.where() == CA_CERTS_BUILTIN -+ assert httplib2.certs.where() == FEDORA_CA_CERTS - - - @mock.patch("httplib2.certs.certifi_where", mock.MagicMock(return_value=CERTIFI_CERTS_FILE)) -@@ -69,4 +70,4 @@ def test_with_certifi_removed_from_modules(ca_certs_tmpfile): - os.environ["HTTPLIB2_CA_CERTS"] = ca_certs_tmpfile - assert httplib2.certs.where() == ca_certs_tmpfile - os.environ.pop("HTTPLIB2_CA_CERTS") -- assert httplib2.certs.where() == CA_CERTS_BUILTIN -+ assert httplib2.certs.where() == FEDORA_CA_CERTS diff --git a/python-httplib2.nomock.patch b/python-httplib2.nomock.patch deleted file mode 100644 index fae803d..0000000 --- a/python-httplib2.nomock.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/requirements-test.txt b/requirements-test.txt -index d208a8f..623875e 100644 ---- a/requirements-test.txt -+++ b/requirements-test.txt -@@ -1,6 +1,6 @@ - flake8==3.4.1 - future==0.16.0 --mock==2.0.0 -+mock==2.0.0;python_version<"3.3" - pytest-cov==2.5.1 - pytest-forked==0.2 - pytest-randomly==1.2.1 -diff --git a/tests/test_cacerts_from_env.py b/tests/test_cacerts_from_env.py -index cb2bd9f..f04ba0e 100644 ---- a/tests/test_cacerts_from_env.py -+++ b/tests/test_cacerts_from_env.py -@@ -1,6 +1,9 @@ - import os - import sys --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - import pytest - import tempfile - import httplib2 -diff --git a/tests/test_http.py b/tests/test_http.py -index f61992c..65bac01 100644 ---- a/tests/test_http.py -+++ b/tests/test_http.py -@@ -5,7 +5,10 @@ from __future__ import print_function - import email.utils - import errno - import httplib2 --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - import os - import pytest - from six.moves import http_client, urllib -diff --git a/tests/test_other.py b/tests/test_other.py -index 0f450ab..6b902b9 100644 ---- a/tests/test_other.py -+++ b/tests/test_other.py -@@ -1,5 +1,8 @@ - import httplib2 --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - import os - import pickle - import pytest -diff --git a/tests/test_proxy.py b/tests/test_proxy.py -index edafe01..556b448 100644 ---- a/tests/test_proxy.py -+++ b/tests/test_proxy.py -@@ -9,7 +9,10 @@ from __future__ import division - from __future__ import print_function - - import httplib2 --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - import os - import pytest - import socket diff --git a/python-httplib2.spec b/python-httplib2.spec deleted file mode 100644 index f9f3dbf..0000000 --- a/python-httplib2.spec +++ /dev/null @@ -1,326 +0,0 @@ -%global srcname httplib2 - -Name: python-%{srcname} -Version: 0.19.0 -Release: 3%{?dist} -Summary: Comprehensive HTTP client library -License: MIT -URL: https://pypi.python.org/pypi/httplib2 -Source: https://github.com/httplib2/httplib2/archive/v%{version}/%{srcname}-%{version}.tar.gz -# -# Patch to use the Fedora ca certs instead of the bundled ones -# -Patch1: python-%{srcname}.certfile.patch -# -# Patch to use mock from the standard library, upstream PR#185 -# -Patch2: python-%{srcname}.nomock.patch - -BuildArch: noarch - -%global _description\ -A comprehensive HTTP client library that supports many features left out of\ -other HTTP libraries. - -%description %{_description} - -%package -n python3-%{srcname} -Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pytest -BuildRequires: python3-pytest-forked -BuildRequires: python3-pytest-flake8 -BuildRequires: python3-pytest-timeout -BuildRequires: python3-six - -%description -n python3-%{srcname} %{_description} - - -%prep -%autosetup -p1 -n %{srcname}-%{version} -rm -r python2 - -# Drop coverage -sed -i '/--cov/d' setup.cfg - - -%build -%py3_build - - -%install -%py3_install - - -%check -PYTHONPATH=%{buildroot}%{python3_sitelib} pytest -k "not test_unknown_server \ - and not test_socks5_auth and not \ - test_server_not_found_error_is_raised_for_invalid_hostname and not \ - test_functional_noproxy_star_https and not \ - test_sni_set_servername_callback and not test_not_trusted_ca and not \ - test_invalid_ca_certs_path and not test_max_tls_version and not \ - test_get_301_via_https and not test_client_cert_password_verified and not\ - test_get_via_https and not test_min_tls_version and not\ - test_client_cert_verified" - - -%files -n python3-%{srcname} -%doc README.md -%{python3_sitelib}/%{srcname}-*.egg-info/ -%{python3_sitelib}/%{srcname}/ - -%changelog -* Fri Apr 16 2021 Mohan Boddu - 0.19.0-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Wed Mar 3 2021 Pavel Cahyna - 0.19.0-2 -- Remove unused python3-pytest-cov build dependency -- Use mock from the standard library, remove build dependency - on the deprecated python-mock package - -* Sun Feb 07 2021 Kevin Fenzi - 0.19.0-1 -- Update t0 0.19.0. Fixes rhbz#1925988 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.18.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Jan 02 2021 Miro Hrončok - 0.18.1-9 -- Disable Python 2 build entirely - -* Tue Nov 24 2020 Miro Hrončok - 0.18.1-8 -- Disable Python 2 build on RHEL 9+ - -* Fri Sep 04 2020 Joel Capitao - 0.18.1-7 -- Remove unused BR - -* Wed Aug 05 2020 Gwyn Ciesla - 0.18.1-6 -- Disable tests related to PySocks bug. - -* Sat Aug 01 2020 Fedora Release Engineering - 0.18.1-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.18.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 11 2020 Gwyn Ciesla - 0.18.1-3 -- BR fixes. - -* Fri May 22 2020 Miro Hrončok - 0.18.1-2 -- Rebuilt for Python 3.9 - -* Wed May 20 2020 Gwyn Ciesla - 0.18.1-1 -- 0.18.1 - -* Wed May 20 2020 Gwyn Ciesla - 0.18.0-1 -- 0.18.0 - -* Wed May 20 2020 Gwyn Ciesla - 0.17.4-1 -- 0.17.4 - -* Mon May 04 2020 Miro Hrončok - 0.17.3-3 -- Fix python2/python3 mishmash (#1830222) -- Run tests - -* Wed Apr 22 2020 Igor Raits - 0.17.3-2 -- Cleanup spec - -* Wed Apr 22 2020 Gwyn Ciesla - 0.17.3-1 -- 0.17.3 - -* Mon Apr 13 2020 Gwyn Ciesla - 0.17.2-1 -- 0.17.2 - -* Thu Apr 02 2020 Gwyn Ciesla - 0.17.1-1 -- 0.17.1 - -* Thu Jan 30 2020 Fedora Release Engineering - 0.17.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 24 2020 Gwyn Ciesla - 0.17.0-1 -- 0.17.0 - -* Fri Jan 17 2020 Gwyn Ciesla - 0.16.0-1 -- 0.16.0 - -* Thu Dec 19 2019 Gwyn Ciesla - 0.15.0-1 -- 0.15.0 - -* Wed Nov 06 2019 Gwyn Ciesla - 0.14.0-1 -- 0.14.0 - -* Thu Oct 03 2019 Miro Hrončok - 0.13.1-2 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Thu Aug 22 2019 Kevin Fenzi - 0.13.1-1 -- Update to 0.13.1. Fixes bug #1742362 - -* Thu Aug 15 2019 Miro Hrončok - 0.13.0-3 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jun 30 2019 Kevin Fenzi - 0.13.0-1 -- Update to 0.13.0. - -* Tue Apr 23 2019 Kevin Fenzi - 0.12.3-1 -- Update to 0.12.3. - -* Sat Feb 02 2019 Fedora Release Engineering - 0.11.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 21 2018 Kevin Fenzi - 0.11.3-5 -- Fix files section on python2 subpackage. - -* Fri Jul 20 2018 Kevin Fenzi - 0.11.3-4 -- Fix FTBFS bug #1605725 - -* Sat Jul 14 2018 Fedora Release Engineering - 0.11.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 15 2018 Miro Hrončok - 0.11.3-2 -- Rebuilt for Python 3.7 - -* Sun Jun 10 2018 Kevin Fenzi - 0.11.3-1 -- Update to 0.11.3. Fixes bug #1559204 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.10.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 11 2017 Nick Bebout - 0.10.3-2 -- Fix BuildRequires to use python2-* instead of python-* - -* Sun Sep 10 2017 Nick Bebout - 0.10.3-1 -- Update to 0.10.3 - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.9.2-7 -- Python 2 binary package renamed to python2-httplib2 - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Jul 27 2017 Fedora Release Engineering - 0.9.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 0.9.2-4 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 0.9.2-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Dec 26 2015 Kevin Fenzi - 0.9.2-1 -- Update to 0.9.2 - -* Tue Nov 10 2015 Fedora Release Engineering - 0.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Jun 18 2015 Fedora Release Engineering - 0.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Apr 12 2015 Kevin Fenzi 0.9.1-1 -- Update to 0.9.1 and drop upstreamed patches - -* Fri Apr 03 2015 Kevin Fenzi 0.9-6 -- Add patch to fix http over proxy. Fixes bug #857514 -- Add patch to fix CVE-2013-2037. Fixes bug #958640 -- Add patch to fix binary headers in python3. Fixes bug #1205127 - -* Mon Jan 12 2015 Adam Williamson - 0.9-5 -- certfile.patch: use /etc/pki/tls not /etc/ssl/certs, patch python3 too - -* Mon Jun 30 2014 Toshio Kuratomi - 0.9-4 -- Replace python-setuptools-devel BR with python-setuptools - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Kalev Lember - 0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Fri May 23 2014 Kevin Fenzi 0.9-1 -- Update to 0.9 - -* Wed May 14 2014 Bohuslav Kabrda - 0.7.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.7.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.7.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jan 02 2013 Ding-Yi Chen - 0.7.7-1 -- Upstream update to 0.7.7 - -* Sat Aug 04 2012 David Malcolm - 0.7.4-7 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Fri Jul 27 2012 Ding-Yi Chen - 0.7.4-6 -- Fixed Bug 840968 - SSL errors when the site certificate contains - subjectAltName but DNS is not in it - -* Sat Jul 21 2012 Fedora Release Engineering - 0.7.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 22 2012 Ding-Yi Chen - 0.7.4-4 -- Unify the spec file between EPEL and Fedora. - -* Thu Jun 21 2012 Ding-Yi Chen - 0.7.4-3 -- Applied patch suggested by richardfearn@gmail.com regarding issue 208 -- Fixed: Bug 832344 - Certification validation fails due to multiple 'dns' entries in subjectAltName - -* Fri Jun 01 2012 Ding-Yi Chen - 0.7.4-2 -- Upstream update for Fedora - -* Thu May 03 2012 Ding-Yi Chen - 0.7.4-1 -- Upstream update to 0.7.4 -- Applied patch suggested in issue 208 - -* Fri Feb 24 2012 Ding-Yi Chen - 0.7.2-1 -- Upstream update to 0.7.2 - Which may fixed http://code.google.com/p/httplib2/issues/detail?id=62 - Note this version uses fedora's cert file bundle instead of httplib2 - default. - -* Sat Jan 14 2012 Fedora Release Engineering - 0.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jul 29 2011 Ding-Yi Chen - 0.4.0-5.el6 -- Apply that address python-httplib2 (GoogleCode Hosted) issue 39 - http://code.google.com/p/httplib2/issues/detail?id=39 - -* Tue Feb 08 2011 Fedora Release Engineering - 0.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Aug 25 2010 Thomas Spura - 0.6.0-4 -- rebuild with python3.2 - http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html - -* Thu Jul 22 2010 David Malcolm - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Apr 20 2010 Tom "spot" Callaway -- minor spec cleanups -- enable python3 support - -* Fri Apr 02 2010 Andreas Bierfert - 0.6.0-1 -- version upgrade (#566721) - -* Sun Jul 26 2009 Fedora Release Engineering - 0.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.4.0-2 -- Rebuild for Python 2.6 - -* Thu Dec 27 2007 Andreas Bierfert - 0.4.0-1 -- initial version diff --git a/sources b/sources deleted file mode 100644 index f21c427..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (httplib2-0.19.0.tar.gz) = f929627118e8e443ee80b6dd7eb936fb5fdc4ae3f0b04381fb1bcdd4498be940fa2c307e63b0ca3512732c55ac1c8c6f4b83d6a5ba8bf8ee0aa0a4ebddbf93a2