diff --git a/mysql-8.4.5.tar.gz b/mysql-8.4.6.tar.gz similarity index 32% rename from mysql-8.4.5.tar.gz rename to mysql-8.4.6.tar.gz index 52122e527f4eefb4c8b965b866b06862be5a5c9c..43f738b87a9a485fc5058a81a2454ad5790bb921 100644 --- a/mysql-8.4.5.tar.gz +++ b/mysql-8.4.6.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53639592a720a719fdfadf2c921b947eac86c06e333202e47667852a5781bd1a -size 478788925 +oid sha256:a1e523dc8be96d18a5ade106998661285ca01b6f5b46c08b2654110e40df2fb7 +size 479211975 diff --git a/mysql-paths.patch b/mysql-paths.patch index d5978b6e9e2e04d103f33b3b983a5c0d821eac65..ef7bf41cdbaf9d57bfe22f51cd51be13381ab773 100644 --- a/mysql-paths.patch +++ b/mysql-paths.patch @@ -4,10 +4,10 @@ Software Collections. Removing these hard-coded paths should fix it. Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485 diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake -index 9f7945d8..6734cdfd 100644 +index d1d50236..6cb09aae 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake -@@ -105,7 +105,7 @@ IF(UNIX) +@@ -106,7 +106,7 @@ IF(UNIX) " Choose between ${VALID_INSTALL_LAYOUTS}" ) ENDIF() @@ -16,19 +16,19 @@ index 9f7945d8..6734cdfd 100644 CACHE PATH "config directory (for my.cnf)") MARK_AS_ADVANCED(SYSCONFDIR) ENDIF() -@@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path}) - # - SET(INSTALL_BINDIR_RPM "bin") - SET(INSTALL_SBINDIR_RPM "sbin") -+SET(INSTALL_SYSCONFDIR_RPM "/etc") +@@ -201,6 +201,7 @@ IF(LINUX_FEDORA_SBIN_MERGE) + SET(INSTALL_SBINDIR_RPM "bin") + ELSE() + SET(INSTALL_SBINDIR_RPM "sbin") ++ SET(INSTALL_SYSCONFDIR_RPM "/etc") + ENDIF() # IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES) - SET(INSTALL_LIBDIR_RPM "lib64/mysql") diff --git a/mysys/my_default.cc b/mysys/my_default.cc -index 290f1666..8403425f 100644 +index 7743c461..27dd8fcb 100644 --- a/mysys/my_default.cc +++ b/mysys/my_default.cc -@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { +@@ -1693,12 +1693,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { #else @@ -45,10 +45,10 @@ index 290f1666..8403425f 100644 #endif diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 4149a764..b091d5e2 100644 +index 3b75eddd..802c7b51 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -288,9 +288,9 @@ IF(UNIX) +@@ -331,9 +331,9 @@ IF(UNIX) ENDIF(UNIX) SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -61,10 +61,10 @@ index 4149a764..b091d5e2 100644 SET(libsubdir ${INSTALL_LIBDIR}) SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR}) diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in -index 84dd4d7c..50397ddd 100644 +index 2f26beba..ba8e47a2 100644 --- a/scripts/mysqld_multi.pl.in +++ b/scripts/mysqld_multi.pl.in -@@ -586,9 +586,7 @@ sub list_defaults_files +@@ -587,9 +587,7 @@ sub list_defaults_files my %seen; # Don't list the same file more than once return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ } diff --git a/mysql.spec b/mysql.spec index 4fc678e4efb9a2c4c2edfc286cc1a581a8614d17..d983a02a5fdffe763b3ce0bb381c2ca1eb82405b 100644 --- a/mysql.spec +++ b/mysql.spec @@ -40,8 +40,8 @@ %bcond_without conflicts %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.4.5 -Release: 2 +Version: 8.4.6 +Release: 1 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND BSD-2-Clause @@ -742,6 +742,14 @@ fi %{_libdir}/mysql/plugin/udf_example.so %changelog +* Wed Jul 23 2025 yaoxin <1024769339@qq.com> - 8.4.6-1 +- Update to 8.4.6 for fix CVEs (CVE-2025-50068,CVE-2025-50077,CVE-2025-50078, + CVE-2025-50079,CVE-2025-50080,CVE-2025-50081,CVE-2025-50082,CVE-2025-50083, + CVE-2025-50084,CVE-2025-50085,CVE-2025-50086,CVE-2025-50087,CVE-2025-50091, + CVE-2025-50092,CVE-2025-50093,CVE-2025-50094,CVE-2025-50096,CVE-2025-50097, + CVE-2025-50098,CVE-2025-50099,CVE-2025-50100,CVE-2025-50101,CVE-2025-50102, + CVE-2025-50104) + * Sun May 25 2025 Funda Wang - 8.4.5-2 - fix systemd user creation - faster build with ninja