Skip to content

Commit 5824fd1

Browse files
committed
arti: update to 2.0.0.
1 parent 3d02139 commit 5824fd1

4 files changed

Lines changed: 48 additions & 12 deletions

File tree

srcpkgs/arti/patches/fix-32bit-tests.patch

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,30 @@ thread 'time_store::test::system_time_conversions' panicked at crates/tor-hsserv
66
2038-01-19T03:14:08Z: OutOfRange
77

88
diff --git a/crates/tor-hsservice/src/time_store.rs b/crates/tor-hsservice/src/time_store.rs
9-
index d63d6f015..fafe806d0 100644
9+
index 54be02664..ebe4cb904 100644
1010
--- a/crates/tor-hsservice/src/time_store.rs
1111
+++ b/crates/tor-hsservice/src/time_store.rs
12-
@@ -515,6 +515,7 @@ mod test {
12+
@@ -518,6 +518,7 @@ mod test {
1313
assert_eq!(e, FutureTimestamp::from_str("T+23kg"));
1414
}
1515

1616
+ #[cfg(target_pointer_width = "64")]
1717
#[test]
1818
#[allow(clippy::unusual_byte_groupings)] // we want them to line up, dammit!
1919
fn system_time_conversions() {
20+
21+
--------------------------------------------------------------------------------
22+
causes compile time overflows on pure 32bit builders
23+
24+
diff --git a/crates/tor-memquota/src/config.rs b/crates/tor-memquota/src/config.rs
25+
index 0ed1241b1..05d33d2ce 100644
26+
--- a/crates/tor-memquota/src/config.rs
27+
+++ b/crates/tor-memquota/src/config.rs
28+
@@ -457,6 +457,7 @@ mod test {
29+
}
30+
31+
/// Test the logic that computes the `max` when configured as "auto".
32+
+ #[cfg(target_pointer_width = "64")]
33+
#[test]
34+
// We do some `1 * X` operations below for readability.
35+
#[allow(clippy::identity_op)]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
musl uses different capitalization for the error message
2+
to_lowercase() covers both glibc and musl
3+
4+
diff --git a/crates/fs-mistrust/src/dir.rs b/crates/fs-mistrust/src/dir.rs
5+
index d422820df..af81c19b0 100644
6+
--- a/crates/fs-mistrust/src/dir.rs
7+
+++ b/crates/fs-mistrust/src/dir.rs
8+
@@ -590,7 +590,7 @@ mod test {
9+
.open("f1-link", OpenOptions::new().read(true))
10+
.unwrap_err();
11+
assert!(
12+
- matches!(e, Error::Io { ref err, .. } if err.to_string().contains("symbolic")), // Error is ELOOP.
13+
+ matches!(e, Error::Io { ref err, .. } if err.to_string().to_lowercase().contains("symbolic")), // Error is ELOOP.
14+
"{e:?}"
15+
);
16+
}
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
Lower system memory requirements for tests to support ci runners <4GiB
22

33
diff --git a/crates/arti/src/arti-example-config.toml b/crates/arti/src/arti-example-config.toml
4-
index 16e2d6ac2..33e9870c5 100644
4+
index 5b53cb2f1..691f0fe7f 100644
55
--- a/crates/arti/src/arti-example-config.toml
66
+++ b/crates/arti/src/arti-example-config.toml
7-
@@ -451,11 +451,11 @@
8-
# The default is unlimited.
7+
@@ -549,7 +549,7 @@
8+
# If `system.memory.low_water` is given as an explicit value,
9+
# `system.memory.max` must also be given as an explicit value.
910
#
10-
# Maximum memory use, after which reclamation starts:
1111
-# memory.max = "8 GiB"
1212
+# memory.max = "3 GiB"
13-
# (If anything is specified in `[system.memory]`, this value is mandatory.)
13+
14+
# Low-water mark for tracked memory:
15+
# When reclaiming memory, we stop when we reach this amount.
16+
@@ -558,7 +558,7 @@
17+
# assumed that the value used for "auto" will remain stable across different
18+
# versions of arti.
1419
#
15-
# When reclaiming memory, we stop when we reach this amount:
1620
-# memory.low_water = "6 GiB"
17-
+# memory.low_water = "2 GiB"
18-
# (The default is 3/4 of `system.memory.max`.)
21+
+# memory.low_water = "2.25 GiB"
1922

2023
##### ONION SERVICES
24+
#

srcpkgs/arti/template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'arti'
22
pkgname=arti
3-
version=1.4.0
3+
version=2.0.0
44
revision=1
55
archs="x86_64* i686* aarch64* arm*" # ring
66
build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
1313
homepage="https://gitlab.torproject.org/tpo/core/arti"
1414
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
1515
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
16-
checksum=404e79e1f33c3dfdf8290c1f2b2c651c0b00ed5dd66fc78e08d92621b7ff660e
16+
checksum=19106e4706222de65f8e735193ec50ba4c312abc2a28b48cca7e13d01fdeacab
1717

1818
post_install() {
1919
vlicense LICENSE-MIT

0 commit comments

Comments
 (0)