aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2025-02-15 00:51:32 +0000
committerAlexander Smirnov <alex@ydb.tech>2025-02-15 00:51:32 +0000
commit67421443097d50444537a60d9035b3d1a6c3afcd (patch)
tree91a02bd1ff8c406c900dbb18c9f61df77734c5f8 /contrib
parent952ca0f30d296247f95ab781b0a5aa5b485ac2c7 (diff)
parent784038d7404cb679026c8cc19204497e8411c75a (diff)
downloadydb-67421443097d50444537a60d9035b3d1a6c3afcd.tar.gz
Merge branch 'rightlib' into merge-libs-250215-0050
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/backtrace/.yandex_meta/override.nix6
-rw-r--r--contrib/libs/backtrace/elf.c34
-rw-r--r--contrib/libs/backtrace/ya.make4
-rw-r--r--contrib/libs/breakpad/src/.yandex_meta/licenses.list.txt35
-rw-r--r--contrib/libs/breakpad/src/common/android/testing/include/wchar.h76
-rw-r--r--contrib/libs/breakpad/src/common/android/testing/mkdtemp.h110
-rw-r--r--contrib/libs/breakpad/src/common/android/testing/pthread_fixes.h94
-rw-r--r--contrib/libs/breakpad/src/ya.make3
-rw-r--r--contrib/python/pytz/py2/.dist-info/METADATA6
-rw-r--r--contrib/python/pytz/py2/pytz/__init__.py4
-rw-r--r--contrib/python/pytz/py2/pytz/tests/test_tzinfo.py4
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/America/Asuncionbin2030 -> 1644 bytes
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/Asia/Manilabin328 -> 422 bytes
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/leapseconds8
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/tzdata.zi33
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/zone.tab2
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/zone1970.tab6
-rw-r--r--contrib/python/pytz/py2/pytz/zoneinfo/zonenow.tab9
-rw-r--r--contrib/python/pytz/py2/ya.make2
-rw-r--r--contrib/python/pytz/py3/.dist-info/METADATA6
-rw-r--r--contrib/python/pytz/py3/pytz/__init__.py4
-rw-r--r--contrib/python/pytz/py3/pytz/tests/test_tzinfo.py4
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/America/Asuncionbin2030 -> 1644 bytes
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/Asia/Manilabin328 -> 422 bytes
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/leapseconds8
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/tzdata.zi33
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/zone.tab2
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/zone1970.tab6
-rw-r--r--contrib/python/pytz/py3/pytz/zoneinfo/zonenow.tab9
-rw-r--r--contrib/python/pytz/py3/ya.make2
30 files changed, 109 insertions, 401 deletions
diff --git a/contrib/libs/backtrace/.yandex_meta/override.nix b/contrib/libs/backtrace/.yandex_meta/override.nix
index b2868617d1..c633909160 100644
--- a/contrib/libs/backtrace/.yandex_meta/override.nix
+++ b/contrib/libs/backtrace/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
pkgs: attrs: with pkgs; with attrs; rec {
- version = "2024-11-29";
+ version = "2025-01-30";
src = fetchFromGitHub {
owner = "ianlancetaylor";
repo = "libbacktrace";
- rev = "1db85642e3fca189cf4e076f840a45d6934b2456";
- hash = "sha256-hRZqnro0fXFrcyMiC7k5Ztm0qckRV23UbzpmCThQ3Y4=";
+ rev = "78af4ffa26e15532847c1ba854ece7b3bacc6b1a";
+ hash = "sha256-yx++/urCnaBt2QQsevSXjZ1aAHfBEznk5Dq3JscPyiQ=";
};
patches = [];
diff --git a/contrib/libs/backtrace/elf.c b/contrib/libs/backtrace/elf.c
index 380cafe91a..4c8e155573 100644
--- a/contrib/libs/backtrace/elf.c
+++ b/contrib/libs/backtrace/elf.c
@@ -1147,7 +1147,10 @@ elf_fetch_bits (const unsigned char **ppin, const unsigned char *pinend,
next = __builtin_bswap32 (next);
#endif
#else
- next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24);
+ next = ((uint32_t)pin[0]
+ | ((uint32_t)pin[1] << 8)
+ | ((uint32_t)pin[2] << 16)
+ | ((uint32_t)pin[3] << 24));
#endif
val |= (uint64_t)next << bits;
@@ -1198,7 +1201,10 @@ elf_fetch_bits_backward (const unsigned char **ppin,
next = __builtin_bswap32 (next);
#endif
#else
- next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24);
+ next = ((uint32_t)pin[0]
+ | ((uint32_t)pin[1] << 8)
+ | ((uint32_t)pin[2] << 16)
+ | ((uint32_t)pin[3] << 24));
#endif
val <<= 32;
@@ -5872,10 +5878,10 @@ elf_uncompress_lzma_block (const unsigned char *compressed,
/* The byte at compressed[off] is ignored for some
reason. */
- code = ((compressed[off + 1] << 24)
- + (compressed[off + 2] << 16)
- + (compressed[off + 3] << 8)
- + compressed[off + 4]);
+ code = ((uint32_t)(compressed[off + 1] << 24)
+ + ((uint32_t)compressed[off + 2] << 16)
+ + ((uint32_t)compressed[off + 3] << 8)
+ + (uint32_t)compressed[off + 4]);
off += 5;
/* This is the main LZMA decode loop. */
@@ -6198,10 +6204,10 @@ elf_uncompress_lzma_block (const unsigned char *compressed,
return 0;
}
computed_crc = elf_crc32 (0, uncompressed, uncompressed_offset);
- stream_crc = (compressed[off]
- | (compressed[off + 1] << 8)
- | (compressed[off + 2] << 16)
- | (compressed[off + 3] << 24));
+ stream_crc = ((uint32_t)compressed[off]
+ | ((uint32_t)compressed[off + 1] << 8)
+ | ((uint32_t)compressed[off + 2] << 16)
+ | ((uint32_t)compressed[off + 3] << 24));
if (computed_crc != stream_crc)
{
elf_uncompress_failed ();
@@ -6336,10 +6342,10 @@ elf_uncompress_lzma (struct backtrace_state *state,
/* Before that is the size of the index field, which precedes the
footer. */
- index_size = (compressed[offset - 4]
- | (compressed[offset - 3] << 8)
- | (compressed[offset - 2] << 16)
- | (compressed[offset - 1] << 24));
+ index_size = ((size_t)compressed[offset - 4]
+ | ((size_t)compressed[offset - 3] << 8)
+ | ((size_t)compressed[offset - 2] << 16)
+ | ((size_t)compressed[offset - 1] << 24));
index_size = (index_size + 1) * 4;
offset -= 4;
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index bf36fcf8c2..b430051ade 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2024-11-29)
+VERSION(2025-01-30)
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/1db85642e3fca189cf4e076f840a45d6934b2456.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/78af4ffa26e15532847c1ba854ece7b3bacc6b1a.tar.gz)
ADDINCL(
contrib/libs/backtrace
diff --git a/contrib/libs/breakpad/src/.yandex_meta/licenses.list.txt b/contrib/libs/breakpad/src/.yandex_meta/licenses.list.txt
index 75fd1567b3..bbd2bbc406 100644
--- a/contrib/libs/breakpad/src/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/breakpad/src/.yandex_meta/licenses.list.txt
@@ -1194,27 +1194,6 @@ permissive licensing, and of not having licensing issues being an
obstacle to adoption, that text has been removed.
-====================GPL-2.0-only====================
- *** This header was automatically generated from a Linux kernel header
- *** of the same name, to make information necessary for userspace to
- *** call into the kernel available to libc. It contains only constants,
- *** structures, and macros generated from the original header, and thus,
- *** contains no copyrightable information.
-
-
-====================LicenseRef-scancode-other-permissive====================
-Portions of this software are derived from third-party works licensed
-under terms compatible with the above MIT license:
-
-
-====================LicenseRef-scancode-unknown-license-reference====================
-have been licensed under extremely permissive terms.
-
-
-====================LicenseRef-scancode-unknown-license-reference====================
-licensed under following terms: "Permission to use, copy, modify,
-
-
====================MIT====================
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -1309,6 +1288,10 @@ all of whom have explicitly granted such permission.
====================MIT-Nagy====================
licensed under following terms: "Permission to use, copy, modify,
+
+
+====================MIT-Nagy====================
+licensed under following terms: "Permission to use, copy, modify,
and/or distribute this code for any purpose with or without fee is
hereby granted. There is no warranty."
@@ -1318,10 +1301,12 @@ hereby granted. There is no warranty."
* This code is in the public domain; do with it what you wish.
-====================Public-Domain AND LicenseRef-scancode-other-permissive====================
-originally written by Solar Designer and placed into the public
-domain. The code also comes with a fallback permissive license for use
-in jurisdictions that may not recognize the public domain.
+====================Public-Domain====================
+ *** This header was automatically generated from a Linux kernel header
+ *** of the same name, to make information necessary for userspace to
+ *** call into the kernel available to libc. It contains only constants,
+ *** structures, and macros generated from the original header, and thus,
+ *** contains no copyrightable information.
====================Unicode====================
diff --git a/contrib/libs/breakpad/src/common/android/testing/include/wchar.h b/contrib/libs/breakpad/src/common/android/testing/include/wchar.h
deleted file mode 100644
index 85373fd2a0..0000000000
--- a/contrib/libs/breakpad/src/common/android/testing/include/wchar.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Android doesn't provide wcscasecmp(), so provide an alternative here.
-//
-// Note that this header is not needed when Breakpad is compiled against
-// a recent version of Googletest. It shall be considered for removal once
-// src/testing/ is updated to an appropriate revision in the future.
-
-#ifndef GOOGLEBREAKPAD_COMMON_ANDROID_INCLUDE_WCHAR_H
-#define GOOGLEBREAKPAD_COMMON_ANDROID_INCLUDE_WCHAR_H
-
-#include_next <wchar.h>
-
-#if !defined(__aarch64__) && !defined(__x86_64__) && \
- !(defined(__mips__) && _MIPS_SIM == _ABI64)
-
-// This needs to be in an extern "C" namespace, or Googletest will not
-// compile against it.
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-static wchar_t inline wcstolower(wchar_t ch) {
- if (ch >= L'a' && ch <= L'A')
- ch -= L'a' - L'A';
- return ch;
-}
-
-static int inline wcscasecmp(const wchar_t* s1, const wchar_t* s2) {
- for (;;) {
- wchar_t c1 = wcstolower(*s1);
- wchar_t c2 = wcstolower(*s2);
- if (c1 < c2)
- return -1;
- if (c1 > c2)
- return 1;
- if (c1 == L'0')
- return 0;
- s1++;
- s2++;
- }
-}
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-#endif
-
-#endif // GOOGLEBREAKPAD_COMMON_ANDROID_INCLUDE_WCHAR_H
diff --git a/contrib/libs/breakpad/src/common/android/testing/mkdtemp.h b/contrib/libs/breakpad/src/common/android/testing/mkdtemp.h
deleted file mode 100644
index b86e2cd783..0000000000
--- a/contrib/libs/breakpad/src/common/android/testing/mkdtemp.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// mkdtemp() wasn't declared in <stdlib.h> until NDK r9b due to a simple
-// packaging bug (the function has always been implemented in all versions
-// of the C library). This header is provided to build Breakpad with earlier
-// NDK revisions (e.g. the one used by Chromium). It may be removed in the
-// future once all major projects upgrade to use a more recent NDK.
-//
-// The reason this is inlined here is to avoid linking a new object file
-// into each unit test program (i.e. keep build files simple).
-
-#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H
-#define GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-
-// Using a macro renaming trick here is necessary when building against
-// NDK r9b. Otherwise the compiler will complain that calls to mkdtemp()
-// are ambiguous.
-#define mkdtemp breakpad_mkdtemp
-
-namespace {
-
-char* breakpad_mkdtemp(char* path) {
- if (path == NULL) {
- errno = EINVAL;
- return NULL;
- }
-
- // 'path' must be terminated with six 'X'
- const char kSuffix[] = "XXXXXX";
- const size_t kSuffixLen = strlen(kSuffix);
- char* path_end = path + strlen(path);
-
- if (static_cast<size_t>(path_end - path) < kSuffixLen ||
- memcmp(path_end - kSuffixLen, kSuffix, kSuffixLen) != 0) {
- errno = EINVAL;
- return NULL;
- }
-
- // If 'path' contains a directory separator, check that it exists to
- // avoid looping later.
- char* sep = strrchr(path, '/');
- if (sep != NULL) {
- struct stat st;
- int ret;
- *sep = '\0'; // temporarily zero-terminate the dirname.
- ret = stat(path, &st);
- *sep = '/'; // restore full path.
- if (ret < 0)
- return NULL;
- if (!S_ISDIR(st.st_mode)) {
- errno = ENOTDIR;
- return NULL;
- }
- }
-
- // Loop. On each iteration, replace the XXXXXX suffix with a random
- // number.
- int tries;
- for (tries = 128; tries > 0; tries--) {
- int random = rand() % 1000000;
-
- snprintf(path_end - kSuffixLen, kSuffixLen + 1, "%0d", random);
- if (mkdir(path, 0700) == 0)
- return path; // Success
-
- if (errno != EEXIST)
- return NULL;
- }
-
- assert(errno == EEXIST);
- return NULL;
-}
-
-} // namespace
-
-#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H
diff --git a/contrib/libs/breakpad/src/common/android/testing/pthread_fixes.h b/contrib/libs/breakpad/src/common/android/testing/pthread_fixes.h
deleted file mode 100644
index b0a3d82e4b..0000000000
--- a/contrib/libs/breakpad/src/common/android/testing/pthread_fixes.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This contains Pthread-related functions not provided by the Android NDK
-// but required by the Breakpad unit test. The functions are inlined here
-// in a C++ anonymous namespace in order to keep the build files simples.
-
-#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_PTHREAD_FIXES_H
-#define GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_PTHREAD_FIXES_H
-
-#include <pthread.h>
-
-namespace {
-
-// Android doesn't provide pthread_barrier_t for now.
-#ifndef PTHREAD_BARRIER_SERIAL_THREAD
-
-// Anything except 0 will do here.
-#define PTHREAD_BARRIER_SERIAL_THREAD 0x12345
-
-typedef struct {
- pthread_mutex_t mutex;
- pthread_cond_t cond;
- unsigned count;
-} pthread_barrier_t;
-
-int pthread_barrier_init(pthread_barrier_t* barrier,
- const void* /* barrier_attr */,
- unsigned count) {
- barrier->count = count;
- pthread_mutex_init(&barrier->mutex, NULL);
- pthread_cond_init(&barrier->cond, NULL);
- return 0;
-}
-
-int pthread_barrier_wait(pthread_barrier_t* barrier) {
- // Lock the mutex
- pthread_mutex_lock(&barrier->mutex);
- // Decrement the count. If this is the first thread to reach 0, wake up
- // waiters, unlock the mutex, then return PTHREAD_BARRIER_SERIAL_THREAD.
- if (--barrier->count == 0) {
- // First thread to reach the barrier
- pthread_cond_broadcast(&barrier->cond);
- pthread_mutex_unlock(&barrier->mutex);
- return PTHREAD_BARRIER_SERIAL_THREAD;
- }
- // Otherwise, wait for other threads until the count reaches 0, then
- // return 0 to indicate this is not the first thread.
- do {
- pthread_cond_wait(&barrier->cond, &barrier->mutex);
- } while (barrier->count > 0);
-
- pthread_mutex_unlock(&barrier->mutex);
- return 0;
-}
-
-int pthread_barrier_destroy(pthread_barrier_t* barrier) {
- barrier->count = 0;
- pthread_cond_destroy(&barrier->cond);
- pthread_mutex_destroy(&barrier->mutex);
- return 0;
-}
-
-#endif // defined(PTHREAD_BARRIER_SERIAL_THREAD)
-
-} // namespace
-
-#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_PTHREAD_FIXES_H
diff --git a/contrib/libs/breakpad/src/ya.make b/contrib/libs/breakpad/src/ya.make
index 2611d5f447..df8dfb1143 100644
--- a/contrib/libs/breakpad/src/ya.make
+++ b/contrib/libs/breakpad/src/ya.make
@@ -9,9 +9,6 @@ LICENSE(
BSD-4-Clause-UC AND
Custom-clarified-artistic-proofread AND
FSFAP AND
- GPL-2.0-only AND
- LicenseRef-scancode-other-permissive AND
- LicenseRef-scancode-unknown-license-reference AND
MIT AND
MIT WITH Musl-Exception AND
MIT-Nagy AND
diff --git a/contrib/python/pytz/py2/.dist-info/METADATA b/contrib/python/pytz/py2/.dist-info/METADATA
index 13beaef4b8..879a28cf7a 100644
--- a/contrib/python/pytz/py2/.dist-info/METADATA
+++ b/contrib/python/pytz/py2/.dist-info/METADATA
@@ -1,14 +1,14 @@
Metadata-Version: 2.1
Name: pytz
-Version: 2024.2
+Version: 2025.1
Summary: World timezone definitions, modern and historical
Home-page: http://pythonhosted.org/pytz
+Download-URL: https://pypi.org/project/pytz/
Author: Stuart Bishop
Author-email: stuart@stuartbishop.net
Maintainer: Stuart Bishop
Maintainer-email: stuart@stuartbishop.net
License: MIT
-Download-URL: https://pypi.org/project/pytz/
Keywords: timezone,tzinfo,datetime,olson,time
Platform: Independent
Classifier: Development Status :: 6 - Mature
@@ -646,5 +646,3 @@ Contact
~~~~~~~
Stuart Bishop <stuart@stuartbishop.net>
-
-
diff --git a/contrib/python/pytz/py2/pytz/__init__.py b/contrib/python/pytz/py2/pytz/__init__.py
index 2f610d015c..1f0194634c 100644
--- a/contrib/python/pytz/py2/pytz/__init__.py
+++ b/contrib/python/pytz/py2/pytz/__init__.py
@@ -22,8 +22,8 @@ from pytz.tzfile import build_tzinfo
# The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2024b'
-VERSION = '2024.2' # pip compatible version number.
+OLSON_VERSION = '2025a'
+VERSION = '2025.1' # pip compatible version number.
__version__ = VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
diff --git a/contrib/python/pytz/py2/pytz/tests/test_tzinfo.py b/contrib/python/pytz/py2/pytz/tests/test_tzinfo.py
index 5184b87b03..3195a1fde3 100644
--- a/contrib/python/pytz/py2/pytz/tests/test_tzinfo.py
+++ b/contrib/python/pytz/py2/pytz/tests/test_tzinfo.py
@@ -27,8 +27,8 @@ from pytz.tzinfo import DstTzInfo, StaticTzInfo # noqa
# I test for expected version to ensure the correct version of pytz is
# actually being tested.
-EXPECTED_VERSION = '2024.2'
-EXPECTED_OLSON_VERSION = '2024b'
+EXPECTED_VERSION = '2025.1'
+EXPECTED_OLSON_VERSION = '2025a'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/America/Asuncion b/contrib/python/pytz/py2/pytz/zoneinfo/America/Asuncion
index 891279d4db..9b07a80b85 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/America/Asuncion
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/America/Asuncion
Binary files differ
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/Asia/Manila b/contrib/python/pytz/py2/pytz/zoneinfo/Asia/Manila
index f4f4b04efa..168f72096d 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/Asia/Manila
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/Asia/Manila
Binary files differ
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/leapseconds b/contrib/python/pytz/py2/pytz/zoneinfo/leapseconds
index 6c715cb20b..76f771427f 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/leapseconds
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/leapseconds
@@ -69,11 +69,11 @@ Leap 2016 Dec 31 23:59:60 + S
# Any additional leap seconds will come after this.
# This Expires line is commented out for now,
# so that pre-2020a zic implementations do not reject this file.
-#Expires 2025 Jun 28 00:00:00
+#Expires 2025 Dec 28 00:00:00
# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
+#updated 1736208000 (2025-01-07 00:00:00 UTC)
+#expires 1766880000 (2025-12-28 00:00:00 UTC)
# Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-# File expires on 28 June 2025
+# File expires on 28 December 2025
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/tzdata.zi b/contrib/python/pytz/py2/pytz/zoneinfo/tzdata.zi
index b89326a7aa..a2fcd54496 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/tzdata.zi
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/tzdata.zi
@@ -721,12 +721,16 @@ R P 2085 o - Ap 21 2 0 -
R P 2085 o - Jun 9 2 1 S
R P 2086 o - Ap 13 2 0 -
R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
+R PH 1936 o - O 31 24 1 D
+R PH 1937 o - Ja 15 24 0 S
+R PH 1941 o - D 15 24 1 D
+R PH 1945 o - N 30 24 0 S
+R PH 1954 o - Ap 11 24 1 D
+R PH 1954 o - Jun 4 24 0 S
+R PH 1977 o - Mar 27 24 1 D
+R PH 1977 o - S 21 24 0 S
+R PH 1990 o - May 21 0 1 D
+R PH 1990 o - Jul 28 24 0 S
R S 1920 1923 - Ap Su>=15 2 1 S
R S 1920 1923 - O Su>=1 2 0 -
R S 1962 o - Ap 29 2 1 S
@@ -1725,7 +1729,7 @@ R Y 1972 2006 - O lastSu 2 0 S
R Y 1987 2006 - Ap Su>=1 2 1 D
R Yu 1965 o - Ap lastSu 0 2 DD
R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
+R m 1931 o - Ap 30 0 1 D
R m 1931 o - O 1 0 0 S
R m 1939 o - F 5 0 1 D
R m 1939 o - Jun 25 0 0 S
@@ -2019,9 +2023,9 @@ R y 2002 2004 - Ap Su>=1 0 0 -
R y 2002 2003 - S Su>=1 0 1 -
R y 2004 2009 - O Su>=15 0 1 -
R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
+R y 2010 2024 - O Su>=1 0 1 -
R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
+R y 2013 2024 - Mar Su>=22 0 0 -
R PE 1938 o - Ja 1 0 1 -
R PE 1938 o - Ap 1 0 0 -
R PE 1938 1939 - S lastSu 0 1 -
@@ -2336,7 +2340,8 @@ Z America/Asuncion -3:50:40 - LMT 1890
-3:50:40 - AMT 1931 O 10
-4 - %z 1972 O
-3 - %z 1974 Ap
--4 y %z
+-4 y %z 2024 O 15
+-3 - %z
Z America/Bahia -2:34:4 - LMT 1914
-3 B %z 2003 S 24
-3 - %z 2011 O 16
@@ -3268,10 +3273,10 @@ Z Asia/Makassar 7:57:36 - LMT 1920
8 - %z 1942 F 9
9 - %z 1945 S 23
8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
+Z Asia/Manila -15:56:8 - LMT 1844 D 31
+8:3:52 - LMT 1899 S 6 4u
+8 PH P%sT 1942 F 11 24
+9 - JST 1945 Mar 4
8 PH P%sT
Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
2 CY EE%sT 1998 S
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/zone.tab b/contrib/python/pytz/py2/pytz/zoneinfo/zone.tab
index bfc0b59330..d2be66359f 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/zone.tab
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/zone.tab
@@ -310,7 +310,7 @@ PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea
PG -0613+15534 Pacific/Bougainville Bougainville
-PH +1435+12100 Asia/Manila
+PH +143512+1205804 Asia/Manila
PK +2452+06703 Asia/Karachi
PL +5215+02100 Europe/Warsaw
PM +4703-05620 America/Miquelon
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/zone1970.tab b/contrib/python/pytz/py2/pytz/zoneinfo/zone1970.tab
index 7726f39a09..5ded0565eb 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/zone1970.tab
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/zone1970.tab
@@ -183,7 +183,7 @@ IR +3540+05126 Asia/Tehran
IT,SM,VA +4154+01229 Europe/Rome
JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
-JP +353916+1394441 Asia/Tokyo
+JP,AU +353916+1394441 Asia/Tokyo Eyre Bird Observatory
KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi
KG +4254+07436 Asia/Bishkek
KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Wake
@@ -246,7 +246,7 @@ PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
PG,AQ,FM -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
PG -0613+15534 Pacific/Bougainville Bougainville
-PH +1435+12100 Asia/Manila
+PH +143512+1205804 Asia/Manila
PK +2452+06703 Asia/Karachi
PL +5215+02100 Europe/Warsaw
PM +4703-05620 America/Miquelon
@@ -293,7 +293,7 @@ RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea
SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa
SB,FM -0932+16012 Pacific/Guadalcanal Pohnpei
SD +1536+03232 Africa/Khartoum
-SG,MY +0117+10351 Asia/Singapore peninsular Malaysia
+SG,AQ,MY +0117+10351 Asia/Singapore peninsular Malaysia, Concordia
SR +0550-05510 America/Paramaribo
SS +0451+03137 Africa/Juba
ST +0020+00644 Africa/Sao_Tome
diff --git a/contrib/python/pytz/py2/pytz/zoneinfo/zonenow.tab b/contrib/python/pytz/py2/pytz/zoneinfo/zonenow.tab
index 01f536b3ba..d2c1e48584 100644
--- a/contrib/python/pytz/py2/pytz/zoneinfo/zonenow.tab
+++ b/contrib/python/pytz/py2/pytz/zoneinfo/zonenow.tab
@@ -97,9 +97,6 @@ XX +1828-06954 America/Santo_Domingo Atlantic Standard ("AST") - eastern Caribbe
# -04/-03 (Chile DST)
XX -3327-07040 America/Santiago most of Chile
#
-# -04/-03 (Paraguay DST)
-XX -2516-05740 America/Asuncion Paraguay
-#
# -04/-03 - AST/ADT (North America DST)
XX +4439-06336 America/Halifax Atlantic ("AST/ADT") - Canada; Bermuda
#
@@ -224,7 +221,7 @@ XX +1345+10031 Asia/Bangkok Russia; Indochina; Christmas Island
XX -0610+10648 Asia/Jakarta Indonesia ("WIB")
#
# +08
-XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore
+XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore; Concordia
#
# +08 - AWST
XX -3157+11551 Australia/Perth Western Australia ("AWST")
@@ -236,7 +233,7 @@ XX +3114+12128 Asia/Shanghai China ("CST")
XX +2217+11409 Asia/Hong_Kong Hong Kong ("HKT")
#
# +08 - PHT
-XX +1435+12100 Asia/Manila Philippines ("PHT")
+XX +143512+1205804 Asia/Manila Philippines ("PHT")
#
# +08 - WITA
XX -0507+11924 Asia/Makassar Indonesia ("WITA")
@@ -248,7 +245,7 @@ XX -3143+12852 Australia/Eucla Eucla
XX +5203+11328 Asia/Chita Russia; Palau; East Timor
#
# +09 - JST
-XX +353916+1394441 Asia/Tokyo Japan ("JST")
+XX +353916+1394441 Asia/Tokyo Japan ("JST"); Eyre Bird Observatory
#
# +09 - KST
XX +3733+12658 Asia/Seoul Korea ("KST")
diff --git a/contrib/python/pytz/py2/ya.make b/contrib/python/pytz/py2/ya.make
index afb4b030b3..ea9dc82c56 100644
--- a/contrib/python/pytz/py2/ya.make
+++ b/contrib/python/pytz/py2/ya.make
@@ -2,7 +2,7 @@
PY2_LIBRARY()
-VERSION(2024.2)
+VERSION(2025.1)
LICENSE(MIT)
diff --git a/contrib/python/pytz/py3/.dist-info/METADATA b/contrib/python/pytz/py3/.dist-info/METADATA
index 13beaef4b8..879a28cf7a 100644
--- a/contrib/python/pytz/py3/.dist-info/METADATA
+++ b/contrib/python/pytz/py3/.dist-info/METADATA
@@ -1,14 +1,14 @@
Metadata-Version: 2.1
Name: pytz
-Version: 2024.2
+Version: 2025.1
Summary: World timezone definitions, modern and historical
Home-page: http://pythonhosted.org/pytz
+Download-URL: https://pypi.org/project/pytz/
Author: Stuart Bishop
Author-email: stuart@stuartbishop.net
Maintainer: Stuart Bishop
Maintainer-email: stuart@stuartbishop.net
License: MIT
-Download-URL: https://pypi.org/project/pytz/
Keywords: timezone,tzinfo,datetime,olson,time
Platform: Independent
Classifier: Development Status :: 6 - Mature
@@ -646,5 +646,3 @@ Contact
~~~~~~~
Stuart Bishop <stuart@stuartbishop.net>
-
-
diff --git a/contrib/python/pytz/py3/pytz/__init__.py b/contrib/python/pytz/py3/pytz/__init__.py
index 2f610d015c..1f0194634c 100644
--- a/contrib/python/pytz/py3/pytz/__init__.py
+++ b/contrib/python/pytz/py3/pytz/__init__.py
@@ -22,8 +22,8 @@ from pytz.tzfile import build_tzinfo
# The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2024b'
-VERSION = '2024.2' # pip compatible version number.
+OLSON_VERSION = '2025a'
+VERSION = '2025.1' # pip compatible version number.
__version__ = VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
diff --git a/contrib/python/pytz/py3/pytz/tests/test_tzinfo.py b/contrib/python/pytz/py3/pytz/tests/test_tzinfo.py
index 5184b87b03..3195a1fde3 100644
--- a/contrib/python/pytz/py3/pytz/tests/test_tzinfo.py
+++ b/contrib/python/pytz/py3/pytz/tests/test_tzinfo.py
@@ -27,8 +27,8 @@ from pytz.tzinfo import DstTzInfo, StaticTzInfo # noqa
# I test for expected version to ensure the correct version of pytz is
# actually being tested.
-EXPECTED_VERSION = '2024.2'
-EXPECTED_OLSON_VERSION = '2024b'
+EXPECTED_VERSION = '2025.1'
+EXPECTED_OLSON_VERSION = '2025a'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/America/Asuncion b/contrib/python/pytz/py3/pytz/zoneinfo/America/Asuncion
index 891279d4db..9b07a80b85 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/America/Asuncion
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/America/Asuncion
Binary files differ
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/Asia/Manila b/contrib/python/pytz/py3/pytz/zoneinfo/Asia/Manila
index f4f4b04efa..168f72096d 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/Asia/Manila
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/Asia/Manila
Binary files differ
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/leapseconds b/contrib/python/pytz/py3/pytz/zoneinfo/leapseconds
index 6c715cb20b..76f771427f 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/leapseconds
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/leapseconds
@@ -69,11 +69,11 @@ Leap 2016 Dec 31 23:59:60 + S
# Any additional leap seconds will come after this.
# This Expires line is commented out for now,
# so that pre-2020a zic implementations do not reject this file.
-#Expires 2025 Jun 28 00:00:00
+#Expires 2025 Dec 28 00:00:00
# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
+#updated 1736208000 (2025-01-07 00:00:00 UTC)
+#expires 1766880000 (2025-12-28 00:00:00 UTC)
# Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-# File expires on 28 June 2025
+# File expires on 28 December 2025
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/tzdata.zi b/contrib/python/pytz/py3/pytz/zoneinfo/tzdata.zi
index b89326a7aa..a2fcd54496 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/tzdata.zi
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/tzdata.zi
@@ -721,12 +721,16 @@ R P 2085 o - Ap 21 2 0 -
R P 2085 o - Jun 9 2 1 S
R P 2086 o - Ap 13 2 0 -
R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
+R PH 1936 o - O 31 24 1 D
+R PH 1937 o - Ja 15 24 0 S
+R PH 1941 o - D 15 24 1 D
+R PH 1945 o - N 30 24 0 S
+R PH 1954 o - Ap 11 24 1 D
+R PH 1954 o - Jun 4 24 0 S
+R PH 1977 o - Mar 27 24 1 D
+R PH 1977 o - S 21 24 0 S
+R PH 1990 o - May 21 0 1 D
+R PH 1990 o - Jul 28 24 0 S
R S 1920 1923 - Ap Su>=15 2 1 S
R S 1920 1923 - O Su>=1 2 0 -
R S 1962 o - Ap 29 2 1 S
@@ -1725,7 +1729,7 @@ R Y 1972 2006 - O lastSu 2 0 S
R Y 1987 2006 - Ap Su>=1 2 1 D
R Yu 1965 o - Ap lastSu 0 2 DD
R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
+R m 1931 o - Ap 30 0 1 D
R m 1931 o - O 1 0 0 S
R m 1939 o - F 5 0 1 D
R m 1939 o - Jun 25 0 0 S
@@ -2019,9 +2023,9 @@ R y 2002 2004 - Ap Su>=1 0 0 -
R y 2002 2003 - S Su>=1 0 1 -
R y 2004 2009 - O Su>=15 0 1 -
R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
+R y 2010 2024 - O Su>=1 0 1 -
R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
+R y 2013 2024 - Mar Su>=22 0 0 -
R PE 1938 o - Ja 1 0 1 -
R PE 1938 o - Ap 1 0 0 -
R PE 1938 1939 - S lastSu 0 1 -
@@ -2336,7 +2340,8 @@ Z America/Asuncion -3:50:40 - LMT 1890
-3:50:40 - AMT 1931 O 10
-4 - %z 1972 O
-3 - %z 1974 Ap
--4 y %z
+-4 y %z 2024 O 15
+-3 - %z
Z America/Bahia -2:34:4 - LMT 1914
-3 B %z 2003 S 24
-3 - %z 2011 O 16
@@ -3268,10 +3273,10 @@ Z Asia/Makassar 7:57:36 - LMT 1920
8 - %z 1942 F 9
9 - %z 1945 S 23
8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
+Z Asia/Manila -15:56:8 - LMT 1844 D 31
+8:3:52 - LMT 1899 S 6 4u
+8 PH P%sT 1942 F 11 24
+9 - JST 1945 Mar 4
8 PH P%sT
Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
2 CY EE%sT 1998 S
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/zone.tab b/contrib/python/pytz/py3/pytz/zoneinfo/zone.tab
index bfc0b59330..d2be66359f 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/zone.tab
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/zone.tab
@@ -310,7 +310,7 @@ PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea
PG -0613+15534 Pacific/Bougainville Bougainville
-PH +1435+12100 Asia/Manila
+PH +143512+1205804 Asia/Manila
PK +2452+06703 Asia/Karachi
PL +5215+02100 Europe/Warsaw
PM +4703-05620 America/Miquelon
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/zone1970.tab b/contrib/python/pytz/py3/pytz/zoneinfo/zone1970.tab
index 7726f39a09..5ded0565eb 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/zone1970.tab
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/zone1970.tab
@@ -183,7 +183,7 @@ IR +3540+05126 Asia/Tehran
IT,SM,VA +4154+01229 Europe/Rome
JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
-JP +353916+1394441 Asia/Tokyo
+JP,AU +353916+1394441 Asia/Tokyo Eyre Bird Observatory
KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi
KG +4254+07436 Asia/Bishkek
KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Wake
@@ -246,7 +246,7 @@ PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
PG,AQ,FM -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
PG -0613+15534 Pacific/Bougainville Bougainville
-PH +1435+12100 Asia/Manila
+PH +143512+1205804 Asia/Manila
PK +2452+06703 Asia/Karachi
PL +5215+02100 Europe/Warsaw
PM +4703-05620 America/Miquelon
@@ -293,7 +293,7 @@ RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea
SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa
SB,FM -0932+16012 Pacific/Guadalcanal Pohnpei
SD +1536+03232 Africa/Khartoum
-SG,MY +0117+10351 Asia/Singapore peninsular Malaysia
+SG,AQ,MY +0117+10351 Asia/Singapore peninsular Malaysia, Concordia
SR +0550-05510 America/Paramaribo
SS +0451+03137 Africa/Juba
ST +0020+00644 Africa/Sao_Tome
diff --git a/contrib/python/pytz/py3/pytz/zoneinfo/zonenow.tab b/contrib/python/pytz/py3/pytz/zoneinfo/zonenow.tab
index 01f536b3ba..d2c1e48584 100644
--- a/contrib/python/pytz/py3/pytz/zoneinfo/zonenow.tab
+++ b/contrib/python/pytz/py3/pytz/zoneinfo/zonenow.tab
@@ -97,9 +97,6 @@ XX +1828-06954 America/Santo_Domingo Atlantic Standard ("AST") - eastern Caribbe
# -04/-03 (Chile DST)
XX -3327-07040 America/Santiago most of Chile
#
-# -04/-03 (Paraguay DST)
-XX -2516-05740 America/Asuncion Paraguay
-#
# -04/-03 - AST/ADT (North America DST)
XX +4439-06336 America/Halifax Atlantic ("AST/ADT") - Canada; Bermuda
#
@@ -224,7 +221,7 @@ XX +1345+10031 Asia/Bangkok Russia; Indochina; Christmas Island
XX -0610+10648 Asia/Jakarta Indonesia ("WIB")
#
# +08
-XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore
+XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore; Concordia
#
# +08 - AWST
XX -3157+11551 Australia/Perth Western Australia ("AWST")
@@ -236,7 +233,7 @@ XX +3114+12128 Asia/Shanghai China ("CST")
XX +2217+11409 Asia/Hong_Kong Hong Kong ("HKT")
#
# +08 - PHT
-XX +1435+12100 Asia/Manila Philippines ("PHT")
+XX +143512+1205804 Asia/Manila Philippines ("PHT")
#
# +08 - WITA
XX -0507+11924 Asia/Makassar Indonesia ("WITA")
@@ -248,7 +245,7 @@ XX -3143+12852 Australia/Eucla Eucla
XX +5203+11328 Asia/Chita Russia; Palau; East Timor
#
# +09 - JST
-XX +353916+1394441 Asia/Tokyo Japan ("JST")
+XX +353916+1394441 Asia/Tokyo Japan ("JST"); Eyre Bird Observatory
#
# +09 - KST
XX +3733+12658 Asia/Seoul Korea ("KST")
diff --git a/contrib/python/pytz/py3/ya.make b/contrib/python/pytz/py3/ya.make
index 0c3f87bace..7686a58661 100644
--- a/contrib/python/pytz/py3/ya.make
+++ b/contrib/python/pytz/py3/ya.make
@@ -2,7 +2,7 @@
PY3_LIBRARY()
-VERSION(2024.2)
+VERSION(2025.1)
LICENSE(MIT)