2 files changed, 47 insertions, 12 deletions

diff --git a/shells/atuin/Makefile b/shells/atuin/Makefile
index 79a4b003b19c..db1df028ec99 100644
--- a/shells/atuin/Makefile
+++ b/shells/atuin/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	atuin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	14.0.1
-PORTREVISION=	1
+DISTVERSION=	15.0.0
 CATEGORIES=	shells
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,10 +18,12 @@ GH_ACCOUNT=	ellie
 WRKSRC_SUBDIR=	atuin
 
 CARGO_BUILD_ARGS=	-p atuin
-CARGO_CRATES=	ahash-0.7.6 \
+CARGO_CRATES=	aead-0.5.2 \
+		ahash-0.7.6 \
 		aho-corasick-0.7.19 \
 		android_system_properties-0.1.5 \
 		anyhow-1.0.64 \
+		argon2-0.5.0 \
 		async-trait-0.1.58 \
 		atoi-1.0.0 \
 		atty-0.2.14 \
@@ -31,8 +32,10 @@ CARGO_CRATES=	ahash-0.7.6 \
 		axum-core-0.3.2 \
 		base64-0.13.1 \
 		base64-0.21.0 \
+		base64ct-1.6.0 \
 		beef-0.5.2 \
 		bitflags-1.3.2 \
+		blake2-0.10.6 \
 		block-buffer-0.10.3 \
 		bumpalo-3.12.0 \
 		byteorder-1.4.3 \
@@ -42,6 +45,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		cfg-if-1.0.0 \
 		chrono-0.4.22 \
 		chronoutil-0.2.3 \
+		cipher-0.4.4 \
 		clap-4.1.14 \
 		clap_builder-4.1.14 \
 		clap_complete-4.2.0 \
@@ -113,6 +117,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		indenter-0.3.3 \
 		indexmap-1.9.1 \
 		indicatif-0.17.3 \
+		inout-0.1.3 \
 		instant-0.1.12 \
 		interim-0.1.0 \
 		io-lifetimes-1.0.10 \
@@ -150,6 +155,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		num_cpus-1.13.1 \
 		number_prefix-0.4.0 \
 		once_cell-1.17.1 \
+		opaque-debug-0.3.0 \
 		openssl-probe-0.1.5 \
 		overload-0.1.1 \
 		parking_lot-0.11.2 \
@@ -157,6 +163,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		parking_lot_core-0.8.5 \
 		parking_lot_core-0.9.3 \
 		parse_duration-2.1.1 \
+		password-hash-0.5.0 \
 		paste-1.0.9 \
 		pathdiff-0.2.1 \
 		pbkdf2-0.11.0 \
@@ -166,13 +173,14 @@ CARGO_CRATES=	ahash-0.7.6 \
 		pin-project-lite-0.2.9 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.25 \
+		poly1305-0.8.0 \
 		portable-atomic-0.3.19 \
 		ppv-lite86-0.2.16 \
 		proc-macro2-1.0.56 \
 		quote-1.0.26 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
+		rand_core-0.6.4 \
 		redox_syscall-0.2.16 \
 		redox_users-0.4.3 \
 		regex-1.7.2 \
@@ -184,7 +192,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		rmp-serde-1.1.1 \
 		rpassword-7.2.0 \
 		rtoolbox-0.0.1 \
-		runtime-format-0.1.2 \
+		runtime-format-0.1.3 \
 		rustc-hash-1.1.0 \
 		rustix-0.37.11 \
 		rustls-0.20.6 \
@@ -192,6 +200,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		rustls-pemfile-1.0.1 \
 		rustversion-1.0.11 \
 		ryu-1.0.11 \
+		salsa20-0.10.2 \
 		same-file-1.0.6 \
 		schannel-0.1.20 \
 		scopeguard-1.1.0 \
@@ -261,6 +270,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		unicode-segmentation-1.10.1 \
 		unicode-width-0.1.10 \
 		unicode_categories-0.1.1 \
+		universal-hash-0.5.0 \
 		untrusted-0.7.1 \
 		url-2.3.1 \
 		urlencoding-2.1.2 \
@@ -309,6 +319,7 @@ CARGO_CRATES=	ahash-0.7.6 \
 		windows_x86_64_msvc-0.42.0 \
 		windows_x86_64_msvc-0.48.0 \
 		winreg-0.10.1 \
+		xsalsa20poly1305-0.9.0 \
 		zeroize-1.6.0 \
 		zeroize_derive-1.4.2
 
diff --git a/shells/atuin/distinfo b/shells/atuin/distinfo
index 35d270b877e2..d51fae156874 100644
--- a/shells/atuin/distinfo
+++ b/shells/atuin/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1681791230
+TIMESTAMP = 1685379717
+SHA256 (rust/crates/aead-0.5.2.crate) = d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0
+SIZE (rust/crates/aead-0.5.2.crate) = 15509
 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
 SIZE (rust/crates/ahash-0.7.6.crate) = 38030
 SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
@@ -7,6 +9,8 @@ SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac2
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
 SHA256 (rust/crates/anyhow-1.0.64.crate) = b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7
 SIZE (rust/crates/anyhow-1.0.64.crate) = 43549
+SHA256 (rust/crates/argon2-0.5.0.crate) = 95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c
+SIZE (rust/crates/argon2-0.5.0.crate) = 27500
 SHA256 (rust/crates/async-trait-0.1.58.crate) = 1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c
 SIZE (rust/crates/async-trait-0.1.58.crate) = 26783
 SHA256 (rust/crates/atoi-1.0.0.crate) = d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e
@@ -23,10 +27,14 @@ SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71
 SIZE (rust/crates/base64-0.13.1.crate) = 61002
 SHA256 (rust/crates/base64-0.21.0.crate) = a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a
 SIZE (rust/crates/base64-0.21.0.crate) = 72180
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
 SHA256 (rust/crates/beef-0.5.2.crate) = 3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1
 SIZE (rust/crates/beef-0.5.2.crate) = 15275
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
 SHA256 (rust/crates/block-buffer-0.10.3.crate) = 69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e
 SIZE (rust/crates/block-buffer-0.10.3.crate) = 10465
 SHA256 (rust/crates/bumpalo-3.12.0.crate) = 0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535
@@ -45,6 +53,8 @@ SHA256 (rust/crates/chrono-0.4.22.crate) = bfd4d1b31faaa3a89d7934dbded3111da0d2e
 SIZE (rust/crates/chrono-0.4.22.crate) = 185570
 SHA256 (rust/crates/chronoutil-0.2.3.crate) = 43a58c924bb772aa201da3acf5308c46b60275c64e6d3bc89c23dd63d71e83fd
 SIZE (rust/crates/chronoutil-0.2.3.crate) = 10858
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
 SHA256 (rust/crates/clap-4.1.14.crate) = 906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14
 SIZE (rust/crates/clap-4.1.14.crate) = 53475
 SHA256 (rust/crates/clap_builder-4.1.14.crate) = 351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b
@@ -187,6 +197,8 @@ SHA256 (rust/crates/indexmap-1.9.1.crate) = 10a35a97730320ffe8e2d410b5d3b69279b9
 SIZE (rust/crates/indexmap-1.9.1.crate) = 54114
 SHA256 (rust/crates/indicatif-0.17.3.crate) = cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729
 SIZE (rust/crates/indicatif-0.17.3.crate) = 53584
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
 SIZE (rust/crates/instant-0.1.12.crate) = 6128
 SHA256 (rust/crates/interim-0.1.0.crate) = 9ffd2ac8397b9574daa4ffa7ede4427dd249cadaa900719d4b01154a5631d38b
@@ -261,6 +273,8 @@ SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1
 SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
 SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3
 SIZE (rust/crates/once_cell-1.17.1.crate) = 32856
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
 SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
@@ -275,6 +289,8 @@ SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e
 SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
 SHA256 (rust/crates/parse_duration-2.1.1.crate) = 7037e5e93e0172a5a96874380bf73bc6ecef022e26fa25f2be26864d6b3ba95d
 SIZE (rust/crates/parse_duration-2.1.1.crate) = 9451
+SHA256 (rust/crates/password-hash-0.5.0.crate) = 346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166
+SIZE (rust/crates/password-hash-0.5.0.crate) = 26884
 SHA256 (rust/crates/paste-1.0.9.crate) = b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1
 SIZE (rust/crates/paste-1.0.9.crate) = 17752
 SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd
@@ -293,6 +309,8 @@ SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/pkg-config-0.3.25.crate) = 1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae
 SIZE (rust/crates/pkg-config-0.3.25.crate) = 16838
+SHA256 (rust/crates/poly1305-0.8.0.crate) = 8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf
+SIZE (rust/crates/poly1305-0.8.0.crate) = 32633
 SHA256 (rust/crates/portable-atomic-0.3.19.crate) = 26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b
 SIZE (rust/crates/portable-atomic-0.3.19.crate) = 87668
 SHA256 (rust/crates/ppv-lite86-0.2.16.crate) = eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872
@@ -305,8 +323,8 @@ SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
-SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
-SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
 SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
@@ -329,8 +347,8 @@ SHA256 (rust/crates/rpassword-7.2.0.crate) = 6678cf63ab3491898c0d021b493c94c9b22
 SIZE (rust/crates/rpassword-7.2.0.crate) = 8857
 SHA256 (rust/crates/rtoolbox-0.0.1.crate) = 034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a
 SIZE (rust/crates/rtoolbox-0.0.1.crate) = 9430
-SHA256 (rust/crates/runtime-format-0.1.2.crate) = b035308411b1af4683acc4fc928366443f08b893bb73e235c85de4c2be572495
-SIZE (rust/crates/runtime-format-0.1.2.crate) = 6100
+SHA256 (rust/crates/runtime-format-0.1.3.crate) = 09958d5b38bca768ede7928c767c89a08ba568144a7b61992aecae79b03c8c94
+SIZE (rust/crates/runtime-format-0.1.3.crate) = 6141
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustix-0.37.11.crate) = 85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77
@@ -345,6 +363,8 @@ SHA256 (rust/crates/rustversion-1.0.11.crate) = 5583e89e108996506031660fe09baa50
 SIZE (rust/crates/rustversion-1.0.11.crate) = 17485
 SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
 SIZE (rust/crates/ryu-1.0.11.crate) = 47007
+SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213
+SIZE (rust/crates/salsa20-0.10.2.crate) = 12780
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/schannel-0.1.20.crate) = 88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2
@@ -483,6 +503,8 @@ SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dab
 SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968
 SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e
 SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
+SHA256 (rust/crates/universal-hash-0.5.0.crate) = 7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5
+SIZE (rust/crates/universal-hash-0.5.0.crate) = 9137
 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
 SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
 SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643
@@ -579,9 +601,11 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f98
 SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422
 SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d
 SIZE (rust/crates/winreg-0.10.1.crate) = 25725
+SHA256 (rust/crates/xsalsa20poly1305-0.9.0.crate) = 472c385ee974833d7e59979eeb74175d56774be3768b5bcc581337e21396bda3
+SIZE (rust/crates/xsalsa20poly1305-0.9.0.crate) = 11428
 SHA256 (rust/crates/zeroize-1.6.0.crate) = 2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9
 SIZE (rust/crates/zeroize-1.6.0.crate) = 19049
 SHA256 (rust/crates/zeroize_derive-1.4.2.crate) = ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69
 SIZE (rust/crates/zeroize_derive-1.4.2.crate) = 11141
-SHA256 (ellie-atuin-v14.0.1_GH0.tar.gz) = 00ba6eea19f11b3f73652e71af69b3dc7eb221761519f3b9680047f5476915b4
-SIZE (ellie-atuin-v14.0.1_GH0.tar.gz) = 1550540
+SHA256 (ellie-atuin-v15.0.0_GH0.tar.gz) = ad5236aa1352b469ed108486efa448bd73ea2670432cf66de043aabfadb04b89
+SIZE (ellie-atuin-v15.0.0_GH0.tar.gz) = 1558068