gentoo resync : 22.01.2021

2 files changed, 59 insertions, 0 deletions

diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
new file mode 100644
index 000000000000..b3e1662a0cf6
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
@@ -0,0 +1,28 @@
+From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Sun, 20 Dec 2020 21:47:33 +0100
+Subject: [PATCH 10/10] Fix building against >=ICU-68
+
+Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
+Bug: https://bugs.gentoo.org/759070
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ sql/mysqld.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index c400e5584..5d2ebfaea 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
+   if (opt_keyring_migration_source || opt_keyring_migration_destination ||
+       migrate_connect_options) {
+     Migrate_keyring mk;
+-    my_getopt_skip_unknown = TRUE;
++    my_getopt_skip_unknown = true;
+     if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
+                 opt_keyring_migration_destination, opt_keyring_migration_user,
+                 opt_keyring_migration_host, opt_keyring_migration_password,
+-- 
+2.29.2
+
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
new file mode 100644
index 000000000000..91f67c437168
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,28 +222,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+ 
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+-  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+-  IF(MY_UNAME)
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+-      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_RESULT
+-      )
+-    EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+-  ENDIF()
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+-ENDIF()
+-
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ IF(APPLE)
+   IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)