Skip to content

Commit 435cdc8

Browse files
committed
[GR-52796] Add patch for cryptography 42.0.5
PullRequest: graalpython/3261
2 parents 3ac1e57 + 8908e6b commit 435cdc8

File tree

2 files changed

+98
-0
lines changed

2 files changed

+98
-0
lines changed
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
From 890114c41f963f36174d22018a6037bad9f4b4f5 Mon Sep 17 00:00:00 2001
2+
From: Tim Felgentreff <[email protected]>
3+
Date: Tue, 19 Sep 2023 06:22:02 +0200
4+
Subject: [PATCH] graalpy pyo3
5+
6+
---
7+
src/rust/Cargo.lock | 15 +++++----------
8+
src/rust/Cargo.toml | 2 +-
9+
src/rust/cryptography-cffi/Cargo.toml | 2 +-
10+
3 files changed, 7 insertions(+), 12 deletions(-)
11+
12+
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
13+
index 030e38d..b614b1c 100644
14+
--- a/src/rust/Cargo.lock
15+
+++ b/src/rust/Cargo.lock
16+
@@ -281,8 +281,7 @@ dependencies = [
17+
[[package]]
18+
name = "pyo3"
19+
version = "0.20.3"
20+
-source = "registry+https://github.com/rust-lang/crates.io-index"
21+
-checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
22+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
23+
dependencies = [
24+
"cfg-if",
25+
"indoc",
26+
@@ -299,8 +298,7 @@ dependencies = [
27+
[[package]]
28+
name = "pyo3-build-config"
29+
version = "0.20.3"
30+
-source = "registry+https://github.com/rust-lang/crates.io-index"
31+
-checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
32+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
33+
dependencies = [
34+
"once_cell",
35+
"target-lexicon",
36+
@@ -309,8 +307,7 @@ dependencies = [
37+
[[package]]
38+
name = "pyo3-ffi"
39+
version = "0.20.3"
40+
-source = "registry+https://github.com/rust-lang/crates.io-index"
41+
-checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
42+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
43+
dependencies = [
44+
"libc",
45+
"pyo3-build-config",
46+
@@ -319,8 +316,7 @@ dependencies = [
47+
[[package]]
48+
name = "pyo3-macros"
49+
version = "0.20.3"
50+
-source = "registry+https://github.com/rust-lang/crates.io-index"
51+
-checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
52+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
53+
dependencies = [
54+
"proc-macro2",
55+
"pyo3-macros-backend",
56+
@@ -331,8 +327,7 @@ dependencies = [
57+
[[package]]
58+
name = "pyo3-macros-backend"
59+
version = "0.20.3"
60+
-source = "registry+https://github.com/rust-lang/crates.io-index"
61+
-checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
62+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
63+
dependencies = [
64+
"heck",
65+
"proc-macro2",
66+
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
67+
index 2322486..a0b5c8f 100644
68+
--- a/src/rust/Cargo.toml
69+
+++ b/src/rust/Cargo.toml
70+
@@ -10,7 +10,7 @@ rust-version = "1.63.0"
71+
[dependencies]
72+
once_cell = "1"
73+
cfg-if = "1"
74+
-pyo3 = { version = "0.20", features = ["abi3"] }
75+
+pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.20.3.graalpy", features = ["abi3"] }
76+
asn1 = { version = "0.15.5", default-features = false }
77+
cryptography-cffi = { path = "cryptography-cffi" }
78+
cryptography-key-parsing = { path = "cryptography-key-parsing" }
79+
diff --git a/src/rust/cryptography-cffi/Cargo.toml b/src/rust/cryptography-cffi/Cargo.toml
80+
index a025e58..cff5fcf 100644
81+
--- a/src/rust/cryptography-cffi/Cargo.toml
82+
+++ b/src/rust/cryptography-cffi/Cargo.toml
83+
@@ -8,7 +8,7 @@ publish = false
84+
rust-version = "1.63.0"
85+
86+
[dependencies]
87+
-pyo3 = { version = "0.20", features = ["abi3"] }
88+
+pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.20.3.graalpy", features = ["abi3"] }
89+
openssl-sys = "0.9.99"
90+
91+
[build-dependencies]
92+
--
93+
2.34.1
94+

graalpython/lib-graalpython/patches/cryptography/metadata.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ patch = 'cryptography-39.0.2.patch'
99
[[rules]]
1010
version = '== 41.0.3'
1111
patch = 'cryptography-41.0.3.patch'
12+
13+
[[rules]]
14+
version = '== 42.0.5'
15+
patch = 'cryptography-42.0.5.patch'

0 commit comments

Comments
 (0)