diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..171ce6cee7f1b39fc4965ffb8b76a431dc69df37 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/mariadb diff --git a/mariadb-10.5.22.tar.gz b/mariadb-10.5.22.tar.gz deleted file mode 100644 index 7795ac9524465d78776f40d4abde33f7f2efca4f..0000000000000000000000000000000000000000 Binary files a/mariadb-10.5.22.tar.gz and /dev/null differ diff --git a/mariadb-10.5.25.tar.gz b/mariadb-10.5.25.tar.gz deleted file mode 100644 index 9046fa149edd9c4858586d79acbbff3b991d4fdf..0000000000000000000000000000000000000000 Binary files a/mariadb-10.5.25.tar.gz and /dev/null differ diff --git a/mariadb-10.5.28.tar.gz b/mariadb-10.5.28.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..356a490a86b28868d7abfbfd1c8f5df25d2a2fad --- /dev/null +++ b/mariadb-10.5.28.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b5070208da0116640f20bd085f1136527f998cc23268715bcbf352e7b7f3cc1 +size 117755203 diff --git a/mariadb-groonga.patch b/mariadb-groonga.patch deleted file mode 100644 index 3a0e74c08d5641bdf484d60fed1b957b4fc2d3f7..0000000000000000000000000000000000000000 --- a/mariadb-groonga.patch +++ /dev/null @@ -1,30 +0,0 @@ -# Fixing conflict with groonga package -# https://bugzilla.redhat.com/show_bug.cgi?id=1763287 - ---- mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt.withoutoption 2019-11-11 14:01:07.762595716 +0100 -+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt 2019-11-11 14:33:05.224012458 +0100 -@@ -86,7 +86,9 @@ - set(INCLUDE_DIR "include") - set(GRN_INCLUDE_DIR "include/groonga") - set(DATA_DIR "share") --set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}") -+if(NOT DEFINED GRN_DATA_DIR) -+ set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}") -+endif() - set(CONFIG_DIR "etc") - set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}") - set(GRN_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GRN_CONFIG_DIR}/groonga.conf") - ---- mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt.withoutoption 2019-11-11 14:34:22.661005715 +0100 -+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt 2019-11-11 14:35:59.962244120 +0100 -@@ -16,7 +16,9 @@ - # MA 02110-1335 USA - - cmake_minimum_required(VERSION 2.6) --set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql") -+if (NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME) -+ set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql") -+endif() - project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}") - - if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED) diff --git a/mariadb-ssl-cipher-tests.patch b/mariadb-ssl-cipher-tests.patch deleted file mode 100644 index 567e43307f3423277f261cb916ac4015aae96b8b..0000000000000000000000000000000000000000 --- a/mariadb-ssl-cipher-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test ---- mariadb-10.3.13/mysql-test/main/ssl_cipher.test 2019-02-20 08:59:09.000000000 +0100 -+++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched 2019-02-22 11:22:01.250256060 +0100 -@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost; - let $restart_parameters=--ssl-cipher=AES128-SHA; - source include/restart_mysqld.inc; - connect (ssl_con,localhost,root,,,,,SSL); -+--replace_regex /TLS_AES_.*/AES128-SHA/ - SHOW STATUS LIKE 'Ssl_cipher'; -+--replace_regex /TLS_AES_.*/AES128-SHA/ - SHOW STATUS LIKE 'Ssl_cipher_list'; - disconnect ssl_con; - connection default; diff --git a/mariadb-ssl-cypher.patch b/mariadb-ssl-cypher.patch deleted file mode 100644 index a1a9dcfded54202c883947b6defca8fc01203cb4..0000000000000000000000000000000000000000 --- a/mariadb-ssl-cypher.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak mariadb-10.1.19/mysql-test/r/ssl_8k_key.result ---- mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak 2016-11-24 08:55:21.637000000 -0500 -+++ mariadb-10.1.19/mysql-test/r/ssl_8k_key.result 2016-11-24 08:55:55.853000000 -0500 -@@ -1,2 +1,2 @@ --Variable_name Value --Ssl_cipher DHE-RSA-AES256-SHA -+have_ssl -+1 -diff -up mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak mariadb-10.1.19/mysql-test/t/ssl_8k_key.test ---- mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak 2016-11-24 08:54:10.485000000 -0500 -+++ mariadb-10.1.19/mysql-test/t/ssl_8k_key.test 2016-11-24 08:54:35.724000000 -0500 -@@ -5,7 +5,7 @@ - # - # Bug#29784 YaSSL assertion failure when reading 8k key. - # ----exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1 -+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1 - - ## This test file is for testing encrypted communication only, not other - ## encryption routines that the SSL library happens to provide! - diff --git a/mariadb.spec b/mariadb.spec index 776c86a8382431e17396f7c0cc5910bae52dee3b..9f45948b0824512671ea91867c7e2519cf1a85bb 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -73,7 +73,7 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.5.25 +Version: 10.5.28 Release: 1 Epoch: 1 @@ -1473,6 +1473,9 @@ fi %endif %changelog +* Mon Mar 31 2025 Funda Wang - 1:10.5.28-1 +- update to 10.5.28 for CVE-2025-21490 + * Tue May 28 2024 xiejing - 1:10.5.25-1 - Bump to 10.5.25 for resolving CVE-2024-21096, CVE-2023-22084 - Fix version description in systemd service file