From 01846aeb81fad79c2db3e2fd656ecedcae7a8fa9258182349983fc0c15917bf7 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 14 Jun 2021 07:07:42 +0000
Subject: [PATCH] Accepting request 896422 from
 home:susnux:branches:server:database

- Update to version 10.5.10

Fix CVE-2021-2154

OBS-URL: https://build.opensuse.org/request/show/896422
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=270
---
 mariadb-10.1.1-mysqld_multi-features.patch |  2 +-
 mariadb-10.5.10.tar.gz                     |  3 +++
 mariadb-10.5.10.tar.gz.asc                 |  6 ++++++
 mariadb-10.5.9-cmake-3.20.patch            | 19 -------------------
 mariadb-10.5.9.tar.gz                      |  3 ---
 mariadb-10.5.9.tar.gz.sig                  |  6 ------
 mariadb.changes                            | 20 ++++++++++++++++++++
 mariadb.spec                               | 10 ++++------
 8 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 mariadb-10.5.10.tar.gz
 create mode 100644 mariadb-10.5.10.tar.gz.asc
 delete mode 100644 mariadb-10.5.9-cmake-3.20.patch
 delete mode 100644 mariadb-10.5.9.tar.gz
 delete mode 100644 mariadb-10.5.9.tar.gz.sig

diff --git a/mariadb-10.1.1-mysqld_multi-features.patch b/mariadb-10.1.1-mysqld_multi-features.patch
index d8f3b6f..62c975b 100644
--- a/mariadb-10.1.1-mysqld_multi-features.patch
+++ b/mariadb-10.1.1-mysqld_multi-features.patch
@@ -48,7 +48,7 @@ Index: scripts/mysqld_multi.sh
    else
    {
 @@ -344,6 +350,39 @@ sub start_mysqlds()
-     $com= "$mysqld";
+ 
      for ($j = 0, $tmp= ""; defined($options[$j]); $j++)
      {
 +      if ("--datadir=" eq substr($options[$j], 0, 10)) {
diff --git a/mariadb-10.5.10.tar.gz b/mariadb-10.5.10.tar.gz
new file mode 100644
index 0000000..d31d71a
--- /dev/null
+++ b/mariadb-10.5.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
+size 99019617
diff --git a/mariadb-10.5.10.tar.gz.asc b/mariadb-10.5.10.tar.gz.asc
new file mode 100644
index 0000000..36af36e
--- /dev/null
+++ b/mariadb-10.5.10.tar.gz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCYJRvoQAKCRDLywgqG7lD
+23CBAJ0ZDLtwXvUvR4vYwrryNXMeTte/gQCgydybdIn2u3C+rvs9PLmUK0+jTc4=
+=my3Y
+-----END PGP SIGNATURE-----
diff --git a/mariadb-10.5.9-cmake-3.20.patch b/mariadb-10.5.9-cmake-3.20.patch
deleted file mode 100644
index 997d1b2..0000000
--- a/mariadb-10.5.9-cmake-3.20.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: [PATCH] Fix syntax error in cmake 3.20
-
----
- cmake/ConnectorName.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
-===================================================================
---- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake
-+++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-     SET(MACHINE_NAME "x64")
-   ELSE()
-     SET(MACHINE_NAME "32")
--  END()
-+  ENDIF()
- ENDIF()
- 
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/mariadb-10.5.9.tar.gz b/mariadb-10.5.9.tar.gz
deleted file mode 100644
index b1c9bfe..0000000
--- a/mariadb-10.5.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
-size 88639930
diff --git a/mariadb-10.5.9.tar.gz.sig b/mariadb-10.5.9.tar.gz.sig
deleted file mode 100644
index ac210f5..0000000
--- a/mariadb-10.5.9.tar.gz.sig
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCYDAyFgAKCRDLywgqG7lD
-2wrXAJ4vsH4IiLiLTiF4fwE0qcHZL4joLgCffboEebE3ibxCXu+9Zp03n+LHVpk=
-=I2yi
------END PGP SIGNATURE-----
diff --git a/mariadb.changes b/mariadb.changes
index f48993a..a6b47ae 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon May 31 17:50:36 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 10.5.10
+  * Fix CVE-2021-2154
+  * Add ST_DISTANCE_SPHERE for calculating the spherical distance
+    between two geometries (point or multipoint) on a sphere
+  * Fix: Crash with invalid multi-table update of view in 2nd execution
+    of SP
+  * Fix: Incorrect name resolution for subqueries in ON expressions
+  * Fix: Complex query in Store procedure corrupts results
+  * Fix: DELETE HISTORY may delete current data on system-versioned
+    table
+  * Fix: Crashes with nested table value constructors
+  * Fix: Server crashes in thd_clear_errors()
+  * Fix: The statement set password=password('') executed in
+    PS mode fails in case it is run by a user with expired password
+  * Full changes: https://mariadb.com/kb/en/mariadb-10510-changelog/
+- Drop mariadb-10.5.9-cmake-3.20.patch, applied upstream
+
 -------------------------------------------------------------------
 Thu Apr 29 12:10:29 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/mariadb.spec b/mariadb.spec
index c58f3ab..cf1c0cc 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -56,14 +56,14 @@
 # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
 %define with_cracklib_plugin 0
 Name:           mariadb
-Version:        10.5.9
+Version:        10.5.10
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 URL:            https://www.mariadb.org
-Source:         https://downloads.mariadb.org/f/mariadb-%{version}/source/mariadb-%{version}.tar.gz
-Source1:        %{name}-%{version}.tar.gz.sig
+Source:         https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz
+Source1:        https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source4:        README.debug
 Source5:        suse-test-run
@@ -85,7 +85,6 @@ Patch4:         mariadb-10.2.4-fortify-and-O.patch
 Patch5:         mariadb-10.2.19-link-and-enable-c++11-atomics.patch
 Patch6:         mariadb-10.4.12-harden_setuid.patch
 Patch7:         mariadb-10.4.12-fix-install-db.patch
-Patch8:         mariadb-10.5.9-cmake-3.20.patch
 # needed for bison SQL parser and wsrep API
 BuildRequires:  bison
 BuildRequires:  cmake
@@ -374,7 +373,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 cp %{_sourcedir}/suse-test-run .