Commit 1ffe3f44 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update changelog and refresh patches after 5.5.50 import

parent 28a18fef
mariadb-5.5 (5.5.50-1ubuntu0.14.04.1) trusty-security; urgency=low
* SECURITY UPDATE: New upstream release 5.5.50 (LP: #1605493)
- 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@debian.org> Fri, 22 Jul 2016 09:24:36 +0300
mariadb-5.5 (5.5.49-1ubuntu0.14.04.1) trusty-security; urgency=low
* SECURITY UPDATE: New upstream release 5.5.49
- CVE-2016-5444
- CVE-2016-3452
- CVE-2016-0647
- CVE-2016-0648
- CVE-2016-0666
......@@ -41,6 +54,8 @@ mariadb-5.5 (5.5.47-1ubuntu0.14.04.1) trusty-security; urgency=low
mariadb-5.5 (5.5.46-1ubuntu0.14.04.2) trusty-security; urgency=low
* SECURITY UPDATE: Update to 5.5.46 to fix security issues (LP: #1512241):
- CVE-2016-3471
- CVE-2015-7744
- CVE-2015-4913
- CVE-2015-4870
- CVE-2015-4861
......
......@@ -4,9 +4,9 @@
## DP: Executes /etc/init.d/mysql on signals
## DP: Reported as http://bugs.mysql.com/bug.php?id=31361
--- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000
+++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000
@@ -33,7 +33,6 @@ err_log=
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -33,7 +33,6 @@ err_log_base=
syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe
......@@ -37,4 +37,3 @@
# Uncomment the following lines if you want all tables to be automatically
# checked and repaired during startup. You should add sensible key_buffer
# and sort_buffer values to my.cnf to improve check performance or require
Author: Christian Hammers <ch@debian.org>
Description: Removes unnecessary library dependencies. See #390692
--- old/scripts/mysql_config.sh 2014-04-17 22:07:38.668960760 +0300
+++ new/scripts/mysql_config.sh 2014-04-17 22:08:33.528958126 +0300
@@ -107,10 +107,10 @@
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -107,10 +107,10 @@ fi
# Create options
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
......
......@@ -4,9 +4,9 @@
## DP: Patch 33_scripts__mysql_create_system_tables__no_test removes the
## DP: rights for anybody to connect to the test database but the test
## DP: suite depends on them.
--- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200
+++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200
@@ -3570,6 +3570,11 @@ sub mysql_install_db {
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3573,6 +3573,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
......
Author: Otto Kekäläinen <otto@seravo.fi>
Description: Extend timeout as some Debian pbuilder/sbuilder chroots may be very slow to run these
--- old/mysql-test/CMakeLists.txt 2014-02-12 17:55:23.469136898 +0200
+++ new/mysql-test/CMakeLists.txt 2014-02-12 17:54:07.471406742 +0200
@@ -64,7 +64,7 @@
--- a/mysql-test/CMakeLists.txt
+++ b/mysql-test/CMakeLists.txt
@@ -64,7 +64,7 @@ ELSE()
ENDIF()
+SET(MTR_FORCE perl ./mysql-test-run.pl --force --testcase-timeout=30 --suite-timeout=540)
-SET(MTR_FORCE perl ./mysql-test-run.pl --force)
+SET(MTR_FORCE perl ./mysql-test-run.pl --force --testcase-timeout=30 --suite-timeout=540)
IF(EXISTS ${CMAKE_SOURCE_DIR}/mysql-test/suite/nist)
SET(TEST_NIST ${MTR_FORCE} --comment=nist suite=nist ${EXP} &&
${MTR_FORCE} --comment=nist --force --suite=nist+ps ${EXP})
Author: Otto Kekäläinen <otto@seravo.fi>
Description: Remove upstream debian/* handling that is obsolete
--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200
+++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200
@@ -436,12 +436,6 @@ CONFIGURE_FILE(
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,12 +438,6 @@ CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment