Unverified Commit 6a25f33c authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

envoy: fix build, 1.32.0 -> 1.32.3 (#370258)

parents bf3495ea 2cecb793

pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch

+3 −3
Original line number Diff line number Diff line 
From 47406ebaf0260e5b66a92baac3717936c8386b69 Mon Sep 17 00:00:00 2001

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Paul Meyer <49727155+katexochen@users.noreply.github.com>

Date: Mon, 22 Apr 2024 11:52:59 +0200

Subject: [PATCH] nixpkgs: use system Python
@@ -10,7 +10,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 
 2 files changed, 5 insertions(+), 23 deletions(-)



diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl

index 9f2b336b1a..53a2c93c59 100644

index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679f0df73f7 100644

--- a/bazel/python_dependencies.bzl

+++ b/bazel/python_dependencies.bzl

@@ -1,28 +1,25 @@
@@ -47,7 +47,7 @@ index 9f2b336b1a..53a2c93c59 100644 
         extra_pip_args = ["--require-hashes"],

     )

diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl

index b92dd461ba..cef32b3140 100644

index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f131184fe4 100644

--- a/bazel/repositories_extra.bzl

+++ b/bazel/repositories_extra.bzl

@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")

pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch

+2 −2
Original line number Diff line number Diff line 
From 4be181e96199529a36e9a93c837af7173c827493 Mon Sep 17 00:00:00 2001

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Paul Meyer <49727155+katexochen@users.noreply.github.com>

Date: Mon, 22 Apr 2024 11:58:00 +0200

Subject: [PATCH] nixpkgs: use system Go
@@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl

index c68eb4bf3e..addee4f6af 100644

index c68eb4bf3ed2d39d46d38d7bd0eeab2c74a507fa..addee4f6af74ea78ae778b73384e01db83ac6694 100644

--- a/bazel/dependency_imports.bzl

+++ b/bazel/dependency_imports.bzl

@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")

pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch

+2 −2
Original line number Diff line number Diff line 
From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Paul Meyer <49727155+katexochen@users.noreply.github.com>

Date: Mon, 22 Apr 2024 11:59:22 +0200

Subject: [PATCH] nixpkgs: use system C/C++ toolchains
@@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 
 1 file changed, 5 insertions(+), 1 deletion(-)



diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl

index addee4f6af..dc1967e43b 100644

index addee4f6af74ea78ae778b73384e01db83ac6694..dc1967e43b2b71358d2767a3d83b52819987290d 100644

--- a/bazel/dependency_imports.bzl

+++ b/bazel/dependency_imports.bzl

@@ -26,7 +26,11 @@ JQ_VERSION = "1.7"

pkgs/by-name/en/envoy/0004-nixpkgs-patch-boringssl-for-gcc14.patch

0 → 100644
+55 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Paul Meyer <katexochen0@gmail.com>

Date: Thu, 2 Jan 2025 09:32:41 +0100

Subject: [PATCH] nixpkgs: patch boringssl for gcc14



Signed-off-by: Paul Meyer <katexochen0@gmail.com>

---

 bazel/boringssl-gcc14.patch | 25 +++++++++++++++++++++++++

 bazel/repositories.bzl      |  1 +

 2 files changed, 26 insertions(+)

 create mode 100644 bazel/boringssl-gcc14.patch



diff --git a/bazel/boringssl-gcc14.patch b/bazel/boringssl-gcc14.patch

new file mode 100644

index 0000000000000000000000000000000000000000..8dcad4cc11f691eec93efa29075c1d356732e58b

--- /dev/null

+++ b/bazel/boringssl-gcc14.patch

@@ -0,0 +1,25 @@

+diff --git a/crypto/internal.h b/crypto/internal.h

+index a77102d..a45f97b 100644

+--- a/crypto/internal.h

++++ b/crypto/internal.h

+@@ -1174,6 +1174,11 @@

+ 

+ // Arithmetic functions.

+ 

++// The most efficient versions of these functions on GCC and Clang depend on C11

++// |_Generic|. If we ever need to call these from C++, we'll need to add a

++// variant that uses C++ overloads instead.

++#if !defined(__cplusplus)

++

+ // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry

+ // bit. |carry| must be zero or one.

+ #if OPENSSL_HAS_BUILTIN(__builtin_addc)

+@@ -1275,6 +1280,8 @@

+ #define CRYPTO_subc_w CRYPTO_subc_u32

+ #endif

+ 

++#endif  // !__cplusplus

++

+ 

+ // FIPS functions.

+ 

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl

index 5cb573770f0aeac7b42d803673c8c520b5e35131..e864ef24db4bf837ef50d90c8eca316eba939d74 100644

--- a/bazel/repositories.bzl

+++ b/bazel/repositories.bzl

@@ -264,6 +264,7 @@ def _boringssl():

         patch_args = ["-p1"],

         patches = [

             "@envoy//bazel:boringssl_static.patch",

+            "@envoy//bazel:boringssl-gcc14.patch",

         ],

     )

pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch

0 → 100644
+128 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: "dependency-envoy[bot]"

 <148525496+dependency-envoy[bot]@users.noreply.github.com>

Date: Fri, 8 Nov 2024 21:09:22 +0000

Subject: [PATCH] deps: Bump `rules_rust` -> 0.54.1 (#37056)



Fix #37054



Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com>

Signed-off-by: Ryan Northey <ryan@synca.io>

---

 bazel/repository_locations.bzl                | 10 ++++++---

 .../dynamic_modules/sdk/rust/Cargo.Bazel.lock | 21 +++++++++++--------

 2 files changed, 19 insertions(+), 12 deletions(-)



diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl

index 85a125d44ece6c655f94aab3d986d96ab837897f..cfe7d145b59b691f6455b58b1baaae48276b7e9f 100644

--- a/bazel/repository_locations.bzl

+++ b/bazel/repository_locations.bzl

@@ -1465,12 +1465,16 @@ REPOSITORY_LOCATIONS_SPEC = dict(

         license = "Emscripten SDK",

         license_url = "https://github.com/emscripten-core/emsdk/blob/{version}/LICENSE",

     ),

+    # After updating you may need to run:

+    #

+    #     CARGO_BAZEL_REPIN=1 bazel sync --only=crate_index

+    #

     rules_rust = dict(

         project_name = "Bazel rust rules",

         project_desc = "Bazel rust rules (used by Wasm)",

         project_url = "https://github.com/bazelbuild/rules_rust",

-        version = "0.51.0",

-        sha256 = "042acfb73469b2d1848fe148d81c3422c61ea47a9e1900f1c9ec36f51e8e7193",

+        version = "0.54.1",

+        sha256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02",

         # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.

         # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap

         # is required which in turn requires a system CC toolchains, not the bazel controlled ones.

@@ -1482,7 +1486,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(

         ],

         implied_untracked_deps = ["rules_cc"],

         extensions = ["envoy.wasm.runtime.wasmtime"],

-        release_date = "2024-09-19",

+        release_date = "2024-11-07",

         cpe = "N/A",

         license = "Apache-2.0",

         license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt",

diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock

index fa6012f406464428b37d548eecd6cec3fdaf901b..6af752304b65af39aa621fa201a8c0108931dad0 100644

--- a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock

+++ b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock

@@ -1,5 +1,5 @@

 {

-  "checksum": "96b309ddded40cf6f46a62829d15a02d7253b4cc94af2ac1890e492f9c07e93f",

+  "checksum": "b550022ca979d6b55c6dbee950bbf18368e4b8da16973c4e88e292b4d6f28e81",

   "crates": {

     "aho-corasick 1.1.3": {

       "name": "aho-corasick",

@@ -2149,9 +2149,6 @@

     "aarch64-apple-ios-sim": [

       "aarch64-apple-ios-sim"

     ],

-    "aarch64-fuchsia": [

-      "aarch64-fuchsia"

-    ],

     "aarch64-linux-android": [

       "aarch64-linux-android"

     ],

@@ -2159,6 +2156,9 @@

     "aarch64-pc-windows-msvc": [

       "aarch64-pc-windows-msvc"

     ],

+    "aarch64-unknown-fuchsia": [

+      "aarch64-unknown-fuchsia"

+    ],

     "aarch64-unknown-linux-gnu": [

       "aarch64-unknown-linux-gnu"

     ],

@@ -2197,8 +2197,8 @@

       "aarch64-apple-darwin",

       "aarch64-apple-ios",

       "aarch64-apple-ios-sim",

-      "aarch64-fuchsia",

       "aarch64-linux-android",

+      "aarch64-unknown-fuchsia",

       "aarch64-unknown-linux-gnu",

       "aarch64-unknown-nixos-gnu",

       "aarch64-unknown-nto-qnx710",

@@ -2213,9 +2213,9 @@

       "s390x-unknown-linux-gnu",

       "x86_64-apple-darwin",

       "x86_64-apple-ios",

-      "x86_64-fuchsia",

       "x86_64-linux-android",

       "x86_64-unknown-freebsd",

+      "x86_64-unknown-fuchsia",

       "x86_64-unknown-linux-gnu",

       "x86_64-unknown-nixos-gnu"

     ],

@@ -2264,15 +2264,15 @@

     "wasm32-wasi": [

       "wasm32-wasi"

     ],

+    "wasm32-wasip1": [

+      "wasm32-wasip1"

+    ],

     "x86_64-apple-darwin": [

       "x86_64-apple-darwin"

     ],

     "x86_64-apple-ios": [

       "x86_64-apple-ios"

     ],

-    "x86_64-fuchsia": [

-      "x86_64-fuchsia"

-    ],

     "x86_64-linux-android": [

       "x86_64-linux-android"

     ],

@@ -2283,6 +2283,9 @@

     "x86_64-unknown-freebsd": [

       "x86_64-unknown-freebsd"

     ],

+    "x86_64-unknown-fuchsia": [

+      "x86_64-unknown-fuchsia"

+    ],

     "x86_64-unknown-linux-gnu": [

       "x86_64-unknown-linux-gnu"

     ],