From 7790163b5f7d523424e3e604a8d1068a68856525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 8 Aug 2018 19:35:19 +0300 Subject: [PATCH] Update changelog and refresh patches after 10.1.35 import --- debian/changelog | 10 +++++++--- .../patches/0026-Mroonga-fix-ice-arm64.patch | 20 ------------------- ...emove_rename_mariadb-server_files_in.patch | 2 +- ...cripts__mysql_install_db.sh__no_test.patch | 2 +- debian/patches/series | 1 - 5 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 debian/patches/0026-Mroonga-fix-ice-arm64.patch diff --git a/debian/changelog b/debian/changelog index d90574e6f..0226e16a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium +mariadb-10.1 (10.1.35-0+deb9u1) stretch-security; urgency=medium [ Otto Kekäläinen ] - * SECURITY UPDATE: New upstream release 10.1.34. Includes fixes for + * SECURITY UPDATE: New upstream release 10.1.35. Includes fixes for the security vulnerabilities from previous releases. + - CVE-2018-3066 + - CVE-2018-3064 + - CVE-2018-3063 + - CVE-2018-3058 * Previous upstream version 10.1.33 included fixes for the following security vulnerabilities: - CVE-2018-2819 @@ -57,7 +61,7 @@ mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium * Extend libmariadbclient-rename.patch to cover TokuDB as well * Disable disks.disks test - -- Otto Kekäläinen Thu, 02 Aug 2018 16:21:46 +0800 + -- Otto Kekäläinen Wed, 08 Aug 2018 19:32:41 +0300 mariadb-10.1 (10.1.26-0+deb9u1) stretch-security; urgency=high diff --git a/debian/patches/0026-Mroonga-fix-ice-arm64.patch b/debian/patches/0026-Mroonga-fix-ice-arm64.patch deleted file mode 100644 index 248de23d5..000000000 --- a/debian/patches/0026-Mroonga-fix-ice-arm64.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Vicentiu Ciorbaru - -Subject: Workaround for ICE in mroonga on Arm64 architecture -Details: There seems to be a bug in gcc-6.3.0 on arm64 where it fails -to compile a file which makes use of the not_equal_float function. -A basic logic workaround solves the problem by calling the equal_float -function instead. - - ---- a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c -+++ b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c -@@ -562,7 +562,7 @@ inline static grn_ts_bool - grn_ts_op_not_equal_float(grn_ts_float lhs, grn_ts_float rhs) - { - /* To suppress warnings, "lhs != rhs" is not used. */ -- return (lhs < rhs) || (lhs > rhs); -+ return !grn_ts_op_equal_float(lhs, rhs); - } - - /* grn_ts_op_not_equal_time() returns lhs != rhs. */ diff --git a/debian/patches/remove_rename_mariadb-server_files_in.patch b/debian/patches/remove_rename_mariadb-server_files_in.patch index 824dbfd6d..2169c7200 100644 --- a/debian/patches/remove_rename_mariadb-server_files_in.patch +++ b/debian/patches/remove_rename_mariadb-server_files_in.patch @@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -448,12 +448,6 @@ CONFIGURE_FILE( +@@ -450,12 +450,6 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) diff --git a/debian/patches/scripts__mysql_install_db.sh__no_test.patch b/debian/patches/scripts__mysql_install_db.sh__no_test.patch index 3059ec12c..7bc74efcb 100644 --- a/debian/patches/scripts__mysql_install_db.sh__no_test.patch +++ b/debian/patches/scripts__mysql_install_db.sh__no_test.patch @@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -414,7 +414,7 @@ then +@@ -419,7 +419,7 @@ then fi # Create database directories diff --git a/debian/patches/series b/debian/patches/series index a884cb323..5961c896e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,4 +21,3 @@ kFreeBSD-gettid.patch mips-innobase-atomic.patch mytop-merge_src:mytop_improvements.patch Add_default_ExecStartPre_to_mariadb@.service.patch -0026-Mroonga-fix-ice-arm64.patch -- GitLab