fix httplib2-0.19.0-r1, add missing patch from main
This commit is contained in:
parent
0c2b8cbf14
commit
63300f5985
GPG Key ID:
E6DB12C8C550F3C0
@ -496,11 +496,11 @@ From time to time a fresh compile test on empty boxes (one with Python 3.9 and o
|
||||
|
||||
## Licenses
|
||||
This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
|
||||
There are 1788 Ebuilds in total, 1780 of them have in total 1789 (34 different) licenses assigned.
|
||||
There are 1786 Ebuilds in total, 1778 of them have in total 1787 (34 different) licenses assigned.
|
||||
|
||||
|License| Ebuilds using it|
|
||||
|-------|-----|
|
||||
|MIT|1076|
|
||||
|MIT|1074|
|
||||
|Apache-2.0|330|
|
||||
|BSD|107|
|
||||
|GPL-3|105|
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d7efe2ae587808c7d9ce23ad0f8b507f51751054cd7079bfca55f9b3496b4806180f28da9acf0dd812ff16f14d9bb03749e7 SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f
|
||||
DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
|
||||
DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
|
||||
AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
|
||||
DIST httplib2-0.19.0.tar.gz 263522 BLAKE2B b35c8dcf86de17a5d8eac86a9a6b4110fb247925662e24a7645a67dfd0b2e640dc29875b41673c5a91a083f17e9619fd40dd08cf2c9ee7f48c8069bc14a50966 SHA512 9193a0e8e9a58a3f0e9b27fdf827932482a47b88af297af6e5f004164ca0b72feeff513b8191bf7c48d6714070a1390ae54eb8a2c6840f54f2580889c7837c7f
|
||||
EBUILD httplib2-0.10.3-r1.ebuild 940 BLAKE2B 8fa30ed12d359fdeb65c8930a0e22ebe85e5ee3548921e706c58485fbd8c227eb56ef74cd6429c19e4d8e702b236ab92ca858664d83b218a0d1cbd7fd93ff799 SHA512 d817e1339ea214b37cfb088bace648c147393fa046eaa5f9ac704a4819d3140a551ea4689c3b1811247eaedbe33394b7a0fac909bf7d83275338b46cd45e914f
|
||||
EBUILD httplib2-0.18.1.ebuild 941 BLAKE2B 9078882a0a09f20737ff3a6daf0ac7228cb787e41b56242602768e6c138618fd0632f4b9a2fa63cbba36b9368946ce1170148f748c9a697270001631f6ff9269 SHA512 4f050e2d3c24e0d4dae2a52a4b50eebc8dd851355825932cd25faaf20368197b1b7e17deb8dbeff479749a456ff580d3c0cdb042031778f553ebf00fa47baa66
|
||||
EBUILD httplib2-0.19.0-r1.ebuild 1425 BLAKE2B 39dc1661a77d2b75d5d680fa60e368b465d48ae096364a6bc10ffeb57029e97b4c76fb63ff9a3bd215423f1a0b10b1324e6bb7edc177cb0aa513833d8ee1fec2 SHA512 ac7e3f9a105fb0b7a834377c3582a19ae34c14e83d3d4238110e8fc3694bd391778c98dcb443d7e7ff163d5447b8616b6e1cdc4abf9c82262e885a8760aafdc1
|
||||
EBUILD httplib2-0.19.0-r1.ebuild 1421 BLAKE2B 88ec6ded5b9af1ae27f2355ff7f61e71f5fe5bb41721b5a05ea7b1e2f6801cef61bc79bcef5b588fbf5fb5a884c0aa249f0cc135d4405dbcf376f696616c25f6 SHA512 468bff0515bdec5011be7abef31ae3f305640c0387905b44c9119af2c30127b4b6c95c24e6790d04ac917efa5f5f66d506cd960a2de4118ba2efc8ea1e725dc1
|
||||
MISC metadata.xml 451 BLAKE2B cfd70c4b4a9dce8c74291054a4188d758d574db0128a8c95faef95a30c2ec23cddb234e3c69063b924918227b6c196f59fe1145ba4ba7ae1cede855266088938 SHA512 27b81fbfc3e05fa676fe87b3c8940726734854bd67388dde76041e54fef4a89643bf6422f00de196af4d436eb18f6613a56a8015ec5dfb0434c9d2128cb3c32e
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
--- a/python2/httplib2/certs.py
|
||||
+++ b/python2/httplib2/certs.py
|
||||
@@ -19,9 +19,7 @@ except ImportError:
|
||||
pass
|
||||
|
||||
|
||||
-BUILTIN_CA_CERTS = os.path.join(
|
||||
- os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
|
||||
-)
|
||||
+BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
|
||||
def where():
|
||||
--- a/python3/httplib2/certs.py
|
||||
+++ b/python3/httplib2/certs.py
|
||||
@@ -19,9 +19,7 @@ except ImportError:
|
||||
pass
|
||||
|
||||
|
||||
-BUILTIN_CA_CERTS = os.path.join(
|
||||
- os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
|
||||
-)
|
||||
+BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
|
||||
def where():
|
||||
@ -1,59 +0,0 @@
|
||||
From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
|
||||
From: Marc Deslauriers <marc.deslauriers@canonical.com>
|
||||
Date: Thu, 8 Oct 2015 12:15:44 -0700
|
||||
Subject: Use system ca certificates, not the bundled ones
|
||||
|
||||
Forwarded: not-needed
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/882027
|
||||
|
||||
Patch-Name: use_system_cacerts.patch
|
||||
---
|
||||
python2/httplib2/__init__.py | 5 ++---
|
||||
python3/httplib2/__init__.py | 5 ++---
|
||||
setup.py | 1 -
|
||||
3 files changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
|
||||
index 6fa3cc6..e996d01 100644
|
||||
--- a/python2/httplib2/__init__.py
|
||||
+++ b/python2/httplib2/__init__.py
|
||||
@@ -190,9 +190,8 @@ try:
|
||||
import ca_certs_locater
|
||||
CA_CERTS = ca_certs_locater.get()
|
||||
except ImportError:
|
||||
- # Default CA certificates file bundled with httplib2.
|
||||
- CA_CERTS = os.path.join(
|
||||
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+ # Use system CA certificates
|
||||
+ CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
# Which headers are hop-by-hop headers by default
|
||||
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
||||
diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
|
||||
index 3ce019e..8383cc4 100644
|
||||
--- a/python3/httplib2/__init__.py
|
||||
+++ b/python3/httplib2/__init__.py
|
||||
@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
|
||||
# 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 CA certificates
|
||||
+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
def _get_end2end_headers(response):
|
||||
hopbyhop = list(HOP_BY_HOP)
|
||||
diff --git a/setup.py b/setup.py
|
||||
index fb00ed2..2c31f44 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou
|
||||
""",
|
||||
package_dir=pkgdir,
|
||||
packages=['httplib2'],
|
||||
- package_data={'httplib2': ['*.txt']},
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Environment :: Web Environment',
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4..8} pypy pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A comprehensive HTTP client library"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="app-misc/ca-certificates"
|
||||
|
||||
# tests connect to random remote sites
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch )
|
||||
|
||||
python_prepare_all() {
|
||||
chmod o+r */*egg*/* || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
if [[ ${EPYTHON} == python2.7 ]] ; then
|
||||
cd python2 || die
|
||||
else
|
||||
cd python3 || die
|
||||
fi
|
||||
|
||||
"${PYTHON}" httplib2test.py || die
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4..8} pypy pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A comprehensive HTTP client library"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="app-misc/ca-certificates"
|
||||
|
||||
# tests connect to random remote sites
|
||||
RESTRICT="test"
|
||||
|
||||
#PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch )
|
||||
|
||||
python_prepare_all() {
|
||||
chmod o+r */*egg*/* || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
if [[ ${EPYTHON} == python2.7 ]] ; then
|
||||
cd python2 || die
|
||||
else
|
||||
cd python3 || die
|
||||
fi
|
||||
|
||||
"${PYTHON}" httplib2test.py || die
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
|
||||
RDEPEND="
|
||||
app-misc/ca-certificates
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user