Add patches for more cryptography versions

msimacek · msimacek · commit f467437308a4 · 2024-05-02T17:01:54.000+02:00
diff --git a/graalpython/lib-graalpython/patches/cryptography/cryptography-38.0.0.patch b/graalpython/lib-graalpython/patches/cryptography/cryptography-38.0.0.patch
@@ -0,0 +1,57 @@
+diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
+index e1fd955..f65dba8 100644
+--- a/src/rust/Cargo.lock
++++ b/src/rust/Cargo.lock
+@@ -327,8 +327,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "cfg-if",
+  "indoc",
+@@ -343,8 +342,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-build-config"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "once_cell",
+ ]
+@@ -352,8 +350,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "pyo3-macros-backend",
+  "quote",
+@@ -363,8 +360,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros-backend"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "proc-macro2",
+  "pyo3-build-config",
+diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
+index 271b290..7f151ed 100644
+--- a/src/rust/Cargo.toml
++++ b/src/rust/Cargo.toml
+@@ -7,7 +7,7 @@ publish = false
+ 
+ [dependencies]
+ once_cell = "1"
+-pyo3 = { version = "0.15.2" }
++pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.15.2.graalpy" }
+ asn1 = { version = "0.12.1", default-features = false, features = ["derive"] }
+ pem = "1.1"
+ chrono = { version = "0.4.22", default-features = false, features = ["alloc", "clock"] }
diff --git a/graalpython/lib-graalpython/patches/cryptography/cryptography-38.0.1.patch b/graalpython/lib-graalpython/patches/cryptography/cryptography-38.0.1.patch
@@ -0,0 +1,57 @@
+diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
+index 4a0ecfd..9a19c80 100644
+--- a/src/rust/Cargo.lock
++++ b/src/rust/Cargo.lock
+@@ -327,8 +327,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "cfg-if",
+  "indoc",
+@@ -343,8 +342,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-build-config"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "once_cell",
+ ]
+@@ -352,8 +350,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "pyo3-macros-backend",
+  "quote",
+@@ -363,8 +360,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros-backend"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "proc-macro2",
+  "pyo3-build-config",
+diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
+index 49e70a3..8d94f34 100644
+--- a/src/rust/Cargo.toml
++++ b/src/rust/Cargo.toml
+@@ -7,7 +7,7 @@ publish = false
+ 
+ [dependencies]
+ once_cell = "1"
+-pyo3 = { version = "0.15.2" }
++pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.15.2.graalpy" }
+ asn1 = { version = "0.12.2", default-features = false, features = ["derive"] }
+ pem = "1.1"
+ chrono = { version = "0.4.22", default-features = false, features = ["alloc", "clock"] }
diff --git a/graalpython/lib-graalpython/patches/cryptography/cryptography-39.0.0.patch b/graalpython/lib-graalpython/patches/cryptography/cryptography-39.0.0.patch
@@ -0,0 +1,57 @@
+diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
+index 02b8e8c..10c675f 100644
+--- a/src/rust/Cargo.lock
++++ b/src/rust/Cargo.lock
+@@ -406,8 +406,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "cfg-if",
+  "indoc",
+@@ -422,8 +421,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-build-config"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "once_cell",
+ ]
+@@ -431,8 +429,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "pyo3-macros-backend",
+  "quote",
+@@ -442,8 +439,7 @@ dependencies = [
+ [[package]]
+ name = "pyo3-macros-backend"
+ version = "0.15.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.15.2.graalpy#879575fc39d7378dec0e56ce4480b1ae5744c34f"
+ dependencies = [
+  "proc-macro2",
+  "pyo3-build-config",
+diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
+index d557fc0..147455c 100644
+--- a/src/rust/Cargo.toml
++++ b/src/rust/Cargo.toml
+@@ -7,7 +7,7 @@ publish = false
+ 
+ [dependencies]
+ once_cell = "1"
+-pyo3 = { version = "0.15.2" }
++pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.15.2.graalpy" }
+ asn1 = { version = "0.13.0", default-features = false }
+ pem = "1.1"
+ chrono = { version = "0.4.22", default-features = false, features = ["alloc", "clock"] }
diff --git a/graalpython/lib-graalpython/patches/cryptography/cryptography-41.0.0.patch b/graalpython/lib-graalpython/patches/cryptography/cryptography-41.0.0.patch
diff --git a/graalpython/lib-graalpython/patches/cryptography/cryptography-42.0.0.patch b/graalpython/lib-graalpython/patches/cryptography/cryptography-42.0.0.patch
@@ -0,0 +1,90 @@
+diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
+index b2e0ac4..792c398 100644
+--- a/src/rust/Cargo.lock
++++ b/src/rust/Cargo.lock
+@@ -274,9 +274,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "pyo3"
+-version = "0.20.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0"
++version = "0.20.3"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
+ dependencies = [
+  "cfg-if",
+  "indoc",
+@@ -291,9 +290,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "pyo3-build-config"
+-version = "0.20.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be"
++version = "0.20.3"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
+ dependencies = [
+  "once_cell",
+  "target-lexicon",
+@@ -301,9 +299,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "pyo3-ffi"
+-version = "0.20.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1"
++version = "0.20.3"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
+ dependencies = [
+  "libc",
+  "pyo3-build-config",
+@@ -311,9 +308,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "pyo3-macros"
+-version = "0.20.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3"
++version = "0.20.3"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
+ dependencies = [
+  "proc-macro2",
+  "pyo3-macros-backend",
+@@ -323,9 +319,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "pyo3-macros-backend"
+-version = "0.20.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
++version = "0.20.3"
++source = "git+https://github.com/timfel/pyo3.git?branch=v0.20.3.graalpy#c02d58c5158dbb3a080200a078b0e997b83a7575"
+ dependencies = [
+  "heck",
+  "proc-macro2",
+diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
+index 2322486..a0b5c8f 100644
+--- a/src/rust/Cargo.toml
++++ b/src/rust/Cargo.toml
+@@ -10,7 +10,7 @@ rust-version = "1.63.0"
+ [dependencies]
+ once_cell = "1"
+ cfg-if = "1"
+-pyo3 = { version = "0.20", features = ["abi3"] }
++pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.20.3.graalpy", features = ["abi3"] }
+ asn1 = { version = "0.15.5", default-features = false }
+ cryptography-cffi = { path = "cryptography-cffi" }
+ cryptography-key-parsing = { path = "cryptography-key-parsing" }
+diff --git a/src/rust/cryptography-cffi/Cargo.toml b/src/rust/cryptography-cffi/Cargo.toml
+index a025e58..cff5fcf 100644
+--- a/src/rust/cryptography-cffi/Cargo.toml
++++ b/src/rust/cryptography-cffi/Cargo.toml
+@@ -8,7 +8,7 @@ publish = false
+ rust-version = "1.63.0"
+ 
+ [dependencies]
+-pyo3 = { version = "0.20", features = ["abi3"] }
++pyo3 = { git = "https://github.com/timfel/pyo3.git", branch = "v0.20.3.graalpy", features = ["abi3"] }
+ openssl-sys = "0.9.99"
+ 
+ [build-dependencies]
diff --git a/graalpython/lib-graalpython/patches/cryptography/metadata.toml b/graalpython/lib-graalpython/patches/cryptography/metadata.toml
@@ -3,12 +3,28 @@ version = '== 3.4.7'
 patch = 'cryptography-3.4.7.patch'
 
 [[rules]]
-version = '== 39.0.2'
+version = '== 38.0.0'
+patch = 'cryptography-38.0.0.patch'
+
+[[rules]]
+version = '>= 38.0.1, < 39.0.0'
+patch = 'cryptography-38.0.1.patch'
+
+[[rules]]
+version = '>= 39.0.0, < 39.0.2'
+patch = 'cryptography-39.0.0.patch'
+
+[[rules]]
+version = '>= 39.0.2, < 41.0.0'
 patch = 'cryptography-39.0.2.patch'
 
 [[rules]]
-version = '== 41.0.3'
-patch = 'cryptography-41.0.3.patch'
+version = '>= 41.0.0, < 42.0.0'
+patch = 'cryptography-41.0.0.patch'
+
+[[rules]]
+version = '>= 42.0.0, < 42.0.5'
+patch = 'cryptography-42.0.0.patch'
 
 [[rules]]
 version = '== 42.0.5'
