From 3d31ee5594a4abb17d3e1026711a74301d3480a8 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 20 Sep 2021 16:19:42 +0900
Subject: [PATCH 1/4] chore(mach): upgrade `blessings` to 1.7

---
 python/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/requirements.txt b/python/requirements.txt
index 8948cef5761..79ce22f3c36 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,7 +1,7 @@
 # Ensure all versions are pinned for repeatability,
 # since `--system-site-packages` is enabled
 
-blessings == 1.6
+blessings == 1.7
 distro == 1.4
 mach == 1.0.0
 mozdebug == 0.3

From 527409e830d22aed6fd3c218ee4934e9b80b0973 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 4 Oct 2021 09:37:45 +0900
Subject: [PATCH 2/4] chore(deps): bump `openssl-sys` from 0.9.63 to 0.9.67

The macOS CI now installs OpenSSL 3.0, which is only supported by newer
versions of `openssl-sys`.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 479e272dae8..a00f2ac99d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4304,9 +4304,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.63"
+version = "0.9.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
+checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058"
 dependencies = [
  "autocfg",
  "cc",

From 8f38a44ee72c3e70c3050bbbffaf91ddd6384979 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 4 Oct 2021 09:39:31 +0900
Subject: [PATCH 3/4] chore(mach): update the required clang-format version to
 12

---
 python/servo/testing_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 3fe720b21e6..ae3bd0f6d2a 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -49,7 +49,7 @@ WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests")
 SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests")
 
 CLANGFMT_CPP_DIRS = ["support/hololens/"]
-CLANGFMT_VERSION = "11"
+CLANGFMT_VERSION = "12"
 
 TEST_SUITES = OrderedDict([
     ("tidy", {"kwargs": {"all_files": False, "no_progress": False, "self_test": False,

From f375f3c4ef34005e298afaceaadf88b51aa05901 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 4 Oct 2021 12:23:10 +0900
Subject: [PATCH 4/4] chore(deps): bump `openssl` from 0.10.34 to v0.10.36

`openssl-sys` 0.9.67 seems incompatible with an older `openssl`.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a00f2ac99d8..21af7a0014f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4284,9 +4284,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.34"
+version = "0.10.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
+checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",