Update changelog and refresh patches after 10.1.34 import

debian/changelog

-mariadb-10.1 (10.1.30-0+deb9u1) UNRELEASED; urgency=high
+mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium
 
   [ Otto Kekäläinen ]
+
+  * SECURITY UPDATE: New upstream release 10.1.34. Includes fixes for
+    the security vulnerabilities from previous releases.
+  * Previous upstream version 10.1.33 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-2819
+    - CVE-2018-2817
+    - CVE-2018-2813
+    - CVE-2018-2787
+    - CVE-2018-2784
+    - CVE-2018-2782
+    - CVE-2018-2781
+    - CVE-2018-2771
+    - CVE-2018-2766
+    - CVE-2018-2761
+    - CVE-2018-2755
+  * Previous upstream version 10.1.31 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-2668
+    - CVE-2018-2665
+    - CVE-2018-2640
+    - CVE-2018-2622
+    - CVE-2018-2612
+    - CVE-2018-2562
   * Revert "Update d/gbp.conf to track stretch branches"
   * New upstream version 10.1.30. Includes fixes for the following
     security vulnerabilities (Closes: #885345):
     - CVE-2017-15365
   * Amend previous Debian changelog entries to contain new CVE identifiers
-  * Refresh patches for MariaDB 10.1.30
+  * Refresh patches for MariaDB 10.1.30 and again for .34
 
   [ Ondřej Surý ]
   * New upstream version 10.1.29. Includes fixes for the following
@@ -30,7 +54,7 @@ mariadb-10.1 (10.1.30-0+deb9u1) UNRELEASED; urgency=high
   [ Vicentiu Ciorbaru ]
   * Fix Mroonga compilation failure on arm64
 
- -- Otto Kekäläinen <otto@debian.org>  Tue, 02 Jan 2018 11:30:15 +0200
+ -- Otto Kekäläinen <otto@debian.org>  Thu, 02 Aug 2018 16:21:46 +0800
 
 mariadb-10.1 (10.1.26-0+deb9u1) stretch-security; urgency=high
 

debian/patches/0026-Mroonga-fix-ice-arm64.patch

@@ -7,8 +7,6 @@ A basic logic workaround solves the problem by calling the equal_float
 function instead.
 
 
-diff --git a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
-index 44378cfa..a3d838c3 100644
 --- 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
@@ -18,5 +16,5 @@ index 44378cfa..a3d838c3 100644
 -  return (lhs < rhs) || (lhs > rhs);
 +  return !grn_ts_op_equal_float(lhs, rhs);
  }
-
+ 
  /* grn_ts_op_not_equal_time() returns lhs != rhs. */

debian/patches/c11_atomics.patch

@@ -10,8 +10,6 @@ Subject: c11_atomics
  sql/CMakeLists.txt            |  4 ++++
  5 files changed, 46 insertions(+), 4 deletions(-)
 
-diff --git a/configure.cmake b/configure.cmake
-index 0057c7f..43ad114 100644
 --- a/configure.cmake
 +++ b/configure.cmake
 @@ -128,7 +128,7 @@ IF(UNIX)
@@ -23,7 +21,7 @@ index 0057c7f..43ad114 100644
      ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
    # Need explicit pthread for gcc -fsanitize=address
    IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1028,7 +1028,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
+@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
      long long int *ptr= &var;
      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
    }"
@@ -51,8 +49,6 @@ index 0057c7f..43ad114 100644
  ELSE()
    MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
  ENDIF()
-diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h
-index 56a0323..044be2e 100644
 --- a/include/atomic/gcc_builtins.h
 +++ b/include/atomic/gcc_builtins.h
 @@ -16,6 +16,7 @@
@@ -84,8 +80,6 @@ index 56a0323..044be2e 100644
  #ifdef MY_ATOMIC_MODE_DUMMY
  #define make_atomic_load_body(S)   ret= *a
  #define make_atomic_store_body(S)  *a= v
-diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h
-index 2137445..2ad7d98 100644
 --- a/include/atomic/nolock.h
 +++ b/include/atomic/nolock.h
 @@ -17,7 +17,7 @@
@@ -106,8 +100,6 @@ index 2137445..2ad7d98 100644
  #      include "gcc_builtins.h"
  #    elif defined(__i386__) || defined(__x86_64__)
  #      include "x86-gcc.h"
-diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
-index eb7f75e..a9221d7 100644
 --- a/mysys/CMakeLists.txt
 +++ b/mysys/CMakeLists.txt
 @@ -78,6 +78,10 @@ IF(HAVE_BFD_H)
@@ -121,8 +113,6 @@ index eb7f75e..a9221d7 100644
  IF (WIN32)
    TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
  ENDIF(WIN32)
-diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index b4acac5..8247714 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
 @@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI

debian/patches/extend_default_test_timeout_for_tokudb.patch

@@ -6,11 +6,9 @@ Subject: extend_default_test_timeout_for_tokudb
  mysql-test/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
-index 1c7cfaf..bc45177 100644
 --- a/mysql-test/CMakeLists.txt
 +++ b/mysql-test/CMakeLists.txt
-@@ -64,7 +64,7 @@ ELSE()
+@@ -65,7 +65,7 @@ ELSE()
  ENDIF()
  
  

debian/patches/kFreeBSD-gettid.patch

@@ -6,11 +6,9 @@ Subject: kFreeBSD-gettid
  storage/tokudb/PerconaFT/portability/portability.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/storage/tokudb/PerconaFT/portability/portability.cc b/storage/tokudb/PerconaFT/portability/portability.cc
-index 19f445a..73dce92 100644
 --- a/storage/tokudb/PerconaFT/portability/portability.cc
 +++ b/storage/tokudb/PerconaFT/portability/portability.cc
-@@ -115,6 +115,10 @@ toku_os_gettid(void) {
+@@ -118,6 +118,10 @@ toku_os_gettid(void) {
      return syscall(SYS_gettid);
  #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
      return pthread_getthreadid_np();

debian/patches/mysql-test__db_test.patch

@@ -12,11 +12,9 @@ Subject: mysql-test__db_test
  mysql-test/mysql-test-run.pl | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
-index ac9f493..7e7f116 100755
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3203,6 +3203,10 @@ sub mysql_install_db {
+@@ -3222,6 +3222,10 @@ sub mysql_install_db {
        mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
             $bootstrap_sql_file);
  

debian/patches/remove_rename_mariadb-server_files_in.patch

@@ -6,11 +6,9 @@ Subject: remove_rename_mariadb-server_files_in
  CMakeLists.txt | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a386549..fdfead9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -443,12 +443,6 @@ CONFIGURE_FILE(
+@@ -448,12 +448,6 @@ CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
      ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  

debian/patches/scripts__mysql_install_db.sh__no_test.patch

@@ -11,11 +11,9 @@ Subject: scripts__mysql_install_db.sh__no_test
  scripts/mysql_install_db.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
-index aad9ef5..c6f0e3c 100644
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -408,7 +408,7 @@ then
+@@ -414,7 +414,7 @@ then
  fi
  
  # Create database directories