[Pkg-mysql-commits] [mariadb-5.5] 04/04: Update changelog and refresh patches after 5.5.52 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 fa322efd5ce6cdaa12d3f6cb4fd8e3b0f99594bc
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Wed Sep 14 21:14:02 2016 +0300

    Update changelog and refresh patches after 5.5.52 import
---
 debian/changelog                                             | 12 +++++++++---
 .../33_scripts__mysql_create_system_tables__no_test.diff     |  4 ++--
 debian/patches/41_scripts__mysql_install_db.sh__no_test.diff |  4 ++--
 debian/patches/50_mysql-test__db_test.diff                   |  2 +-
 debian/patches/61_replace_dash_with_bash_mbug675185.diff     |  5 ++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a85044..53cde6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
-mariadb-5.5 (5.5.50-1ubuntu0.14.04.1) UNRELEASED; urgency=low
+mariadb-5.5 (5.5.52-1ubuntu0.14.04.1) trusty-security; urgency=low
 
-  * SECURITY UPDATE: New upstream release 5.5.50 (LP: #1605493)
+  * SECURITY UPDATE: New upstream release 5.5.52 (LP: #1605493)
+    - Latest maintenance release includes only fixes to serious bugs.
+  * Previous release 5.5.51 included included fixes for
+    the following security vulnerabilities:
+    - CVE-2016-6662
+  * Previous release 5.5.50 included included fixes for
+    the following security vulnerabilities:
     - CVE-2016-5440
     - CVE-2016-3615
     - CVE-2016-3521
     - CVE-2016-3477
   * Update previous changelog entries to contain new CVE identifiers
 
- -- Otto Kekäläinen <otto at debian.org>  Fri, 22 Jul 2016 09:24:36 +0300
+ -- Otto Kekäläinen <otto at debian.org>  Wed, 14 Sep 2016 21:01:08 +0300
 
 mariadb-5.5 (5.5.49-1ubuntu0.14.04.1) trusty-security; urgency=low
 
diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
index 59e9e39..c297ce4 100644
--- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
+++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
@@ -6,8 +6,8 @@
 ## DP: circumstances as it is checked first. See #301741.
 ## DP: http://bugs.mysql.com/bug.php?id=6901
 
---- old/scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
-+++ new/scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
+--- a/scripts/mysql_system_tables_data.sql
++++ b/scripts/mysql_system_tables_data.sql
 @@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
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 a44fbdb..6e0bbf0 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
@@ -4,8 +4,8 @@
 ## DP: scripts__mysql_install_db.sh__no_test
 ## DP: http://bugs.mysql.com/bug.php?id=6901
 
---- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh	2008-01-29 22:41:20.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh	2008-02-28 10:08:11.000000000 +0100
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
 @@ -372,7 +372,7 @@ then
  fi
  
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
index d61b0f8..4c84314 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
-@@ -3573,6 +3573,11 @@ sub mysql_install_db {
+@@ -3556,6 +3556,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  
diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.diff b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
index 1d920b1..83292df 100644
--- a/debian/patches/61_replace_dash_with_bash_mbug675185.diff
+++ b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
@@ -5,12 +5,11 @@
 ## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
 ## DP: Fix by using bash instead.
 ## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
---- old/scripts/mysqld_safe.sh	2010-04-09 11:47:18 +0000
-+++ new/scripts/mysqld_safe.sh	2010-11-21 09:40:50 +0000
+--- a/scripts/mysqld_safe.sh
++++ b/scripts/mysqld_safe.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
  # This file is public domain and comes with NO WARRANTY of any kind
  #
-

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