From 3ecfadb08aadc524643ed32f330d70d008dd57e8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 25 Jun 2023 23:22:27 +0200 Subject: python3-cryptography: update 39.0.2 -> 41.0.1 Drop 0002-Cargo.toml-edition-2018-2021.patch (issue fixed upstream) License-Update: PSF licensed code removed as of https://github.com/pyca/cryptography/commit/5e6476a4c6e094926a983dcf5cbe9488c30aeb53 (From OE-Core rev: 5c7ea0531bd099006c258b50c7b1747182123ae0) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...y-cffi-substitute-include-path-from-targe.patch | 29 ++++++++++++++++++++++ ...ject.toml-remove-benchmark-disable-option.patch | 25 +++++++++++-------- .../0002-Cargo.toml-edition-2018-2021.patch | 28 --------------------- 3 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch delete mode 100644 meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch (limited to 'meta/recipes-devtools/python/python3-cryptography') diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch new file mode 100644 index 0000000000..1a60abada7 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch @@ -0,0 +1,29 @@ +From 04aac6c88152088778c6551dfa86b2fc446dc61c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Jun 2023 13:27:28 +0200 +Subject: [PATCH] cryptography-cffi: substitute include path from target + sysroot + +Upstream-Status: Accepted [https://github.com/pyca/cryptography/pull/9105] + +Signed-off-by: Alexander Kanavin +--- + src/rust/cryptography-cffi/build.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs +index 4a40990..08abb95 100644 +--- a/src/rust/cryptography-cffi/build.rs ++++ b/src/rust/cryptography-cffi/build.rs +@@ -48,7 +48,7 @@ fn main() { + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); + let python_include = run_python_script( + &python, +- "import sysconfig; print(sysconfig.get_path('include'), end='')", ++ "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'), end='')", + ) + .unwrap(); + let openssl_include = +-- +2.30.2 + 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 481f595246..69cf451d57 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 ce972ea92d724f232323a9a6265a8b44d913d4d8 Mon Sep 17 00:00:00 2001 +From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 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 @@ -18,23 +18,28 @@ Fixes: Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu + --- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 4d58129..b011fca 100644 +index b2e511f..4a285af 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -15,7 +15,7 @@ line-length = 79 - target-version = ["py36"] +@@ -85,7 +85,7 @@ line-length = 79 + target-version = ["py37"] [tool.pytest.ini_options] -addopts = "-r s --capture=no --strict-markers --benchmark-disable" +addopts = "-r s --capture=no --strict-markers" + console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", - "supported: parametrized test requiring only_if and skip_message", --- -2.25.1 - +@@ -151,4 +151,4 @@ git-only = [ + "ci-constraints-requirements.txt", + ".gitattributes", + ".gitignore", +-] +\ No newline at end of file ++] diff --git a/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch b/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch deleted file mode 100644 index 366e3a4d39..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001 -From: Tim Orling -Date: Fri, 14 Jan 2022 22:34:59 -0800 -Subject: [PATCH 2/2] Cargo.toml: edition 2018 -> 2021 - -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 174eaa80..7ad053d9 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -2,7 +2,7 @@ - name = "cryptography-rust" - version = "0.1.0" - authors = ["The cryptography developers "] --edition = "2018" -+edition = "2021" - publish = false - - [dependencies] --- -2.30.2 - -- cgit v1.2.3-54-g00ecf