Merge branch 'rightlib' into merge-libs-250112-0023

Author: alexv-smirnov

contrib/libs/curl/.yandex_meta/__init__.py

@@ -83,9 +83,6 @@ def post_install(self):
 
         # add ifaddrs implementation if needed
         m.PEERDIR.add("contrib/libs/libc_compat")
-        m.PEERDIR.add("contrib/libs/openssl")
-        m.PEERDIR.add("contrib/libs/ngtcp2")
-        m.PEERDIR.add("contrib/libs/nghttp3")
 
         # make c-ares dependency conditional,
         # but leave ADDINCL in place to make CONFIGURE work

contrib/libs/curl/.yandex_meta/override.nix

@@ -29,6 +29,7 @@ in rec {
   ];
 
   configureFlags = [
+    "--build=x86_64-pc-linux-gnu"
     "--disable-manual"
     "--disable-ldap"
     "--disable-ldaps"
@@ -41,6 +42,7 @@ in rec {
     "--with-ngtcp2"
     "--without-gnutls"
     "--without-libidn2"
+    "--without-libpsl"
     "--without-librtmp"
     "--without-wolfssl"
   ];

contrib/libs/curl/lib/curl_config-linux.h

@@ -161,7 +161,7 @@
 #define HAVE_ALARM 1
 
 /* Define to 1 if you have the `arc4random' function. */
-/* #undef HAVE_ARC4RANDOM */
+#define HAVE_ARC4RANDOM 1
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #define HAVE_ARPA_INET_H 1

contrib/libs/curl/ya.make

@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 LIBRARY()
 
@@ -36,6 +36,7 @@ ENDIF()
 ADDINCL(
     GLOBAL contrib/libs/curl/include
     contrib/libs/curl/lib
+    contrib/libs/ngtcp2/crypto/includes
     contrib/libs/zstd/include
 )
 

contrib/libs/libunwind/.yandex_meta/__init__.py

@@ -25,7 +25,6 @@ def post_install(self):
                 {
                     "NOT OS_EMSCRIPTEN": Linkable(
                         SRCS=sources,
-                        CFLAGS=["-D_LIBUNWIND_IS_NATIVE_ONLY"],
                     ),
                     "OS_EMSCRIPTEN AND ARCH_WASM32": Linkable(
                         SRCS=["src/Unwind-wasm.c"],
@@ -39,7 +38,7 @@ def post_install(self):
                         PEERDIR=["contrib/restricted/emscripten/include"],
                         CFLAGS=[
                             "-D_LIBUNWIND_HIDE_SYMBOLS",
-                            "-D__USING_WASM_EXCEPTIONS__",
+                            "-D__WASM_EXCEPTIONS__",
                         ],
                     ),
                 }

contrib/libs/libunwind/.yandex_meta/override.nix

@@ -1,11 +1,11 @@
 pkgs: attrs: with pkgs; with attrs; rec {
-  version = "18.1.0-rc1";
+  version = "19.1.6";
 
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
     rev = "llvmorg-${version}";
-    hash = "sha256-I9VUoDv+P/3C6R1I9VozGYJDjK4KBAkezVkpPMLjMuU=";
+    hash = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI=";
   };
 
   patches = [];

contrib/libs/libunwind/patches/03-unused.patch

@@ -13,15 +13,6 @@ diff --git a/contrib/libs/libunwind/src/Unwind-EHABI.cpp b/contrib/libs/libunwin
 diff --git a/contrib/libs/libunwind/src/UnwindLevel1.c b/contrib/libs/libunwind/src/UnwindLevel1.c
 --- a/contrib/libs/libunwind/src/UnwindLevel1.c
 +++ b/contrib/libs/libunwind/src/UnwindLevel1.c
-@@ -195,7 +195,7 @@
- 
-   // uc is initialized by __unw_getcontext in the parent frame. The first stack
-   // frame walked is unwind_phase2.
--  unsigned framesWalked = 1;
-+  unsigned framesWalked __attribute__((unused)) = 1;
- #ifdef _LIBUNWIND_USE_CET
-   unsigned long shadowStackTop = _get_ssp();
- #endif
 @@ -330,7 +330,7 @@
 
    // uc is initialized by __unw_getcontext in the parent frame. The first stack

contrib/libs/libunwind/patches/04-wasm-config.patch

@@ -4,11 +4,11 @@
 
  #include "config.h"
 
--#ifdef __USING_WASM_EXCEPTIONS__
+-#ifdef __WASM_EXCEPTIONS__
 
  #include "unwind.h"
 +
-+#ifdef __USING_WASM_EXCEPTIONS__
++#ifdef __WASM_EXCEPTIONS__
  #include <threads.h>
 
  _Unwind_Reason_Code __gxx_personality_wasm0(int version, _Unwind_Action actions,
@@ -24,4 +24,4 @@
 +_Unwind_RaiseException(_Unwind_Exception *exception_object __attribute__((unused))) {
 +  abort();
 +}
- #endif // defined(__USING_WASM_EXCEPTIONS__)
+ #endif // defined(__WASM_EXCEPTIONS__)

contrib/libs/libunwind/patches/04-wasm-exceptions.patch

@@ -1815,6 +1815,13 @@ inline const char *Registers_ppc64::getRegisterName(int regNum) {
 /// process.
 class _LIBUNWIND_HIDDEN Registers_arm64;
 extern "C" void __libunwind_Registers_arm64_jumpto(Registers_arm64 *);
+
+#if defined(_LIBUNWIND_USE_GCS)
+extern "C" void *__libunwind_cet_get_jump_target() {
+  return reinterpret_cast<void *>(&__libunwind_Registers_arm64_jumpto);
+}
+#endif
+
 class _LIBUNWIND_HIDDEN Registers_arm64 {
 public:
   Registers_arm64();