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
5e6476a4c6

(From OE-Core rev: 5c7ea0531bd099006c258b50c7b1747182123ae0)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-06-25 23:22:27 +02:00
committed by Richard Purdie
parent f01cd7aeaf
commit 3ecfadb08a
5 changed files with 131 additions and 153 deletions

View File

@@ -0,0 +1,29 @@
From 04aac6c88152088778c6551dfa86b2fc446dc61c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
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 <alex@linutronix.de>
---
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

View File

@@ -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 <mingli.yu@windriver.com>
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 <mingli.yu@windriver.com>
---
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
+]

View File

@@ -1,28 +0,0 @@
From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001
From: Tim Orling <tim.orling@konsulko.com>
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 <tim.orling@konsulko.com>
---
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 <cryptography-dev@python.org>"]
-edition = "2018"
+edition = "2021"
publish = false
[dependencies]
--
2.30.2