diff --git a/README.debug b/README.debug index a38a52b..c7b8c7f 100644 --- a/README.debug +++ b/README.debug @@ -33,9 +33,9 @@ not allways work, eg. if the crash is caused by some race condition). Note that this log file may become extremly large, so if you decide to attach it whole to the bugzilla, don't forget to - bzip2 -k /var/lib/mysql/mysqld-query.log + xz -k9 /var/lib/mysql/mysqld-query.log -and attach the bzipped file instead. +and attach the xzipped file instead. 2) Coredumps and Backtraces --------------------------- @@ -71,4 +71,4 @@ Add the following line to your /etc/my.cnf into section [mysqld]: stack-trace -The trace file will be then written to /var/lib/mysql directory. \ No newline at end of file +The trace file will be then written to /var/lib/mysql directory. diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 deleted file mode 100644 index b38442e..0000000 --- a/configuration-tweaks.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b1a75ace8d9140d486db8d22051cc4a736042afcbb5db32eb1f40d46bddf9fe -size 615 diff --git a/configuration-tweaks.tar.xz b/configuration-tweaks.tar.xz new file mode 100644 index 0000000..5105bee --- /dev/null +++ b/configuration-tweaks.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d45316a88350db3fd13892484f0c10582b0c7f2a67acc28f475665d19e20618 +size 580 diff --git a/mariadb-10.1.18.tar.gz b/mariadb-10.1.18.tar.gz deleted file mode 100644 index 16431be..0000000 --- a/mariadb-10.1.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7336907e9ff44496d6453f92526b25bd253638a64a051ca879f953499873b73 -size 61187451 diff --git a/mariadb-10.1.19.tar.gz b/mariadb-10.1.19.tar.gz new file mode 100644 index 0000000..8f598f8 --- /dev/null +++ b/mariadb-10.1.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 +size 61222929 diff --git a/mariadb.changes b/mariadb.changes index 38c36d2..b45a38b 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Dec 2 15:26:57 UTC 2016 - kstreitova@suse.com + +- update to MariaDB 10.1.19 + * notable changes: + * XtraDB updated to 5.6.33-79.0 + * TokuDB updated to 5.6.33-79.0 + * release notes and changelog: + * https://mariadb.com/kb/en/mariadb/mariadb-10119-release-notes/ + * https://mariadb.com/kb/en/mariadb/mariadb-10119-changelog/ + * fixes for the following security vulnerabilities: + CVE-2016-7440 [bsc#1005581] + CVE-2016-5584 [bsc#1005558] +- add mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch to fix + mysql_install_db.sh script to find data files in mariadb + directories when a user uses "--basedir" option [bsc#1006539] +- switch to xz compression instead of bz2 for the following tarballs: + * mysql-patches.tar.bz2 renamed to mysql-patches.tar.xz + * configuration-tweaks.tar.bz2 renamed to configuration-tweaks.tar.xz + replace occurrences of "bzip2" with "xz" in README.debug + ------------------------------------------------------------------- Mon Oct 24 18:38:45 UTC 2016 - kstreitova@suse.com diff --git a/mariadb.spec b/mariadb.spec index 930cc1c..6d4053e 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,7 +43,7 @@ %define with_cassandra 0 %endif Name: mariadb -Version: 10.1.18 +Version: 10.1.19 Release: 0 Summary: Server part of %{pretty_name} License: SUSE-GPL-2.0-with-FLOSS-exception @@ -56,9 +56,9 @@ Source4: suse-test-run Source5: mysql.SuSEfirewall2 Source7: README.install Source8: README.SUSE -Source9: mysql-patches.tar.bz2 +Source9: mysql-patches.tar.xz Source12: series -Source13: configuration-tweaks.tar.bz2 +Source13: configuration-tweaks.tar.xz Source14: my.ini Source15: mysql.service Source16: mysql.target @@ -610,10 +610,10 @@ ln -s mysqlcheck '%{buildroot}'%{_bindir}/mysqloptimize # Use our configuration stuff instead of upstream one rm -rf '%{buildroot}'%{_sysconfdir}/my.cnf.d install -d -m 755 '%{buildroot}'%{_sysconfdir}/my.cnf.d -bzip2 -cd '%{_sourcedir}'/configuration-tweaks.tar.bz2 | tar -C '%{buildroot}'%{_sysconfdir}/my.cnf.d -xvf - +tar -C '%{buildroot}'%{_sysconfdir}/my.cnf.d -xvf %{SOURCE13} # Documentation that was copied to wrong folder -rm -f '%{buildroot}'%{_datadir}/doc/* 2> /dev/null || true +rm -f '%{buildroot}'%{_datadir}/doc/* 2> /dev/null || true # Unwanted packaged stuff rm -rf '%{buildroot}'%{_datadir}/mysql/{solaris,SELinux} diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 deleted file mode 100644 index 2ec3c29..0000000 --- a/mysql-patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f9d7f6da580e38a74a5e8e5e64e38bc2440063b967b52eb7c0b78fd2515448e -size 12434 diff --git a/mysql-patches.tar.xz b/mysql-patches.tar.xz new file mode 100644 index 0000000..bfd53e1 --- /dev/null +++ b/mysql-patches.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec239e1173d48cbce8f958fb36610261a1ab75f9b3b8259bafef8962702e3ae +size 12024 diff --git a/series b/series index 6919cc5..d4dbee5 100644 --- a/series +++ b/series @@ -9,3 +9,4 @@ mariadb-10.1.12-deharcode-libdir.patch 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