diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-10-16 14:37:04 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-10-16 14:37:04 +0000 |
| commit | b551f311fe7f0a5d4d1f06aa0e732c037c01347f (patch) | |
| tree | 2da8ccf40fd0ca3396b53e5aa6131ef301b1010a | |
| parent | f98ef2f98cbc26b52e6a1e83fb5ca5258fa71d4f (diff) | |
automatic import of mariadbopeneuler22.03_LTS_SP2
| -rw-r--r-- | mariadb-ssl-cipher-tests.patch | 13 | ||||
| -rw-r--r-- | mariadb.spec | 3 |
2 files changed, 0 insertions, 16 deletions
diff --git a/mariadb-ssl-cipher-tests.patch b/mariadb-ssl-cipher-tests.patch deleted file mode 100644 index 567e433..0000000 --- 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.spec b/mariadb.spec index 5fb53f6..c45d35c 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -108,8 +108,6 @@ Patch4: %{pkgnamepatch}-logrotate.patch Patch7: %{pkgnamepatch}-scripts.patch # Patch9: pre-configure to comply with guidelines Patch9: %{pkgnamepatch}-ownsetup.patch -# Patch10: Fix cipher name in the SSL Cipher name test -Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch # Patch11: Use PCDIR CMake option, if configured Patch11: %{pkgnamepatch}-pcdir.patch Patch12: mariadb-10.5.10-sw.patch @@ -622,7 +620,6 @@ sources. %patch4 -p1 %patch7 -p1 %patch9 -p1 -%patch10 -p1 %patch11 -p1 %patch12 -p1 |