From 5f5f293e92c44a0009781c27a4982754ed6ecc58 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Feb 01 2022 00:27:33 +0000 Subject: Merge: sync content of all branches to match 'rawhide' --- diff --git a/community-mysql-arm32-timer.patch b/community-mysql-arm32-timer.patch index 3edd785..d9c616c 100644 --- a/community-mysql-arm32-timer.patch +++ b/community-mysql-arm32-timer.patch @@ -1,10 +1,10 @@ diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql -index 7a56616a..5e5f7950 100644 +index eff14a67..413dfc27 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql -@@ -359,6 +359,11 @@ INSERT INTO global_suppressions VALUES - ("A deprecated TLS version TLSv1 is enabled for channel"), - ("A deprecated TLS version TLSv1.1 is enabled for channel"), +@@ -363,6 +363,11 @@ INSERT INTO global_suppressions VALUES + */ + ("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."), + /* + ARM32 don't support timers and get this warning in every test. diff --git a/community-mysql-gcc12.patch b/community-mysql-gcc12.patch new file mode 100644 index 0000000..7c260be --- /dev/null +++ b/community-mysql-gcc12.patch @@ -0,0 +1,60 @@ +[ 47%] Building CXX object components/logging/CMakeFiles/component_log_sink_syseventlog.dir/log_sink_syseventlog.cc.o +cd /builddir/build/BUILD/mysql-8.0.28/redhat-linux-build/components/logging && /usr/bin/g++ -DHAVE_CONFIG_H -DLZ4_DISABLE_DEPRECATE_WARNINGS -DMYSQL_COMPONENT -DRAPIDJSON_NO_SIZETYPEDEFINE -DRAPIDJSON_SCHEMA_USE_INTERNALREGEX=0 -DRAPIDJSON_SCHEMA_USE_STDREGEX=1 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_USE_MATH_DEFINES -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Dcomponent_log_sink_syseventlog_EXPORTS -I/builddir/build/BUILD/mysql-8.0.28/redhat-linux-build -I/builddir/build/BUILD/mysql-8.0.28/redhat-linux-build/include -I/builddir/build/BUILD/mysql-8.0.28 -I/builddir/build/BUILD/mysql-8.0.28/include -isystem /builddir/build/BUILD/mysql-8.0.28/extra/rapidjson/include -isystem /usr/include/editline -std=c++17 -fno-omit-frame-pointer -ftls-model=initial-exec -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wall -Wextra -Wformat-security -Wvla -Wundef -Wmissing-format-attribute -Woverloaded-virtual -Wcast-qual -Wimplicit-fallthrough=5 -Wstringop-truncation -Wsuggest-override -Wmissing-include-dirs -Wextra-semi -Wlogical-op -ffunction-sections -fdata-sections -O2 -g -DNDEBUG -fPIC -fvisibility=hidden -MD -MT components/logging/CMakeFiles/component_log_sink_syseventlog.dir/log_sink_syseventlog.cc.o -MF CMakeFiles/component_log_sink_syseventlog.dir/log_sink_syseventlog.cc.o.d -o CMakeFiles/component_log_sink_syseventlog.dir/log_sink_syseventlog.cc.o -c /builddir/build/BUILD/mysql-8.0.28/components/logging/log_sink_syseventlog.cc +/builddir/build/BUILD/mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc: In static member function 'static int keyring_common::service_definition::Log_builtins_keyring::line_submit(log_line*)': +/builddir/build/BUILD/mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc:266:12: error: 'unique_ptr' is not a member of 'std' + 266 | std::unique_ptr date{new char[date_length]}; + | ^~~~~~~~~~ +/builddir/build/BUILD/mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc:49:1: note: 'std::unique_ptr' is defined in header ''; did you forget to '#include '? + 48 | #include "mysqld_ername.h" + +++ |+#include + 49 | #endif /* IN_DOXYGEN */ +/builddir/build/BUILD/mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc:266:23: error: expected primary-expression before 'char' + 266 | std::unique_ptr date{new char[date_length]}; + | ^~~~ +/builddir/build/BUILD/mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc:267:16: error: 'date' was not declared in this scope + 267 | strftime(date.get(), date_length, format, &tm); + | ^~~~ +gmake[2]: Leaving directory '/builddir/build/BUILD/mysql-8.0.28/redhat-linux-build' + + + +--- mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc 2021-12-17 17:07:27.000000000 +0100 ++++ mysql-8.0.28/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc_patched 2022-01-24 13:42:33.252351078 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + +[ 16%] Linking CXX executable ../runtime_output_directory/comp_client_err +cd /builddir/build/BUILD/mysql-8.0.28/redhat-linux-build/utilities && /usr/bin/cmake -E cmake_link_script CMakeFiles/comp_client_err.dir/link.txt --verbose=1 +/usr/bin/g++ -std=c++17 -fno-omit-frame-pointer -ftls-model=initial-exec -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wall -Wextra -Wformat-security -Wvla -Wundef -Wmissing-format-attribute -Woverloaded-virtual -Wcast-qual -Wimplicit-fallthrough=5 -Wstringop-truncation -Wsuggest-override -Wmissing-include-dirs -Wextra-semi -Wlogical-op -ffunction-sections -fdata-sections -O2 -g -DNDEBUG -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dT,/builddir/build/BUILD/.package_note-community-mysql-8.0.28-1.fc36.x86_64.ld -pie -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dT,/builddir/build/BUILD/.package_note-community-mysql-8.0.28-1.fc36.x86_64.ld CMakeFiles/comp_client_err.dir/comp_client_err.cc.o CMakeFiles/comp_client_err.dir/__/libmysql/errmsg.cc.o -o ../runtime_output_directory/comp_client_err ../archive_output_directory/libmysys.a ../archive_output_directory/libstrings.a ../archive_output_directory/libmysys.a ../archive_output_directory/libstrings.a ../archive_output_directory/libmytime.a /usr/lib64/libz.so /usr/lib64/libzstd.so -lm /usr/lib64/libssl.so /usr/lib64/libcrypto.so +/builddir/build/BUILD/mysql-8.0.28/client/logger.cc: In function 'std::ostream& operator<<(std::ostream&, const Datetime&)': +/builddir/build/BUILD/mysql-8.0.28/client/logger.cc:39:8: error: 'unique_ptr' is not a member of 'std' + 39 | std::unique_ptr date{new char[date_length]}; + | ^~~~~~~~~~ +/builddir/build/BUILD/mysql-8.0.28/client/logger.cc:30:1: note: 'std::unique_ptr' is defined in header ''; did you forget to '#include '? + 29 | #include + +++ |+#include + 30 | +/builddir/build/BUILD/mysql-8.0.28/client/logger.cc:39:19: error: expected primary-expression before 'char' + 39 | std::unique_ptr date{new char[date_length]}; + | ^~~~ +/builddir/build/BUILD/mysql-8.0.28/client/logger.cc:40:12: error: 'date' was not declared in this scope + 40 | strftime(date.get(), date_length, format, &tm); + | ^~~~ +gmake[2]: *** [client/CMakeFiles/mysql_ssl_rsa_setup.dir/build.make:79: client/CMakeFiles/mysql_ssl_rsa_setup.dir/logger.cc.o] Error 1 +gmake[2]: *** Waiting for unfinished jobs.... + +--- mysql-8.0.28/client/logger.cc 2021-12-17 17:07:27.000000000 +0100 ++++ mysql-8.0.28/client/logger.cc_patched 2022-01-24 11:52:45.172650792 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + using namespace std; + diff --git a/community-mysql-openssl3.patch b/community-mysql-openssl3.patch new file mode 100644 index 0000000..632691f --- /dev/null +++ b/community-mysql-openssl3.patch @@ -0,0 +1,204 @@ +Make MySQL compile with openssl 3.x without FIPS properly implemented + +This change takes some pieces from MariaDB, including compat_ssl.h and +changes in my_md5.cc. + +MySQL utilizes FIPS_mode() and FIPS_mode_set() functions that are not +available in OpenSSL 3.x any more. This patch only mocks the call of +those functions, returning 0 every time, which effectively makes usage +of those functions non working. For making the MySQL build with +OpenSSL 3.x this seems to be enough though. + +diff -rup mysql-8.0.22-orig/cmake/ssl.cmake mysql-8.0.22/cmake/ssl.cmake +--- mysql-8.0.22-orig/cmake/ssl.cmake 2021-05-19 21:36:33.161996422 +0200 ++++ mysql-8.0.22/cmake/ssl.cmake 2021-05-19 23:06:54.211877057 +0200 +@@ -227,8 +227,7 @@ MACRO (MYSQL_CHECK_SSL) + ENDIF() + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND +- CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ CRYPTO_LIBRARY + ) + SET(OPENSSL_FOUND TRUE) + FIND_PROGRAM(OPENSSL_EXECUTABLE openssl +diff -rup mysql-8.0.22-orig/include/ssl_compat.h mysql-8.0.22/include/ssl_compat.h +--- mysql-8.0.22-orig/include/ssl_compat.h 2021-05-19 23:19:36.152956356 +0200 ++++ mysql-8.0.22/include/ssl_compat.h 2021-05-19 23:06:55.048885933 +0200 +@@ -0,0 +1,105 @@ ++/* ++ Copyright (c) 2016, 2021, MariaDB Corporation. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; version 2 of the License. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ ++ ++#include ++ ++/* OpenSSL version specific definitions */ ++#if defined(OPENSSL_VERSION_NUMBER) ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#define HAVE_OPENSSL11 1 ++#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) ++#define ERR_remove_state(X) ERR_clear_error() ++#define EVP_CIPHER_CTX_SIZE 176 ++#define EVP_MD_CTX_SIZE 48 ++#undef EVP_MD_CTX_init ++#define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) ++#undef EVP_CIPHER_CTX_init ++#define EVP_CIPHER_CTX_init(X) do { memset((X), 0, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0) ++ ++/* ++ Macros below are deprecated. OpenSSL 1.1 may define them or not, ++ depending on how it was built. ++*/ ++#undef ERR_free_strings ++#define ERR_free_strings() ++#undef EVP_cleanup ++#define EVP_cleanup() ++#undef CRYPTO_cleanup_all_ex_data ++#define CRYPTO_cleanup_all_ex_data() ++#undef SSL_load_error_strings ++#define SSL_load_error_strings() ++ ++#else ++#define HAVE_OPENSSL10 1 ++#ifdef HAVE_WOLFSSL ++#define SSL_LIBRARY "WolfSSL " WOLFSSL_VERSION ++#else ++#define SSL_LIBRARY SSLeay_version(SSLEAY_VERSION) ++#endif ++ ++#ifdef HAVE_WOLFSSL ++#undef ERR_remove_state ++#define ERR_remove_state(x) do {} while(0) ++#elif defined (HAVE_ERR_remove_thread_state) ++#define ERR_remove_state(X) ERR_remove_thread_state(NULL) ++#endif /* HAVE_ERR_remove_thread_state */ ++ ++#endif /* HAVE_OPENSSL11 */ ++#endif ++ ++#ifdef HAVE_WOLFSSL ++#define EVP_MD_CTX_SIZE sizeof(wc_Md5) ++#endif ++ ++#ifndef HAVE_OPENSSL11 ++#ifndef ASN1_STRING_get0_data ++#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X) ++#endif ++#ifndef EVP_MD_CTX_SIZE ++#define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) ++#endif ++ ++#define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) ++#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) ++#define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) ++#define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) ++ ++#ifndef HAVE_WOLFSSL ++#define OPENSSL_init_ssl(X,Y) SSL_library_init() ++#define EVP_MD_CTX_reset(X) EVP_MD_CTX_cleanup(X) ++#define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X) ++#define X509_get0_notBefore(X) X509_get_notBefore(X) ++#define X509_get0_notAfter(X) X509_get_notAfter(X) ++#endif ++#endif ++ ++#ifndef TLS1_3_VERSION ++//#define SSL_CTX_set_ciphersuites(X,Y) 0 ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++int check_openssl_compatibility(); ++ ++#define FIPS_mode_set(X) 0 ++#define FIPS_mode() 0 ++ ++#ifdef __cplusplus ++} ++#endif +diff -rup mysql-8.0.22-orig/mysys/my_md5.cc mysql-8.0.22/mysys/my_md5.cc +--- mysql-8.0.22-orig/mysys/my_md5.cc 2021-05-19 21:36:31.738980913 +0200 ++++ mysql-8.0.22/mysys/my_md5.cc 2021-05-19 23:13:41.380194493 +0200 +@@ -34,13 +34,12 @@ + + #include + #include ++#include ++#include + + static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int len) { +- MD5_CTX ctx; +- MD5_Init(&ctx); +- MD5_Update(&ctx, buf, len); +- MD5_Final(digest, &ctx); ++ MD5(buf, len, digest); + } + + /** +diff -Naurp mysql-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc* +--- mysql-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc 2021-09-28 13:46:34.000000000 +0200 ++++ mysql-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc_patched 2021-10-31 10:57:37.865934624 +0100 +@@ -30,6 +30,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -39,6 +40,7 @@ + #endif + + #include "openssl/engine.h" ++#include + + #include "xcom/task_debug.h" + #include "xcom/x_platform.h" +diff -rup mysql-8.0.22-orig/plugin/x/client/xconnection_impl.cc mysql-8.0.22/plugin/x/client/xconnection_impl.cc +--- mysql-8.0.22-orig/plugin/x/client/xconnection_impl.cc 2021-05-19 21:36:14.388791818 +0200 ++++ mysql-8.0.22/plugin/x/client/xconnection_impl.cc 2021-05-19 23:06:55.049885943 +0200 +@@ -31,6 +31,7 @@ + #ifdef HAVE_NETINET_IN_H + #include + #endif // HAVE_NETINET_IN_H ++#include + #include + #include + #include // NOLINT(build/c++11) +@@ -38,6 +39,7 @@ + #include + #include + #include ++#include + + #include "errmsg.h" // NOLINT(build/include_subdir) + #include "my_config.h" // NOLINT(build/include_subdir) +diff -rup mysql-8.0.22-orig/vio/viosslfactories.cc mysql-8.0.22/vio/viosslfactories.cc +--- mysql-8.0.22-orig/vio/viosslfactories.cc 2021-05-19 21:36:33.310998046 +0200 ++++ mysql-8.0.22/vio/viosslfactories.cc 2021-05-19 23:06:55.049885943 +0200 +@@ -39,7 +39,9 @@ + #include "mysys_err.h" + #include "vio/vio_priv.h" + ++#include + #include ++#include + + #if OPENSSL_VERSION_NUMBER < 0x10002000L + #include diff --git a/community-mysql-s390-tsc.patch b/community-mysql-s390-tsc.patch index f86899c..21fd2d4 100644 --- a/community-mysql-s390-tsc.patch +++ b/community-mysql-s390-tsc.patch @@ -2,21 +2,21 @@ Support s390/s390x in performance schema's cycle-counting functions. Filed upstream at http://bugs.mysql.com/bug.php?id=59953 diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h -index b411eda0..03fc9a58 100644 +index 6e378e94..7703cf85 100644 --- a/include/my_rdtsc.h +++ b/include/my_rdtsc.h -@@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti); - #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 +@@ -137,5 +137,6 @@ void my_timer_init(MY_TIMER_INFO *mti); /* #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 - No longer used */ #define MY_TIMER_ROUTINE_ASM_AARCH64 28 -+#define MY_TIMER_ROUTINE_ASM_S390 29 + #define MY_TIMER_ROUTINE_GET_THREAD_TIMES 29 ++#define MY_TIMER_ROUTINE_ASM_S390 30 #endif diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc -index d9756487..817aa9d6 100644 +index 3869db57..655a955e 100644 --- a/mysys/my_rdtsc.cc +++ b/mysys/my_rdtsc.cc -@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) { +@@ -169,6 +169,13 @@ ulonglong my_timer_cycles(void) { __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result)); return result; } @@ -30,7 +30,7 @@ index d9756487..817aa9d6 100644 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) /* gethrtime may appear as either cycle or nanosecond counter */ return (ulonglong)gethrtime(); -@@ -453,6 +460,8 @@ void my_timer_init(MY_TIMER_INFO *mti) { +@@ -491,6 +498,8 @@ void my_timer_init(MY_TIMER_INFO *mti) { mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64; #elif defined(__GNUC__) && defined(__aarch64__) mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64; diff --git a/community-mysql.spec b/community-mysql.spec index 5180573..f243e76 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -1,7 +1,3 @@ -# This is a fix for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds -# So the beaviour will be the same also in F31 nad F32 -%undefine __cmake_in_source_build - # Name of the package without any prefixes %global pkg_name %{name} %global pkgnamepatch community-mysql @@ -17,7 +13,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 8.0.27 +%global last_tested_version 8.0.28 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -79,7 +75,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 8.0.27 +Version: 8.0.28 Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -124,7 +120,9 @@ Patch52: %{pkgnamepatch}-sharedir.patch Patch55: %{pkgnamepatch}-rpath.patch Patch56: %{pkgnamepatch}-mtr.patch Patch75: %{pkgnamepatch}-arm32-timer.patch +Patch79: %{pkgnamepatch}-openssl3.patch Patch80: %{pkgnamepatch}-fix-includes-robin-hood.patch +Patch81: %{pkgnamepatch}-gcc12.patch # Patches taken from boost 1.59 Patch115: boost-1.58.0-pool.patch @@ -204,6 +202,9 @@ BuildRequires: perl(warnings) BuildRequires: systemd BuildRequires: make +# Since MySQL 8.0.28 +BuildRequires: libfido2-devel + Requires: bash coreutils grep Requires: %{name}-common%{?_isa} = %{sameevr} @@ -391,8 +392,17 @@ the MySQL sources. %patch55 -p1 %patch56 -p1 %patch75 -p1 +# OpenSSL 3.0 has been introduced to F36 +%if 0%{?fedora} >= 36 +%patch79 -p1 +%endif %patch80 -p1 +# GCC 12 has been introduced to F36 +%if 0%{?fedora} >= 36 +%patch81 -p1 +%endif + # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch115 -p0 @@ -481,6 +491,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ -DWITH_ROUTER=OFF \ -DWITH_SYSTEM_LIBS=ON \ -DWITH_MECAB=system \ + -DWITH_FIDO=system \ -DWITH_BOOST=boost \ -DREPRODUCIBLE_BUILD=OFF \ -DCMAKE_C_FLAGS="%{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ @@ -978,9 +989,27 @@ fi %endif %changelog +* Wed Jan 19 2022 Lars Tangvald - 8.0.28-1 +- Update to MySQL 8.0.28 + +* Wed Jan 19 2022 Fedora Release Engineering - 8.0.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Nov 07 2021 Mamoru TASAKA - 8.0.27-2 +- rebuild for new protobuf + * Sun Oct 31 2021 Lars Tangvald - 8.0.27-1 - Update to MySQL 8.0.27 +* Sat Oct 30 2021 Honza Horak - 8.0.26-4 +- Make MySQL compile with openssl 3.x without FIPS properly implemented + +* Mon Oct 25 2021 Adrian Reber - 8.0.26-3 +- Rebuilt for protobuf 3.18.1 + +* Tue Sep 14 2021 Sahana Prasad - 8.0.26-2 +- Rebuilt with OpenSSL 3.0.0 + * Wed Jul 21 2021 Lars Tangvald - 8.0.26-1 - Update to MySQL 8.0.26 diff --git a/rh-skipped-tests-list-arm.list b/rh-skipped-tests-list-arm.list index 4f73b0d..f3636f4 100644 --- a/rh-skipped-tests-list-arm.list +++ b/rh-skipped-tests-list-arm.list @@ -8,12 +8,8 @@ perfschema.setup_objects : BUG#0 missing hw on 32-bit arm clone.remote_error_basic : BUG#0 fails since 8.0.19 on F32+, max_allowed_packet is 0 -clone.remote_dml_auto_tune : BUG#0 - -# Unstable -clone.local_dml_auto_tune : BUG#0 +# Fails consistently innodb.innodb_bug-13628249 : BUG#0 -main.grant_dynamic_flush : BUG#0 -innodb.innodb_read_only : BUG#0 -rpl_nogtid.rpl_mixed_mixing_engines : BUG#0 timeout after 1800 secs or armv7hl +# Failing since MySQL 8.0.28 +main.func_unixtime_64bits : BUG#0 diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list index 5a23ac5..0c87489 100644 --- a/rh-skipped-tests-list-base.list +++ b/rh-skipped-tests-list-base.list @@ -1,8 +1,3 @@ -# Fails on all arches -main.subquery_sj_mat_bka_nobnl : BUG#0 failing since 8.0.24 on F32+ -main.derived_limit : BUG#0 failing since 8.0.24 on F32+ -main.explain_tree : BUG#0 failing since 8.0.24 on F32+ - auth_sec.keyring_file_data_qa : BUG#0 failing on F32+ innodb.alter_kill : BUG#0 failing on F34+ main.mtr_unit_tests : BUG#0 failing on F35+ @@ -11,19 +6,16 @@ main.mtr_unit_tests : BUG#0 failing on F35+ # TLS 1.1 and older has been disabled by system-wide crypto-policies setting # https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2 # Tests pass when using legacy crypto-policies seetings -auth_sec.tls12_tls1 : BUG#0 Expected to fail on F33+ -auth_sec.tls13_tls1 : BUG#0 Expected to fail on F33+ -main.ssl_deprecated_tls_versions : BUG#0 Expected to fail on F33+ x.connection_tls_version : BUG#0 Expected to fail on F33+ -# Fails when -DENABLED_LOCAL_INFILE=ON -main.mysql_load_data_local_dir : BUG#0 failing on F32+ +# We intentionaly compile in a different default value than the upstream +# Thus the commands expected by upstream to fail succeeds in our builds +# and thus the test fails +# Cmake option: -DENABLED_LOCAL_INFILE=ON +main.mysql_load_data_local_dir : BUG#0 Intentional divergence from the upstream compiled-in default # Unstable innodb.innodb_force_recovery : BUG#0 unstable since 8.0.24 on F32+ -clone.local_dml_auto_tune : BUG#0 unstable on x86_64 and i686 -perfschema.threads_mysql : BUG#0 unstable on x86_64 and i686 -rpl_gtid.rpl_multi_source_mtr_includes : BUG#0 unstable on x86_64 and i686 # Failing on 32-bit arches: armv7hl i686 s390x; since MySQL 8.0.25 x.connection_unixsocket : BUG#0 @@ -31,5 +23,29 @@ x.connection_unixsocket_invalid : BUG#0 x.connection_unixsocket_lock : BUG#0 innodb.innodb_bug-13628249 : BUG#0 -# Unstable since 8.0.27 +# OpenSSL 3 - 100% failing tests on Fedora 36 - MySQL 8.0.26 +auth_sec.admin_channel_tls : BUG#0 +auth_sec.cipher_support : BUG#0 +auth_sec.openssl_cert_generation : BUG#0 +auth_sec.ssl_mode : BUG#0 +auth_sec.tls : BUG#0 +binlog.binlog_grant_alter_user : BUG#0 +main.grant_alter_user_qa : BUG#0 +main.grant_user_lock_qa : BUG#0 +main.openssl_1 : BUG#0 +main.ssl_cipher : BUG#0 +main.ssl_dynamic : BUG#0 +x.connection_openssl : BUG#0 +x.connection_openssl_unixsocket : BUG#0 +# OpenSSL 3 - unstable tests - MySQL 8.0.26 innodb.innodb_read_only-2 : BUG#0 +# OpenSSL 3 - 100% failing tests on Fedora 36 - MySQL 8.0.27 +auth_sec.openssl_without_fips : BUG#0 + +# Failing since MySQL 8.0.28 +innodb.trigger_function_lock_compare : BUG#0 +main.func_math : BUG#0 +main.index_merge_myisam : BUG#0 +main.merge_myisam : BUG#0 +main.parser_precedence : BUG#0 +rpl.rpl_auto_increment_myisam : BUG#0 diff --git a/rh-skipped-tests-list-ppc.list b/rh-skipped-tests-list-ppc.list index d4da526..b7dcd2c 100644 --- a/rh-skipped-tests-list-ppc.list +++ b/rh-skipped-tests-list-ppc.list @@ -1,3 +1,2 @@ # ppc64le sys_vars.innodb_buffer_pool_size_basic : BUG#0 fails only on ppc64le on f32+ - diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list index 2e9c16b..0bb1503 100644 --- a/rh-skipped-tests-list-s390.list +++ b/rh-skipped-tests-list-s390.list @@ -17,27 +17,18 @@ gis.gis_bugs_crashes : BUG#0 gis.spatial_analysis_functions_buffer : BUG#0 gis.spatial_analysis_functions_centroid : BUG#0 gis.spatial_analysis_functions_distance : BUG#0 -gis.spatial_operators_intersection : BUG#0 -gis.spatial_operators_union : BUG#0 -gis.spatial_operators_symdifference : BUG#0 gis.spatial_op_testingfunc_mix : BUG#0 gis.spatial_utility_function_distance_sphere : BUG#0 gis.spatial_utility_function_simplify : BUG#0 -# Fails since 8.0.26 -main.gis-precise : BUG#0 +# Fails since 8.0.26 main.window_std_var : BUG#0 main.window_std_var_optimized : BUG#0 -main.with_recursive : BUG#0 - -# Unstable -main.grant_dynamic_flush : BUG#0 - -# Unstable since 8.0.26 -main.slow_log : BUG#0 -innodb.innodb_read_only-2 : BUG#0 -main.group_by : BUG#0 # Failing since 8.0.27 gis.st_symdifference : BUG#0 -main.regular_expressions_utf-8 : BUG#0 + +# Since 8.0.28 fails only on s390x +main.subquery_sj_mat_bka_nobnl : BUG#0 failing since 8.0.24 on F32+ +main.derived_limit : BUG#0 failing since 8.0.24 on F32+ +main.explain_tree : BUG#0 failing since 8.0.24 on F32+ diff --git a/sources b/sources index d80ec8a..1cf6637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-boost-8.0.27.tar.gz) = 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891 +SHA512 (mysql-boost-8.0.28.tar.gz) = 4473678619a03a6c1349ce7330127f03d2da70b5b598375015abe871a0591171fc206f6e248b20085b46a0f465c52408bcadcb732ff72a737c012364d1e46297