From 6654ad28b7dd48466869086611ee5c5b032fc5f6 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 06:23:18 +0900 Subject: [PATCH 01/10] Update rocket_csrf to 0.1.1 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3632d47f..f4c2f04a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,8 +60,8 @@ path = "plume-common" path = "plume-models" [dependencies.rocket_csrf] -git = "https://github.com/fdb-hiroshima/rocket_csrf" -rev = "29910f2829e7e590a540da3804336577b48c7b31" +git = "https://git.joinplu.me/plume/rocket_csrf" +rev = "0.1.1" [build-dependencies] ructe = "0.14.0" From 10617f31440edbc19161aad3de075fcf771b4cde Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 06:23:25 +0900 Subject: [PATCH 02/10] Install rocket_csrf --- Cargo.lock | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd91e109..b7832850 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1290,7 +1290,7 @@ dependencies = [ "futures-sink", "nanorand", "pin-project", - "spin", + "spin 0.9.3", ] [[package]] @@ -3934,14 +3934,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.13.5" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", - "lazy_static", "libc", + "once_cell", + "spin 0.5.2", "untrusted", + "web-sys", + "winapi 0.3.9", ] [[package]] @@ -3995,8 +3998,8 @@ dependencies = [ [[package]] name = "rocket_csrf" -version = "0.1.0" -source = "git+https://github.com/fdb-hiroshima/rocket_csrf?rev=29910f2829e7e590a540da3804336577b48c7b31#29910f2829e7e590a540da3804336577b48c7b31" +version = "0.1.1" +source = "git+https://git.joinplu.me/plume/rocket_csrf?rev=0.1.1#e400909066fe57c1da7640bd086361e5233d8511" dependencies = [ "data-encoding", "ring", @@ -4398,6 +4401,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.3" @@ -5269,9 +5278,9 @@ dependencies = [ [[package]] name = "untrusted" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" From 87edb2486c72dd2cd8487876ff8cd4148a9044f4 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 06:36:30 +0900 Subject: [PATCH 03/10] Update openssl --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7832850..1baa5a25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2924,9 +2924,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.40" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", @@ -2956,9 +2956,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.73" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg 1.1.0", "cc", From a275aa59653ec32b215cd1949f1295e6919b32c3 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 07:10:09 +0900 Subject: [PATCH 04/10] Stick serde version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f4c2f04a..b082301b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ rocket = "0.4.11" rocket_contrib = { version = "0.4.11", features = ["json"] } rocket_i18n = "0.4.1" scheduled-thread-pool = "0.2.6" -serde = "1.0" +serde = "1.0.137" serde_json = "1.0.81" shrinkwraprs = "0.3.0" validator = { version = "0.15", features = ["derive"] } From b180089b1b1411758ffffc00dbef5987c33a59cb Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 07:10:31 +0900 Subject: [PATCH 05/10] Update ldap3 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1baa5a25..b5136b8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2163,9 +2163,9 @@ dependencies = [ [[package]] name = "ldap3" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef35dc747152dd47bdc6aaeb35a232f84cbc8d84ae4cb9673aea810a6570ab8f" +checksum = "ce38dafca0608c64cc0146fb782b06abb8d946dae7a3af23c89a95da24f6b84d" dependencies = [ "async-trait", "bytes 1.1.0", From 47394fc620f1e6c3d7a420ca29b3dcbb6a3b333d Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 07:24:32 +0900 Subject: [PATCH 06/10] Stick serde --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b082301b..a8eb72ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ rocket = "0.4.11" rocket_contrib = { version = "0.4.11", features = ["json"] } rocket_i18n = "0.4.1" scheduled-thread-pool = "0.2.6" -serde = "1.0.137" +serde = "=1.0.137" serde_json = "1.0.81" shrinkwraprs = "0.3.0" validator = { version = "0.15", features = ["derive"] } From a550291c858cfc62571233661b003dc61264e064 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 07:41:54 +0900 Subject: [PATCH 07/10] Stick activitystreams version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a8eb72ff..c767f93c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ webfinger = "0.4.1" tracing = "0.1.35" tracing-subscriber = "0.3.10" riker = "0.4.2" -activitystreams = "0.7.0-alpha.18" +activitystreams = "=0.7.0-alpha.18" [[bin]] name = "plume" From 903b48ed12e81371101cdcf73896dbd1d0de1b4c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 07:54:08 +0900 Subject: [PATCH 08/10] Stick activitystreams version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c767f93c..a8d1bd39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ webfinger = "0.4.1" tracing = "0.1.35" tracing-subscriber = "0.3.10" riker = "0.4.2" -activitystreams = "=0.7.0-alpha.18" +activitystreams = "=0.7.0-alpha.20" [[bin]] name = "plume" From 22ebecba675363047b8cb90375323de1f7d86fde Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 08:11:14 +0900 Subject: [PATCH 09/10] Stick serde for all packages --- plume-api/Cargo.toml | 2 +- plume-common/Cargo.toml | 2 +- plume-front/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plume-api/Cargo.toml b/plume-api/Cargo.toml index 3d608b63..8baf7aba 100644 --- a/plume-api/Cargo.toml +++ b/plume-api/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Plume contributors"] edition = "2018" [dependencies] -serde = "1.0" +serde = "=1.0.137" serde_derive = "1.0" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index ffa1bb47..1bc5ef5f 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -11,7 +11,7 @@ hex = "0.4" openssl = "0.10.40" rocket = "0.4.11" reqwest = { version = "0.11.11", features = ["blocking", "json", "socks"] } -serde = "1.0" +serde = "=1.0.137" serde_derive = "1.0" serde_json = "1.0.81" shrinkwraprs = "0.3.0" diff --git a/plume-front/Cargo.toml b/plume-front/Cargo.toml index 3ea82f17..1acea938 100644 --- a/plume-front/Cargo.toml +++ b/plume-front/Cargo.toml @@ -12,7 +12,7 @@ gettext = "0.4.0" gettext-macros = "0.6.1" gettext-utils = "0.1.0" lazy_static = "1.3" -serde = "1.0" +serde = "=1.0.137" serde_json = "1.0" wasm-bindgen = "0.2.81" js-sys = "0.3.58" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 49d57365..9629e277 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -17,7 +17,7 @@ rocket = "0.4.11" rocket_i18n = "0.4.1" reqwest = "0.11.11" scheduled-thread-pool = "0.2.6" -serde = "1.0" +serde = "=1.0.137" serde_derive = "1.0" serde_json = "1.0.81" tantivy = "0.13.3" From 263cf9e04fe39a153b1d51e83b552b5636e6a81e Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 1 Jan 2023 08:52:08 +0900 Subject: [PATCH 10/10] Stick activitystreams for all packages --- Cargo.lock | 4 ++-- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5136b8a..d039f82c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2076,9 +2076,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "iri-string" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e76a2a488a2bce15f9e696e3b9b66a4e1412c13339344bba8a24b7eae30f91b" +checksum = "bf071934ee7ee97e52fa1868a9540a7885eab75926bd70794030304a9797cea1" dependencies = [ "serde 1.0.137", ] diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 1bc5ef5f..29bfabee 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -19,7 +19,7 @@ syntect = "4.5.0" regex-syntax = { version = "0.6.26", default-features = false, features = ["unicode-perl"] } tracing = "0.1.35" askama_escape = "0.10.3" -activitystreams = "0.7.0-alpha.18" +activitystreams = "=0.7.0-alpha.20" activitystreams-ext = "0.1.0-alpha.2" url = "2.2.2" flume = "0.10.13" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 9629e277..0d7d0303 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -34,7 +34,7 @@ riker = "0.4.2" once_cell = "1.12.0" lettre = "0.9.6" native-tls = "0.2.10" -activitystreams = "0.7.0-alpha.18" +activitystreams = "=0.7.0-alpha.20" [dependencies.chrono] features = ["serde"]