diff options
Diffstat (limited to 'dev-python/cryptography')
| -rw-r--r-- | dev-python/cryptography/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/cryptography/cryptography-41.0.3.ebuild (renamed from dev-python/cryptography/cryptography-41.0.1.ebuild) | 138 | ||||
| -rw-r--r-- | dev-python/cryptography/files/cryptography-36.0.2-libressl.patch | 102 | ||||
| -rw-r--r-- | dev-python/cryptography/files/openssl_cleanup.patch | 16 |
4 files changed, 77 insertions, 182 deletions
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index 0e8c118de50f..1826689b2689 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -7,8 +7,8 @@ DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a14947518 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST cryptography-41.0.1.tar.gz 629124 BLAKE2B 726b6adbdd175e71135c7fcf239c2be822eea2e0221d59301dba3ee24aa958bd12acd0945883e4d0a14028cb0fe16b4c5f0c0adde3d44d23a815a290d87eb4af SHA512 7f944cc99f57db3e3e54eaea74ce65a4477c71fc9475dfb50247ca291d5e806dbf0323651edf9ce8ec3bf03de8912fb86f6c83b3b76f1d0e37369bd83e86805c DIST cryptography-41.0.2.tar.gz 630080 BLAKE2B 26f1422133510d2c8076dfdccc4cfc2134b3704122b13e15cc34b1b4a1362d81a22efb7cb9ba64a266a7832ff7910ddd9da94f4ab8e58bf7308985ca57c3c00c SHA512 9c9b7fd047430bbde841fcd97e4ce76be6c708b372a7c1170013d8d8baaa263d90bed4a0fa4fca82ff713e8acf25971e7eab0f4ec1c8cbc8e9658a8527787e3a +DIST cryptography-41.0.3.tar.gz 630139 BLAKE2B 148c01d3956a821edfcbba386287707f6e327d49669d163c00080f5208d65f340096a211825d6b5550036b00c5ccf9c84b137413454d68cae5374e9c10947c87 SHA512 84f79f72be3646c1e9a932ba8aba514471f6c0e50462a0bb3a927622ce67c7932e71d44e187db8928b05f04b803b958284f785c0dc297a0c9453846af1ac1aca DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8 @@ -27,7 +27,6 @@ DIST pem-1.1.1.crate 11352 BLAKE2B 2f21e56ab3e1c55aeab08a2d60b3e83b9b9520ed611de DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495 -DIST proc-macro2-1.0.59.crate 44360 BLAKE2B b1e42efd70e9a61bd46fd8bdd7db26aea142d98d28765de799901606b721c23a22c3e853d0821709ef5ddeac0304731b6a09c3bff3b7769e946b77fc67e44d36 SHA512 30e3340f53593afb3f07c4ba4c3d51acabd9a7513976aeaeed4c063fee268a28066c53b265b629d5d3f56597d1d34a9e69378f0ef5cda37b51a8fa8b67424aea DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04 DIST pyo3-0.18.3.crate 420236 BLAKE2B bc00a825a67ed3590b31d3ea6bd77f6c4c927c0355d9d03ce64ca44e36ae3e29ab4d891bf2d94ca074b3bf858e077c516dc64e4620f875fe1e8fbffb5c9db1ec SHA512 39f044a19a42a5e2f46049431fbe3fe10c14d12a4741cc789b42de7cbf448bcbded7fe38a0f124d994ff9bcd3d95a19305dbfdc7462331fda3e6686cc4289be5 DIST pyo3-build-config-0.18.3.crate 29137 BLAKE2B 5fa645b64f50a078f38cc10a27ed52bd7e7aadd8a069c05ec2963f0b7c869b94d29eddda97cc31d200cf749ab8e2cd9cd1ea00e75620287e9187745ae0e100a5 SHA512 7ccad5f245e84895e147389f05270f32d12f81aba46bcd0dc184b8d62af2ea579efc50383502efda40601c981c4dbcf911aa7d8192364caa2e177ad939062cdb diff --git a/dev-python/cryptography/cryptography-41.0.1.ebuild b/dev-python/cryptography/cryptography-41.0.3.ebuild index 16312dee4eb4..4d2e85bebe8d 100644 --- a/dev-python/cryptography/cryptography-41.0.1.ebuild +++ b/dev-python/cryptography/cryptography-41.0.3.ebuild @@ -7,84 +7,92 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} ) PYTHON_REQ_USE="threads(+)" CRATES=" -Inflector-0.11.4 -aliasable-0.1.3 -asn1-0.15.2 -asn1_derive-0.15.2 -autocfg-1.1.0 -base64-0.13.1 -bitflags-1.3.2 -cc-1.0.79 -cfg-if-1.0.0 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -indoc-1.0.9 -libc-0.2.144 -lock_api-0.4.9 -memoffset-0.8.0 -once_cell-1.17.2 -openssl-0.10.54 -openssl-macros-0.1.1 -openssl-sys-0.9.88 -ouroboros-0.15.6 -ouroboros_macro-0.15.6 -parking_lot-0.12.1 -parking_lot_core-0.9.7 -pem-1.1.1 -pkg-config-0.3.27 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro2-1.0.59 -pyo3-0.18.3 -pyo3-build-config-0.18.3 -pyo3-ffi-0.18.3 -pyo3-macros-0.18.3 -pyo3-macros-backend-0.18.3 -quote-1.0.28 -redox_syscall-0.2.16 -scopeguard-1.1.0 -smallvec-1.10.0 -syn-1.0.109 -syn-2.0.18 -target-lexicon-0.12.7 -unicode-ident-1.0.9 -unindent-0.1.11 -vcpkg-0.2.15 -version_check-0.9.4 -windows-sys-0.45.0 -windows-targets-0.42.2 -windows_aarch64_gnullvm-0.42.2 -windows_aarch64_msvc-0.42.2 -windows_i686_gnu-0.42.2 -windows_i686_msvc-0.42.2 -windows_x86_64_gnu-0.42.2 -windows_x86_64_gnullvm-0.42.2 -windows_x86_64_msvc-0.42.2 + Inflector@0.11.4 + aliasable@0.1.3 + asn1@0.15.2 + asn1_derive@0.15.2 + autocfg@1.1.0 + base64@0.13.1 + bitflags@1.3.2 + cc@1.0.79 + cfg-if@1.0.0 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + indoc@1.0.9 + libc@0.2.144 + lock_api@0.4.9 + memoffset@0.8.0 + once_cell@1.17.2 + openssl-macros@0.1.1 + openssl-sys@0.9.88 + openssl@0.10.54 + ouroboros@0.15.6 + ouroboros_macro@0.15.6 + parking_lot@0.12.1 + parking_lot_core@0.9.7 + pem@1.1.1 + pkg-config@0.3.27 + proc-macro-error-attr@1.0.4 + proc-macro-error@1.0.4 + proc-macro2@1.0.64 + pyo3-build-config@0.18.3 + pyo3-ffi@0.18.3 + pyo3-macros-backend@0.18.3 + pyo3-macros@0.18.3 + pyo3@0.18.3 + quote@1.0.28 + redox_syscall@0.2.16 + scopeguard@1.1.0 + smallvec@1.10.0 + syn@1.0.109 + syn@2.0.18 + target-lexicon@0.12.7 + unicode-ident@1.0.9 + unindent@0.1.11 + vcpkg@0.2.15 + version_check@0.9.4 + windows-sys@0.45.0 + windows-targets@0.42.2 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_msvc@0.42.2 + windows_i686_gnu@0.42.2 + windows_i686_msvc@0.42.2 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_msvc@0.42.2 " + inherit cargo distutils-r1 multiprocessing DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" +HOMEPAGE=" + https://github.com/pyca/cryptography/ + https://pypi.org/project/cryptography/ +" SRC_URI=" https://github.com/pyca/cryptography/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris ${CRATES})" -# 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" +LICENSE="|| ( Apache-2.0 BSD ) PSF-2" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT + Unicode-DFS-2016 +" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="libressl" -DEPEND=" +RDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= ) libressl? ( >=dev-libs/libressl-3.6.0:0= ) -" -RDEPEND=" $(python_gen_cond_dep ' >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}] ' 'python*') " +DEPEND=" + ${RDEPEND} +" BDEPEND=" ${DEPEND} dev-python/setuptools-rust[${PYTHON_USEDEP}] @@ -100,7 +108,7 @@ BDEPEND=" " # Files built without CFLAGS/LDFLAGS, acceptable for rust -QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.abi3.so" +QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so" distutils_enable_tests pytest @@ -111,6 +119,8 @@ src_unpack() { src_prepare() { default + sed -i -e 's:--benchmark-disable::' pyproject.toml || die + # work around availability macros not supported in GCC (yet) if [[ ${CHOST} == *-darwin* ]] ; then local darwinok=0 @@ -122,6 +132,10 @@ src_prepare() { fi } +python_configure_all() { + filter-lto # bug #903908 +} + 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-libressl.patch b/dev-python/cryptography/files/cryptography-36.0.2-libressl.patch deleted file mode 100644 index 3e3722115455..000000000000 --- a/dev-python/cryptography/files/cryptography-36.0.2-libressl.patch +++ /dev/null @@ -1,102 +0,0 @@ -commit 8a98c812c3346e6c18b6d067e036fad63e30fcc1 -Author: Charlie Li <vishwin@users.noreply.github.com> -Date: Wed Mar 2 06:48:49 2022 -0500 - - Support LibreSSL 3.5.0 (#6919) - - * Add LibreSSL 3.5.0 to CI - - * Add LibreSSL 3.5.0 guard - - * Expose FIPS functions in LibreSSL 3.5.0+ - - * Expose DH API in LibreSSL 3.5.0+ - - * Expose SSL_get0_verified_chain and SSL_CTX_{set,get}_keylog_callback in LibreSSL 3.5.0+ - - * Fix SSL_CTX_{set,get}_keylog_callback guard - - * Add missing CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 symbol - - * Fix SSL_CTX_{set,get}_keylog_callback guard again - - * Condense LibreSSL 3.5.0 defines - - * Kick CircleCI - -diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py -index 7d36feb5..03019e0a 100644 ---- a/src/_cffi_src/openssl/cryptography.py -+++ b/src/_cffi_src/openssl/cryptography.py -@@ -43,9 +43,13 @@ INCLUDES = """ - (LIBRESSL_VERSION_NUMBER < 0x3030200f) - #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 \ - (LIBRESSL_VERSION_NUMBER < 0x3040000f) -+#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 \ -+ (LIBRESSL_VERSION_NUMBER < 0x3050000f) -+ - #else - #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 (0) - #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 (0) -+#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 (0) - #endif - - #if OPENSSL_VERSION_NUMBER < 0x10100000 -@@ -84,6 +88,9 @@ static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_111; - static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_111B; - static const int CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE; - -+static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340; -+static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350; -+ - static const int CRYPTOGRAPHY_IS_LIBRESSL; - static const int CRYPTOGRAPHY_IS_BORINGSSL; - """ -diff --git a/src/_cffi_src/openssl/dh.py b/src/_cffi_src/openssl/dh.py -index b369bf9f..c378ad1b 100644 ---- a/src/_cffi_src/openssl/dh.py -+++ b/src/_cffi_src/openssl/dh.py -@@ -36,7 +36,7 @@ int Cryptography_i2d_DHxparams_bio(BIO *, DH *); - """ - - CUSTOMIZATIONS = """ --#if CRYPTOGRAPHY_IS_LIBRESSL -+#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 - #ifndef DH_CHECK_Q_NOT_PRIME - #define DH_CHECK_Q_NOT_PRIME 0x10 - #endif -diff --git a/src/_cffi_src/openssl/fips.py b/src/_cffi_src/openssl/fips.py -index 23c10af9..dd81d06c 100644 ---- a/src/_cffi_src/openssl/fips.py -+++ b/src/_cffi_src/openssl/fips.py -@@ -17,7 +17,7 @@ int FIPS_mode(void); - """ - - CUSTOMIZATIONS = """ --#if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_OPENSSL_300_OR_GREATER -+#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || CRYPTOGRAPHY_OPENSSL_300_OR_GREATER - static const long Cryptography_HAS_FIPS = 0; - int (*FIPS_mode_set)(int) = NULL; - int (*FIPS_mode)(void) = NULL; -diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py -index 3ec82fb6..2d93fe24 100644 ---- a/src/_cffi_src/openssl/ssl.py -+++ b/src/_cffi_src/openssl/ssl.py -@@ -527,14 +527,15 @@ static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1; - int (*SSL_CTX_set_client_cert_engine)(SSL_CTX *, ENGINE *) = NULL; - #endif - --#if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL -+#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || CRYPTOGRAPHY_IS_BORINGSSL - static const long Cryptography_HAS_VERIFIED_CHAIN = 0; - Cryptography_STACK_OF_X509 *(*SSL_get0_verified_chain)(const SSL *) = NULL; - #else - static const long Cryptography_HAS_VERIFIED_CHAIN = 1; - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 -+#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || \ -+ (CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 && !CRYPTOGRAPHY_IS_LIBRESSL) - static const long Cryptography_HAS_KEYLOG = 0; - void (*SSL_CTX_set_keylog_callback)(SSL_CTX *, - void (*) (const SSL *, const char *) diff --git a/dev-python/cryptography/files/openssl_cleanup.patch b/dev-python/cryptography/files/openssl_cleanup.patch deleted file mode 100644 index 1464089e21b4..000000000000 --- a/dev-python/cryptography/files/openssl_cleanup.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN cryptography-38.0.1.orig/src/_cffi_src/openssl/crypto.py cryptography-38.0.1/src/_cffi_src/openssl/crypto.py ---- cryptography-38.0.1.orig/src/_cffi_src/openssl/crypto.py 2022-10-09 14:12:20.634321377 +0200 -+++ cryptography-38.0.1/src/_cffi_src/openssl/crypto.py 2022-10-09 14:13:19.612325625 +0200 -@@ -75,12 +75,7 @@ - # define OPENSSL_DIR SSLEAY_DIR - #endif - --#if CRYPTOGRAPHY_IS_LIBRESSL --static const long Cryptography_HAS_OPENSSL_CLEANUP = 0; --void (*OPENSSL_cleanup)(void) = NULL; --#else - static const long Cryptography_HAS_OPENSSL_CLEANUP = 1; --#endif - - #if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL - static const long Cryptography_HAS_MEM_FUNCTIONS = 0; |