| Patrick Williams | 3965356 | 2024-03-01 08:54:02 -0600 | [diff] [blame] | 1 | From cfdd98b3215cc12e66190a9c7f0a32c052e3c2e7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 26 Feb 2024 18:26:30 -0800 |
| 4 | Subject: [PATCH] Bump pyo3 from 0.20.0 to 0.20.3 in /src/_bcrypt (#746) |
| 5 | |
| 6 | It fixes build on hosts without 64bit atomics |
| 7 | |
| 8 | Upstream-Status: Backport [https://github.com/pyca/bcrypt/commit/c2ef9350798ab59b18e8a0e04a01389858578fe0] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | src/_bcrypt/Cargo.lock | 22 ++++++++++++++-------- |
| 12 | src/_bcrypt/Cargo.toml | 2 +- |
| 13 | 2 files changed, 15 insertions(+), 9 deletions(-) |
| 14 | |
| 15 | --- a/src/_bcrypt/Cargo.lock |
| 16 | +++ b/src/_bcrypt/Cargo.lock |
| 17 | @@ -233,6 +233,12 @@ dependencies = [ |
| 18 | ] |
| 19 | |
| 20 | [[package]] |
| 21 | +name = "portable-atomic" |
| 22 | +version = "1.6.0" |
| 23 | +source = "registry+https://github.com/rust-lang/crates.io-index" |
| 24 | +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
| 25 | + |
| 26 | +[[package]] |
| 27 | name = "proc-macro2" |
| 28 | version = "1.0.70" |
| 29 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 30 | @@ -243,15 +249,16 @@ dependencies = [ |
| 31 | |
| 32 | [[package]] |
| 33 | name = "pyo3" |
| 34 | -version = "0.20.0" |
| 35 | +version = "0.20.3" |
| 36 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 37 | -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" |
| 38 | +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" |
| 39 | dependencies = [ |
| 40 | "cfg-if", |
| 41 | "indoc", |
| 42 | "libc", |
| 43 | "memoffset", |
| 44 | "parking_lot", |
| 45 | + "portable-atomic", |
| 46 | "pyo3-build-config", |
| 47 | "pyo3-ffi", |
| 48 | "pyo3-macros", |
| 49 | @@ -260,9 +267,9 @@ dependencies = [ |
| 50 | |
| 51 | [[package]] |
| 52 | name = "pyo3-build-config" |
| 53 | -version = "0.20.0" |
| 54 | +version = "0.20.3" |
| 55 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 56 | -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" |
| 57 | +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" |
| 58 | dependencies = [ |
| 59 | "once_cell", |
| 60 | "target-lexicon", |
| 61 | @@ -270,9 +277,9 @@ dependencies = [ |
| 62 | |
| 63 | [[package]] |
| 64 | name = "pyo3-ffi" |
| 65 | -version = "0.20.0" |
| 66 | +version = "0.20.3" |
| 67 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 68 | -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" |
| 69 | +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" |
| 70 | dependencies = [ |
| 71 | "libc", |
| 72 | "pyo3-build-config", |
| 73 | @@ -280,9 +287,9 @@ dependencies = [ |
| 74 | |
| 75 | [[package]] |
| 76 | name = "pyo3-macros" |
| 77 | -version = "0.20.0" |
| 78 | +version = "0.20.3" |
| 79 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 80 | -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" |
| 81 | +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" |
| 82 | dependencies = [ |
| 83 | "proc-macro2", |
| 84 | "pyo3-macros-backend", |
| 85 | @@ -292,12 +299,13 @@ dependencies = [ |
| 86 | |
| 87 | [[package]] |
| 88 | name = "pyo3-macros-backend" |
| 89 | -version = "0.20.0" |
| 90 | +version = "0.20.3" |
| 91 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 92 | -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" |
| 93 | +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" |
| 94 | dependencies = [ |
| 95 | "heck", |
| 96 | "proc-macro2", |
| 97 | + "pyo3-build-config", |
| 98 | "quote", |
| 99 | "syn", |
| 100 | ] |
| 101 | --- a/src/_bcrypt/Cargo.toml |
| 102 | +++ b/src/_bcrypt/Cargo.toml |
| 103 | @@ -6,7 +6,7 @@ edition = "2018" |
| 104 | publish = false |
| 105 | |
| 106 | [dependencies] |
| 107 | -pyo3 = { version = "0.20.0", features = ["abi3"] } |
| 108 | +pyo3 = { version = "0.20.3", features = ["abi3"] } |
| 109 | bcrypt = "0.15" |
| 110 | bcrypt-pbkdf = "0.10.0" |
| 111 | base64 = "0.21.5" |