1 |
commit: 0dc1682bd1f57adfc6eaf2950548b180b3ea0a2f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 17 14:06:13 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 17 14:06:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc1682b |
7 |
|
8 |
dev-python/cryptography: Remove old versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/cryptography/Manifest | 6 -- |
13 |
.../cryptography/cryptography-2.2.2-r1.ebuild | 70 -------------------- |
14 |
dev-python/cryptography/cryptography-2.3.1.ebuild | 68 ------------------- |
15 |
dev-python/cryptography/cryptography-2.3.ebuild | 68 ------------------- |
16 |
dev-python/cryptography/cryptography-2.4.2.ebuild | 68 ------------------- |
17 |
dev-python/cryptography/cryptography-2.5.ebuild | 68 ------------------- |
18 |
dev-python/cryptography/cryptography-2.7.ebuild | 66 ------------------- |
19 |
dev-python/cryptography/files/CVE-2018-10903.patch | 76 ---------------------- |
20 |
.../cryptography-2.1.4-libressl-2.7-x509.patch | 23 ------- |
21 |
.../cryptography-2.1.4-libressl-2.7-x509_vfy.patch | 73 --------------------- |
22 |
10 files changed, 586 deletions(-) |
23 |
|
24 |
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest |
25 |
index dbf81720002..ee134edad07 100644 |
26 |
--- a/dev-python/cryptography/Manifest |
27 |
+++ b/dev-python/cryptography/Manifest |
28 |
@@ -1,8 +1,2 @@ |
29 |
-DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9 |
30 |
-DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1 |
31 |
-DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52 |
32 |
-DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28 |
33 |
-DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f |
34 |
DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39 |
35 |
-DIST cryptography-2.7.tar.gz 495877 BLAKE2B 48654897ff6ecd2fcf732b2d0378b806a9162c07c9e8349128593f4e28b3df222ac6a9cc19bc9342d303d1930bfb12747f9831f2a1bc42b1e784d85d69f0bf00 SHA512 fa420f44b038b6fe1983c6f2c6d830e2668017c26e1e125ad621e37ea627a927ffe64d0e987e0a26dcc260834f2ec817cccd22da03b892190f46cb6e8131a5a8 |
36 |
DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7 |
37 |
|
38 |
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index b3af716f887..00000000000 |
41 |
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,70 +0,0 @@ |
44 |
-# Copyright 1999-2019 Gentoo Authors |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI=6 |
48 |
- |
49 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
50 |
-PYTHON_REQ_USE="threads(+)" |
51 |
- |
52 |
-inherit distutils-r1 flag-o-matic |
53 |
- |
54 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
55 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
56 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
57 |
- |
58 |
-LICENSE="|| ( Apache-2.0 BSD )" |
59 |
-SLOT="0" |
60 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" |
61 |
-IUSE="libressl test" |
62 |
-RESTRICT="!test? ( test )" |
63 |
- |
64 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
65 |
-# It'd theb be able to go into the || section again |
66 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
67 |
-# the following is the original section, disallowing bindist entirely |
68 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
69 |
-RDEPEND=" |
70 |
- !libressl? ( |
71 |
- dev-libs/openssl:0= ( |
72 |
- || ( |
73 |
- dev-libs/openssl:0[-bindist(-)] |
74 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
75 |
- ) |
76 |
- ) |
77 |
- ) |
78 |
- libressl? ( dev-libs/libressl:0= ) |
79 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') |
80 |
- >=dev-python/idna-2.1[${PYTHON_USEDEP}] |
81 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
82 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
83 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
84 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
85 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
86 |
- " |
87 |
-DEPEND="${RDEPEND} |
88 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
89 |
- test? ( |
90 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
91 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
92 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
93 |
- dev-python/pretend[${PYTHON_USEDEP}] |
94 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
95 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
96 |
- dev-python/pytz[${PYTHON_USEDEP}] |
97 |
- )" |
98 |
- |
99 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
100 |
- |
101 |
-PATCHES=( |
102 |
- "${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch |
103 |
- "${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch |
104 |
- "${FILESDIR}"/CVE-2018-10903.patch |
105 |
-) |
106 |
- |
107 |
-python_configure_all() { |
108 |
- append-cflags $(test-flags-CC -pthread) |
109 |
-} |
110 |
- |
111 |
-python_test() { |
112 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
113 |
-} |
114 |
|
115 |
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild |
116 |
deleted file mode 100644 |
117 |
index a55307607e9..00000000000 |
118 |
--- a/dev-python/cryptography/cryptography-2.3.1.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,68 +0,0 @@ |
121 |
-# Copyright 1999-2019 Gentoo Authors |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
- |
124 |
-EAPI=6 |
125 |
- |
126 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
127 |
-PYTHON_REQ_USE="threads(+)" |
128 |
- |
129 |
-inherit distutils-r1 flag-o-matic |
130 |
- |
131 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
132 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
133 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
134 |
- |
135 |
-LICENSE="|| ( Apache-2.0 BSD )" |
136 |
-SLOT="0" |
137 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
138 |
-IUSE="libressl test" |
139 |
-RESTRICT="!test? ( test )" |
140 |
- |
141 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
142 |
-# It'd theb be able to go into the || section again |
143 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
144 |
-# the following is the original section, disallowing bindist entirely |
145 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
146 |
-RDEPEND=" |
147 |
- !libressl? ( |
148 |
- dev-libs/openssl:0= ( |
149 |
- || ( |
150 |
- dev-libs/openssl:0[-bindist(-)] |
151 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
152 |
- ) |
153 |
- ) |
154 |
- ) |
155 |
- libressl? ( dev-libs/libressl:0= ) |
156 |
- >=dev-python/idna-2.1[${PYTHON_USEDEP}] |
157 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
158 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
159 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
160 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
161 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
162 |
- " |
163 |
-DEPEND="${RDEPEND} |
164 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
165 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') |
166 |
- $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') |
167 |
- test? ( |
168 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
169 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
170 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
171 |
- dev-python/pretend[${PYTHON_USEDEP}] |
172 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
173 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
174 |
- dev-python/pytz[${PYTHON_USEDEP}] |
175 |
- )" |
176 |
- |
177 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
178 |
- |
179 |
-PATCHES=( |
180 |
-) |
181 |
- |
182 |
-python_configure_all() { |
183 |
- append-cflags $(test-flags-CC -pthread) |
184 |
-} |
185 |
- |
186 |
-python_test() { |
187 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
188 |
-} |
189 |
|
190 |
diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild |
191 |
deleted file mode 100644 |
192 |
index c6d14006331..00000000000 |
193 |
--- a/dev-python/cryptography/cryptography-2.3.ebuild |
194 |
+++ /dev/null |
195 |
@@ -1,68 +0,0 @@ |
196 |
-# Copyright 1999-2019 Gentoo Authors |
197 |
-# Distributed under the terms of the GNU General Public License v2 |
198 |
- |
199 |
-EAPI=6 |
200 |
- |
201 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
202 |
-PYTHON_REQ_USE="threads(+)" |
203 |
- |
204 |
-inherit distutils-r1 flag-o-matic |
205 |
- |
206 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
207 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
208 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
209 |
- |
210 |
-LICENSE="|| ( Apache-2.0 BSD )" |
211 |
-SLOT="0" |
212 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" |
213 |
-IUSE="libressl test" |
214 |
-RESTRICT="!test? ( test )" |
215 |
- |
216 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
217 |
-# It'd theb be able to go into the || section again |
218 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
219 |
-# the following is the original section, disallowing bindist entirely |
220 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
221 |
-RDEPEND=" |
222 |
- !libressl? ( |
223 |
- dev-libs/openssl:0= ( |
224 |
- || ( |
225 |
- dev-libs/openssl:0[-bindist(-)] |
226 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
227 |
- ) |
228 |
- ) |
229 |
- ) |
230 |
- libressl? ( dev-libs/libressl:0= ) |
231 |
- >=dev-python/idna-2.1[${PYTHON_USEDEP}] |
232 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
233 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
234 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
235 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
236 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
237 |
- " |
238 |
-DEPEND="${RDEPEND} |
239 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
240 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') |
241 |
- $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') |
242 |
- test? ( |
243 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
244 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
245 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
246 |
- dev-python/pretend[${PYTHON_USEDEP}] |
247 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
248 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
249 |
- dev-python/pytz[${PYTHON_USEDEP}] |
250 |
- )" |
251 |
- |
252 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
253 |
- |
254 |
-PATCHES=( |
255 |
-) |
256 |
- |
257 |
-python_configure_all() { |
258 |
- append-cflags $(test-flags-CC -pthread) |
259 |
-} |
260 |
- |
261 |
-python_test() { |
262 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
263 |
-} |
264 |
|
265 |
diff --git a/dev-python/cryptography/cryptography-2.4.2.ebuild b/dev-python/cryptography/cryptography-2.4.2.ebuild |
266 |
deleted file mode 100644 |
267 |
index c6d14006331..00000000000 |
268 |
--- a/dev-python/cryptography/cryptography-2.4.2.ebuild |
269 |
+++ /dev/null |
270 |
@@ -1,68 +0,0 @@ |
271 |
-# Copyright 1999-2019 Gentoo Authors |
272 |
-# Distributed under the terms of the GNU General Public License v2 |
273 |
- |
274 |
-EAPI=6 |
275 |
- |
276 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
277 |
-PYTHON_REQ_USE="threads(+)" |
278 |
- |
279 |
-inherit distutils-r1 flag-o-matic |
280 |
- |
281 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
282 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
283 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
284 |
- |
285 |
-LICENSE="|| ( Apache-2.0 BSD )" |
286 |
-SLOT="0" |
287 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" |
288 |
-IUSE="libressl test" |
289 |
-RESTRICT="!test? ( test )" |
290 |
- |
291 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
292 |
-# It'd theb be able to go into the || section again |
293 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
294 |
-# the following is the original section, disallowing bindist entirely |
295 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
296 |
-RDEPEND=" |
297 |
- !libressl? ( |
298 |
- dev-libs/openssl:0= ( |
299 |
- || ( |
300 |
- dev-libs/openssl:0[-bindist(-)] |
301 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
302 |
- ) |
303 |
- ) |
304 |
- ) |
305 |
- libressl? ( dev-libs/libressl:0= ) |
306 |
- >=dev-python/idna-2.1[${PYTHON_USEDEP}] |
307 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
308 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
309 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
310 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
311 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
312 |
- " |
313 |
-DEPEND="${RDEPEND} |
314 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
315 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') |
316 |
- $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') |
317 |
- test? ( |
318 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
319 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
320 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
321 |
- dev-python/pretend[${PYTHON_USEDEP}] |
322 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
323 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
324 |
- dev-python/pytz[${PYTHON_USEDEP}] |
325 |
- )" |
326 |
- |
327 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
328 |
- |
329 |
-PATCHES=( |
330 |
-) |
331 |
- |
332 |
-python_configure_all() { |
333 |
- append-cflags $(test-flags-CC -pthread) |
334 |
-} |
335 |
- |
336 |
-python_test() { |
337 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
338 |
-} |
339 |
|
340 |
diff --git a/dev-python/cryptography/cryptography-2.5.ebuild b/dev-python/cryptography/cryptography-2.5.ebuild |
341 |
deleted file mode 100644 |
342 |
index da47b8248bd..00000000000 |
343 |
--- a/dev-python/cryptography/cryptography-2.5.ebuild |
344 |
+++ /dev/null |
345 |
@@ -1,68 +0,0 @@ |
346 |
-# Copyright 1999-2019 Gentoo Authors |
347 |
-# Distributed under the terms of the GNU General Public License v2 |
348 |
- |
349 |
-EAPI=6 |
350 |
- |
351 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
352 |
-PYTHON_REQ_USE="threads(+)" |
353 |
- |
354 |
-inherit distutils-r1 flag-o-matic |
355 |
- |
356 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
357 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
358 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
359 |
- |
360 |
-LICENSE="|| ( Apache-2.0 BSD )" |
361 |
-SLOT="0" |
362 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" |
363 |
-IUSE="libressl idna test" |
364 |
-RESTRICT="!test? ( test )" |
365 |
- |
366 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
367 |
-# It'd theb be able to go into the || section again |
368 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
369 |
-# the following is the original section, disallowing bindist entirely |
370 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
371 |
-RDEPEND=" |
372 |
- !libressl? ( |
373 |
- dev-libs/openssl:0= ( |
374 |
- || ( |
375 |
- dev-libs/openssl:0[-bindist(-)] |
376 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
377 |
- ) |
378 |
- ) |
379 |
- ) |
380 |
- libressl? ( dev-libs/libressl:0= ) |
381 |
- idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) |
382 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
383 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
384 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
385 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
386 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
387 |
- " |
388 |
-DEPEND="${RDEPEND} |
389 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
390 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') |
391 |
- $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') |
392 |
- test? ( |
393 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
394 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
395 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
396 |
- dev-python/pretend[${PYTHON_USEDEP}] |
397 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
398 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
399 |
- dev-python/pytz[${PYTHON_USEDEP}] |
400 |
- )" |
401 |
- |
402 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
403 |
- |
404 |
-PATCHES=( |
405 |
-) |
406 |
- |
407 |
-python_configure_all() { |
408 |
- append-cflags $(test-flags-CC -pthread) |
409 |
-} |
410 |
- |
411 |
-python_test() { |
412 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
413 |
-} |
414 |
|
415 |
diff --git a/dev-python/cryptography/cryptography-2.7.ebuild b/dev-python/cryptography/cryptography-2.7.ebuild |
416 |
deleted file mode 100644 |
417 |
index 79ef2f06b93..00000000000 |
418 |
--- a/dev-python/cryptography/cryptography-2.7.ebuild |
419 |
+++ /dev/null |
420 |
@@ -1,66 +0,0 @@ |
421 |
-# Copyright 1999-2019 Gentoo Authors |
422 |
-# Distributed under the terms of the GNU General Public License v2 |
423 |
- |
424 |
-EAPI=6 |
425 |
- |
426 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
427 |
-PYTHON_REQ_USE="threads(+)" |
428 |
- |
429 |
-inherit distutils-r1 flag-o-matic |
430 |
- |
431 |
-DESCRIPTION="Library providing cryptographic recipes and primitives" |
432 |
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" |
433 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
434 |
- |
435 |
-LICENSE="|| ( Apache-2.0 BSD )" |
436 |
-SLOT="0" |
437 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" |
438 |
-IUSE="libressl idna test" |
439 |
-RESTRICT="!test? ( test )" |
440 |
- |
441 |
-# the openssl 1.0.2l-r1 needs to be updated again :( |
442 |
-# It'd theb be able to go into the || section again |
443 |
-#=dev-libs/openssl-1.0.2l-r1:0 |
444 |
-# the following is the original section, disallowing bindist entirely |
445 |
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
446 |
-RDEPEND=" |
447 |
- !libressl? ( |
448 |
- dev-libs/openssl:0= ( |
449 |
- || ( |
450 |
- dev-libs/openssl:0[-bindist(-)] |
451 |
- >=dev-libs/openssl-1.0.2o-r6:0 |
452 |
- ) |
453 |
- ) |
454 |
- ) |
455 |
- libressl? ( dev-libs/libressl:0= ) |
456 |
- idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) |
457 |
- >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] |
458 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
459 |
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}] |
460 |
- virtual/python-enum34[${PYTHON_USEDEP}] |
461 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
462 |
- " |
463 |
-DEPEND="${RDEPEND} |
464 |
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] |
465 |
- $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') |
466 |
- $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') |
467 |
- test? ( |
468 |
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] |
469 |
- dev-python/pretend[${PYTHON_USEDEP}] |
470 |
- dev-python/iso8601[${PYTHON_USEDEP}] |
471 |
- dev-python/pytz[${PYTHON_USEDEP}] |
472 |
- >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] |
473 |
- !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] |
474 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
475 |
- >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] |
476 |
- )" |
477 |
- |
478 |
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) |
479 |
- |
480 |
-python_configure_all() { |
481 |
- append-cflags $(test-flags-CC -pthread) |
482 |
-} |
483 |
- |
484 |
-python_test() { |
485 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
486 |
-} |
487 |
|
488 |
diff --git a/dev-python/cryptography/files/CVE-2018-10903.patch b/dev-python/cryptography/files/CVE-2018-10903.patch |
489 |
deleted file mode 100644 |
490 |
index 1133405fb93..00000000000 |
491 |
--- a/dev-python/cryptography/files/CVE-2018-10903.patch |
492 |
+++ /dev/null |
493 |
@@ -1,76 +0,0 @@ |
494 |
-From 688e0f673bfbf43fa898994326c6877f00ab19ef Mon Sep 17 00:00:00 2001 |
495 |
-From: Paul Kehrer <paul.l.kehrer@×××××.com> |
496 |
-Date: Tue, 17 Jul 2018 10:47:57 +0800 |
497 |
-Subject: [PATCH] disallow implicit tag truncation with finalize_with_tag |
498 |
- |
499 |
---- |
500 |
- docs/hazmat/primitives/symmetric-encryption.rst | 1 + |
501 |
- src/cryptography/hazmat/backends/openssl/ciphers.py | 5 +++++ |
502 |
- src/cryptography/hazmat/primitives/ciphers/modes.py | 1 + |
503 |
- tests/hazmat/primitives/test_aes.py | 16 ++++++++++++++++ |
504 |
- 5 files changed, 28 insertions(+) |
505 |
- |
506 |
-diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst |
507 |
-index 5ebcca754..5b6000902 100644 |
508 |
---- a/docs/hazmat/primitives/symmetric-encryption.rst |
509 |
-+++ b/docs/hazmat/primitives/symmetric-encryption.rst |
510 |
-@@ -670,6 +670,7 @@ Interfaces |
511 |
- :raises ValueError: This is raised when the data provided isn't |
512 |
- a multiple of the algorithm's block size, if ``min_tag_length`` is |
513 |
- less than 4, or if ``len(tag) < min_tag_length``. |
514 |
-+ ``min_tag_length`` is an argument to the ``GCM`` constructor. |
515 |
- :raises NotImplementedError: This is raised if the version of the |
516 |
- OpenSSL backend used is 1.0.1 or earlier. |
517 |
- |
518 |
-diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py |
519 |
-index 462ffea25..e0ee06ee2 100644 |
520 |
---- a/src/cryptography/hazmat/backends/openssl/ciphers.py |
521 |
-+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py |
522 |
-@@ -199,6 +199,11 @@ def finalize_with_tag(self, tag): |
523 |
- "finalize_with_tag requires OpenSSL >= 1.0.2. To use this " |
524 |
- "method please update OpenSSL" |
525 |
- ) |
526 |
-+ if len(tag) < self._mode._min_tag_length: |
527 |
-+ raise ValueError( |
528 |
-+ "Authentication tag must be {0} bytes or longer.".format( |
529 |
-+ self._mode._min_tag_length) |
530 |
-+ ) |
531 |
- res = self._backend._lib.EVP_CIPHER_CTX_ctrl( |
532 |
- self._ctx, self._backend._lib.EVP_CTRL_AEAD_SET_TAG, |
533 |
- len(tag), tag |
534 |
-diff --git a/src/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py |
535 |
-index 598dfaa4a..543015fef 100644 |
536 |
---- a/src/cryptography/hazmat/primitives/ciphers/modes.py |
537 |
-+++ b/src/cryptography/hazmat/primitives/ciphers/modes.py |
538 |
-@@ -220,6 +220,7 @@ def __init__(self, initialization_vector, tag=None, min_tag_length=16): |
539 |
- min_tag_length) |
540 |
- ) |
541 |
- self._tag = tag |
542 |
-+ self._min_tag_length = min_tag_length |
543 |
- |
544 |
- tag = utils.read_only_property("_tag") |
545 |
- initialization_vector = utils.read_only_property("_initialization_vector") |
546 |
-diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py |
547 |
-index d6f83ebc2..4ceccf155 100644 |
548 |
---- a/tests/hazmat/primitives/test_aes.py |
549 |
-+++ b/tests/hazmat/primitives/test_aes.py |
550 |
-@@ -439,3 +439,19 @@ def test_gcm_tag_decrypt_finalize(self, backend): |
551 |
- decryptor.finalize() |
552 |
- else: |
553 |
- decryptor.finalize_with_tag(tag) |
554 |
-+ |
555 |
-+ @pytest.mark.supported( |
556 |
-+ only_if=lambda backend: ( |
557 |
-+ not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 or |
558 |
-+ backend._lib.CRYPTOGRAPHY_IS_LIBRESSL |
559 |
-+ ), |
560 |
-+ skip_message="Not supported on OpenSSL 1.0.1", |
561 |
-+ ) |
562 |
-+ def test_gcm_tag_decrypt_finalize_tag_length(self, backend): |
563 |
-+ decryptor = base.Cipher( |
564 |
-+ algorithms.AES(b"0" * 16), |
565 |
-+ modes.GCM(b"0" * 12), |
566 |
-+ backend=backend |
567 |
-+ ).decryptor() |
568 |
-+ with pytest.raises(ValueError): |
569 |
-+ decryptor.finalize_with_tag(b"tagtooshort") |
570 |
|
571 |
diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch |
572 |
deleted file mode 100644 |
573 |
index 9a14d460601..00000000000 |
574 |
--- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch |
575 |
+++ /dev/null |
576 |
@@ -1,23 +0,0 @@ |
577 |
-diff -ur a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py |
578 |
---- a/src/_cffi_src/openssl/x509.py 2017-07-27 05:11:29.000000000 +0200 |
579 |
-+++ b/src/_cffi_src/openssl/x509.py 2018-03-23 10:28:00.387774214 +0100 |
580 |
-@@ -254,8 +254,7 @@ |
581 |
- |
582 |
- const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *); |
583 |
- |
584 |
--/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */ |
585 |
--void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *); |
586 |
-+void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *); |
587 |
- |
588 |
- long X509_get_version(X509 *); |
589 |
- |
590 |
-@@ -338,7 +337,8 @@ |
591 |
- CUSTOMIZATIONS = """ |
592 |
- /* Added in 1.0.2 beta but we need it in all versions now due to the great |
593 |
- opaquing. */ |
594 |
--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 |
595 |
-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \ |
596 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
597 |
- /* from x509/x_x509.c version 1.0.2 */ |
598 |
- void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, |
599 |
- const X509 *x) |
600 |
|
601 |
diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch |
602 |
deleted file mode 100644 |
603 |
index a1c93cf0c66..00000000000 |
604 |
--- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch |
605 |
+++ /dev/null |
606 |
@@ -1,73 +0,0 @@ |
607 |
-$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $ |
608 |
- |
609 |
---- a/src/_cffi_src/openssl/x509_vfy.py |
610 |
-+++ b/src/_cffi_src/openssl/x509_vfy.py |
611 |
-@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE |
612 |
- X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int); |
613 |
- X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *); |
614 |
- Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *); |
615 |
--X509 *X509_OBJECT_get0_X509(X509_OBJECT *); |
616 |
-+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *); |
617 |
- int X509_OBJECT_get_type(const X509_OBJECT *); |
618 |
- |
619 |
- /* added in 1.1.0 */ |
620 |
-@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER |
621 |
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; |
622 |
- #else |
623 |
- static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0; |
624 |
-+#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL |
625 |
-+static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; |
626 |
-+#else |
627 |
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0; |
628 |
- |
629 |
--static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; |
630 |
--static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; |
631 |
--static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; |
632 |
--static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; |
633 |
--static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; |
634 |
--static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; |
635 |
- /* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added |
636 |
- in the future... */ |
637 |
- #ifndef X509_V_ERR_HOSTNAME_MISMATCH |
638 |
-@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0; |
639 |
- static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; |
640 |
- #endif |
641 |
- |
642 |
--/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately |
643 |
-- below because it shows up in some earlier 3rd party OpenSSL packages. */ |
644 |
--static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; |
645 |
--static const long X509_V_FLAG_SUITEB_192_LOS = 0; |
646 |
--static const long X509_V_FLAG_SUITEB_128_LOS = 0; |
647 |
-- |
648 |
- int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *, |
649 |
- size_t) = NULL; |
650 |
- int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *, |
651 |
-@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA |
652 |
- unsigned int) = NULL; |
653 |
- #endif |
654 |
- |
655 |
-+static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; |
656 |
-+static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; |
657 |
-+static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; |
658 |
-+static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; |
659 |
-+static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; |
660 |
-+static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; |
661 |
-+/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately |
662 |
-+ below because it shows up in some earlier 3rd party OpenSSL packages. */ |
663 |
-+static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; |
664 |
-+static const long X509_V_FLAG_SUITEB_192_LOS = 0; |
665 |
-+static const long X509_V_FLAG_SUITEB_128_LOS = 0; |
666 |
-+#endif |
667 |
-+ |
668 |
- /* OpenSSL 1.0.2+ or Solaris's backport */ |
669 |
- #ifdef X509_V_FLAG_PARTIAL_CHAIN |
670 |
- static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1; |
671 |
-@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) |
672 |
- return ctx->cert; |
673 |
- } |
674 |
- |
675 |
--X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) { |
676 |
-+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) { |
677 |
- return x->data.x509; |
678 |
- } |
679 |
- #endif |