From f6a029b9de728ef18afdccabd6025fca857a79d9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:04:46 +0200 Subject: python3-cryptography: upgrade 36.0.2 -> 37.0.1 Drop backported fix-leak-metric.patch. Adjust versions of crate components. (From OE-Core rev: 9a9b172da07c719aff3630bd25ec859e57f246f4) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../0001-Cargo.toml-specify-pem-version.patch | 12 +++----- .../python3-cryptography/fix-leak-metric.patch | 36 ---------------------- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch (limited to 'meta/recipes-devtools/python/python3-cryptography') diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch index d7ab757bb5..7266fd7bef 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch @@ -1,4 +1,4 @@ -From ec8d3f3c61280c8140b34ed1479baef5e706f064 Mon Sep 17 00:00:00 2001 +From d41203b9b79f5edc2d33b0d62921822294dfaa6b Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 14 Jan 2022 22:02:25 -0800 Subject: [PATCH] Cargo.toml: specify pem version @@ -9,23 +9,21 @@ pem = { version: "1.0.2"} Upstream-Status: Pending Signed-off-by: Tim Orling + --- src/rust/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 617167d0..174eaa80 100644 +index d17245d..f8f6416 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -9,7 +9,7 @@ publish = false 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" +pem = { version = "1.0.2" } chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] } - ouroboros = "0.13" + ouroboros = "0.15" --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch b/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch deleted file mode 100644 index 904984f43d..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch +++ /dev/null @@ -1,36 +0,0 @@ -Trigger hashlib initialisation so that the test_create_certificate_with_extensions -test doesn't fail. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From dc989d563ab6a078651160e5e6d4ee3df8cb08d7 Mon Sep 17 00:00:00 2001 -From: Alex Gaynor -Date: Thu, 7 Apr 2022 03:15:09 -0400 -Subject: [PATCH] Added Ubuntu Jammy to CI (#7047) - -* Added Ubuntu Jammy to CI - -* try thing ---- - .github/workflows/ci.yml | 1 + - docs/installation.rst | 2 +- - tests/hazmat/backends/test_openssl_memleak.py | 3 +++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/hazmat/backends/test_openssl_memleak.py b/tests/hazmat/backends/test_openssl_memleak.py -index 835c9256a6..2605566bd5 100644 ---- a/tests/hazmat/backends/test_openssl_memleak.py -+++ b/tests/hazmat/backends/test_openssl_memleak.py -@@ -82,8 +82,11 @@ def free(ptr, path, line): - assert result == 1 - - # Trigger a bunch of initialization stuff. -+ import hashlib - from cryptography.hazmat.backends.openssl.backend import backend - -+ hashlib.sha256() -+ - start_heap = set(heap) - - try: -- cgit v1.2.3-54-g00ecf