From 18c29922230db2e3e2e5cab11f4aa343aa987fdce86723a58439519ab7aa7ecc Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Fri, 1 Dec 2017 16:10:41 +0000 Subject: [PATCH] Accepting request 547171 from home:kstreitova:branches:server:database - update to 10.2.11 GA * release notes and changelog: * https://mariadb.com/kb/en/library/mariadb-10211-release-notes/ * https://mariadb.com/kb/en/library/mariadb-10211-changelog/ - pack additional mroonga/groonga files - change default charset to utf8mb4 for full Unicode support [fate#324329] - remove mariadb-10.2.10-wsrep_sst_common.patch as it's no longer needed * 10.2.10: CVE-2017-10378, CVE-2017-10268, CVE-2017-15365 OBS-URL: https://build.opensuse.org/request/show/547171 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=201 --- mariadb-10.2.10.tar.gz | 3 --- mariadb-10.2.10.tar.gz.sig | 7 ------- mariadb-10.2.11.tar.gz | 3 +++ mariadb-10.2.11.tar.gz.sig | 7 +++++++ mariadb.changes | 15 ++++++++++++++- mariadb.spec | 16 +++++++++++++--- mysql-patches.tar.xz | 4 ++-- series | 1 - 8 files changed, 39 insertions(+), 17 deletions(-) delete mode 100644 mariadb-10.2.10.tar.gz delete mode 100644 mariadb-10.2.10.tar.gz.sig create mode 100644 mariadb-10.2.11.tar.gz create mode 100644 mariadb-10.2.11.tar.gz.sig diff --git a/mariadb-10.2.10.tar.gz b/mariadb-10.2.10.tar.gz deleted file mode 100644 index 17d4419..0000000 --- a/mariadb-10.2.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2 -size 72388999 diff --git a/mariadb-10.2.10.tar.gz.sig b/mariadb-10.2.10.tar.gz.sig deleted file mode 100644 index b1ea4dc..0000000 --- a/mariadb-10.2.10.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAln3nsIACgkQy8sIKhu5Q9vFRQCg69lFrS73cKNtjYV4j2YCvL2A -5/sAn0+VeicT1OZnfNU/4zvEwzLXlCAD -=bRqj ------END PGP SIGNATURE----- diff --git a/mariadb-10.2.11.tar.gz b/mariadb-10.2.11.tar.gz new file mode 100644 index 0000000..f17267d --- /dev/null +++ b/mariadb-10.2.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63555a810db905175a8bd714f6ec77d1b1a11fcfa6d4b97b448cf5bcb6caa3e8 +size 72772830 diff --git a/mariadb-10.2.11.tar.gz.sig b/mariadb-10.2.11.tar.gz.sig new file mode 100644 index 0000000..26f6a14 --- /dev/null +++ b/mariadb-10.2.11.tar.gz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAlocj50ACgkQy8sIKhu5Q9spfACff759upWG8o3oQ08AEPQtaGAu +FnYAn0J19eIV3qLj10b9ODxFwc2WsWgv +=i5z7 +-----END PGP SIGNATURE----- diff --git a/mariadb.changes b/mariadb.changes index 5e39c3e..c5d4f9c 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 30 07:53:14 UTC 2017 - kstreitova@suse.com + +- update to 10.2.11 GA + * release notes and changelog: + * https://mariadb.com/kb/en/library/mariadb-10211-release-notes/ + * https://mariadb.com/kb/en/library/mariadb-10211-changelog/ +- pack additional mroonga/groonga files +- change default charset to utf8mb4 for full Unicode support + [fate#324329] +- remove mariadb-10.2.10-wsrep_sst_common.patch as it's no longer + needed + ------------------------------------------------------------------- Wed Nov 29 16:16:45 UTC 2017 - rhafer@suse.de @@ -22,7 +35,7 @@ Tue Oct 31 14:23:22 UTC 2017 - kstreitova@suse.com * release notes and changelogs https://downloads.mariadb.org/mariadb/+releases/ * fixes for the following security vulnerabilities - * 10.2.10: CVE-2017-10378, CVE-2017-10268 + * 10.2.10: CVE-2017-10378, CVE-2017-10268, CVE-2017-15365 * 10.2.8: CVE-2017-3636, CVE-2017-3641, CVE-2017-3653, CVE-2017-10320, CVE-2017-10365, CVE-2017-10379, CVE-2017-10384, CVE-2017-10286, CVE-2017-3257 diff --git a/mariadb.spec b/mariadb.spec index e34cf94..0b8e679 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -49,7 +49,7 @@ %define with_mroonga 0 %endif Name: mariadb -Version: 10.2.10 +Version: 10.2.11 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -376,7 +376,8 @@ export CXXFLAGS="$CFLAGS -felide-constructors" -DINSTALL_MYSQLSHAREDIR=share/%{name} \ -DWITH_COMMENT="openSUSE mariadb rpm" \ -DWITH_EXTRA_CHARSET=all \ - -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_general_ci \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ %if 0%{with_oqgraph} < 1 @@ -512,7 +513,7 @@ rm -r %{buildroot}%{_includedir}/mysql # Generate various filelists (binaries and manpages) # mariadb.files -filelist mariabackup mbstream innochecksum mariadb-service-convert my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_install_db mysql_secure_installation mysql_upgrade mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log tokuft_logprint tokuft_logdump tokuftdump mysql_ldb sst_dump >mariadb.files +filelist mariabackup mbstream innochecksum mariadb-service-convert my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_install_db mysql_secure_installation mysql_upgrade mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log tokuft_logprint tokuft_logdump tokuftdump mysql_ldb sst_dump >mariadb.files # mariadb-client.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor mysqld_safe_helper >mariadb-client.files @@ -768,6 +769,15 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-someth %exclude %{_libdir}/mysql/plugin/dialog*.so %ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something %dir %attr(0750, mysql, mysql) %{_localstatedir}/lib/mysql-files +%if 0%{with_mroonga} > 0 +%{_datadir}/mariadb/mroonga/ +%dir %{_datadir}/groonga/ +%{_datadir}/groonga/COPYING +%{_datadir}/groonga/README.md +%dir %{_datadir}/groonga-normalizer-mysql +%{_datadir}/groonga-normalizer-mysql/README.md +%{_datadir}/groonga-normalizer-mysql/lgpl-2.0.txt +%endif %dir %{_datadir}/mysql/policy %dir %{_datadir}/mysql/policy/apparmor %{_datadir}/mysql/policy/apparmor/README diff --git a/mysql-patches.tar.xz b/mysql-patches.tar.xz index 975d0a7..e55cb68 100644 --- a/mysql-patches.tar.xz +++ b/mysql-patches.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66244d8de641c4aca066cebb2985d58c13aa62e18829d2c159da8def908bd2b4 -size 13460 +oid sha256:8f9b001e3f2bd39d185b464c57eb760d980cc325a13800a7a853381455147eee +size 12084 diff --git a/series b/series index 20c2770..3cddc02 100644 --- a/series +++ b/series @@ -12,4 +12,3 @@ mariadb-10.2.8-systemd-cmake.patch mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch mariadb-10.2.9-galera_cnf.patch mariadb-10.2.10-disable_openssl_compatibility_check.patch -mariadb-10.2.10-wsrep_sst_common.patch