diff options
Diffstat (limited to 'security/agave')
| -rw-r--r-- | security/agave/Makefile | 4 | ||||
| -rw-r--r-- | security/agave/distinfo | 10 | ||||
| -rw-r--r-- | security/agave/files/patch-rust-1.87.0 | 42 |
3 files changed, 49 insertions, 7 deletions
diff --git a/security/agave/Makefile b/security/agave/Makefile index c23f02587c7c..b6fc26a9c13a 100644 --- a/security/agave/Makefile +++ b/security/agave/Makefile @@ -1,6 +1,6 @@ PORTNAME= agave DISTVERSIONPREFIX= v -DISTVERSION= 2.2.10 +DISTVERSION= 2.2.14 CATEGORIES= security PKGNAMESUFFIX= -blockchain @@ -653,7 +653,7 @@ CARGO_CRATES= Inflector-0.11.4 \ solana-reserved-account-keys-2.2.1 \ solana-reward-info-2.2.1 \ solana-sanitize-2.2.1 \ - solana-sbpf-0.10.0 \ + solana-sbpf-0.10.1 \ solana-sdk-2.2.2 \ solana-sdk-ids-2.2.1 \ solana-sdk-macro-2.2.1 \ diff --git a/security/agave/distinfo b/security/agave/distinfo index 3efe7f5d17ae..1d57ba0c8a39 100644 --- a/security/agave/distinfo +++ b/security/agave/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1744998301 +TIMESTAMP = 1747742789 SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 SIZE (rust/crates/Inflector-0.11.4.crate) = 17438 SHA256 (rust/crates/addr2line-0.20.0.crate) = f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3 @@ -1253,8 +1253,8 @@ SHA256 (rust/crates/solana-reward-info-2.2.1.crate) = 18205b69139b1ae0ab8f6e11cd SIZE (rust/crates/solana-reward-info-2.2.1.crate) = 4139 SHA256 (rust/crates/solana-sanitize-2.2.1.crate) = 61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf SIZE (rust/crates/solana-sanitize-2.2.1.crate) = 1565 -SHA256 (rust/crates/solana-sbpf-0.10.0.crate) = 66a3ce7a0f4d6830124ceb2c263c36d1ee39444ec70146eb49b939e557e72b96 -SIZE (rust/crates/solana-sbpf-0.10.0.crate) = 167288 +SHA256 (rust/crates/solana-sbpf-0.10.1.crate) = 8e6aed9fa0b4791538896be288fb5ccb2ab9f558ca0fe1ff28dfd3046fbdb5c5 +SIZE (rust/crates/solana-sbpf-0.10.1.crate) = 167277 SHA256 (rust/crates/solana-sdk-2.2.2.crate) = e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d SIZE (rust/crates/solana-sdk-2.2.2.crate) = 28048 SHA256 (rust/crates/solana-sdk-ids-2.2.1.crate) = 5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f @@ -1727,5 +1727,5 @@ SHA256 (rust/crates/zstd-sys-2.0.13+zstd.1.5.6.crate) = 38ff0f21cfee8f97d94cef41 SIZE (rust/crates/zstd-sys-2.0.13+zstd.1.5.6.crate) = 749090 SHA256 (anza-xyz-crossbeam-fd279d707025f0e60951e429bf778b4813d1b6bf_GH0.tar.gz) = c997bc77438ef12fbddf0a4e3fe1d8665dbd479980bab65cda3bfe2dbfda32ea SIZE (anza-xyz-crossbeam-fd279d707025f0e60951e429bf778b4813d1b6bf_GH0.tar.gz) = 254980 -SHA256 (anza-xyz-agave-v2.2.10_GH0.tar.gz) = b4dd7d82f93959b9c055dac85436928cf3aa47d24c8f3cd55c0b9253f5feec80 -SIZE (anza-xyz-agave-v2.2.10_GH0.tar.gz) = 18448115 +SHA256 (anza-xyz-agave-v2.2.14_GH0.tar.gz) = 210e181762c217e3c16b3747c32526d61bda70a0c1a97ebb2ec72941df82e7d9 +SIZE (anza-xyz-agave-v2.2.14_GH0.tar.gz) = 49456937 diff --git a/security/agave/files/patch-rust-1.87.0 b/security/agave/files/patch-rust-1.87.0 new file mode 100644 index 000000000000..cc2162774154 --- /dev/null +++ b/security/agave/files/patch-rust-1.87.0 @@ -0,0 +1,42 @@ +https://github.com/anza-xyz/agave/pull/5323 + +https://github.com/anza-xyz/agave/pull/5323/commits/b8444343075a96f7472dd3b18490233cd0aeb9a2 +https://github.com/anza-xyz/agave/pull/5323/commits/28ec738e2282958f5b85bf6fd515ac31b099f95e + +--- unified-scheduler-pool/src/lib.rs.orig 2025-05-20 14:31:43.222181000 +0200 ++++ unified-scheduler-pool/src/lib.rs 2025-05-20 14:31:51.894607000 +0200 +@@ -12,6 +12,8 @@ + //! Refer to [`PooledScheduler`] doc comment for general overview of scheduler state transitions + //! regarding to pooling and the actual use. + ++use std::ops::DerefMut; ++ + #[cfg(feature = "dev-context-only-utils")] + use qualifier_attr::qualifiers; + use { +@@ -326,10 +328,10 @@ where + // + // Note that this critical section could block the latency-sensitive replay + // code-path via ::take_scheduler(). +- #[allow(unstable_name_collisions)] +- idle_inners.extend(scheduler_inners.extract_if(|(_inner, pooled_at)| { +- now.duration_since(*pooled_at) > max_pooling_duration +- })); ++ idle_inners.extend(MakeExtractIf::extract_if( ++ scheduler_inners.deref_mut(), ++ |(_inner, pooled_at)| now.duration_since(*pooled_at) > max_pooling_duration, ++ )); + drop(scheduler_inners); + + let idle_inner_count = idle_inners.len(); +@@ -357,8 +359,8 @@ where + let Ok(mut timeout_listeners) = scheduler_pool.timeout_listeners.lock() else { + break; + }; +- #[allow(unstable_name_collisions)] +- expired_listeners.extend(timeout_listeners.extract_if( ++ expired_listeners.extend(MakeExtractIf::extract_if( ++ timeout_listeners.deref_mut(), + |(_callback, registered_at)| { + now.duration_since(*registered_at) > timeout_duration + }, |