commit: e611b1b915dcd5e22a039e3210e41a44135be7a5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 17:17:21 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 17:32:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e611b1b9
dev-python/cryptography: Bump to 36.0.2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/cryptography/Manifest | 6 +
dev-python/cryptography/cryptography-36.0.2.ebuild | 136 +++++++++++++++++++++
.../files/cryptography-36.0.2-pyo3-bump.patch | 74 +++++++++++
3 files changed, 216 insertions(+)
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index eabe38530a87..3afca11a8ddd 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -9,8 +9,10 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B
e99a5589c11d79d77a4537b34ce0a45d37b981c123b
DIST chrono-0.4.19.crate 155663 BLAKE2B
c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54
SHA512
a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B
49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1
SHA512
3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
DIST cryptography-36.0.0.tar.gz 571931 BLAKE2B
50a0f2fbf940484930c49d405af8eaa9b004a691705c3328bc324ffc867620b3bc4cb2257054392cd58e48f67c23d18450fb3bf7ad5894795c285a6da028225a
SHA512
0588ab77c329277950ab3a20fbc1c1db2d59dfa86e8f6f2f0947507eb65557a749d40680b13df513db70bdf7a6c7c827b339988523cb5b476ad0340acb28bdf6
+DIST cryptography-36.0.2.tar.gz 572053 BLAKE2B
b34b994e44b1ccd099a56fba4a167d563a29652f86ab0f0000ef78b4093a15cbfb82a9cebecdcaf6bca782a5fdd20f6c7d2206d68a219626a9fe8ae13e9aec5e
SHA512
cf4a537ba0ccaf136c82aefc2fc80f042827c48bf9ef072e3513760a93285cb4174021c72f9df0033a8bf58af6f831988adc0f4658855710715558b56631362e
DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B
fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f
SHA512
269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
DIST cryptography_vectors-36.0.0.tar.gz 35227525 BLAKE2B
120a278c4175400ff49d7ab44428bbeabed97e61a51ddd62285d8548b92c487327ca36cedc58742703dbaa6dee509c14bc6eff80f307314554a1d80b5ba18c82
SHA512
67147dd945dc76ae27d6de4c694253081eeadf10da8c265bdf217031846696451fd6065469b272fab5bd65c1a55239f3a1af0cef7bc2c2a14b64f0a0f6e1c7de
+DIST cryptography_vectors-36.0.2.tar.gz 35227191 BLAKE2B
ea2581778246cb32aaedcc47541c7f3db22449b915b4a4956e73588704714ae22efc1fcd7d095e3d9f6b451793ae5e04994eee6cf56327785583efec4f516931
SHA512
b7725a92191312686a0fdc0fcdb8f1ecba5ccfe249b3d6eebb5675bb5efd7bce6a424a4eef94dade0ab21415a952caee3c3d4624dade9d5de492be9e7175d623
DIST indoc-0.3.6.crate 9663 BLAKE2B
ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2
SHA512
e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
DIST indoc-impl-0.3.6.crate 7933 BLAKE2B
93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725
SHA512
18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
DIST instant-0.1.12.crate 6128 BLAKE2B
728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902
SHA512
fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -32,9 +34,13 @@ DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B
98e2925881c2be186e22c2c43969
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B
98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203
SHA512
9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro2-1.0.32.crate 41003 BLAKE2B
e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff
SHA512
8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
DIST pyo3-0.15.1.crate 370722 BLAKE2B
b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3
SHA512
9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
+DIST pyo3-0.15.2.crate 371382 BLAKE2B
79b813eca0818bf79e0e1c118c952219f16f1fe22a0ab1aaaac0499a5048ebbc27326bdd2d96054e410ef116866250464aa4e4d8e91bb733f915f77536bf0f05
SHA512
81595bf2b5d2b3a4e79750f0779c142fe7c3e7185f9ffa68a83fce30062ae6812d7af71bee425206552c95839ad7473408f658ff936d4a1f58fd1ac922822582
DIST pyo3-build-config-0.15.1.crate 22095 BLAKE2B
47803b389f30f15f487daf96d32e374ebc83b1b41ddee1d2dcadd1a0fbaef40c4c1af2312b86ec085637e3192b1bd213c93b5f4e8dee173d81e510f480fa6953
SHA512
a9aae6bb4a4a56f7857262276bf1c95510912a367e32470b871f2fe2d6adbffd87247ed2e3b5fa2dfd273a3b0e139d92f25f3228e15c6d8c206c6ba919f38a9c
+DIST pyo3-build-config-0.15.2.crate 22235 BLAKE2B
35355ee30242b7e95426920e7f108fd7f32aa86f2949bb388139ed84ac0a8da2adbc05a5ecaf3beb89525d0c7a4e25ca8e33e9f35e324cbd970f6b4dbe5fbfdf
SHA512
e05e68bc54bc7287d3fb037251767dcbcb512e3cae29948507deb7e0ca18ec4d7fd5d598f1dca1a595b6edcd5395fb443189fe56724e67ef68422bf050b10324
DIST pyo3-macros-0.15.1.crate 7555 BLAKE2B
c7d87c150678efbb5dd6ef98da9997676ef3e7f8628a79f01a3ecbf94cc8b2d0752573d894fd769fb8791f30bcfd03a5c9f76cce73c00be90c1488faed63198d
SHA512
1969b5ec6dd26ff2d534fe43143e44b91b66e05c61281b64f96fda47ff7826f625c658412d7587520df7455a67cd970a9aa49c7544ffb70a425314a0cff65060
+DIST pyo3-macros-0.15.2.crate 7596 BLAKE2B
f8ab6ba53354705617ad88a2db693e38596d563f14e5481141b913595f367cf43fdb438c077c89b22a60fb0cccba7d67e79f9528af25c626ec7d8ba2c2ae3825
SHA512
4a40fae4362aa811996d9ff94ff7bfb645396eccffe13fbfc1fff70ada80db56f1a03630cadffca4ff6e156f04c052e82e059d72541d720abbf0ab18f2a7057e
DIST pyo3-macros-backend-0.15.1.crate 46111 BLAKE2B
fabde516114a001e7f9ec1a1f422c5819ad5bceb4db36ecf2ef5dfde397d4d3c7dc7a8acf11cafde4156594e90a4f95d51dbefa43ee8bc172441d3f81eb299b2
SHA512
6c62fd1bc50666f63f9854947e9d88ae385159d90d026e0179d91aa151fef8403b23f55eab6f3340b1455b23d411083780c49198afacc267b49a52ee9c4999a4
+DIST pyo3-macros-backend-0.15.2.crate 46112 BLAKE2B
f3efd72d375f709efca7366f702837222b3bde498a89750a9184437ac495cab031f12f83a062329ea3907e264ec0782523656e15cbe3eb03bc0535fe438a3e4d
SHA512
5c3be99d863764376c3f66de304de8b36548cd99fae8ac40c548b3d467b6bdfcd683c53b4cd1aba26b1730c6b9214c36b1723a5d1299265734e67ea791918c82
DIST quote-1.0.10.crate 29960 BLAKE2B
fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f
SHA512
08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
DIST redox_syscall-0.2.10.crate 23582 BLAKE2B
7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f
SHA512
ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
DIST regex-1.5.4.crate 236581 BLAKE2B
6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0
SHA512
1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
diff --git a/dev-python/cryptography/cryptography-36.0.2.ebuild
b/dev-python/cryptography/cryptography-36.0.2.ebuild
new file mode 100644
index 000000000000..838aaff865ba
--- /dev/null
+++ b/dev-python/cryptography/cryptography-36.0.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+ Inflector-0.11.4
+ aliasable-0.1.3
+ asn1-0.8.7
+ asn1_derive-0.8.7
+ autocfg-1.0.1
+ base64-0.13.0
+ bitflags-1.3.2
+ cfg-if-1.0.0
+ chrono-0.4.19
+ indoc-0.3.6
+ indoc-impl-0.3.6
+ instant-0.1.12
+ lazy_static-1.4.0
+ libc-0.2.107
+ lock_api-0.4.5
+ num-integer-0.1.44
+ num-traits-0.2.14
+ once_cell-1.8.0
+ ouroboros-0.13.0
+ ouroboros_macro-0.13.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ paste-0.1.18
+ paste-impl-0.1.18
+ pem-1.0.1
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.32
+ pyo3-0.15.2
+ pyo3-build-config-0.15.2
+ pyo3-macros-0.15.2
+ pyo3-macros-backend-0.15.2
+ quote-1.0.10
+ redox_syscall-0.2.10
+ regex-1.5.4
+ regex-syntax-0.6.25
+ scopeguard-1.1.0
+ smallvec-1.7.0
+ stable_deref_trait-1.2.0
+ syn-1.0.81
+ unicode-xid-0.2.2
+ unindent-0.1.7
+ version_check-0.9.3
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+ https://github.com/pyca/cryptography/
+ https://pypi.org/project/cryptography/
+"
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ test? (
+ mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+ )
+"
+
+# MIT and BSD-3-Clause come from rust dependencies, some dependencies are also
Apache 2.0 exclusively,
+# and some are Apache 2.0 or MIT
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="0"
+# See bug #769482, bug #827350
+#KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2o-r6:0=
+"
+DEPEND="
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+ ' 'python*')
+"
+BDEPEND="
+ dev-python/setuptools-rust[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.abi3.so"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pyo3-bump.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+ cargo_src_unpack
+}
+
+src_prepare() {
+ default
+
+ # work around availability macros not supported in GCC (yet)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local darwinok=0
+ if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+ darwinok=1
+ fi
+ sed -i -e 's/__builtin_available(macOS 10\.12,
\*)/'"${darwinok}"'/' \
+ src/_cffi_src/openssl/src/osrandom_engine.c || die
+ fi
+}
+
+python_test() {
+ local -x
PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+ epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch
b/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch
new file mode 100644
index 000000000000..9a7d7237c80c
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch
@@ -0,0 +1,74 @@
+From a39fbdcf31c1bb50d2d57fb42cf2b44f6d76525f Mon Sep 17 00:00:00 2001
+From: Alex Gaynor <alex.gay...@gmail.com>
+Date: Thu, 14 Apr 2022 14:18:02 -0400
+Subject: [PATCH] Update pyo3 to 0.15.2
+
+---
+ src/rust/Cargo.lock | 16 ++++++++--------
+ src/rust/Cargo.toml | 2 +-
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
+index 6798102729..501dc47cc3 100644
+--- a/src/rust/Cargo.lock
++++ b/src/rust/Cargo.lock
+@@ -280,9 +280,9 @@ dependencies = [
+
+ [[package]]
+ name = "pyo3"
+-version = "0.15.1"
++version = "0.15.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720"
++checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
+ dependencies = [
+ "cfg-if",
+ "indoc",
+@@ -296,18 +296,18 @@ dependencies = [
+
+ [[package]]
+ name = "pyo3-build-config"
+-version = "0.15.1"
++version = "0.15.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b"
++checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
+ dependencies = [
+ "once_cell",
+ ]
+
+ [[package]]
+ name = "pyo3-macros"
+-version = "0.15.1"
++version = "0.15.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755"
++checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
+ dependencies = [
+ "pyo3-macros-backend",
+ "quote",
+@@ -316,9 +316,9 @@ dependencies = [
+
+ [[package]]
+ name = "pyo3-macros-backend"
+-version = "0.15.1"
++version = "0.15.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a"
++checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
+ dependencies = [
+ "proc-macro2",
+ "pyo3-build-config",
+diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
+index 7e10a5374c..d17245d46d 100644
+--- a/src/rust/Cargo.toml
++++ b/src/rust/Cargo.toml
+@@ -7,7 +7,7 @@ publish = false
+
+ [dependencies]
+ lazy_static = "1"
+-pyo3 = { version = "0.15.1" }
++pyo3 = { version = "0.15.2" }
+ asn1 = { version = "0.8.7", default-features = false, features = ["derive"] }
+ pem = "1.0"
+ chrono = { version = "0.4", default-features = false, features = ["alloc",
"clock"] }
