Accepting request 1069133 from home:dspinella:branches:server:database

- Update to 10.11.2: * release notes and changelog: https://mariadb.com/kb/en/changes-improvements-in-mariadb-1011/ https://mariadb.com/kb/en/mariadb-10-11-2-release-notes/ https://mariadb.com/kb/en/mariadb-10-11-2-changelog/ https://mariadb.com/kb/en/mariadb-10-11-1-release-notes/ https://mariadb.com/kb/en/mariadb-10-11-1-changelog/ https://mariadb.com/kb/en/mariadb-10-11-0-release-notes/ https://mariadb.com/kb/en/mariadb-10-11-0-changelog/ - Refresh mariadb-10.2.4-logrotate.patch OBS-URL: https://build.opensuse.org/request/show/1069133 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=305
2023-03-06 07:56:47 +00:00 · 2023-03-06 07:56:47 +00:00 · 3d7bb0dc2f
commit 3d7bb0dc2f
parent 32fc978093
8 changed files with 45 additions and 47 deletions
--- a/mariadb-10.10.3.tar.gz
+++ b/mariadb-10.10.3.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d0c45fe85059d8d26c6e229f30410a8b8f7282ec2d56560fc9a8930e14ed77d
-size 96335704
--- a/mariadb-10.10.3.tar.gz.asc
+++ b/mariadb-10.10.3.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmPcF8UACgkQ8WVvJMdM
-0dil7RAAwJHggFDr0T0TJsMEqh6am5WKu5s7OrI0F46P3RebZ8RfCmuQGkEQ9D0k
-htFTn4dHhVsOQrsYmkIeRbx0NBx/BkSZMFqTQFnVSaYAXObTSjaSw01i31MnA11U
-d8KVcfWlWdtPTjxgjW5REFqWMMxbJnm+ywvqllZArsQw9wdb85yK2ynmDZ2wAd+K
-2OYl50KWSfan9HcOs1lg4mQhINAPAMJsigTMhSi+Ao3fwi2S3b803FJ8Wy8sf3Yx
-vs8xRjUF7Mz7tk93udcZjmA1E34Rve6Zn63fnz0ugdR8iS0zrNCV9R3BGG/we4Dv
-HFNlw37OzgVAvZZxr07hV+YuIeTmAV1YZD/Q2D7yr0Uz32oQAK2/d4B3J+v91iX2
-fx04dXEDq7gZmwsgwAaWfbzGBzTSZoscVKYwpBfYsR1WMrAPxk32SuJOhqH4xMu8
-2+Hx4Rb2SKhbOQn1laic6PbZ24QeaTCEhRMkI7lHlOB0qjFiiN/a1ZJ6otu65lLq
-2nLaHGqaYKiJWWN4RvrknLxeQ7mOIOqQrEyNant4TELyUHfJEwAO3d2ZU8+XGgFm
-ynPt6Fw1vPaRUAo733uP53P5aCihLsLLfeN8er+V79BucsUkn8O1FGYPJSoxkT8l
-lsidGvuS2/GDO+xgV5Yy+hC9Zj+ojz16mTyolVhYaWID0U0Z4LY=
-=tVSA
-----END PGP SIGNATURE-----
--- a/mariadb-10.11.2.tar.gz
+++ b/mariadb-10.11.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc
+size 96372411
--- a/mariadb-10.11.2.tar.gz.asc
+++ b/mariadb-10.11.2.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmPlDlwACgkQ8WVvJMdM
+0dhG7hAAk6HknexFLwiw7B9q7ciAdNBDDDq9MYZ4Lap05xiJptEKGvEUUazF0drC
+zUs4TUdfu1pOAcBWJokIU9XOG5bMozamzEcdP6RkXC3c/BW1iOlxN+VCa9mi191U
+jwqCDqkptXRRU4DsziKpcuwPypTIPtX7grQzmEFqTwbl+HDBZ1RXFZ2CLp5xm2ki
+SzwUqiUKB/EiDR2vpWjz1pXegH8HnfBSZBCFnGtYxWbPc9vJsqa5JP+W1rYW1kxD
+k85Zf7UbPT7//tKC/1hrC5A5Q0Glzs4+HMfYW2F7C0zw2wXikqjvmKovo1IjQfDE
+yp0S7nfm95xoq12Tk0J6xGBL7yaraJB9xf0Ywcbyi/y38Fix3zFPCYcJVlI1sWrp
+qGaD7paHqRjJsWq7LmPCeen7/6n+8BrZHGrgCwbUjePh2k8kEaaKHUq+SelUQ51Y
+LE77n26RWkC9LOXqpr6/ebidjAEWOk5YIKLgwE8rkvQXTJB+OdISsH20UfqFQFtS
+IWdEM2qMypXiCJ85nm4bsPlWMYIj5Q6kyVcakbyhzrpYvLQlG9rPvuUSUGDlVl1X
+v+2+t4v5gGcOOZQLVrgbRfLE4Jox47AT+EmE+vmuV4KL42Ik3+X69g/N0FsCoHVz
+a6WLBAlhNpVgBt0vnllpCVeCGQs1cbL12luMsP1Tv9EftOSau28=
+=QClB
+-----END PGP SIGNATURE-----
--- a/mariadb-10.2.4-logrotate.patch
+++ b/mariadb-10.2.4-logrotate.patch
@ -5,23 +5,14 @@ In SUSE we've got MySQL log in different directory. It's located in

 Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org>

-Index: support-files/mysql-log-rotate.sh
+Index: support-files/mariadb.logrotate.sh
 ===================================================================
--- support-files/mysql-log-rotate.sh.orig
-+++ support-files/mysql-log-rotate.sh
-@@ -18,7 +18,7 @@
- # ATTENTION: This /root/.my.cnf should be readable ONLY
- # for root !
- 
-@localstatedir@/mysqld.log {
-+/var/log/mysql/*.log {
-         # create 600 mysql mysql
-         su mysql mysql
-         notifempty
+--- support-files/mariadb.logrotate.sh.orig
+++ support-files/mariadb.logrotate.sh
@@ -32,6 +32,14 @@
- 	then
- 	   @bindir@/mysqladmin --local flush-error-log \
-               flush-engine-log flush-general-log flush-slow-log
+     then
+       @bindir@/mariadb-admin $EXTRAPARAM --local flush-error-log \
+         flush-engine-log flush-general-log flush-slow-log
 +	   ret=$?
 +	   if test $ret -ne 0
 +	   then
@ -30,6 +21,6 @@ Index: support-files/mysql-log-rotate.sh
 +		echo "See comments in /etc/logrotate.d/mariadb on how to fix this" >&2
 +		exit $ret
 +	   fi
- 	fi
-     endscript
+     fi
+   endscript
 }
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar  1 10:49:52 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update to 10.11.2:
+  * release notes and changelog:
+    https://mariadb.com/kb/en/changes-improvements-in-mariadb-1011/
+    https://mariadb.com/kb/en/mariadb-10-11-2-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-2-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-1-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-1-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-0-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-0-changelog/
+- Refresh mariadb-10.2.4-logrotate.patch
+
 -------------------------------------------------------------------
 Mon Feb 20 16:32:57 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>

--- a/mariadb.spec
+++ b/mariadb.spec
@ -52,7 +52,7 @@
 # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
 %define with_cracklib_plugin 0
 Name:           mariadb
-Version:        10.10.3
+Version:        10.11.2
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@ -380,8 +380,6 @@ rm -f man/comp_err.1        # built-time utility
 # Breaks VPATH builds when in sourcedir, is generated in the builddirs
 rm -f sql/sql_builtin.cc

-sed -i 's|@localstatedir@|%{_localstatedir}/log|' support-files/mysql-log-rotate.sh
-
 # Broken test that needs sources
 rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result

@ -519,13 +517,6 @@ filelist_excludes()
 # Install the package itself
 %cmake_install benchdir_root=%{_datadir}/

-# Logrotate file should be named as the package
-if [ ! -e %{buildroot}%{_sysconfdir}/logrotate.d/mysql ]; then
-    # some versions do not install it automatically
-    install -D -m 644 build/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
-fi
-mv %{buildroot}%{_sysconfdir}/logrotate.d/mysql %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-
 # Create log directory with the expected perms of mysql
 install -d -m 700 %{buildroot}%{_localstatedir}/log/mysql/

--- a/suse_skipped_tests.list
+++ b/suse_skipped_tests.list
@ -111,5 +111,7 @@ main.lock_kill                                   : since 10.9.2 - all
 innodb.innodb_bug51920                           : since 10.9.2 - all
 rpl.rpl_slave_shutdown_mdev20821                 : since 10.9.2 - all

-rpl.rpl_change_master_demote                     : since 10.10.2 -all
+rpl.rpl_change_master_demote                     : since 10.10.2 - all
+
+rpl.rpl_rewrite_db_sys_vars                      : since 10.11.2 - all