From 992659911b46e9b0f93733630c5883e0e60f8dc4 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Wed, 22 May 2024 14:20:00 -0700 Subject: python3-bcrypt: upgrade 4.1.2 -> 4.1.3 https://github.com/pyca/bcrypt/compare/4.1.2...4.1.3 Upstream release notes: Bump Rust dependency versions * Drop 0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch -- merged * Refresh -crates.inc (From OE-Core rev: d2404135fd263947bcfd448657d3d0312e12122a) Signed-off-by: Tim Orling Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch | 111 --------------------- 1 file changed, 111 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch (limited to 'meta/recipes-devtools/python/python3-bcrypt') diff --git a/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch b/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch deleted file mode 100644 index 3f671fcc98..0000000000 --- a/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch +++ /dev/null @@ -1,111 +0,0 @@ -From cfdd98b3215cc12e66190a9c7f0a32c052e3c2e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 26 Feb 2024 18:26:30 -0800 -Subject: [PATCH] Bump pyo3 from 0.20.0 to 0.20.3 in /src/_bcrypt (#746) - -It fixes build on hosts without 64bit atomics - -Upstream-Status: Backport [https://github.com/pyca/bcrypt/commit/c2ef9350798ab59b18e8a0e04a01389858578fe0] -Signed-off-by: Khem Raj ---- - src/_bcrypt/Cargo.lock | 22 ++++++++++++++-------- - src/_bcrypt/Cargo.toml | 2 +- - 2 files changed, 15 insertions(+), 9 deletions(-) - ---- a/src/_bcrypt/Cargo.lock -+++ b/src/_bcrypt/Cargo.lock -@@ -233,6 +233,12 @@ dependencies = [ - ] - - [[package]] -+name = "portable-atomic" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -+ -+[[package]] - name = "proc-macro2" - version = "1.0.70" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -243,15 +249,16 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.20.0" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" -+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" - dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", - "parking_lot", -+ "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", -@@ -260,9 +267,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.20.0" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" -+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" - dependencies = [ - "once_cell", - "target-lexicon", -@@ -270,9 +277,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.20.0" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" -+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -280,9 +287,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.20.0" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" -+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -292,12 +299,13 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.20.0" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" -+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" - dependencies = [ - "heck", - "proc-macro2", -+ "pyo3-build-config", - "quote", - "syn", - ] ---- a/src/_bcrypt/Cargo.toml -+++ b/src/_bcrypt/Cargo.toml -@@ -6,7 +6,7 @@ edition = "2018" - publish = false - - [dependencies] --pyo3 = { version = "0.20.0", features = ["abi3"] } -+pyo3 = { version = "0.20.3", features = ["abi3"] } - bcrypt = "0.15" - bcrypt-pbkdf = "0.10.0" - base64 = "0.21.5" -- cgit v1.2.3-54-g00ecf