From 1488ebda0025a270d1fdadd78bef8993662e67fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Tue, 7 Aug 2018 22:25:01 +0300 Subject: [PATCH] Update changelog and refresh patches after 10.1.35 import --- debian/changelog | 23 +- .../patches/armhf_mroonga_storage_fail.patch | 2 - debian/patches/fix-FTBFS-on-GNU-Hurd.patch | 236 ------------------ debian/patches/hurd_socket.patch | 2 - .../innodb_simulate_comp_test_speedup.patch | 2 - debian/patches/mips-groonga-atomic.patch | 4 - debian/patches/mips-innobase-atomic.patch | 2 - debian/patches/mips-machine.patch | 2 - .../mysqld_multi.server_lsb-header.patch | 2 - debian/patches/mysqld_multi_confd.patch | 2 - ...emove_rename_mariadb-server_files_in.patch | 2 +- .../replace_dash_with_bash_mbug675185.patch | 2 - ..._mysql_create_system_tables__no_test.patch | 2 - ...cripts__mysql_install_db.sh__no_test.patch | 2 +- .../scripts__mysqld_safe.sh__signals.patch | 2 - debian/patches/series | 1 - 16 files changed, 24 insertions(+), 264 deletions(-) delete mode 100644 debian/patches/fix-FTBFS-on-GNU-Hurd.patch diff --git a/debian/changelog b/debian/changelog index 12d398bae..f846192bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +mariadb-10.1 (1:10.1.35-1) unstable; urgency=medium + + * New upstream version 10.1.35. Includes security fixes for: + - CVE-2018-3066 + - CVE-2018-3064 + - CVE-2018-3063 + - CVE-2018-3058 + * Fix wrong-path-for-interpreter in innotop script + * Update Debian standards version + * Revert "Remove the mariadb-test-* packages" (Closes: #888956) + * Omit test plugins as they are not used by the tests and already deleted + * Define autopkgtest with isolation-container to allow service (Closes: #870408) + * Ship config examples et al in /usr/share/mysql (Closes: #878223) + * Extend the server README to clarify common misunderstandings (Closes: #878215) + * Introduce mariadb-backup as a separate binary package, just like in upstream + * Fix bash syntax issues detected by Shellcheck + * Fix 'max key length is 767 bytes' errors (Closes: #886756) + * Remove GNU Hurd FTBFS patch as it has been applied upstream (Closes: #882062) + + -- Otto Kekäläinen Tue, 07 Aug 2018 22:18:20 +0300 + mariadb-10.1 (1:10.1.34-1) unstable; urgency=medium * New upstream release 10.1.34. @@ -395,7 +416,7 @@ mariadb-10.1 (10.1.21-3) unstable; urgency=low * Extend WSREP and Galera man pages patch to cover all commands [ Dieter Adriaenssens ] - * Specify Architecture for mariadb-plugin-mroonga and mariadb-plugin-tokudb + * Specify Architecture for mariadb-plugin-mroonga and mariadb-plugin-tokudb (Closes: #852709) [ James Clarke ] diff --git a/debian/patches/armhf_mroonga_storage_fail.patch b/debian/patches/armhf_mroonga_storage_fail.patch index 807e71d2a..98eaa7bee 100644 --- a/debian/patches/armhf_mroonga_storage_fail.patch +++ b/debian/patches/armhf_mroonga_storage_fail.patch @@ -6,8 +6,6 @@ Subject: armhf_mroonga_storage_fail storage/mroonga/lib/mrn_multiple_column_key_codec.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp -index 0038a7f..5213da8 100644 --- 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 { diff --git a/debian/patches/fix-FTBFS-on-GNU-Hurd.patch b/debian/patches/fix-FTBFS-on-GNU-Hurd.patch deleted file mode 100644 index 2c06ec15f..000000000 --- a/debian/patches/fix-FTBFS-on-GNU-Hurd.patch +++ /dev/null @@ -1,236 +0,0 @@ -From: Debian MySQL Maintainers -Date: Thu, 10 Aug 2017 20:40:29 +0200 -Subject: fix-FTBFS-on-GNU-Hurd - ---- - cmake/dtrace.cmake | 4 +++ - cmake/package_name.cmake | 3 ++ - extra/mariabackup/backup_copy.cc | 29 +++++++++++++----- - mysys/mysys_priv.h | 10 +++++-- - sql/wsrep_binlog.cc | 42 ++++++++++++++++++++------- - storage/mroonga/vendor/groonga/config.h.cmake | 1 + - 6 files changed, 68 insertions(+), 21 deletions(-) - ---- a/cmake/dtrace.cmake -+++ b/cmake/dtrace.cmake -@@ -46,6 +46,10 @@ MACRO(CHECK_DTRACE) - AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") - SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") - ENDIF() -+ # On GNU/Hurd, dtrace is not supported -+ IF(DTRACE AND CMAKE_SYSTEM_NAME MATCHES "GNU") -+ SET(ENABLE_DTRACE OFF CACHE BOOL "Disable dtrace") -+ ENDIF() - SET(HAVE_DTRACE ${ENABLE_DTRACE}) - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - IF(CMAKE_SIZEOF_VOID_P EQUAL 4) ---- a/cmake/package_name.cmake -+++ b/cmake/package_name.cmake -@@ -81,6 +81,9 @@ IF(NOT VERSION) - SET(DEFAULT_MACHINE "i386") - ENDIF() - ENDIF() -+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "GNU") -+ SET(DEFAULT_PLATFORM "GNU") -+ SET(DEFAULT_MACHINE "i386") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin") - IF(CMAKE_OSX_DEPLOYMENT_TARGET) - SET(DEFAULT_PLATFORM "osx${CMAKE_OSX_DEPLOYMENT_TARGET}") ---- a/extra/mariabackup/backup_copy.cc -+++ b/extra/mariabackup/backup_copy.cc -@@ -623,11 +623,13 @@ static - int - mkdirp(const char *pathname, int Flags, myf MyFlags) - { -- char parent[PATH_MAX], *p; -+ char *parent, *p; -+ int len = strlen(pathname) + 1; - - /* make a parent directory path */ -- strncpy(parent, pathname, sizeof(parent)); -- parent[sizeof(parent) - 1] = 0; -+ parent = (char *)malloc(len); -+ strncpy(parent, pathname, len); -+ parent[len] = 0; - - for (p = parent + strlen(parent); - !is_path_separator(*p) && p != parent; p--); -@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags, - - /* try to make parent directory */ - if (p != parent && mkdirp(parent, Flags, MyFlags) != 0) { -+ free(parent); - return(-1); - } - - /* make this one if parent has been made */ - if (my_mkdir(pathname, Flags, MyFlags) == 0) { -+ free(parent); - return(0); - } - - /* if it already exists that is fine */ - if (errno == EEXIST) { -+ free(parent); - return(0); - } - -+ free(parent); - return(-1); - } - -@@ -658,17 +664,24 @@ bool - equal_paths(const char *first, const char *second) - { - #ifdef HAVE_REALPATH -- char real_first[PATH_MAX]; -- char real_second[PATH_MAX]; -+ char *real_first, *real_second; -+ int result; - -- if (realpath(first, real_first) == NULL) { -+ real_first = realpath(first, 0); -+ if (real_first == NULL) { - return false; - } -- if (realpath(second, real_second) == NULL) { -+ -+ real_second = realpath(second, 0); -+ if (real_second == NULL) { -+ free(real_second); - return false; - } - -- return (strcmp(real_first, real_second) == 0); -+ result = strcmp(real_first, real_second); -+ free(real_first); -+ free(real_second); -+ return result == 0; - #else - return strcmp(first, second) == 0; - #endif ---- a/mysys/mysys_priv.h -+++ b/mysys/mysys_priv.h -@@ -16,6 +16,10 @@ - #ifndef MYSYS_PRIV_INCLUDED - #define MYSYS_PRIV_INCLUDED - -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+ - #include - #include - #include -@@ -111,7 +115,7 @@ void my_error_unregister_all(void); - #ifndef O_PATH /* not Linux */ - #if defined(O_SEARCH) /* Illumos */ - #define O_PATH O_SEARCH --#elif defined(O_EXEC) /* FreeBSD */ -+#elif defined(O_EXEC) && defined(__FreeBSD_kernel__) /* FreeBSD */ - #define O_PATH O_EXEC - #endif - #endif -@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlink - return res; - #elif defined(HAVE_REALPATH) && defined(PATH_MAX) - #define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \ -- char buf[PATH_MAX+1]; \ -- if (realpath(pathname, buf) == NULL) return -1; \ -+ char *buf = realpath(NULL, 0); \ -+ if (buf == NULL) return -1; \ - if (strcmp(pathname, buf)) { errno= ENOTDIR; return -1; } \ - return NOAT; - #elif defined(HAVE_REALPATH) ---- a/sql/wsrep_binlog.cc -+++ b/sql/wsrep_binlog.cc -@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t* const ws - - void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len) - { -- char filename[PATH_MAX]= {0}; -- int len= snprintf(filename, PATH_MAX, "%s/GRA_%ld_%lld.log", -+ int len = snprintf(NULL, 0, "%s/GRA_%ld_%lld.log", - wsrep_data_home_dir, thd->thread_id, - (long long)wsrep_thd_trx_seqno(thd)); -- if (len >= PATH_MAX) -+ if (len < 0) - { -- WSREP_ERROR("RBR dump path too long: %d, skipping dump.", len); -+ WSREP_ERROR("snprintf error: %d, skipping dump.", len); -+ DBUG_VOID_RETURN; -+ } -+ -+ char *filename= (char *)malloc(len++); -+ int len1= snprintf(filename, len, "%s/GRA_%ld_%lld.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long)wsrep_thd_trx_seqno(thd)); -+ if (len >= len1) -+ { -+ WSREP_ERROR("RBR dump path truncated: %d, skipping dump.", len); -+ free(filename); - return; - } - -@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const - WSREP_ERROR("Failed to open file '%s': %d (%s)", - filename, errno, strerror(errno)); - } -+ free(filename); - } - - /* -@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD - { - DBUG_ENTER("wsrep_dump_rbr_buf_with_header"); - -- char filename[PATH_MAX]= {0}; - File file; - IO_CACHE cache; - Log_event_writer writer(&cache); - Format_description_log_event *ev=NULL; - -- int len= my_snprintf(filename, PATH_MAX, "%s/GRA_%ld_%lld_v2.log", -- wsrep_data_home_dir, thd->thread_id, -- (long long) wsrep_thd_trx_seqno(thd)); -+ int len = snprintf(NULL, 0, "%s/GRA_%ld_%lld_v2.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long) wsrep_thd_trx_seqno(thd)); - -- if (len >= PATH_MAX) -+ if (len < 0) - { -- WSREP_ERROR("RBR dump path too long: %d, skipping dump.", len); -+ WSREP_ERROR("snprintf error: %d, skipping dump.", len); -+ DBUG_VOID_RETURN; -+ } -+ -+ char *filename = (char *)malloc(len++); -+ int len1 = my_snprintf(filename, len, "%s/GRA_%ld_%lld_v2.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long) wsrep_thd_trx_seqno(thd)); -+ -+ if (len >= len1) -+ { -+ WSREP_ERROR("RBR dump path truncated: %d, skipping dump.", len); - DBUG_VOID_RETURN; - } - -@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD - } - - cleanup2: -+ free(filename); - end_io_cache(&cache); - - cleanup1: ---- a/storage/mroonga/vendor/groonga/config.h.cmake -+++ b/storage/mroonga/vendor/groonga/config.h.cmake -@@ -107,6 +107,7 @@ - #cmakedefine HAVE_SIGNAL_H - #cmakedefine HAVE_SYS_MMAN_H - #cmakedefine HAVE_SYS_PARAM_H -+#cmakedefine HAVE_SYS_POLL_H - #cmakedefine HAVE_SYS_RESOURCE_H - #cmakedefine HAVE_SYS_SELECT_H - #cmakedefine HAVE_SYS_SOCKET_H diff --git a/debian/patches/hurd_socket.patch b/debian/patches/hurd_socket.patch index 178a77fd2..b1a6e28e8 100644 --- a/debian/patches/hurd_socket.patch +++ b/debian/patches/hurd_socket.patch @@ -6,8 +6,6 @@ Subject: hurd_socket mysql-test/lib/My/Platform.pm | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm -index 110cf8a..c49450b 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -112,6 +112,8 @@ sub check_socket_path_length { diff --git a/debian/patches/innodb_simulate_comp_test_speedup.patch b/debian/patches/innodb_simulate_comp_test_speedup.patch index ea5aec7b5..a15671a47 100644 --- a/debian/patches/innodb_simulate_comp_test_speedup.patch +++ b/debian/patches/innodb_simulate_comp_test_speedup.patch @@ -6,8 +6,6 @@ Subject: innodb_simulate_comp_test_speedup mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt | 1 + 1 file changed, 1 insertion(+) -diff --git a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt -index fae3205..2ac6dc5 100644 --- a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt +++ b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt @@ -1,2 +1,3 @@ diff --git a/debian/patches/mips-groonga-atomic.patch b/debian/patches/mips-groonga-atomic.patch index 792ae0509..70cb3ca6b 100644 --- a/debian/patches/mips-groonga-atomic.patch +++ b/debian/patches/mips-groonga-atomic.patch @@ -7,8 +7,6 @@ Subject: mips-groonga-atomic storage/mroonga/vendor/groonga/lib/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) -diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt -index e27070f..7f1899c 100644 --- a/storage/mroonga/vendor/groonga/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/CMakeLists.txt @@ -238,6 +238,8 @@ endmacro() @@ -20,8 +18,6 @@ index e27070f..7f1899c 100644 ac_check_symbols(fpclassify math.h) ac_check_lib(m fpclassify) -diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt -index 6765261..6c13737 100644 --- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt @@ -90,6 +90,7 @@ endif() diff --git a/debian/patches/mips-innobase-atomic.patch b/debian/patches/mips-innobase-atomic.patch index cc19189ea..9c791143a 100644 --- a/debian/patches/mips-innobase-atomic.patch +++ b/debian/patches/mips-innobase-atomic.patch @@ -6,8 +6,6 @@ Subject: mips-innobase-atomic storage/innobase/include/os0sync.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h -index bb225c5..6520237 100644 --- a/storage/innobase/include/os0sync.h +++ b/storage/innobase/include/os0sync.h @@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri diff --git a/debian/patches/mips-machine.patch b/debian/patches/mips-machine.patch index 8cc56fc1c..06d6dd546 100644 --- a/debian/patches/mips-machine.patch +++ b/debian/patches/mips-machine.patch @@ -6,8 +6,6 @@ Subject: mips-machine cmake/package_name.cmake | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake -index 4930a6b..7681f78 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -34,6 +34,10 @@ IF(NOT VERSION) diff --git a/debian/patches/mysqld_multi.server_lsb-header.patch b/debian/patches/mysqld_multi.server_lsb-header.patch index a4c7043e8..49606c51d 100644 --- a/debian/patches/mysqld_multi.server_lsb-header.patch +++ b/debian/patches/mysqld_multi.server_lsb-header.patch @@ -6,8 +6,6 @@ Subject: mysqld_multi.server_lsb-header support-files/mysqld_multi.server.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -diff --git a/support-files/mysqld_multi.server.sh b/support-files/mysqld_multi.server.sh -index 75908a5..9e0dd79 100644 --- a/support-files/mysqld_multi.server.sh +++ b/support-files/mysqld_multi.server.sh @@ -14,8 +14,24 @@ diff --git a/debian/patches/mysqld_multi_confd.patch b/debian/patches/mysqld_multi_confd.patch index 600a2f89e..f48533dd1 100644 --- a/debian/patches/mysqld_multi_confd.patch +++ b/debian/patches/mysqld_multi_confd.patch @@ -6,8 +6,6 @@ Subject: mysqld_multi_confd scripts/mysqld_multi.sh | 1 + 1 file changed, 1 insertion(+) -diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh -index c6515a3..f50f0fe 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -497,6 +497,7 @@ sub list_defaults_files 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/replace_dash_with_bash_mbug675185.patch b/debian/patches/replace_dash_with_bash_mbug675185.patch index e4b0ca058..4faff64b2 100644 --- a/debian/patches/replace_dash_with_bash_mbug675185.patch +++ b/debian/patches/replace_dash_with_bash_mbug675185.patch @@ -13,8 +13,6 @@ Subject: replace_dash_with_bash_mbug675185 scripts/mysqld_safe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh -index 3236ebb..96b4ca7 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -1,4 +1,4 @@ diff --git a/debian/patches/scripts__mysql_create_system_tables__no_test.patch b/debian/patches/scripts__mysql_create_system_tables__no_test.patch index f4256511d..32024b57d 100644 --- a/debian/patches/scripts__mysql_create_system_tables__no_test.patch +++ b/debian/patches/scripts__mysql_create_system_tables__no_test.patch @@ -13,8 +13,6 @@ Subject: scripts__mysql_create_system_tables__no_test scripts/mysql_system_tables_data.sql | 10 ---------- 1 file changed, 10 deletions(-) -diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql -index 9556e7b..0783f3d 100644 --- a/scripts/mysql_system_tables_data.sql +++ b/scripts/mysql_system_tables_data.sql @@ -26,16 +26,6 @@ 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/scripts__mysqld_safe.sh__signals.patch b/debian/patches/scripts__mysqld_safe.sh__signals.patch index 29a18e2df..dd328a12f 100644 --- a/debian/patches/scripts__mysqld_safe.sh__signals.patch +++ b/debian/patches/scripts__mysqld_safe.sh__signals.patch @@ -11,8 +11,6 @@ Subject: scripts__mysqld_safe.sh__signals scripts/mysqld_safe.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh -index bcaf7b8..3236ebb 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -37,7 +37,6 @@ skip_err_log=0 diff --git a/debian/patches/series b/debian/patches/series index dc96a8957..2d8fbfa01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,7 +19,6 @@ c11_atomics.patch remove-systemd-obsolete-target.patch kFreeBSD-gettid.patch mips-innobase-atomic.patch -fix-FTBFS-on-GNU-Hurd.patch mytop-merge_src:mytop_improvements.patch Add_default_ExecStartPre_to_mariadb@.service.patch 0024-Revert-to-using-system-pcre-library.patch -- GitLab