diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/servers/http/envoy/protobuf.patch | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/http/envoy/protobuf.patch')
-rw-r--r-- | nixpkgs/pkgs/servers/http/envoy/protobuf.patch | 123 |
1 files changed, 93 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/servers/http/envoy/protobuf.patch b/nixpkgs/pkgs/servers/http/envoy/protobuf.patch index 1cc071bd861a..dc7026350316 100644 --- a/nixpkgs/pkgs/servers/http/envoy/protobuf.patch +++ b/nixpkgs/pkgs/servers/http/envoy/protobuf.patch @@ -1,33 +1,39 @@ diff --git a/BUILD.bazel b/BUILD.bazel -index 0f6e41e3a..c0d2bbccf 100644 +index 637882c49..2cb08f1b0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel -@@ -138,7 +138,7 @@ cc_library( +@@ -165,6 +165,8 @@ alias( visibility = ["//visibility:public"], - deps = [":protobuf_lite"] + select({ - "//build_defs:config_msvc": [], -- "//conditions:default": ["@zlib//:zlib"], -+ "//conditions:default": ["//external:zlib"], - }), ) -@@ -755,7 +820,7 @@ cc_test( - "@com_google_googletest//:gtest_main", - ] + select({ - "//build_defs:config_msvc": [], -- "//conditions:default": ["@zlib//:zlib"], -+ "//conditions:default": ["//external:zlib"], - }), ++# Envoy: Patch ++ + cc_binary( + name = "protoc", + copts = COPTS, +@@ -173,6 +175,14 @@ cc_binary( + deps = ["//src/google/protobuf/compiler:protoc_lib"], ) ++alias( ++ name = "protobuf_python_genproto", ++ actual = "//python:well_known_types_py_pb2_genproto", ++ visibility = ["//visibility:public"], ++) ++ ++# /Envoy: Patch ++ + cc_binary( + name = "protoc_static", + copts = COPTS, diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py -index e7555ee10..a93beb1c5 100644 +index 88de4cf8a..b3e046997 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -31,3 +31,10 @@ # Copyright 2007 Google Inc. All Rights Reserved. - __version__ = '4.21.12' + __version__ = '4.23.1' + + +if __name__ != '__main__': @@ -35,19 +41,76 @@ index e7555ee10..a93beb1c5 100644 + __import__('pkg_resources').declare_namespace(__name__) + except ImportError: + __path__ = __import__('pkgutil').extend_path(__path__, __name__) -diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc -index 9993811dc..d80006af7 100644 ---- a/src/google/protobuf/generated_message_tctable_lite.cc -+++ b/src/google/protobuf/generated_message_tctable_lite.cc -@@ -343,11 +343,6 @@ const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) { +diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel +index a2171c806..8aec6187f 100644 +--- a/src/google/protobuf/compiler/BUILD.bazel ++++ b/src/google/protobuf/compiler/BUILD.bazel +@@ -306,7 +306,7 @@ cc_library( + srcs = ["retention.cc"], + hdrs = ["retention.h"], + include_prefix = "google/protobuf/compiler", +- visibility = ["//src/google/protobuf:__subpackages__"], ++ visibility = ["//visibility:public"], + deps = [ + "//src/google/protobuf:protobuf_nowkt", + "@com_google_absl//absl/types:span", +diff --git a/src/google/protobuf/io/BUILD.bazel b/src/google/protobuf/io/BUILD.bazel +index 8f39625c2..2c2c73dcd 100644 +--- a/src/google/protobuf/io/BUILD.bazel ++++ b/src/google/protobuf/io/BUILD.bazel +@@ -142,7 +142,7 @@ cc_library( + "@com_google_absl//absl/log:absl_log", + ] + select({ + "//build_defs:config_msvc": [], +- "//conditions:default": ["@zlib//:zlib"], ++ "//conditions:default": ["//external:zlib"], + }), + ) + +diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h +index 869ebf100..fec92e2b1 100644 +--- a/src/google/protobuf/map.h ++++ b/src/google/protobuf/map.h +@@ -883,7 +883,7 @@ class KeyMapBase : public UntypedMapBase { + TreeConvert(b); + } + ABSL_DCHECK(TableEntryIsTree(b)) +- << (void*)table_[b] << " " << (uintptr_t)table_[b]; ++ << reinterpret_cast<void*>(table_[b]) << " " << static_cast<uintptr_t>(table_[b]); + InsertUniqueInTree(b, node); + index_of_first_non_null_ = (std::min)(index_of_first_non_null_, b); + } +diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h +index 70b12b1e7..b8f46db45 100644 +--- a/src/google/protobuf/map_field.h ++++ b/src/google/protobuf/map_field.h +@@ -345,7 +345,7 @@ class PROTOBUF_EXPORT MapFieldBase : public MapFieldBaseForParse { + + protected: + // "protected" stops users from deleting a `MapFieldBase *` +- ~MapFieldBase(); ++ virtual ~MapFieldBase(); - namespace { + public: + // Returns reference to internal repeated field. Data written using +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index 1c6a24945..6186c2ad1 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -1004,7 +1004,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + // Turn on -Wdeprecated-enum-enum-conversion. This deprecation comes in C++20 + // via http://wg21.link/p1120r0. +-#pragma clang diagnostic error "-Wdeprecated-enum-enum-conversion" ++// #pragma clang diagnostic error "-Wdeprecated-enum-enum-conversion" + // This error has been generally flaky, but we need to disable it specifically + // to fix https://github.com/protocolbuffers/protobuf/issues/12313 + #pragma clang diagnostic ignored "-Wunused-parameter" +@@ -1062,6 +1062,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), + #pragma warning(disable: 4125) + #endif --// Offset returns the address `offset` bytes after `base`. --inline void* Offset(void* base, uint32_t offset) { -- return static_cast<uint8_t*>(base) + offset; --} -- - // InvertPacked changes tag bits from the given wire type to length - // delimited. This is the difference expected between packed and non-packed - // repeated fields. ++#pragma GCC diagnostic ignored "-Wundef" + #if PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII + #define PROTOBUF_DEBUG true + #else |