diff --git a/debian/changelog b/debian/changelog index e8b7382..ada1bb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mariadb-5.5 (5.5.44-1ubuntu0.14.10.1) utopic-security; urgency=low + + * SECURITY UPDATE: Update to 5.5.44 to fix security issues (LP: #1464895): + - CVE-2015-3152 + * Upstream also includes lots of line ending changes (from CRLF -> LF) + * Removed hotfix patch now included in upstream release (MDEV-8115) + + -- Otto Kekäläinen Sat, 13 Jun 2015 21:09:48 +0300 + mariadb-5.5 (5.5.43-1ubuntu0.14.10.1) utopic-security; urgency=low * SECURITY UPDATE: Update to 5.5.43 to fix security issues (LP: #1451677): diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 104917d..e83ac1f 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -4,7 +4,12 @@ Priority: optional Maintainer: MariaDB Developers XSBC-Original-Maintainer: Maria Developers Uploaders: MariaDB Developers -Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), + perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), + zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, + libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, + dpatch, gawk, bison, lsb-release, hardening-wrapper, + ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) Standards-Version: 3.8.3 Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 0c33163..94424f3 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -4,7 +4,12 @@ Priority: optional Maintainer: MariaDB Developers XSBC-Original-Maintainer: Maria Developers Uploaders: MariaDB Developers -Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), + perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), + zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, + libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, + dpatch, gawk, bison, lsb-release, hardening-wrapper, + ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) Standards-Version: 3.8.2 Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files diff --git a/debian/patches/10_mysql_upgrade_crash_fix.patch b/debian/patches/10_mysql_upgrade_crash_fix.patch deleted file mode 100644 index 7a0c34e..0000000 --- a/debian/patches/10_mysql_upgrade_crash_fix.patch +++ /dev/null @@ -1,61 +0,0 @@ -From https://github.com/MariaDB/server/commit/0014bdc7.patch -From: Sergei Golubchik -Date: Thu, 7 May 2015 22:18:34 +0200 -Subject: [PATCH] MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW - -on REPAIR don't do table-specific stuff for views -(because even if the view has a temp table opened for it, -it's not opened all the way down the engine. In particular, -Aria crashes in maria_status() because MARIA_HA* info - that is -table->table->file->file - is NULL) ---- - mysql-test/r/repair.result | 7 +++++++ - mysql-test/t/repair.test | 9 +++++++++ - sql/sql_admin.cc | 2 +- - 3 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result -index 52ae9c3..51c3374 100644 ---- a/mysql-test/r/repair.result -+++ b/mysql-test/r/repair.result -@@ -207,3 +207,10 @@ check table t1; - Table Op Msg_type Msg_text - test.t1 check status OK - drop table t1; -+create table t1 (a blob); -+create view v1 as select * from t1; -+repair view v1; -+Table Op Msg_type Msg_text -+test.v1 repair status OK -+drop view v1; -+drop table t1; -diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test -index 337b73f..f625965 100644 ---- a/mysql-test/t/repair.test -+++ b/mysql-test/t/repair.test -@@ -208,3 +208,12 @@ repair table t1 use_frm; - select count(*) from t1; - check table t1; - drop table t1; -+ -+# -+# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW -+# -+create table t1 (a blob); -+create view v1 as select * from t1; -+repair view v1; -+drop view v1; -+drop table t1; -diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc -index 44057b6..9827c67 100644 ---- a/sql/sql_admin.cc -+++ b/sql/sql_admin.cc -@@ -901,7 +901,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, - break; - } - } -- if (table->table) -+ if (table->table && !table->view) - { - if (table->table->s->tmp_table) - { diff --git a/debian/patches/75_man_syntax_fixes.diff b/debian/patches/75_man_syntax_fixes.diff index c5d1ee3..2ef81e4 100644 --- a/debian/patches/75_man_syntax_fixes.diff +++ b/debian/patches/75_man_syntax_fixes.diff @@ -1,20 +1,20 @@ -Author: Colin Watson -Description: Fix man page syntax to make package Lintian clean - ---- a/man/mysqldump.1 -+++ b/man/mysqldump.1 -@@ -2041,12 +2041,12 @@ T} - T{ - \'\' (\fIempty string\fR) - T}:T{ -- -+\: - T} - T{ - \'NULL\' (\fIstring value\fR) - T}:T{ --NULL -+\:NULL - T} - .TE - .sp 1 +Author: Colin Watson +Description: Fix man page syntax to make package Lintian clean + +--- a/man/mysqldump.1 ++++ b/man/mysqldump.1 +@@ -2041,12 +2041,12 @@ T} + T{ + \'\' (\fIempty string\fR) + T}:T{ +- ++\: + T} + T{ + \'NULL\' (\fIstring value\fR) + T}:T{ +-NULL ++\:NULL + T} + .TE + .sp 1 diff --git a/debian/patches/series b/debian/patches/series index 8173b30..479a9ca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -10_mysql_upgrade_crash_fix.patch 33_scripts__mysql_create_system_tables__no_test.diff 38_scripts__mysqld_safe.sh__signals.diff 41_scripts__mysql_install_db.sh__no_test.diff diff --git a/debian/po/it.po b/debian/po/it.po index b6cdfd6..55b71bf 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,7 +1,8 @@ -# Italian (it) translation of debconf templates for mariadb-5.5 -# This file is distributed under the same license as the mariadb-5.5 package. -# Luca Monducci , 2006-2014. -# +# Italian (it) translation of debconf templates for mysql-dfsg-5.1 +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# Luca Monducci , 2006 - 2009. +# msgid "" msgstr "" "Project-Id-Version: mariadb-5.5 5.5.39 italian debconf templates\n" diff --git a/debian/po/nl.po b/debian/po/nl.po index eaf3fa1..c70fa54 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,9 +1,9 @@ -# Dutch mariadb po-debconf translation, -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mariadb package. -# Vincent Zweije , 2006. -# Frans Spiesschaert , 2014. -# +# Dutch mariadb po-debconf translation, +# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mariadb package. +# Vincent Zweije , 2006. +# Frans Spiesschaert , 2014. +# msgid "" msgstr "" "Project-Id-Version: mariadb-5.5_5.5.39-2\n" diff --git a/debian/po/sv.po b/debian/po/sv.po index d0ec550..baba7c3 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,9 +1,9 @@ -# Translation of mysql-dfsg-5.1 debconf template to Swedish -# Copyright (C) 2009 Martin Bagge -# This file is distributed under the same license as the mysql-dfsg-5.1 package. -# -# Andreas Henriksson , 2007 -# Martin Bagge , 2009 +# Translation of mysql-dfsg-5.1 debconf template to Swedish +# Copyright (C) 2009 Martin Bagge +# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# +# Andreas Henriksson , 2007 +# Martin Bagge , 2009 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"