diff --git a/mariadb-10.2.10-disable_openssl_compatibility_check.patch b/mariadb-10.2.10-disable_openssl_compatibility_check.patch index 7ba9fe7..3792d86 100644 --- a/mariadb-10.2.10-disable_openssl_compatibility_check.patch +++ b/mariadb-10.2.10-disable_openssl_compatibility_check.patch @@ -21,7 +21,7 @@ Index: mariadb-10.2.10/mysys_ssl/openssl.c - EVP_MD_CTX *md5_ctx; - - if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL)) -- return 1; +- return 0; - - testing= 1; - alloc_size= alloc_count= 0; diff --git a/mariadb-10.2.12.tar.gz b/mariadb-10.2.12.tar.gz deleted file mode 100644 index 3abae44..0000000 --- a/mariadb-10.2.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ab22d7fbacfabc30fe18f71a8afb173250074502d889457e3cde2e203d341ec -size 72818636 diff --git a/mariadb-10.2.12.tar.gz.sig b/mariadb-10.2.12.tar.gz.sig deleted file mode 100644 index e9d70d1..0000000 --- a/mariadb-10.2.12.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAlpNVUMACgkQy8sIKhu5Q9tRaACfXwknCjVQsgkfCadQfgbANzpO -fV8An2LGzcM1wpmnWOxuDe5AvO/yvqvi -=0wDN ------END PGP SIGNATURE----- diff --git a/mariadb-10.2.13.tar.gz b/mariadb-10.2.13.tar.gz new file mode 100644 index 0000000..08f01a2 --- /dev/null +++ b/mariadb-10.2.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:272e7ed9300a05da9e02f8217a01ed3447c4f5a36a12e5233d62cc7c586fc753 +size 72591913 diff --git a/mariadb-10.2.13.tar.gz.sig b/mariadb-10.2.13.tar.gz.sig new file mode 100644 index 0000000..549c2eb --- /dev/null +++ b/mariadb-10.2.13.tar.gz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAlqCV40ACgkQy8sIKhu5Q9tYcwCaA9E0IdgHyQdZS9mmL6DEnzk+ +AxkAoMj28JOCvnaSwBMaclw+Fu6ALu8S +=7VSx +-----END PGP SIGNATURE----- diff --git a/mariadb-10.2.3-group.patch b/mariadb-10.2.3-group.patch index 3979a65..953bea7 100644 --- a/mariadb-10.2.3-group.patch +++ b/mariadb-10.2.3-group.patch @@ -17,7 +17,7 @@ Index: scripts/mysqld_safe.sh pid_file= err_log= err_log_base= -@@ -300,6 +301,7 @@ parse_arguments() { +@@ -308,6 +309,7 @@ parse_arguments() { --pid[-_]file=*) pid_file="$val" ;; --plugin[-_]dir=*) PLUGIN_DIR="$val" ;; --user=*) user="$val"; SET_USER=1 ;; @@ -25,7 +25,7 @@ Index: scripts/mysqld_safe.sh --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) pid_file="$val.pid"; err_log_base="$val"; -@@ -713,6 +715,7 @@ then +@@ -725,6 +727,7 @@ then if test "$user" != "root" -o $SET_USER = 1 then USER_OPTION="--user=$user" @@ -33,7 +33,7 @@ Index: scripts/mysqld_safe.sh fi if test -n "$open_files" then -@@ -735,7 +738,12 @@ then +@@ -747,7 +750,12 @@ then log_error "Fatal error Can't create database directory '$mysql_unix_port'" exit 1 fi @@ -51,15 +51,15 @@ Index: scripts/mysql_install_db.sh =================================================================== --- scripts/mysql_install_db.sh.orig +++ scripts/mysql_install_db.sh -@@ -29,6 +29,7 @@ args="" - defaults="" +@@ -30,6 +30,7 @@ defaults="" + defaults_group_suffix="" mysqld_opt="" user="" +group="" silent_startup="--silent-startup" force=0 -@@ -89,6 +90,11 @@ Usage: $0 [OPTIONS] +@@ -93,6 +94,11 @@ Usage: $0 [OPTIONS] user. You must be root to use this option. By default mysqld runs using your current login name and files and directories that it creates will be owned by you. @@ -71,7 +71,7 @@ Index: scripts/mysql_install_db.sh All other options are passed to the mysqld program -@@ -136,11 +142,11 @@ parse_arguments() +@@ -140,11 +146,11 @@ parse_arguments() --builddir=*) builddir=`parse_arg "$arg"` ;; --srcdir=*) srcdir=`parse_arg "$arg"` ;; --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; @@ -85,7 +85,7 @@ Index: scripts/mysql_install_db.sh --skip-name-resolve) ip_only=1 ;; --verbose) verbose=1 ; silent_startup="" ;; --rpm) in_rpm=1 ;; -@@ -421,7 +427,12 @@ do +@@ -429,7 +435,12 @@ do fi if test -n "$user" then @@ -99,7 +99,7 @@ Index: scripts/mysql_install_db.sh if test $? -ne 0 then echo "Cannot change ownership of the database directories to the '$user'" -@@ -436,6 +447,11 @@ then +@@ -444,6 +455,11 @@ then args="$args --user=$user" fi @@ -115,7 +115,7 @@ Index: scripts/CMakeLists.txt =================================================================== --- scripts/CMakeLists.txt.orig +++ scripts/CMakeLists.txt -@@ -134,6 +134,7 @@ ENDIF() +@@ -161,6 +161,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") diff --git a/mariadb.changes b/mariadb.changes index 89a2f17..58f4a86 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Wed Feb 14 11:51:39 UTC 2018 - kstreitova@suse.com + +- update to 10.2.13 GA + * notable changes + * InnoDB updated to 5.7.21 + * Galera wsrep library updated to 25.3.23 + * MDEV-13869 - MariaDB slow start + * MDEV-14611 - ALTER TABLE EXCHANGE PARTITION does not work + properly when used with DATA DIRECTORY + * MDEV-15249 - Crash in MVCC read after IMPORT TABLESPACE + * Foreign key bugs: + * MDEV-15199 - Referential integrity broken in ON DELETE + CASCADE/MDEV-14222 Unnecessary 'cascade' memory allocation + for every updated row + * MDEV-15219 - FOREIGN KEY CASCADE or SET NULL operations will + not resume after lock wait + * MDEV-15042 - INSERT ON DUPLICATE KEY UPDATE produces error + 1032 (Can't find record) + * MDEV-13205 - InnoDB: Failing assertion: + !dict_index_is_online_ddl(index) upon ALTER TABLE + * MDEV-14958 - Merge new release of InnoDB MySQL 5.7.21 to 10.2 + * MDEV-15165 - InnoDB purge for index on virtual column is + trying to access an incomplete record + * MDEV-15143 - InnoDB: Rollback of trx with id 0 completed + * MDEV-11415 - Remove excessive undo logging during ALTER + TABLE…ALGORITHM=COPY + * MDEV-15016 - multiple page cleaner threads use a lot of CPU + * MDEV-14941 - Timeouts on persistent statistics tables caused + by MDEV-14511 + * MDEV-14985 - innodb_undo_log_truncate may be blocked if + transactions were recovered at startup + * MDEV-14441 - InnoDB hangs when setting + innodb_adaptive_hash_index=OFF during UPDATE + * MDEV-14887 - On a 32-bit system, MariaDB 10.2 mishandles + data file sizes exceeding 4GiB + * fixes for the following security vulnerabilities: + * CVE-2018-2562, CVE-2018-2622, CVE-2018-2640, CVE-2018-2665, + CVE-2018-2668, CVE-2018-2612 + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-10213-release-notes/ + https://mariadb.com/kb/en/library/mariadb-10213-changelog/ + * fixes [bsc#1058729] and [bsc#1068906] +- refresh mariadb-10.2.10-disable_openssl_compatibility_check.patch +- refresh mariadb-10.2.3-group.patch + ------------------------------------------------------------------- Mon Feb 12 17:12:18 UTC 2018 - dmueller@suse.com diff --git a/mariadb.spec b/mariadb.spec index 2ca5a8a..ab87502 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -49,7 +49,7 @@ %define with_mroonga 0 %endif Name: mariadb -Version: 10.2.12 +Version: 10.2.13 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -543,7 +543,7 @@ cp Docs/README-wsrep Docs/README.wsrep # 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 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 myrocks_hotbackup >mariadb.files # mariadb-client.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor mysqld_safe_helper >mariadb-client.files