[Pkg-mysql-commits] [mariadb-5.5] 03/03: Update changelog and refresh patches after 5.5.58 import

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

otto pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.

commit f06c422fb1e941f11adbf20aed4f5fd3e2482c74
Author: Otto Kekäläinen <otto at debian.org>
Date:   Sat Dec 30 18:01:24 2017 +0200

    Update changelog and refresh patches after 5.5.58 import
---
 debian/changelog                                            | 13 +++++++++++++
 .../patches/41_scripts__mysql_install_db.sh__no_test.diff   |  2 +-
 debian/patches/50_mysql-test__db_test.diff                  |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e38683a..393e8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+mariadb-5.5 (5.5.58-1ubuntu0.14.04.1) trusty-security; urgency=high
+
+  * SECURITY UPDATE: New upstream release 5.5.58. Includes fixes for
+    the following security vulnerabilities (LP: #1740608):
+    - CVE-2017-10378, MDEV-13819
+    - CVE-2017-10268
+  * Update previous changelog entries to contain new CVE identifiers
+  * Includes upstream MDEV-13819 server crash fix (LP: #1735876)
+
+ -- Otto Kekäläinen <otto at debian.org>  Sat, 30 Dec 2017 17:55:52 +0200
+
 mariadb-5.5 (5.5.57-1ubuntu0.14.04.1) trusty-security; urgency=high
 
   * SECURITY UPDATE: New upstream release 5.5.57. Includes fixes made
     in release 5.5.55 for the following security vulnerabilities
     (LP: #1705944):
+    - CVE-2017-10384
+    - CVE-2017-10379, MDEV-13187
     - CVE-2017-3653
     - CVE-2017-3641
     - CVE-2017-3636
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
index 6e0bbf0..480dc52 100644
--- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
+++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
@@ -6,7 +6,7 @@
 
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -372,7 +372,7 @@ then
+@@ -374,7 +374,7 @@ then
  fi
  
  # Create database directories
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
index cee41ac..d97b5bd 100644
--- a/debian/patches/50_mysql-test__db_test.diff
+++ b/debian/patches/50_mysql-test__db_test.diff
@@ -6,7 +6,7 @@
 ## DP: suite depends on them.
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3553,6 +3553,11 @@ sub mysql_install_db {
+@@ -3552,6 +3552,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git