security/arti: Update to 1.1.13

3 files changed, 50 insertions, 29 deletions

diff --git a/security/arti/Makefile b/security/arti/Makefile
index 2762bfa6447a..6aa78f7bc3f2 100644
--- a/security/arti/Makefile
+++ b/security/arti/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	arti
-DISTVERSION=	1.1.12
+DISTVERSION=	1.1.13
 CATEGORIES=	security
 
 MAINTAINER=	cs@FreeBSD.org
@@ -21,7 +21,7 @@ PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.torproject.org
 GL_ACCOUNT=	tpo/core
-GL_TAGNAME=	d6e89fbb361137efcfb0ce5d66437a6ff77cdb2e
+GL_TAGNAME=	3ef803627bc84e6ba8c89ca57128141f237f35f8
 CARGO_FEATURES=	tokio rustls
 CARGO_INSTALL=	no
 
diff --git a/security/arti/Makefile.crates b/security/arti/Makefile.crates
index fe0749bee19a..a700c774577e 100644
--- a/security/arti/Makefile.crates
+++ b/security/arti/Makefile.crates
@@ -34,7 +34,6 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		async-lock-3.2.0 \
 		async-native-tls-0.5.0 \
 		async-process-1.8.1 \
-		async-rustls-0.4.1 \
 		async-signal-0.2.5 \
 		async-std-1.12.0 \
 		async-task-4.7.0 \
@@ -131,7 +130,6 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		enum-ordinalize-3.1.15 \
 		env_logger-0.5.13 \
 		equivalent-1.0.1 \
-		erased-serde-0.3.31 \
 		erased-serde-0.4.2 \
 		errno-0.3.8 \
 		event-listener-2.5.3 \
@@ -158,6 +156,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.2.1 \
 		fslock-0.2.1 \
+		fslock-arti-fork-0.2.0 \
 		funty-2.0.0 \
 		futures-0.3.30 \
 		futures-await-test-0.3.0 \
@@ -169,6 +168,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		futures-lite-1.13.0 \
 		futures-lite-2.2.0 \
 		futures-macro-0.3.30 \
+		futures-rustls-0.25.1 \
 		futures-sink-0.3.30 \
 		futures-task-0.3.30 \
 		futures-util-0.3.30 \
@@ -195,13 +195,17 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		http-0.2.11 \
 		http-1.0.0 \
 		http-body-0.4.6 \
+		http-body-1.0.0 \
+		http-body-util-0.1.0 \
 		httparse-1.8.0 \
 		httpdate-1.0.3 \
 		humantime-1.3.0 \
 		humantime-2.1.0 \
 		humantime-serde-1.1.1 \
 		hyper-0.14.28 \
-		iana-time-zone-0.1.59 \
+		hyper-1.1.0 \
+		hyper-util-0.1.2 \
+		iana-time-zone-0.1.60 \
 		iana-time-zone-haiku-0.1.2 \
 		ident_case-1.0.1 \
 		idna-0.4.0 \
@@ -340,8 +344,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		rustc_version-0.4.0 \
 		rustix-0.37.27 \
 		rustix-0.38.28 \
-		rustls-0.21.10 \
-		rustls-webpki-0.101.7 \
+		rustls-0.22.2 \
+		rustls-pki-types-1.1.0 \
+		rustls-webpki-0.102.1 \
 		rustversion-1.0.14 \
 		ryu-1.0.16 \
 		safe_arch-0.7.1 \
@@ -349,7 +354,6 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		sanitize-filename-0.5.0 \
 		schannel-0.1.23 \
 		scopeguard-1.2.0 \
-		sct-0.7.1 \
 		sec1-0.7.3 \
 		secmem-proc-0.3.2 \
 		security-framework-2.9.2 \
@@ -368,8 +372,8 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		serde_urlencoded-0.7.1 \
 		serde_with-3.4.0 \
 		serde_with_macros-3.4.0 \
-		serial_test-2.0.0 \
-		serial_test_derive-2.0.0 \
+		serial_test-3.0.0 \
+		serial_test_derive-3.0.0 \
 		sha1-0.10.6 \
 		sha1-asm-0.5.2 \
 		sha2-0.10.8 \
@@ -399,7 +403,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		statrs-0.16.0 \
 		strsim-0.10.0 \
 		strum-0.25.0 \
+		strum-0.26.1 \
 		strum_macros-0.25.3 \
+		strum_macros-0.26.1 \
 		subtle-2.5.0 \
 		syn-1.0.109 \
 		syn-2.0.48 \
@@ -425,6 +431,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		tls-api-test-0.9.0 \
 		tokio-1.35.1 \
 		tokio-macros-2.2.0 \
+		tokio-native-tls-0.3.1 \
 		tokio-socks-0.5.1 \
 		tokio-stream-0.1.14 \
 		tokio-util-0.7.10 \
diff --git a/security/arti/distinfo b/security/arti/distinfo
index e54c6bdfe080..05b91cb114bf 100644
--- a/security/arti/distinfo
+++ b/security/arti/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1705009194
+TIMESTAMP = 1707169842
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -71,8 +71,6 @@ SHA256 (rust/crates/async-native-tls-0.5.0.crate) = 9343dc5acf07e79ff82d0c37899f
 SIZE (rust/crates/async-native-tls-0.5.0.crate) = 24719
 SHA256 (rust/crates/async-process-1.8.1.crate) = ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88
 SIZE (rust/crates/async-process-1.8.1.crate) = 22758
-SHA256 (rust/crates/async-rustls-0.4.1.crate) = bd10f063fb367d26334e10c50c67ea31ac542b8c3402be2251db4cfc5d74ba66
-SIZE (rust/crates/async-rustls-0.4.1.crate) = 24947
 SHA256 (rust/crates/async-signal-0.2.5.crate) = 9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5
 SIZE (rust/crates/async-signal-0.2.5.crate) = 16743
 SHA256 (rust/crates/async-std-1.12.0.crate) = 62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d
@@ -265,8 +263,6 @@ SHA256 (rust/crates/env_logger-0.5.13.crate) = 15b0a4d2e39f8420210be8b27eeda2802
 SIZE (rust/crates/env_logger-0.5.13.crate) = 25275
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/erased-serde-0.3.31.crate) = 6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c
-SIZE (rust/crates/erased-serde-0.3.31.crate) = 24182
 SHA256 (rust/crates/erased-serde-0.4.2.crate) = 55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7
 SIZE (rust/crates/erased-serde-0.4.2.crate) = 25661
 SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
@@ -319,6 +315,8 @@ SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd
 SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
 SHA256 (rust/crates/fslock-0.2.1.crate) = 04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb
 SIZE (rust/crates/fslock-0.2.1.crate) = 13463
+SHA256 (rust/crates/fslock-arti-fork-0.2.0.crate) = 8b21bd626aaab7b904b20bef6d9e06298914a0c8d9fb8b010483766b2e532791
+SIZE (rust/crates/fslock-arti-fork-0.2.0.crate) = 14305
 SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
 SIZE (rust/crates/funty-2.0.0.crate) = 13160
 SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
@@ -341,6 +339,8 @@ SHA256 (rust/crates/futures-lite-2.2.0.crate) = 445ba825b27408685aaecefd65178908
 SIZE (rust/crates/futures-lite-2.2.0.crate) = 38029
 SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
 SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-rustls-0.25.1.crate) = c8d8a2499f0fecc0492eb3e47eab4e92da7875e1028ad2528f214ac3346ca04e
+SIZE (rust/crates/futures-rustls-0.25.1.crate) = 22165
 SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
 SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
 SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
@@ -393,6 +393,10 @@ SHA256 (rust/crates/http-1.0.0.crate) = b32afd38673a8016f7c9ae69e5af41a58f81b1d3
 SIZE (rust/crates/http-1.0.0.crate) = 100981
 SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
 SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-body-1.0.0.crate) = 1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643
+SIZE (rust/crates/http-body-1.0.0.crate) = 5411
+SHA256 (rust/crates/http-body-util-0.1.0.crate) = 41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840
+SIZE (rust/crates/http-body-util-0.1.0.crate) = 10368
 SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
 SIZE (rust/crates/httparse-1.8.0.crate) = 29954
 SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
@@ -405,8 +409,12 @@ SHA256 (rust/crates/humantime-serde-1.1.1.crate) = 57a3db5ea5923d99402c94e9feb26
 SIZE (rust/crates/humantime-serde-1.1.1.crate) = 7886
 SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
 SIZE (rust/crates/hyper-0.14.28.crate) = 197204
-SHA256 (rust/crates/iana-time-zone-0.1.59.crate) = b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539
-SIZE (rust/crates/iana-time-zone-0.1.59.crate) = 27033
+SHA256 (rust/crates/hyper-1.1.0.crate) = fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75
+SIZE (rust/crates/hyper-1.1.0.crate) = 145893
+SHA256 (rust/crates/hyper-util-0.1.2.crate) = bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67
+SIZE (rust/crates/hyper-util-0.1.2.crate) = 54182
+SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
+SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
 SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
@@ -683,10 +691,12 @@ SHA256 (rust/crates/rustix-0.37.27.crate) = fea8ca367a3a01fe35e6943c400addf443c0
 SIZE (rust/crates/rustix-0.37.27.crate) = 324534
 SHA256 (rust/crates/rustix-0.38.28.crate) = 72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316
 SIZE (rust/crates/rustix-0.38.28.crate) = 365398
-SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
-SIZE (rust/crates/rustls-0.21.10.crate) = 284920
-SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
-SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustls-0.22.2.crate) = e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41
+SIZE (rust/crates/rustls-0.22.2.crate) = 332080
+SHA256 (rust/crates/rustls-pki-types-1.1.0.crate) = 9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a
+SIZE (rust/crates/rustls-pki-types-1.1.0.crate) = 21252
+SHA256 (rust/crates/rustls-webpki-0.102.1.crate) = ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b
+SIZE (rust/crates/rustls-webpki-0.102.1.crate) = 196873
 SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4
 SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
 SHA256 (rust/crates/ryu-1.0.16.crate) = f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c
@@ -701,8 +711,6 @@ SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb656926561522261
 SIZE (rust/crates/schannel-0.1.23.crate) = 41667
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
-SIZE (rust/crates/sct-0.7.1.crate) = 27501
 SHA256 (rust/crates/sec1-0.7.3.crate) = d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc
 SIZE (rust/crates/sec1-0.7.3.crate) = 17979
 SHA256 (rust/crates/secmem-proc-0.3.2.crate) = 0b19a1b87c3bab9f9ce77a4317680035d068c6f3911fc3e0e37e0c80ae8d5254
@@ -739,10 +747,10 @@ SHA256 (rust/crates/serde_with-3.4.0.crate) = 64cd236ccc1b7a29e7e2739f27c0b2dd19
 SIZE (rust/crates/serde_with-3.4.0.crate) = 126494
 SHA256 (rust/crates/serde_with_macros-3.4.0.crate) = 93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788
 SIZE (rust/crates/serde_with_macros-3.4.0.crate) = 28226
-SHA256 (rust/crates/serial_test-2.0.0.crate) = 0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d
-SIZE (rust/crates/serial_test-2.0.0.crate) = 7946
-SHA256 (rust/crates/serial_test_derive-2.0.0.crate) = 91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f
-SIZE (rust/crates/serial_test_derive-2.0.0.crate) = 5638
+SHA256 (rust/crates/serial_test-3.0.0.crate) = 953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d
+SIZE (rust/crates/serial_test-3.0.0.crate) = 8483
+SHA256 (rust/crates/serial_test_derive-3.0.0.crate) = b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212
+SIZE (rust/crates/serial_test_derive-3.0.0.crate) = 6588
 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sha1-asm-0.5.2.crate) = 2ba6947745e7f86be3b8af00b7355857085dbdf8901393c89514510eb61f4e21
@@ -801,8 +809,12 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
 SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125
 SIZE (rust/crates/strum-0.25.0.crate) = 5539
+SHA256 (rust/crates/strum-0.26.1.crate) = 723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f
+SIZE (rust/crates/strum-0.26.1.crate) = 5861
 SHA256 (rust/crates/strum_macros-0.25.3.crate) = 23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0
 SIZE (rust/crates/strum_macros-0.25.3.crate) = 22570
+SHA256 (rust/crates/strum_macros-0.26.1.crate) = 7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18
+SIZE (rust/crates/strum_macros-0.26.1.crate) = 25326
 SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
 SIZE (rust/crates/subtle-2.5.0.crate) = 13909
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
@@ -853,6 +865,8 @@ SHA256 (rust/crates/tokio-1.35.1.crate) = c89b4efa943be685f629b149f53829423f8f55
 SIZE (rust/crates/tokio-1.35.1.crate) = 744407
 SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
 SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2
+SIZE (rust/crates/tokio-native-tls-0.3.1.crate) = 20676
 SHA256 (rust/crates/tokio-socks-0.5.1.crate) = 51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0
 SIZE (rust/crates/tokio-socks-0.5.1.crate) = 16137
 SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
@@ -1037,5 +1051,5 @@ SHA256 (rust/crates/zstd-safe-7.0.0.crate) = 43747c7422e2924c11144d5229878b98180
 SIZE (rust/crates/zstd-safe-7.0.0.crate) = 20463
 SHA256 (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656
 SIZE (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 728791
-SHA256 (tpo/core-arti-d6e89fbb361137efcfb0ce5d66437a6ff77cdb2e_GL0.tar.gz) = 3e9eef9758c88cfe1718fcd67e150e00981c27dfcddf336b58c17d23a1b1a256
-SIZE (tpo/core-arti-d6e89fbb361137efcfb0ce5d66437a6ff77cdb2e_GL0.tar.gz) = 4225120
+SHA256 (tpo/core-arti-3ef803627bc84e6ba8c89ca57128141f237f35f8_GL0.tar.gz) = 6292f1dd635088a60e791b7b64ae1a5703880a1ff3a9f89ed5c3b6eb3b8be8c2
+SIZE (tpo/core-arti-3ef803627bc84e6ba8c89ca57128141f237f35f8_GL0.tar.gz) = 4263112