1 |
commit: d6794c2701249dd6b435aee6b36c066db5bec305 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 4 20:05:35 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 4 20:34:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6794c27 |
7 |
|
8 |
dev-python/httplib2: Clean old up |
9 |
|
10 |
dev-python/httplib2/Manifest | 1 - |
11 |
.../files/python-httplib2-0.9-cve-2013-2037.patch | 21 ----------- |
12 |
dev-python/httplib2/httplib2-0.10.3.ebuild | 37 ------------------- |
13 |
dev-python/httplib2/httplib2-0.9.2-r2.ebuild | 41 ---------------------- |
14 |
4 files changed, 100 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest |
17 |
index 3f7bddd40c3..3e45a6dcbfd 100644 |
18 |
--- a/dev-python/httplib2/Manifest |
19 |
+++ b/dev-python/httplib2/Manifest |
20 |
@@ -1,2 +1 @@ |
21 |
DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa |
22 |
-DIST httplib2-0.9.2.tar.gz 205165 BLAKE2B 8bcd1b5786ef2bac51d31766f2477e05cb942feb5edc829ef8d13cd256169da3fb812880fe422e61c3c14d268833e38686452916b5cfc7e0ed1cff17bad6dcfb SHA512 cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8 |
23 |
|
24 |
diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch |
25 |
deleted file mode 100644 |
26 |
index 6a09337b199..00000000000 |
27 |
--- a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch |
28 |
+++ /dev/null |
29 |
@@ -1,21 +0,0 @@ |
30 |
-diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py |
31 |
---- httplib2-0.9.orig/python2/httplib2/__init__.py 2015-04-03 13:10:43.401035131 -0600 |
32 |
-+++ httplib2-0.9/python2/httplib2/__init__.py 2015-04-03 13:10:08.470685647 -0600 |
33 |
-@@ -1042,7 +1042,7 @@ |
34 |
- raise CertificateHostnameMismatch( |
35 |
- 'Server presented certificate that does not match ' |
36 |
- 'host %s: %s' % (hostname, cert), hostname, cert) |
37 |
-- except ssl_SSLError, e: |
38 |
-+ except (ssl_SSLError, CertificateHostnameMismatch), e: |
39 |
- if sock: |
40 |
- sock.close() |
41 |
- if self.sock: |
42 |
-@@ -1052,7 +1052,7 @@ |
43 |
- # to get at more detailed error information, in particular |
44 |
- # whether the error is due to certificate validation or |
45 |
- # something else (such as SSL protocol mismatch). |
46 |
-- if e.errno == ssl.SSL_ERROR_SSL: |
47 |
-+ if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL: |
48 |
- raise SSLHandshakeError(e) |
49 |
- else: |
50 |
- raise |
51 |
|
52 |
diff --git a/dev-python/httplib2/httplib2-0.10.3.ebuild b/dev-python/httplib2/httplib2-0.10.3.ebuild |
53 |
deleted file mode 100644 |
54 |
index a12c08521b0..00000000000 |
55 |
--- a/dev-python/httplib2/httplib2-0.10.3.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,37 +0,0 @@ |
58 |
-# Copyright 1999-2017 Gentoo Foundation |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI=6 |
62 |
- |
63 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) |
64 |
- |
65 |
-inherit distutils-r1 |
66 |
- |
67 |
-DESCRIPTION="A comprehensive HTTP client library" |
68 |
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2" |
69 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
70 |
- |
71 |
-LICENSE="MIT" |
72 |
-SLOT="0" |
73 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
74 |
-IUSE="" |
75 |
- |
76 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
77 |
- |
78 |
-# tests connect to random remote sites |
79 |
-RESTRICT="test" |
80 |
- |
81 |
-python_prepare_all() { |
82 |
- chmod o+r */*egg*/* || die |
83 |
- distutils-r1_python_prepare_all |
84 |
-} |
85 |
- |
86 |
-python_test() { |
87 |
- if [[ ${EPYTHON} == python2.7 ]] ; then |
88 |
- cd python2 || die |
89 |
- else |
90 |
- cd python3 || die |
91 |
- fi |
92 |
- |
93 |
- "${PYTHON}" httplib2test.py || die |
94 |
-} |
95 |
|
96 |
diff --git a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild |
97 |
deleted file mode 100644 |
98 |
index 063a7624efe..00000000000 |
99 |
--- a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild |
100 |
+++ /dev/null |
101 |
@@ -1,41 +0,0 @@ |
102 |
-# Copyright 1999-2017 Gentoo Foundation |
103 |
-# Distributed under the terms of the GNU General Public License v2 |
104 |
- |
105 |
-EAPI=6 |
106 |
- |
107 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) |
108 |
- |
109 |
-inherit distutils-r1 |
110 |
- |
111 |
-DESCRIPTION="A comprehensive HTTP client library" |
112 |
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2" |
113 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
114 |
- |
115 |
-LICENSE="MIT" |
116 |
-SLOT="0" |
117 |
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" |
118 |
-IUSE="" |
119 |
- |
120 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
121 |
- |
122 |
-# tests connect to random remote sites |
123 |
-RESTRICT="test" |
124 |
- |
125 |
-PATCHES=( |
126 |
- "${FILESDIR}/python-httplib2-0.9-cve-2013-2037.patch" |
127 |
-) |
128 |
- |
129 |
-python_prepare_all() { |
130 |
- chmod o+r */*egg*/* || die |
131 |
- distutils-r1_python_prepare_all |
132 |
-} |
133 |
- |
134 |
-python_test() { |
135 |
- if [[ ${EPYTHON} == python2.7 ]] ; then |
136 |
- cd python2 || die |
137 |
- else |
138 |
- cd python3 || die |
139 |
- fi |
140 |
- |
141 |
- "${PYTHON}" httplib2test.py || die |
142 |
-} |