$ git show --format=fuller --patch-with-stat --summary c23af1300f89c0b75bdb12480222ae84a55d0090

commit c23af1300f89c0b75bdb12480222ae84a55d0090
Author:     Tomasz Paweł Gajc <tpgxyz@gmail.com>
AuthorDate: Tue Nov 9 10:30:06 2021 +0100
Commit:     Tomasz Paweł Gajc <tpgxyz@gmail.com>
CommitDate: Tue Nov 9 13:48:30 2021 +0100

    new version 10.5.13
---
 .abf.yml                            |  2 +-
 mariadb-scripts-setpermission.patch | 30 ------------------------------
 mariadb.spec                        | 15 ++++++++-------
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 mariadb-scripts-setpermission.patch

diff --git a/.abf.yml b/.abf.yml
index 6583b46..92ace15 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  "mariadb-10.5.12.tar.gz": 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
+  "mariadb-10.5.13.tar.gz": a57d4ff38ab914878e56fc3f07d97d6c7bc73613
diff --git a/mariadb-scripts-setpermission.patch b/mariadb-scripts-setpermission.patch
deleted file mode 100644
index 58e07bd..0000000
--- a/mariadb-scripts-setpermission.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch fixes bug in mysql_setpermission perl script
-by adding conditionally port information to connections parameters.
-
-More information about this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1976224
-
-This bug has been fixed in upstream.
-Patch can be removed when new version with fix is released.
-
-https://github.com/MariaDB/server/pull/1896
-
---- mariadb/scripts/mysql_setpermission_a.sh	2068-11-11 14:01:07.762595716 +0100
-+++ mariadb/scripts/mysql_setpermission.sh	2070-11-11 14:33:05.224012458 +0100
-@@ -105,11 +105,15 @@
- 
- if ($opt_socket and -S $opt_socket)
- {
--    $dsn .= "${prefix}_socket=$opt_socket";
-+  $dsn .= "${prefix}_socket=$opt_socket";
- }
- else
- {
--  $dsn .= "host=$sqlhost;port=$opt_port";
-+  $dsn .= "host=$sqlhost";
-+  if ($sqlhost ne "localhost")
-+  {
-+    $dsn .= ";port=$opt_port";
-+  }
- }
- 
- # make the connection to MariaDB
diff --git a/mariadb.spec b/mariadb.spec
index 9282b50..4716580 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -12,7 +12,7 @@
 
 Summary:	The MariaDB database, a drop-in replacement for MySQL
 Name:		mariadb
-Version:	10.5.12
+Version:	10.5.13
 Release:	1
 URL:		http://mariadb.org/
 License:	GPL
@@ -44,8 +44,6 @@ Patch10:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-ssl-ci
 Patch11:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-pcdir.patch
 #   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
 Patch15:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-groonga.patch
-#   Patch16:  Fix port bug in mysql_setpermission perl script
-Patch16:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-scripts-setpermission.patch
 
 # OpenMandriva patches
 # Don't strip -Wformat from --cflags -- -Werror=format-string without -Wformat
@@ -299,9 +297,11 @@ Plugins for the MariaDB database.
 %{_libdir}/mysql/plugin/simple_password_check.so
 %{_libdir}/mysql/plugin/wsrep_info.so
 %ifarch %{armx} x86_64 %{ix86} znver1
-%{_libdir}/mysql/plugin/JavaWrappers.jar
+%{_datadir}/mysql/JavaWrappers.jar
 %endif
-%optional %{_libdir}/mysql/plugin/JdbcInterface.jar
+%optional %{_datadir}/mysql/JdbcInterface.jar
+%optional %{_datadir}/mysql/Mongo2.jar
+%optional %{_datadir}/mysql/Mongo3.jar
 
 %package plugin-tokudb
 Summary:	The TokuDB storage engine plugin for MariaDB
@@ -387,7 +387,6 @@ package '%{name}'.
 %doc %{_mandir}/man1/mariadb-conv.1*
 %doc %{_mandir}/man1/myrocks_hotbackup.1*
 %doc %{_mandir}/man1/mytop.1*
-%{_prefix}/lib/sysusers.d/mariadb.conf
 %{_sysconfdir}/security/user_map.conf
 /%{_lib}/security/pam_user_map.so
 %optional %{_bindir}/aria_s3_copy
@@ -560,7 +559,6 @@ Common files needed by both the MariaDB server and client.
 %dir %{_sysconfdir}/my.cnf.d
 %dir %{_datadir}/mysql
 %{_sysconfdir}/my.cnf.d/*
-%{_datadir}/mysql/mysql_to_mariadb.sql
 %{_datadir}/mysql/english
 %{_datadir}/mysql/charsets
 %{_datadir}/mysql/czech
@@ -739,6 +737,9 @@ export LDFLAGS="$LDFLAGS -fuse-ld=bfd"
 # (tpg) install services into %_unitdir
 sed -i -e "s,/usr/lib/systemd/system,%{_unitdir},g" cmake/install_layout.cmake
 
+# (tpg) fix error: 'noreturn' attribute only applies to functions
+sed -i 's|WSREP_NORETURN|__attribute__((noreturn))|' wsrep-lib/include/wsrep/thread_service.hpp
+
 # DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING breaks binary compatibility
 # with some other distributions, but fixes the loading
 # of the Qt mysql plugin. Better fix wanted.