Accepting request 509375 from home:kstreitova:branches:server:database

- update to MariaDB 10.1.25 GA
  * notable changes
    * MariaDB can no longer be compiled with OpenSSL version 0.9.8
      and below. The last 0.9.8 release was in December 2015, it is
      out of support and is no longer getting security fixes.
    * MariaDB Backup is now beta
  * release notes and changelog:
    * https://mariadb.com/kb/en/mariadb/mariadb-10125-release-notes
    * https://mariadb.com/kb/en/mariadb/mariadb-10125-changelog
  * refresh mariadb-10.1.12-fortify-and-O.patch
  * remove mariadb-10.1.22-xtradb_null_checks.patch (MDEV-12358),
    a fix was merged upstream
  * update file lists for new man-pages and tools
- switch from 'Restart=on-failure' to 'Restart=on-abort' in
  mysql.service in order to follow the upstream

OBS-URL: https://build.opensuse.org/request/show/509375
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=192

configuration-tweaks.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:851e21785b81a17512093dbfac98c8d10752bc571e7e57b5b44dc7db0aa6d52a
-size 564
+oid sha256:79e339131ce01384337cedcb92a2220d8049d031f1604536c178537ed83476d8
+size 568

mariadb-10.1.22.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce
-size 61542321

mariadb-10.1.25.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6
+size 61790542

mariadb.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Jul 10 11:30:59 UTC 2017 - kstreitova@suse.com
+
+- update to MariaDB 10.1.25 GA
+  * notable changes
+    * MariaDB can no longer be compiled with OpenSSL version 0.9.8
+      and below. The last 0.9.8 release was in December 2015, it is
+      out of support and is no longer getting security fixes.
+    * MariaDB Backup is now beta
+  * release notes and changelog:
+    * https://mariadb.com/kb/en/mariadb/mariadb-10125-release-notes
+    * https://mariadb.com/kb/en/mariadb/mariadb-10125-changelog
+  * refresh mariadb-10.1.12-fortify-and-O.patch
+  * remove mariadb-10.1.22-xtradb_null_checks.patch (MDEV-12358),
+    a fix was merged upstream
+  * update file lists for new man-pages and tools
+- switch from 'Restart=on-failure' to 'Restart=on-abort' in
+  mysql.service in order to follow the upstream
+ 
 -------------------------------------------------------------------
 Tue May 30 13:12:47 UTC 2017 - fvogt@suse.com
 

mariadb.spec

@@ -43,7 +43,7 @@
 %define with_cassandra 0
 %endif
 Name:           mariadb
-Version:        10.1.22
+Version:        10.1.25
 Release:        0
 Summary:        Server part of %{pretty_name}
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -484,7 +484,7 @@ rm -f %{buildroot}'%{_unitdir}/mariadb@bootstrap.service.d/use_galera_new_cluste
 %endif
 
 # Generate various filelists
-filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_ssl_rsa_setup mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files
+filelist galera_new_cluster galera_recovery innochecksum mariadb-service-convert my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_ssl_rsa_setup mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuft_logdump tokuftdump >mysql.files
 
 filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor mysqld_safe_helper >mysql-client.files
 # The dialog stuff is mariadb only
@@ -506,7 +506,7 @@ filelist mysqlslap >mysql-bench.files
 
 filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
 
-filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient %{_bindir}/wsrep* %{_datadir}/mysql/wsrep_notify >mysql-tools.files
+filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_xtrabackup-v2 wsrep_sst_xtrabackup %{_datadir}/mysql/wsrep_notify >mysql-tools.files
 
 filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
 
@@ -775,6 +775,8 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}
 %{_bindir}/galera_new_cluster
 %{_bindir}/galera_recovery
 %{_bindir}/mariadb-service-convert
+%{_bindir}/mariabackup
+%{_bindir}/mbstream
 %dir %{_datadir}/mysql/policy
 %dir %{_datadir}/mysql/policy/apparmor
 %{_datadir}/mysql/policy/apparmor/README
@@ -832,6 +834,9 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}
 %files test -f mysql-test.files
 %defattr(-, root, root)
 %{_bindir}/my_safe_process
+%if "%{extra_provides}" == "mariadb_101"
+%{_mandir}/man1/my_safe_process.1*
+%endif
 %{_mandir}/man1/mysql-test-run.pl.1*
 %{_mandir}/man1/mysql-stress-test.pl.1*
 %{_datadir}/mysql-test/valgrind.supp

mysql-patches.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0841d11b85109131ed973648058f6a254224c0aa4b06f61a475cb226719d7b
-size 12112
+oid sha256:a96952443fb73f6cb8791280d32abd9fa4cb5f5677562193a54f1b7786471b90
+size 11952

mysql.service

@@ -5,7 +5,7 @@ Conflicts=mysql.target
 After=basic.target network.target 
 
 [Service]
-Restart=on-failure
+Restart=on-abort
 Type=simple
 ExecStartPre=/usr/lib/mysql/mysql-systemd-helper  install
 ExecStartPre=/usr/lib/mysql/mysql-systemd-helper  upgrade

mysql@.service

@@ -5,7 +5,7 @@ PartOf=mysql.target
 After=basic.target network.target
 
 [Service]
-Restart=on-failure
+Restart=on-abort
 Type=simple
 ExecStartPre=/usr/lib/mysql/mysql-systemd-helper  install %i
 ExecStartPre=/usr/lib/mysql/mysql-systemd-helper  upgrade %i

series

@@ -10,4 +10,3 @@ mariadb-10.0.15-logrotate-su.patch
 mariadb-10.1.12-fortify-and-O.patch
 mariadb-10.1.16-systemd-cmake.patch
 mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch
-mariadb-10.1.22-xtradb_null_checks.patch