Skip to content

Commit d739e23

Browse files
committed
[GR-52292] Add patch for cryptography-39.0.2
PullRequest: graalpython/3216
2 parents 3a8c6b6 + 6618f8e commit d739e23

File tree

2 files changed

+74
-0
lines changed

2 files changed

+74
-0
lines changed
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
From c02f6cd637b6285744caba1ed8553ffb2147dad9 Mon Sep 17 00:00:00 2001
2+
From: Tim Felgentreff <[email protected]>
3+
Date: Fri, 23 Feb 2024 13:35:07 +0100
4+
Subject: [PATCH] Use graalpy patched pyo3
5+
6+
---
7+
src/rust/Cargo.lock | 12 ++++--------
8+
src/rust/Cargo.toml | 2 +-
9+
2 files changed, 5 insertions(+), 9 deletions(-)
10+
11+
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
12+
index 02b8e8c..10c675f 100644
13+
--- a/src/rust/Cargo.lock
14+
+++ b/src/rust/Cargo.lock
15+
@@ -406,8 +406,7 @@ dependencies = [
16+
[[package]]
17+
name = "pyo3"
18+
version = "0.15.2"
19+
-source = "registry+https://github.com/rust-lang/crates.io-index"
20+
-checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
21+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
22+
dependencies = [
23+
"cfg-if",
24+
"indoc",
25+
@@ -422,8 +421,7 @@ dependencies = [
26+
[[package]]
27+
name = "pyo3-build-config"
28+
version = "0.15.2"
29+
-source = "registry+https://github.com/rust-lang/crates.io-index"
30+
-checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
31+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
32+
dependencies = [
33+
"once_cell",
34+
]
35+
@@ -431,8 +429,7 @@ dependencies = [
36+
[[package]]
37+
name = "pyo3-macros"
38+
version = "0.15.2"
39+
-source = "registry+https://github.com/rust-lang/crates.io-index"
40+
-checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
41+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
42+
dependencies = [
43+
"pyo3-macros-backend",
44+
"quote",
45+
@@ -442,8 +439,7 @@ dependencies = [
46+
[[package]]
47+
name = "pyo3-macros-backend"
48+
version = "0.15.2"
49+
-source = "registry+https://github.com/rust-lang/crates.io-index"
50+
-checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
51+
+source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
52+
dependencies = [
53+
"proc-macro2",
54+
"pyo3-build-config",
55+
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
56+
index d557fc0..147455c 100644
57+
--- a/src/rust/Cargo.toml
58+
+++ b/src/rust/Cargo.toml
59+
@@ -7,7 +7,7 @@ publish = false
60+
61+
[dependencies]
62+
once_cell = "1"
63+
-pyo3 = { version = "0.15.2" }
64+
+pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.15.2.graalpy" }
65+
asn1 = { version = "0.13.0", default-features = false }
66+
pem = "1.1"
67+
chrono = { version = "0.4.22", default-features = false, features = ["alloc", "clock"] }
68+
--
69+
2.34.1
70+

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
version = '== 3.4.7'
33
patch = 'cryptography-3.4.7.patch'
44

5+
[[rules]]
6+
version = '== 39.0.2'
7+
patch = 'cryptography-39.0.2.patch'
8+
59
[[rules]]
610
version = '== 41.0.3'
711
patch = 'cryptography-41.0.3.patch'

0 commit comments

Comments
 (0)