summary refs log tree commit diff
path: root/packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch')
-rw-r--r--packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch166
1 files changed, 0 insertions, 166 deletions
diff --git a/packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch b/packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch
deleted file mode 100644

index 7d1ee5d..0000000 --- a/packages/overlays/matrix-synapse/patches/0025-Bump-pyo3-from-0.23.5-to-0.24.2-18460.patch +++ /dev/null
@@ -1,166 +0,0 @@ -From ed6b7ba9c3da3add7a1551069411fa3697b0efc4 Mon Sep 17 00:00:00 2001 -From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> -Date: Wed, 21 May 2025 23:12:01 +0100 -Subject: [PATCH 25/34] Bump pyo3 from 0.23.5 to 0.24.2 (#18460) - -Also bump pythonize from 0.23.0 to 0.24.0, otherwise we couldn't compile -as pythonize 0.23.0 required pyo3 "^0.23.0". - -Addresses -[RUSTSEC-2025-0020](https://rustsec.org/advisories/RUSTSEC-2025-0020), -although Synapse is not affected as we don't make use of -`PyString::from_object`. - -[pyo3 0.24.x](https://github.com/PyO3/pyo3/releases/tag/v0.24.0) include -some performance optimisations apparently, and no breaking changes. - -### Pull Request Checklist - -<!-- Please read -https://element-hq.github.io/synapse/latest/development/contributing_guide.html -before submitting your pull request --> - -* [x] Pull request is based on the develop branch -* [x] Pull request includes a [changelog -file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). -The entry should: -- Be a short description of your change which makes sense to users. -"Fixed a bug that prevented receiving messages from other servers." -instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - - Use markdown where necessary, mostly for `code blocks`. - - End with either a period (.) or an exclamation mark (!). - - Start with a capital letter. -- Feel free to credit yourself, by adding a sentence "Contributed by -@github_username." or "Contributed by [Your Name]." to the end of the -entry. -* [x] [Code -style](https://element-hq.github.io/synapse/latest/code_style.html) is -correct (run the -[linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters)) ---- - Cargo.lock | 28 ++++++++++++++-------------- - changelog.d/18460.misc | 1 + - rust/Cargo.toml | 4 ++-- - 3 files changed, 17 insertions(+), 16 deletions(-) - create mode 100644 changelog.d/18460.misc - -diff --git a/Cargo.lock b/Cargo.lock -index 13156e67b5..980dff6987 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -277,9 +277,9 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.23.5" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872" -+checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" - dependencies = [ - "anyhow", - "cfg-if", -@@ -296,9 +296,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.23.5" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" -+checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" - dependencies = [ - "once_cell", - "target-lexicon", -@@ -306,9 +306,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.23.5" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" -+checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -327,9 +327,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.23.5" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da" -+checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -339,9 +339,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.23.5" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" -+checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" - dependencies = [ - "heck", - "proc-macro2", -@@ -352,9 +352,9 @@ dependencies = [ - - [[package]] - name = "pythonize" --version = "0.23.0" -+version = "0.24.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "91a6ee7a084f913f98d70cdc3ebec07e852b735ae3059a1500db2661265da9ff" -+checksum = "d5bcac0d0b71821f0d69e42654f1e15e5c94b85196446c4de9588951a2117e7b" - dependencies = [ - "pyo3", - "serde", -@@ -532,9 +532,9 @@ dependencies = [ - - [[package]] - name = "target-lexicon" --version = "0.12.14" -+version = "0.13.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" -+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" - - [[package]] - name = "typenum" -diff --git a/changelog.d/18460.misc b/changelog.d/18460.misc -new file mode 100644 -index 0000000000..5aa19683eb ---- /dev/null -+++ b/changelog.d/18460.misc -@@ -0,0 +1 @@ -+Bump pyo3 from 0.23.5 to 0.24.2. -\ No newline at end of file -diff --git a/rust/Cargo.toml b/rust/Cargo.toml -index 651b268f86..840988e74e 100644 ---- a/rust/Cargo.toml -+++ b/rust/Cargo.toml -@@ -30,14 +30,14 @@ http = "1.1.0" - lazy_static = "1.4.0" - log = "0.4.17" - mime = "0.3.17" --pyo3 = { version = "0.23.5", features = [ -+pyo3 = { version = "0.24.2", features = [ - "macros", - "anyhow", - "abi3", - "abi3-py39", - ] } - pyo3-log = "0.12.0" --pythonize = "0.23.0" -+pythonize = "0.24.0" - regex = "1.6.0" - sha2 = "0.10.8" - serde = { version = "1.0.144", features = ["derive"] } --- -2.49.0 -