From dc3fde076fd876c84735dc0e1563e3b6d4f6b6b759b32ddb4664fe32c71be06a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 2 Jun 2020 06:17:25 +0000 Subject: [PATCH] Accepting request 810670 from home:kstreitova:branches:server:database - Build with oqgraph by default for all codestreams [jsc#SLE-12253] - Update to 10.4.13 * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-10413-release-notes https://mariadb.com/kb/en/library/mariadb-10413-changelog * fixes for the following security vulnerabilities: CVE-2020-2752, CVE-2020-2812, CVE-2020-2814, CVE-2020-2760, CVE-2020-13249 - fixes [bsc#1168380] (the same as [bsc#1166781]) MDEV-21244 mysql_upgrade creating empty global_priv table support upgrades from 5.2 privilege tables - drop specfile "hacks" as things work correctly in upstream now: * renaming tmpfiles.conf -> mariadb.conf * installing pam_user_map.so to /lib64/security for non 32bit architectures * sysusers.conf was renamed to mariadb.conf - update suse_skipped_tests.list OBS-URL: https://build.opensuse.org/request/show/810670 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=254 --- mariadb-10.4.12.tar.gz | 3 --- mariadb-10.4.12.tar.gz.sig | 6 ----- mariadb-10.4.13.tar.gz | 3 +++ mariadb-10.4.13.tar.gz.sig | 6 +++++ mariadb.changes | 25 +++++++++++++++++++ mariadb.spec | 20 +++------------ suse_skipped_tests.list | 50 +++++++++++++++++++++++--------------- 7 files changed, 68 insertions(+), 45 deletions(-) delete mode 100644 mariadb-10.4.12.tar.gz delete mode 100644 mariadb-10.4.12.tar.gz.sig create mode 100644 mariadb-10.4.13.tar.gz create mode 100644 mariadb-10.4.13.tar.gz.sig diff --git a/mariadb-10.4.12.tar.gz b/mariadb-10.4.12.tar.gz deleted file mode 100644 index 94f66ae..0000000 --- a/mariadb-10.4.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 -size 79120835 diff --git a/mariadb-10.4.12.tar.gz.sig b/mariadb-10.4.12.tar.gz.sig deleted file mode 100644 index 06ca906..0000000 --- a/mariadb-10.4.12.tar.gz.sig +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCXi88fwAKCRDLywgqG7lD -2yWlAJ0TS/HGlGiixf74yZZ7O7HBmnb9iACfUksIWM66twshntwTSGrE5llBw/g= -=MmfV ------END PGP SIGNATURE----- diff --git a/mariadb-10.4.13.tar.gz b/mariadb-10.4.13.tar.gz new file mode 100644 index 0000000..da9edcc --- /dev/null +++ b/mariadb-10.4.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df +size 80608459 diff --git a/mariadb-10.4.13.tar.gz.sig b/mariadb-10.4.13.tar.gz.sig new file mode 100644 index 0000000..5733f1b --- /dev/null +++ b/mariadb-10.4.13.tar.gz.sig @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCXrlggQAKCRDLywgqG7lD +25PwAJwIvy0vHelea4DgezeXxfVoYR5vdQCg8HwZZpKXEfC0s4FEjxLSw3cjdsI= +=Dl39 +-----END PGP SIGNATURE----- diff --git a/mariadb.changes b/mariadb.changes index e443627..3c834ed 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Jun 1 11:50:50 UTC 2020 - Kristyna Streitova + +- Build with oqgraph by default for all codestreams [jsc#SLE-12253] + +------------------------------------------------------------------- +Fri May 22 14:21:14 UTC 2020 - Kristyna Streitova + +- Update to 10.4.13 + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-10413-release-notes + https://mariadb.com/kb/en/library/mariadb-10413-changelog + * fixes for the following security vulnerabilities: + CVE-2020-2752, CVE-2020-2812, CVE-2020-2814, CVE-2020-2760, + CVE-2020-13249 +- fixes [bsc#1168380] (the same as [bsc#1166781]) + MDEV-21244 mysql_upgrade creating empty global_priv table support + upgrades from 5.2 privilege tables +- drop specfile "hacks" as things work correctly in upstream now: + * renaming tmpfiles.conf -> mariadb.conf + * installing pam_user_map.so to /lib64/security for non 32bit + architectures + * sysusers.conf was renamed to mariadb.conf +- update suse_skipped_tests.list + ------------------------------------------------------------------- Mon Apr 27 16:36:28 UTC 2020 - Kristyna Streitova diff --git a/mariadb.spec b/mariadb.spec index 66476e6..1158050 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -25,12 +25,7 @@ # unstable-tests list (contains also suse_skipped_tests.list) and don't # ignore failures %define ignore_testsuite_result 0 -# OQGRAPH engine cannot be built for SLE (missing Judy dependency) -%if 0%{?is_opensuse} > 0 %define with_oqgraph 1 -%else -%define with_oqgraph 0 -%endif # TokuDB engine is available only for x86_64 architecture # see https://mariadb.com/kb/en/mariadb/tokudb/ # Temporarily stop to build it as jemalloc 5 is not backwards compatible @@ -56,7 +51,7 @@ # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available %define with_cracklib_plugin 0 Name: mariadb -Version: 10.4.12 +Version: 10.4.13 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -550,7 +545,7 @@ rm -f %{buildroot}'%{_unitdir}/mariadb@.service' rm -f %{buildroot}'%{_unitdir}/mariadb@bootstrap.service.d/use_galera_new_cluster.conf' # Remove systemd-sysusers conf file for creating of mysql user (we do it in the specfile) -rm -f %{buildroot}%{_sysusersdir}/sysusers.conf +rm -f %{buildroot}%{_sysusersdir}/mariadb.conf # Remove client libraries that are now provided in mariadb-connector-c # Client library and links @@ -563,7 +558,7 @@ rm %{buildroot}%{_libdir}/mysql/plugin/{auth_gssapi_client.so,dialog.so,mysql_cl # Devel files rm %{buildroot}%{_bindir}/mysql_config rm %{buildroot}%{_bindir}/mariadb_config -rm %{buildroot}%{_datadir}/pkgconfig/mariadb.pc +rm %{buildroot}%{_libdir}/pkgconfig/mariadb.pc rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc rm -f %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc rm %{buildroot}%{_datadir}/aclocal/mysql.m4 @@ -640,9 +635,6 @@ install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb ln -sf %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service ln -sf %{_unitdir}/mariadb@.service %{buildroot}%{_unitdir}/mysql@.service -# Rename systemd-tmpfiles conf file because each systemd-tmpfiles file shall be named in the style of package.conf or package-part.conf -mv %{buildroot}%{_tmpfilesdir}/tmpfiles.conf %{buildroot}%{_tmpfilesdir}/mariadb.conf - # Tmpfiles file to exclude mysql tempfiles that are auto-cleaned up # bnc#852451 mkdir -p %{buildroot}%{_tmpfilesdir} @@ -693,12 +685,6 @@ mkdir -p '%{buildroot}'%{_localstatedir}/lib/mysql-files mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -m 644 %{SOURCE19} %{buildroot}%{_rpmconfigdir}/macros.d -# install pam_user_map.so to /lib64/security for non 32bit architectures -%ifnarch i586 %{arm} ppc -mkdir -p %{buildroot}/%{_lib}/security -mv %{buildroot}/lib/security/pam_user_map.so %{buildroot}/%{_lib}/security/ -%endif - # Install sysusers.d file mkdir -p %{buildroot}%{_sysusersdir} install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/ diff --git a/suse_skipped_tests.list b/suse_skipped_tests.list index 45241de..7a944a3 100644 --- a/suse_skipped_tests.list +++ b/suse_skipped_tests.list @@ -26,22 +26,34 @@ unit.ed25519 : since 10.4.12 - ppc, we don't bui #---------------------------------------------------------------- # Needs to be investigated (issues trackers will be added) -sys_vars.slave_parallel_threads_basic : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le -main.gis_notembedded : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le -versioning.partition : since 10.3.16 - armv7l -innodb.innodb-page_compression_lzma : since 10.3.20 - armv7l -sys_vars.sysvars_wsrep : since 10.4.12 - ppc -rpl.rpl_ip_mix : since 10.4.10 - all -rpl.rpl_ip_mix2 : since 10.4.10 - all -rpl.rpl_ipv4_as_ipv6 : since 10.4.10 - all -rpl.rpl_ipv6 : since 10.4.10 - all -perfschema.socket_instances_func : since 10.4.10 - all -main.ipv4_and_ipv6 : since 10.4.10 - all -main.ipv4_as_ipv6 : since 10.4.10 - all -main.ipv6 : since 10.4.10 - all -main.information_schema : since 10.4.10 - all -main.system_mysql_db : since 10.4.10 - all -main.gis_notembedded : since 10.4.10 - all -funcs_1.is_columns_mysql : since 10.4.10 - all -sys_vars.tcp_nodelay : since 10.4.10 - all -oqgraph.social : since 10.4.12 - i386 +sys_vars.slave_parallel_threads_basic : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le +main.gis_notembedded : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le +versioning.partition : since 10.3.16 - armv7l +innodb.innodb-page_compression_lzma : since 10.3.20 - armv7l +sys_vars.sysvars_wsrep : since 10.4.12 - ppc +rpl.rpl_ip_mix : since 10.4.10 - all +rpl.rpl_ip_mix2 : since 10.4.10 - all +rpl.rpl_ipv4_as_ipv6 : since 10.4.10 - all +rpl.rpl_ipv6 : since 10.4.10 - all +perfschema.socket_instances_func : since 10.4.10 - all +main.ipv4_and_ipv6 : since 10.4.10 - all +main.ipv4_as_ipv6 : since 10.4.10 - all +main.ipv6 : since 10.4.10 - all +main.information_schema : since 10.4.10 - all +main.system_mysql_db : since 10.4.10 - all +main.gis_notembedded : since 10.4.10 - all +funcs_1.is_columns_mysql : since 10.4.10 - all +sys_vars.tcp_nodelay : since 10.4.10 - all +oqgraph.social : since 10.4.12 - i586 (MDEV-22280) +sys_vars.have_rtree_keys_basic : since 10.4.13 - x86_64 +main.func_int : since 10.4.13 - i586 +perfschema.dml_tlws_by_table : since 10.4.13 - x86_64 +sys_vars.aria_used_for_temp_tables_basic : since 10.4.13 - ppc64 +main.subselect_no_opts : since 10.4.13 - aarch64 +igcol.main_mysqldump : since 10.4.13 - aarch64 +main.timezone_grant : since 10.4.13 - ppc64 +perfschema.ddl_setup_consumers : since 10.4.13 - i586 +main.subselect_sj_nonmerged : since 10.4.13 - i586 +sys_vars.innodb_encryption_rotation_iops_basic : since 10.4.13 - i586 +main.symlink-myisam-11902 : since 10.4.13 - i586 +sys_vars.innodb_fast_shutdown_basic : since 10.4.13 - i586