Merge pull request #17646 from ydb-platform/merge-libs-250424-0050

Author: alexv-smirnov

build/conf/java.conf

@@ -342,10 +342,6 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
     .NODE_TYPE=Bundle
     .CMD=$COMPILE_JAVA_MF
     .STRUCT_CMD=yes
-    # TODO(YMAKE-27) all contribs involved into opensource export must be JAVA_CONTRIB modules
-    # and this module must not be intended for export. Such hange will break JBUILD and thus is
-    # blocked on YMAKE-27
-    .SEM=_JAVA_CONTRIB_SEM
     .PEERDIR_POLICY=as_build_from
     .FINAL_TARGET=no
     .ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -769,6 +765,7 @@ macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) {
 # tag:java-specific
 ERROR_PRONE_JDK16PLUS_ADD_OPENS=-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
 ERROR_PRONE_2_7_1_FORCED_OPTS=-Xep:InlineMeInliner:OFF -Xep:SameNameButDifferent:OFF
+ERROR_PRONE_2_3_7_FORCED_OPTS=--should-stop=ifError=FLOW
 
 # tag:java-specific
 macro _ADD_OPTS_IF_NON_EMPTY(Opt, Args...) {
@@ -1475,6 +1472,8 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
         ERROR_PRONE_VERSION=2.37.0
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.37.0
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_37_0_RESOURCE_GLOBAL
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_3_7_FORCED_OPTS
+        JAVAC_OPTS+=$ERROR_PRONE_2_3_7_FORCED_OPTS
     }
     otherwise {
         ERROR_PRONE_VERSION=2.7.1

build/mapping.conf.json

@@ -1328,18 +1328,23 @@
         "7320257970": "{registry_endpoint}/7320257970",
         "7336062757": "{registry_endpoint}/7336062757",
         "7406874438": "{registry_endpoint}/7406874438",
+        "8562787275": "{registry_endpoint}/8562787275",
         "7599484265": "{registry_endpoint}/7599484265",
         "7451602609": "{registry_endpoint}/7451602609",
         "7407124272": "{registry_endpoint}/7407124272",
+        "8562985395": "{registry_endpoint}/8562985395",
         "7599517506": "{registry_endpoint}/7599517506",
         "7451585962": "{registry_endpoint}/7451585962",
         "7406983705": "{registry_endpoint}/7406983705",
+        "8562765524": "{registry_endpoint}/8562765524",
         "7599285566": "{registry_endpoint}/7599285566",
         "7451712332": "{registry_endpoint}/7451712332",
         "7407028815": "{registry_endpoint}/7407028815",
+        "8563229520": "{registry_endpoint}/8563229520",
         "7599469156": "{registry_endpoint}/7599469156",
         "7451466407": "{registry_endpoint}/7451466407",
         "7407150115": "{registry_endpoint}/7407150115",
+        "8563465815": "{registry_endpoint}/8563465815",
         "7599422144": "{registry_endpoint}/7599422144",
         "7451406900": "{registry_endpoint}/7451406900",
         "8493428438": "{registry_endpoint}/8493428438",
@@ -2703,18 +2708,23 @@
         "7320257970": "ynd-bin-frozen-python3-mingw-w64-x86_64-e139f4d2038ecfbb34fbbd77f84c4b63ddcb613b",
         "7336062757": "ynd-bin-frozen-python3-mingw-w64-x86_64-eacbfe8057414a218b407c837c9dcd8f2162f810",
         "7406874438": "ynd-clang-18-optimized-darwin-arm64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
+        "8562787275": "ynd-clang-18-optimized-darwin-arm64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
         "7599484265": "ynd-clang-18-optimized-darwin-arm64-c40775195488adad9218aa6c6dcaf4c20dca0084",
         "7451602609": "ynd-clang-18-optimized-darwin-arm64-c66062833fd14752a7ad8fbfb8f25f370b097278",
         "7407124272": "ynd-clang-18-optimized-darwin-x86_64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
+        "8562985395": "ynd-clang-18-optimized-darwin-x86_64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
         "7599517506": "ynd-clang-18-optimized-darwin-x86_64-c40775195488adad9218aa6c6dcaf4c20dca0084",
         "7451585962": "ynd-clang-18-optimized-darwin-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
         "7406983705": "ynd-clang-18-optimized-linux-aarch64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
+        "8562765524": "ynd-clang-18-optimized-linux-aarch64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
         "7599285566": "ynd-clang-18-optimized-linux-aarch64-c40775195488adad9218aa6c6dcaf4c20dca0084",
         "7451712332": "ynd-clang-18-optimized-linux-aarch64-c66062833fd14752a7ad8fbfb8f25f370b097278",
         "7407028815": "ynd-clang-18-optimized-linux-x86_64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
+        "8563229520": "ynd-clang-18-optimized-linux-x86_64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
         "7599469156": "ynd-clang-18-optimized-linux-x86_64-c40775195488adad9218aa6c6dcaf4c20dca0084",
         "7451466407": "ynd-clang-18-optimized-linux-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
         "7407150115": "ynd-clang-18-optimized-mingw-w64-x86_64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
+        "8563465815": "ynd-clang-18-optimized-mingw-w64-x86_64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
         "7599422144": "ynd-clang-18-optimized-mingw-w64-x86_64-c40775195488adad9218aa6c6dcaf4c20dca0084",
         "7451406900": "ynd-clang-18-optimized-mingw-w64-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
         "8493428438": "ynd-clang-format-18-darwin-arm64-1743ab83194ed485afca3ceaef1078d95b33f80f",

build/platform/clang/clang18.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin-arm64": {
-            "uri": "sbr:7599484265"
+            "uri": "sbr:8562787275"
         },
         "darwin-x86_64": {
-            "uri": "sbr:7599517506"
+            "uri": "sbr:8562985395"
         },
         "linux-aarch64": {
-            "uri": "sbr:7599285566"
+            "uri": "sbr:8562765524"
         },
         "linux-x86_64": {
-            "uri": "sbr:7599469156"
+            "uri": "sbr:8563229520"
         },
         "win32-x86_64": {
-            "uri": "sbr:7599422144"
+            "uri": "sbr:8563465815"
         }
     }
 }

build/sysincl/python.yml

@@ -1,4 +1,4 @@
-- source_filter: "^(?!(contrib/tools/python|library/python/runtime|library/python/symbols))"
+- source_filter: "^(?!((contrib/tools/python3?|library/python/runtime(_py3)?/main|library/python/symbols)/))"
   includes:
   - Python-ast.h
   - Python.h

contrib/libs/backtrace/.yandex_meta/override.nix

@@ -1,11 +1,11 @@
 pkgs: attrs: with pkgs; with attrs; rec {
-  version = "2025-02-10";
+  version = "2025-04-08";
 
   src = fetchFromGitHub {
     owner = "ianlancetaylor";
     repo = "libbacktrace";
-    rev = "0034e33946824057b48c5e686a3aefc761b37384";
-    hash = "sha256-JCut4afd8a2iXTdbjnyabdWX9JomcSh3qj/RScyVGSw=";
+    rev = "f1104f3270095831df536a2539f4cc408365105c";
+    hash = "sha256-+D6oI1EcHh/wMPFBhW5+tjo/8yrqumTv74W90v28BX0=";
   };
 
   patches = [];

contrib/libs/backtrace/atomic.c

@@ -103,7 +103,7 @@ backtrace_atomic_store_size_t (size_t *p, size_t v)
 void
 backtrace_atomic_store_int (int *p, int v)
 {
-  size_t old;
+  int old;
 
   old = *p;
   while (!__sync_bool_compare_and_swap (p, old, v))

contrib/libs/backtrace/ya.make

@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2025-02-10)
+VERSION(2025-04-08)
 
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/0034e33946824057b48c5e686a3aefc761b37384.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/f1104f3270095831df536a2539f4cc408365105c.tar.gz)
 
 ADDINCL(
     contrib/libs/backtrace

contrib/libs/protobuf-mutator/.yandex_meta/__init__.py

@@ -0,0 +1,20 @@
+from devtools.yamaker import fileutil
+from devtools.yamaker.project import CMakeNinjaNixProject
+
+
+def post_install(self):
+    fileutil.re_sub_dir(
+        self.dstdir,
+        r"\bstd::string\b",
+        "TProtoStringType",
+    )
+
+
+protobuf_mutator = CMakeNinjaNixProject(
+    nixattr="protobuf_mutator",
+    arcdir="contrib/libs/protobuf-mutator",
+    owners=["g:cpp-contrib"],
+    addincl_global={".": ["."]},
+    put_with={"protobuf-mutator": ["protobuf-mutator-libfuzzer"]},
+    post_install=post_install,
+)

contrib/libs/protobuf-mutator/.yandex_meta/default.nix

@@ -0,0 +1,21 @@
+self: super: with self; {
+  protobuf_mutator = stdenv.mkDerivation rec {
+    pname = "protobuf_mutator";
+    version = "1.5";
+
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "libprotobuf-mutator";
+      rev = "v${version}";
+      hash = "sha256-0iohTyYcV76OOaq9zBpQ6FB+ipxlK/fm/4N7Gp8vnwA=";
+    };
+
+    buildInputs = [ pkgs.protobuf ];
+
+    nativeBuildInputs = [ cmake ];
+
+    cmakeFlags = [
+      "-DLIB_PROTO_MUTATOR_TESTING=OFF"
+    ];
+  };
+}

contrib/libs/protobuf-mutator/README.md

@@ -1,26 +1,31 @@
 # libprotobuf-mutator
 
-[![TravisCI Build Status](https://travis-ci.org/google/libprotobuf-mutator.svg?branch=master)](https://travis-ci.org/google/libprotobuf-mutator)
+[![Build Status](https://github.com/google/libprotobuf-mutator/actions/workflows/cmake-multi-platform.yml/badge.svg?event=push)](https://github.com/google/libprotobuf-mutator/actions/workflows/cmake-multi-platform.yml?query=event%3Apush)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libprotobuf-mutator.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#libprotobuf-mutator)
 
 ## Overview
 libprotobuf-mutator is a library to randomly mutate
 [protobuffers](https://github.com/google/protobuf). <BR>
 It could be used together with guided fuzzing engines, such as [libFuzzer](http://libfuzzer.info).
 
+The core of libprotobuf-mutator has the following dependencies:
+
+- Protobuf >=3.6.1.3 (library and compiler)
+- Clang >=12.0.0 including libFuzzer
+
 ## Quick start on Debian/Ubuntu
 
 Install prerequisites:
 
-```
+```sh
 sudo apt-get update
 sudo apt-get install protobuf-compiler libprotobuf-dev binutils cmake \
   ninja-build liblzma-dev libz-dev pkg-config autoconf libtool
 ```
 
 Compile and test everything:
 
-```
+```sh
 mkdir build
 cd build
 cmake .. -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug
@@ -36,7 +41,7 @@ build a working version of protobuf.
 
 Installation:
 
-```
+```sh
 ninja
 sudo ninja install
 ```
@@ -59,7 +64,7 @@ using [libFuzzer](http://libfuzzer.info)'s mutators.
 
 To apply one mutation to a protobuf object do the following:
 
-```
+```c++
 class MyProtobufMutator : public protobuf_mutator::Mutator {
  public:
   // Optionally redefine the Mutate* methods to perform more sophisticated mutations.
@@ -77,7 +82,7 @@ See also the `ProtobufMutatorMessagesTest.UsageExample` test from
 ## Integrating with libFuzzer
 LibFuzzerProtobufMutator can help to integrate with libFuzzer. For example 
 
-```
+```c++
 #include "src/libfuzzer/libfuzzer_macro.h"
 
 DEFINE_PROTO_FUZZER(const MyMessageType& input) {
@@ -97,7 +102,7 @@ for fuzzer even if it's capable of inserting acceptable values with time.
 PostProcessorRegistration can be used to avoid such issue and guide your fuzzer towards interesting
 code. It registers callback which will be called for each message of particular type after each mutation.
 
-```
+```c++
 static protobuf_mutator::libfuzzer::PostProcessorRegistration<MyMessageType> reg = {
     [](MyMessageType* message, unsigned int seed) {
       TweakMyMessage(message, seed);
@@ -117,7 +122,7 @@ may corrupt the reproducer so it stops triggering the bug.
 
 Note: You can add callback for any nested message and you can add multiple callbacks for
 the same message type.
-```
+```c++
 static PostProcessorRegistration<MyMessageType> reg1 = {
     [](MyMessageType* message, unsigned int seed) {
       TweakMyMessage(message, seed);
@@ -155,6 +160,24 @@ cleanup/initialize the message as workaround.
 * [Envoy](https://github.com/envoyproxy/envoy/search?q=DEFINE_TEXT_PROTO_FUZZER+OR+DEFINE_PROTO_FUZZER+OR+DEFINE_BINARY_PROTO_FUZZER&unscoped_q=DEFINE_TEXT_PROTO_FUZZER+OR+DEFINE_PROTO_FUZZER+OR+DEFINE_BINARY_PROTO_FUZZER&type=Code)
 * [LLVM](https://github.com/llvm-mirror/clang/search?q=DEFINE_TEXT_PROTO_FUZZER+OR+DEFINE_PROTO_FUZZER+OR+DEFINE_BINARY_PROTO_FUZZER&unscoped_q=DEFINE_TEXT_PROTO_FUZZER+OR+DEFINE_PROTO_FUZZER+OR+DEFINE_BINARY_PROTO_FUZZER&type=Code)
 
+## Grammars
+* GIF, https://github.com/google/oss-fuzz/tree/master/projects/giflib
+* JSON
+  * https://github.com/google/oss-fuzz/tree/master/projects/jsoncpp
+  * https://github.com/officialcjunior/fuzzrtos/tree/c72e6670e566672ccf8023265cbfad616e75790d/protobufv2
+* Lua 5.1 Language,
+  * https://github.com/ligurio/lua-c-api-tests/tree/master/tests/luaL_loadbuffer_proto
+  * https://github.com/Spoookyyy/luaj/tree/main/fuzz
+* PNG, https://github.com/google/oss-fuzz/tree/master/projects/libpng-proto
+* SQL
+  * https://github.com/tarantool/tarantool/tree/master/test/fuzz/sql_fuzzer
+  * https://chromium.googlesource.com/chromium/src/third_party/+/refs/heads/main/sqlite/fuzz
+* Solidity Language, https://github.com/ethereum/solidity/tree/develop/test/tools/ossfuzz
+* XML
+  * https://github.com/google/oss-fuzz/tree/master/projects/xerces-c
+  * https://github.com/google/libprotobuf-mutator/tree/master/examples/xml
+* JPEG, https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/vaapi/fuzzers/jpeg_decoder/
+
 ## Bugs found with help of the library
 
 ### Chromium