Update changelog and refresh patches after 10.1.40 import

debian/changelog

+mariadb-10.1 (1:10.1.40-0ubuntu0.18.04.1) bionic-security; urgency=medium
+
+  * SECURITY UPDATE: New upstream version 10.1.40. Includes previous
+    upstream release 10.1.39 which included fixes for the following
+    security vulnerabilities:
+    - CVE-2019-2627
+    - CVE-2019-2614
+  * Amend previous changelog entries to include newly released CVE numbers.
+
+ -- Otto Kekäläinen <otto@debian.org>  Fri, 03 May 2019 10:18:41 +0300
+
 mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.2) bionic; urgency=medium
 
   * Restore tests to stop autopkgtest failures, by adding commits
@@ -35,6 +46,7 @@ mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.1) bionic-security; urgency=medium
   * Add (and rename) new man pages
   * Previous upstream version 10.1.37 included fixes for the following
     security vulnerabilities:
+    - CVE-2019-2503
     - CVE-2018-3282
     - CVE-2018-3251
     - CVE-2018-3174
@@ -59,6 +71,7 @@ mariadb-10.1 (1:10.1.34-0ubuntu0.18.04.1) bionic-security; urgency=medium
     the security vulnerabilities from previous releases (LP: #1779715).
   * Previous upstream version 10.1.33 included fixes for the following
     security vulnerabilities:
+    - CVE-2019-2455
     - CVE-2018-2819
     - CVE-2018-2817
     - CVE-2018-2813
@@ -80,6 +93,7 @@ mariadb-10.1 (1:10.1.34-0ubuntu0.18.04.1) bionic-security; urgency=medium
     - CVE-2018-2562
   * Previous upstream version 10.1.30 included fixes for the following
     security vulnerabilities:
+    - CVE-2018-3133
     - CVE-2017-15365
 
   [ Otto Kekäläinen ]

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
-@@ -3225,6 +3225,10 @@ sub mysql_install_db {
+@@ -3227,6 +3227,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

@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -456,12 +456,6 @@ CONFIGURE_FILE(
+@@ -465,12 +465,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

@@ -2,23 +2,16 @@ From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Date: Thu, 10 Aug 2017 20:40:28 +0200
 Subject: scripts__mysql_install_db.sh__no_test
 
-## 41_scripts__mysql_install_db.sh__no_test.dpatch by  <ch@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: scripts__mysql_install_db.sh__no_test
-## DP: http://bugs.mysql.com/bug.php?id=6901
----
- scripts/mysql_install_db.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Updated 2019-05-03 to match upstream change:
+https://github.com/mariadb/server/commit/3db6de33b2b47a3c31bc8f8deb721abe0c5b0e1c
 
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -429,7 +429,7 @@ then
- fi
- 
- # Create database directories
--for dir in "$ldata" "$ldata/mysql" "$ldata/test"
-+for dir in "$ldata" "$ldata/mysql"
- do
-   if test ! -d "$dir"
-   then
+@@ -36,7 +36,6 @@ in_rpm=0
+ ip_only=0
+ cross_bootstrap=0
+ install_params="create database if not exists mysql;
+-create database if not exists test;
+ use mysql;"
+ auth_root_authentication_method=normal
+ auth_root_socket_user='root'