From b31f7fd4aeafb2b4744dbec760ea5a86edd2697a Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 21 May 2024 09:24:17 -0700 Subject: python3-cryptography: upgrade 42.0.5 -> 42.0.7 Also upgrade python3-cryptography-vectors Refresh python3-cryptography-crates.inc 42.0.7 - 2024-05-06 Restored Windows 7 compatibility for our pre-built wheels. Note that we do not test on Windows 7 and wheels for our next release will not support it. Microsoft no longer provides support for Windows 7 and users are encouraged to upgrade. 42.0.6 - 2024-05-04 Fixed compilation when using LibreSSL 3.9.1. https://cryptography.io/en/latest/changelog/#v42-0-7 https://cryptography.io/en/latest/changelog/#v42-0-6 https://github.com/pyca/cryptography/compare/42.0.5...42.0.7 (From OE-Core rev: e4b16965cea57f72554c2e71ec07091afeeec9d8) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../python/python3-cryptography-crates.inc | 8 +-- .../python/python3-cryptography-vectors_42.0.5.bb | 31 ---------- .../python/python3-cryptography-vectors_42.0.7.bb | 31 ++++++++++ ...ject.toml-remove-benchmark-disable-option.patch | 7 +-- .../python/python3-cryptography_42.0.5.bb | 67 ---------------------- .../python/python3-cryptography_42.0.7.bb | 67 ++++++++++++++++++++++ 6 files changed, 104 insertions(+), 107 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb create mode 100644 meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb delete mode 100644 meta/recipes-devtools/python/python3-cryptography_42.0.5.bb create mode 100644 meta/recipes-devtools/python/python3-cryptography_42.0.7.bb diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc b/meta/recipes-devtools/python/python3-cryptography-crates.inc index b26e22b70c..dbeda05dc4 100644 --- a/meta/recipes-devtools/python/python3-cryptography-crates.inc +++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc @@ -18,9 +18,9 @@ SRC_URI += " \ crate://crates.io/lock_api/0.4.11 \ crate://crates.io/memoffset/0.9.0 \ crate://crates.io/once_cell/1.19.0 \ - crate://crates.io/openssl/0.10.63 \ + crate://crates.io/openssl/0.10.64 \ crate://crates.io/openssl-macros/0.1.1 \ - crate://crates.io/openssl-sys/0.9.99 \ + crate://crates.io/openssl-sys/0.9.102 \ crate://crates.io/parking_lot/0.12.1 \ crate://crates.io/parking_lot_core/0.9.9 \ crate://crates.io/pem/3.0.3 \ @@ -68,9 +68,9 @@ SRC_URI[libc-0.2.152.sha256sum] = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb0 SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -SRC_URI[openssl-0.10.63.sha256sum] = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +SRC_URI[openssl-0.10.64.sha256sum] = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -SRC_URI[openssl-sys-0.9.99.sha256sum] = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +SRC_URI[openssl-sys-0.9.102.sha256sum] = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" SRC_URI[pem-3.0.3.sha256sum] = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb deleted file mode 100644 index ee522af08e..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b" - -# NOTE: Make sure to keep this recipe at the same version as python3-cryptography -# Upgrade both recipes at the same time - -SRC_URI[sha256sum] = "505cd5e3b0cb32da1526f07042b7fc38a4b6c356710cb73d2b5f76b037a38ed1" - -PYPI_PACKAGE = "cryptography_vectors" - -inherit pypi python_setuptools_build_meta - -DEPENDS += " \ - python3-cryptography \ -" - -do_install:append () { - # Remove the sha256 checksum lines for pycache files - sed ${D}${PYTHON_SITEPACKAGES_DIR}/cryptography_vectors-${PV}.dist-info/RECORD -e '/__pycache__/d' -i -} - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_REGEX = "" - -RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-cryptography." diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb new file mode 100644 index 0000000000..9a025a530c --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb @@ -0,0 +1,31 @@ +SUMMARY = "Test vectors for the cryptography package." +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ + file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ + file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b" + +# NOTE: Make sure to keep this recipe at the same version as python3-cryptography +# Upgrade both recipes at the same time + +SRC_URI[sha256sum] = "8294c632dbe2cb14c7b7e24219560e674bc2224dfc4bed577ab077dbb82bfa3c" + +PYPI_PACKAGE = "cryptography_vectors" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + python3-cryptography \ +" + +do_install:append () { + # Remove the sha256 checksum lines for pycache files + sed ${D}${PYTHON_SITEPACKAGES_DIR}/cryptography_vectors-${PV}.dist-info/RECORD -e '/__pycache__/d' -i +} + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "" + +RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-cryptography." diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index f9c8d1393d..ec4bfcc98b 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch @@ -1,4 +1,4 @@ -From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001 +From 18d78736f5c39784d5151b08fdfdd21c61225686 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 17 May 2022 17:22:48 +0800 Subject: [PATCH] pyproject.toml: remove --benchmark-disable option @@ -26,7 +26,7 @@ Signed-off-by: Tim Orling 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index c9a7979bd..dec4b7157 100644 +index 4f0fa36..0d54ea6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ rust-version = ">=1.63.0" @@ -38,6 +38,3 @@ index c9a7979bd..dec4b7157 100644 console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", --- -2.34.1 - diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb deleted file mode 100644 index 0300330c60..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ - " -LDSHARED += "-pthread" - -SRC_URI[sha256sum] = "6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1" - -SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://check-memfree.py \ - file://run-ptest \ - " - -require ${BPN}-crates.inc - -inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig - -DEPENDS += " \ - python3-cffi-native \ -" - -RDEPENDS:${PN} += " \ - python3-cffi \ -" - -RDEPENDS:${PN}:append:class-target = " \ - python3-numbers \ - python3-threading \ -" - -RDEPENDS:${PN}-ptest += " \ - python3-bcrypt \ - python3-cryptography-vectors (= ${PV}) \ - python3-hypothesis \ - python3-iso8601 \ - python3-mmap \ - python3-pretend \ - python3-psutil \ - python3-pytest \ - python3-unittest-automake-output \ - python3-pytest-subtests \ - python3-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - # remove test_x509.py as it needs benchmark and we don't - # want to introduce the benchmark dependency - rm -rf ${D}${PTEST_PATH}/tests/bench/test_x509.py - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ - cp -r ${S}/pyproject.toml ${D}${PTEST_PATH}/ -} - -FILES:${PN}-dbg += " \ - ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb new file mode 100644 index 0000000000..5964400a04 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb @@ -0,0 +1,67 @@ +SUMMARY = "Provides cryptographic recipes and primitives to python developers" +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ + file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ + file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ + " +LDSHARED += "-pthread" + +SRC_URI[sha256sum] = "ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2" + +SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ + file://check-memfree.py \ + file://run-ptest \ + " + +require ${BPN}-crates.inc + +inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig + +DEPENDS += " \ + python3-cffi-native \ +" + +RDEPENDS:${PN} += " \ + python3-cffi \ +" + +RDEPENDS:${PN}:append:class-target = " \ + python3-numbers \ + python3-threading \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-bcrypt \ + python3-cryptography-vectors (= ${PV}) \ + python3-hypothesis \ + python3-iso8601 \ + python3-mmap \ + python3-pretend \ + python3-psutil \ + python3-pytest \ + python3-unittest-automake-output \ + python3-pytest-subtests \ + python3-pytz \ +" + +inherit ptest + +do_install_ptest() { + install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + # remove test_x509.py as it needs benchmark and we don't + # want to introduce the benchmark dependency + rm -rf ${D}${PTEST_PATH}/tests/bench/test_x509.py + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ + cp -r ${S}/pyproject.toml ${D}${PTEST_PATH}/ +} + +FILES:${PN}-dbg += " \ + ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/hazmat/bindings/.debug \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf