diff --git a/macros.mariadb-test b/macros.mariadb-test index 5e6c9de..ea050cb 100644 --- a/macros.mariadb-test +++ b/macros.mariadb-test @@ -3,14 +3,19 @@ %__mysql_test_pass dbuserpass %__mysql_test_cconf abuild-myclient.cnf %__mysql_test_port 63306 +%__mysql_test_db testdb # # macro: mysql_testserver_start -- start a test mysqld instance # -# usage: %mysql_test_start -u -p -t +# usage: %mysql_test_start -u -p -t -d +# +# db_user: user of the database (not admin of the server) +# db_user_password: his password +# db_names: name or names separated by semicolon (e. g. testhat or test1:test2) # -%mysql_testserver_start(u:p:t:) \ +%mysql_testserver_start(u:p:t:d:) \ TEST_RUN_DIR=%{__mysql_test_run_dir} \ TEST_USER="%{-u:%{-u*}}" \ if [ -z "$TEST_USER" ]; then \ @@ -24,6 +29,10 @@ TEST_PORT="%{-t:%{-t*}}" \ if [ -z "$TEST_PORT" ]; then \ TEST_PORT='%{__mysql_test_port}' \ fi \ +TEST_DB="%{-d:%{-d*}}" \ +if [ -z "$TEST_DB" ]; then \ + TEST_DB='%{__mysql_test_db}' \ +fi \ \ [ -d $TEST_RUN_DIR ] && rm -r $TEST_RUN_DIR \ mkdir -p $TEST_RUN_DIR/datadir{,-private} \ @@ -50,9 +59,11 @@ echo '>>> Invoking mysqld' \ /usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \ sleep 2 \ \ -echo '>>> Creating authentication database (credentials: $TEST_USER, $TEST_PASS)' \ +echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \ mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \ -mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuildpw create testhat \ +for db in `echo $TEST_DB | tr ':' ' '`; do \ + mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuildpw create $db \ +done \ cat << EOF > $TEST_RUN_DIR/create_auth.sql \ CREATE USER '$TEST_USER'@'localhost' IDENTIFIED BY '$TEST_PASS'; \ GRANT ALL PRIVILEGES ON * . * TO '$TEST_USER'@'localhost'; \ @@ -62,24 +73,28 @@ mysql --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuild %nil # -# macro mysql_testserver_cconf -- generate client access conf +# macro: mysql_testserver_cconf -- generate client access conf # +# usage: %mysql_testserver_cconf -n -d +# +# filename: filename of the configuration +# dbname: database name (only one, not multiple as in %mysql_testserver_start) -%mysql_testserver_cconf(n:t:) \ +%mysql_testserver_cconf(n:d:) \ TEST_RUN_DIR=%{__mysql_test_run_dir} \ TEST_CCONF="%{-n:%{-n*}}" \ if [ -z "$TEST_CCONF" ]; then \ TEST_CCONF='%{__mysql_test_cconf}' \ fi \ -TEST_PORT="%{-t:%{-t*}}" \ -if [ -z "$TEST_PORT" ]; then \ - TEST_PORT='%{__mysql_test_port}' \ +TEST_DB="%{-d:%{-d*}}" \ +if [ -z "$TEST_DB" ]; then \ + TEST_DB='%{__mysql_test_db}' \ fi \ cat << EOF > $TEST_CCONF \ [client] \ -user = abuild \ -password = abuildpw \ -database = test \ +user = $TEST_USER \ +password = $TEST_PASS \ +database = $TEST_DB \ socket = $TEST_RUN_DIR/mysql.sock \ port = $TEST_PORT \ EOF\ 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..c590d4e 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Jun 3 13:32:46 UTC 2020 - pgajdos@suse.com + +- rpm macros: $TEST_USER identified by $TEST_PASS is actually user + of the database for which client conf should be made for +- rpm macros: database name or names can be specified as a + %mysql_testserver_start and %mysql_testserver_cconf parameter +- modified sources + % macros.mariadb-test + +------------------------------------------------------------------- +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