From ebf82d1668cc10719aada438a362ecd5a027870b Mon Sep 17 00:00:00 2001
From: Laurenz <lalten@users.noreply.github.com>
Date: Mon, 29 Jan 2024 23:40:41 +0100
Subject: [PATCH] Update boringssl to 20240126-22d349c (#1398)

* Update boringssl to 20240126-22d349c

* review

* set `--copt=-isystem/usr/local/include` for macos

* upgrade platforms, add centos back in

* try the other workaround mentioned in https://github.com/bazelbuild/bazel/issues/10472#issuecomment-678528743
---
 .../0.0.0-20240126-22d349c/MODULE.bazel       |  7 ++++++
 .../patches/module_dot_bazel.patch            | 10 ++++++++
 .../0.0.0-20240126-22d349c/presubmit.yml      | 24 +++++++++++++++++++
 .../0.0.0-20240126-22d349c/source.json        |  9 +++++++
 modules/boringssl/metadata.json               |  3 ++-
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 modules/boringssl/0.0.0-20240126-22d349c/MODULE.bazel
 create mode 100644 modules/boringssl/0.0.0-20240126-22d349c/patches/module_dot_bazel.patch
 create mode 100644 modules/boringssl/0.0.0-20240126-22d349c/presubmit.yml
 create mode 100644 modules/boringssl/0.0.0-20240126-22d349c/source.json

diff --git a/modules/boringssl/0.0.0-20240126-22d349c/MODULE.bazel b/modules/boringssl/0.0.0-20240126-22d349c/MODULE.bazel
new file mode 100644
index 0000000000..1a07310c63
--- /dev/null
+++ b/modules/boringssl/0.0.0-20240126-22d349c/MODULE.bazel
@@ -0,0 +1,7 @@
+module(
+    name = "boringssl",
+    version = "0.0.0-20240126-22d349c",
+    compatibility_level = 2,
+)
+bazel_dep(name = "rules_cc", version = "0.0.9")
+bazel_dep(name = "platforms", version = "0.0.8")
diff --git a/modules/boringssl/0.0.0-20240126-22d349c/patches/module_dot_bazel.patch b/modules/boringssl/0.0.0-20240126-22d349c/patches/module_dot_bazel.patch
new file mode 100644
index 0000000000..370b8db393
--- /dev/null
+++ b/modules/boringssl/0.0.0-20240126-22d349c/patches/module_dot_bazel.patch
@@ -0,0 +1,10 @@
+--- MODULE.bazel
++++ MODULE.bazel
+@@ -0,0 +1,7 @@
++module(
++    name = "boringssl",
++    version = "0.0.0-20240126-22d349c",
++    compatibility_level = 2,
++)
++bazel_dep(name = "rules_cc", version = "0.0.9")
++bazel_dep(name = "platforms", version = "0.0.8")
diff --git a/modules/boringssl/0.0.0-20240126-22d349c/presubmit.yml b/modules/boringssl/0.0.0-20240126-22d349c/presubmit.yml
new file mode 100644
index 0000000000..71ca6b00e5
--- /dev/null
+++ b/modules/boringssl/0.0.0-20240126-22d349c/presubmit.yml
@@ -0,0 +1,24 @@
+build_targets: &build_targets
+  - "@boringssl//:crypto"
+  - "@boringssl//:ssl"
+
+matrix:
+  platform:
+    - centos7_java11_devtoolset10
+    - debian11
+    - ubuntu2204
+    - windows
+  bazel: [6.x, 7.x]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets: *build_targets
+  # Work around https://github.com/bazelbuild/bazel/issues/10472
+  verify_targets_on_macos:
+    name: Verify build targets on macOS
+    platform: macos
+    bazel: ${{ bazel }}
+    build_targets: *build_targets
+    build_flags: [--sandbox_block_path=/usr/local]
diff --git a/modules/boringssl/0.0.0-20240126-22d349c/source.json b/modules/boringssl/0.0.0-20240126-22d349c/source.json
new file mode 100644
index 0000000000..53b29d85eb
--- /dev/null
+++ b/modules/boringssl/0.0.0-20240126-22d349c/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-rMEdcuN6QX90hSzHXUCE7HEhcnwBvR6bVSUjHJsDwnc=",
+    "strip_prefix": "boringssl-22d349c4596e81425ec88f82fab47063a9a2bac6",
+    "url": "https://github.com/google/boringssl/archive/22d349c4596e81425ec88f82fab47063a9a2bac6.tar.gz",
+    "patch_strip": 0,
+    "patches": {
+        "module_dot_bazel.patch": "sha256-vLc6oUB/XI3PtPUx1z0U5e+l6BEuz3IeRW7wR8Omp14="
+    }
+}
diff --git a/modules/boringssl/metadata.json b/modules/boringssl/metadata.json
index 59274faced..b453c80277 100644
--- a/modules/boringssl/metadata.json
+++ b/modules/boringssl/metadata.json
@@ -11,7 +11,8 @@
   ],
   "versions": [
     "0.0.0-20211025-d4f1ab9",
-    "0.0.0-20230215-5c22014"
+    "0.0.0-20230215-5c22014",
+    "0.0.0-20240126-22d349c"
   ],
   "yanked_versions": {}
 }