Intermediate changes

10 files changed, 36 insertions, 17 deletions

diff --git a/contrib/restricted/libffi/ya.make b/contrib/restricted/libffi/ya.make
index afb4917186..f45c62c4a0 100644
--- a/contrib/restricted/libffi/ya.make
+++ b/contrib/restricted/libffi/ya.make
@@ -91,6 +91,11 @@ ELSEIF (ARCH_ARM7 AND OS_LINUX)
         src/arm/ffi.c
         src/arm/sysv.S
     )
+ELSEIF (ARCH_ARM7EM AND OS_NONE)
+    ADDINCL(
+        contrib/restricted/libffi/configs/x86_64-pc-linux-gnu
+        GLOBAL contrib/restricted/libffi/configs/x86_64-pc-linux-gnu/include
+    )
 ELSEIF (ARCH_I386 AND OS_ANDROID)
     ADDINCL(
         contrib/restricted/libffi/configs/i686-pc-linux-android16
@@ -128,11 +133,6 @@ ELSEIF (ARCH_RISCV32 AND OS_NONE)
         contrib/restricted/libffi/configs/x86_64-pc-linux-gnu
         GLOBAL contrib/restricted/libffi/configs/x86_64-pc-linux-gnu/include
     )
-ELSEIF (ARCH_XTENSA AND OS_NONE)
-    ADDINCL(
-        contrib/restricted/libffi/configs/x86_64-pc-linux-gnu
-        GLOBAL contrib/restricted/libffi/configs/x86_64-pc-linux-gnu/include
-    )
 ELSEIF (ARCH_X86_64 AND OS_ANDROID)
     ADDINCL(
         contrib/restricted/libffi/configs/x86_64-pc-linux-android21
@@ -186,6 +186,11 @@ ELSEIF (ARCH_X86_64 AND OS_WINDOWS)
         configs/x86_64-microsoft-windows/win64_intel.masm
         src/x86/ffiw64.c
     )
+ELSEIF (ARCH_XTENSA AND OS_NONE)
+    ADDINCL(
+        contrib/restricted/libffi/configs/x86_64-pc-linux-gnu
+        GLOBAL contrib/restricted/libffi/configs/x86_64-pc-linux-gnu/include
+    )
 ELSE()
     MESSAGE(FATAL_ERROR Unsupported libffi platform: ${TARGET_PLATFORM} / ${HARDWARE_TYPE})
 ENDIF()
diff --git a/contrib/tools/bison/gnulib/platform/win64/stdbool.h b/contrib/tools/bison/gnulib/platform/win64/stdbool.h
index b898ca1f82..8f918a3123 100644
--- a/contrib/tools/bison/gnulib/platform/win64/stdbool.h
+++ b/contrib/tools/bison/gnulib/platform/win64/stdbool.h
@@ -62,7 +62,7 @@
 /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
    definitions below, but temporarily we have to #undef them.  */
 #if defined __BEOS__ && !defined __HAIKU__
-# include <OS.h> /* defines bool but not _Bool */
+# error #include <OS.h> /* defines bool but not _Bool */
 # undef false
 # undef true
 #endif
diff --git a/contrib/tools/bison/gnulib/platform/win64/unistd.h b/contrib/tools/bison/gnulib/platform/win64/unistd.h
index 06babd93a7..3980820c14 100644
--- a/contrib/tools/bison/gnulib/platform/win64/unistd.h
+++ b/contrib/tools/bison/gnulib/platform/win64/unistd.h
@@ -1082,7 +1082,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
 #    endif
 /* This is for BeOS.  */
 #    if !defined _gl_getpagesize && 0
-#     include <OS.h>
+#     error #include <OS.h>
 #     if defined B_PAGE_SIZE
 #      define _gl_getpagesize() B_PAGE_SIZE
 #     endif
diff --git a/contrib/tools/yasm/ya.make b/contrib/tools/yasm/ya.make
index 66fbd32416..f14e701fe5 100644
--- a/contrib/tools/yasm/ya.make
+++ b/contrib/tools/yasm/ya.make
@@ -8,16 +8,10 @@ PROGRAM(yasm)
 VERSION(1.3.0)
 
 LICENSE(
-    Artistic-1.0 AND
-    Artistic-1.0-Perl AND
-    Artistic-2.0 AND
+    "(Artistic-1.0 OR GPL-1.0-or-later OR LGPL-2.0-or-later)" AND
+    "(BSD-3-Clause AND BSD-2-Clause AND (Artistic-1.0 OR GPL-1.0-or-later OR LGPL-2.0-or-later))" AND
     BSD-2-Clause AND
     BSD-3-Clause AND
-    GPL-1.0-or-later AND
-    GPL-2.0-only AND
-    LGPL-2.0-only AND
-    LGPL-2.0-or-later AND
-    LicenseRef-scancode-warranty-disclaimer AND
     Public-Domain
 )
 
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index 1c7a61a68a..1089d99179 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -519,6 +519,7 @@ TFuture<void> TClient::CreateTableBackup(
     req->set_checkpoint_check_period(ToProto<i64>(options.CheckpointCheckPeriod));
     req->set_checkpoint_check_timeout(ToProto<i64>(options.CheckpointCheckTimeout));
     req->set_force(options.Force);
+    req->set_preserve_account(options.PreserveAccount);
 
     return req->Invoke().As<void>();
 }
@@ -536,6 +537,7 @@ TFuture<void> TClient::RestoreTableBackup(
     req->set_force(options.Force);
     req->set_mount(options.Mount);
     req->set_enable_replicas(options.EnableReplicas);
+    req->set_preserve_account(options.PreserveAccount);
 
     return req->Invoke().As<void>();
 }
diff --git a/yt/yt/client/api/table_client.h b/yt/yt/client/api/table_client.h
index f333788ad2..f4d959e94d 100644
--- a/yt/yt/client/api/table_client.h
+++ b/yt/yt/client/api/table_client.h
@@ -251,6 +251,7 @@ struct TCreateTableBackupOptions
     TDuration CheckpointCheckTimeout = TDuration::Zero();
 
     bool Force = false;
+    bool PreserveAccount = false;
 };
 
 struct TRestoreTableBackupOptions
@@ -259,6 +260,7 @@ struct TRestoreTableBackupOptions
     bool Force = false;
     bool Mount = false;
     bool EnableReplicas = false;
+    bool PreserveAccount = false;
 };
 
 struct TUpdateChaosTableReplicaProgressOptions
diff --git a/yt/yt/client/driver/table_commands.cpp b/yt/yt/client/driver/table_commands.cpp
index 4e4cf3131c..ccd30ac874 100644
--- a/yt/yt/client/driver/table_commands.cpp
+++ b/yt/yt/client/driver/table_commands.cpp
@@ -1549,6 +1549,13 @@ void TCreateTableBackupCommand::Register(TRegistrar registrar)
             return command->Options.Force;
         })
         .Default(false);
+
+    registrar.ParameterWithUniversalAccessor<bool>(
+        "preserve_account",
+        [] (TThis* command) -> auto& {
+            return command->Options.PreserveAccount;
+        })
+        .Default(false);
 }
 
 void TCreateTableBackupCommand::DoExecute(ICommandContextPtr context)
@@ -1585,6 +1592,13 @@ void TRestoreTableBackupCommand::Register(TRegistrar registrar)
             return command->Options.EnableReplicas;
         })
         .Default(false);
+
+    registrar.ParameterWithUniversalAccessor<bool>(
+        "preserve_account",
+        [] (TThis* command) -> auto& {
+            return command->Options.PreserveAccount;
+        })
+        .Default(false);
 }
 
 void TRestoreTableBackupCommand::DoExecute(ICommandContextPtr context)
diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index 9388897339..f5ad0c462c 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -762,4 +762,4 @@ IClientPtr CreateClient(
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // NYT::NClient::NFederated
+} // namespace NYT::NClient::NFederated
diff --git a/yt/yt/core/yson/config.h b/yt/yt/core/yson/config.h
index 8e34bc233f..3c5817c5d2 100644
--- a/yt/yt/core/yson/config.h
+++ b/yt/yt/core/yson/config.h
@@ -50,4 +50,4 @@ DEFINE_REFCOUNTED_TYPE(TProtobufInteropDynamicConfig)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // NYT::NYson
+} // namespace NYT::NYson
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index 649d7f6184..a0cef87d82 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -1357,6 +1357,7 @@ message TReqCreateTableBackup
     required uint64 checkpoint_check_period = 3;
     required uint64 checkpoint_check_timeout = 4;
     required bool force = 5;
+    required bool preserve_account = 6;
 }
 
 message TRspCreateTableBackup
@@ -1371,6 +1372,7 @@ message TReqRestoreTableBackup
     required bool force = 2;
     required bool mount = 3;
     required bool enable_replicas = 4;
+    required bool preserve_account = 5;
 }
 
 message TRspRestoreTableBackup