From 8d495e7528c4452bd8aed3e4329f122601a1fce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 4 Nov 2018 19:40:06 +0200 Subject: [PATCH] Update changelog and refresh patches after 10.1.37 import --- debian/changelog | 18 +++++++++++++----- ...4-Revert-to-using-system-pcre-library.patch | 2 -- ...ult-optimization-from-O3-to-O2-in-mys.patch | 4 ++-- .../patches/armhf_mroonga_storage_fail.patch | 2 +- debian/patches/c11_atomics.patch | 2 +- debian/patches/libmariadbclient-rename.patch | 6 +++--- debian/patches/mysql-test__db_test.patch | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e0b0bc7f..3b933622b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -mariadb-10.1 (1:10.1.35-2) UNRELEASED; urgency=medium - - * New changelog entry - - -- Otto Kekäläinen Sat, 25 Aug 2018 22:26:34 +0300 +mariadb-10.1 (1:10.1.37-1) unstable; urgency=high + + * New upstream version 10.1.37. Includes security fixes for: + - CVE-2018-3282 + - CVE-2018-3251 + - CVE-2018-3174 + - CVE-2018-3156 + - CVE-2018-3143 + - CVE-2016-9843 + * Update README.Contributor based on recent feedback + * Update README.Maintainer to match current best practices + + -- Otto Kekäläinen Sun, 04 Nov 2018 19:11:19 +0200 mariadb-10.1 (1:10.1.35-1) unstable; urgency=medium diff --git a/debian/patches/0024-Revert-to-using-system-pcre-library.patch b/debian/patches/0024-Revert-to-using-system-pcre-library.patch index f3d1d42c3..2d370a317 100644 --- a/debian/patches/0024-Revert-to-using-system-pcre-library.patch +++ b/debian/patches/0024-Revert-to-using-system-pcre-library.patch @@ -6,8 +6,6 @@ Subject: Revert to using system pcre library cmake/pcre.cmake | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake -index 4c11392..894bde3 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -1,23 +1,11 @@ diff --git a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch b/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch index 18b75ef01..d7174c3f8 100644 --- a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch +++ b/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch @@ -53,7 +53,7 @@ Subject: Change the default optimization from -O3 to -O2 in # Solaris flags --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -121,10 +121,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE +@@ -124,10 +124,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) # have tried -flto and -O4, both make our statically linked executables break apple's linker @@ -68,7 +68,7 @@ Subject: Change the default optimization from -O3 to -O2 in else () if (APPLE) set(FLTO_OPTS "-fwhole-program") -@@ -132,10 +132,10 @@ else () +@@ -135,10 +135,10 @@ else () set(FLTO_OPTS "-fuse-linker-plugin") endif() # we overwrite this because the default passes -DNDEBUG and we don't want that diff --git a/debian/patches/armhf_mroonga_storage_fail.patch b/debian/patches/armhf_mroonga_storage_fail.patch index 98eaa7bee..ad376b162 100644 --- a/debian/patches/armhf_mroonga_storage_fail.patch +++ b/debian/patches/armhf_mroonga_storage_fail.patch @@ -8,7 +8,7 @@ Subject: armhf_mroonga_storage_fail --- a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp +++ b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp -@@ -621,9 +621,10 @@ namespace mrn { +@@ -623,9 +623,10 @@ namespace mrn { long long int long_long_value; mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size); int max_bit = (grn_key_size * 8 - 1); diff --git a/debian/patches/c11_atomics.patch b/debian/patches/c11_atomics.patch index 6dc403c1d..6c3649f05 100644 --- a/debian/patches/c11_atomics.patch +++ b/debian/patches/c11_atomics.patch @@ -102,7 +102,7 @@ Subject: c11_atomics # include "x86-gcc.h" --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ IF(HAVE_BFD_H) +@@ -79,6 +79,10 @@ IF(HAVE_BFD_H) TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) diff --git a/debian/patches/libmariadbclient-rename.patch b/debian/patches/libmariadbclient-rename.patch index 4c7810e39..6c852581e 100644 --- a/debian/patches/libmariadbclient-rename.patch +++ b/debian/patches/libmariadbclient-rename.patch @@ -15,7 +15,7 @@ Subject: libmariadbclient-rename --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt -@@ -32,7 +32,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -33,7 +33,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) @@ -24,7 +24,7 @@ Subject: libmariadbclient-rename IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) -@@ -40,39 +40,39 @@ ENDIF(UNIX) +@@ -41,39 +41,39 @@ ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") @@ -74,7 +74,7 @@ Subject: libmariadbclient-rename # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -81,7 +81,7 @@ ENDIF(WIN32) +@@ -82,7 +82,7 @@ ENDIF(WIN32) # async_example is just a code example, do not install it. ADD_EXECUTABLE(async_example async_example.c) diff --git a/debian/patches/mysql-test__db_test.patch b/debian/patches/mysql-test__db_test.patch index b1049ec35..ded65d88e 100644 --- a/debian/patches/mysql-test__db_test.patch +++ b/debian/patches/mysql-test__db_test.patch @@ -14,7 +14,7 @@ Subject: mysql-test__db_test --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl -@@ -3222,6 +3222,10 @@ sub mysql_install_db { +@@ -3225,6 +3225,10 @@ sub mysql_install_db { mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); -- GitLab