Bug#882909: Acknowledgement (jessie-pu: package mariab-10.1/10.0.33-1)
Attached the final debdiff (also visible at
https://anonscm.debian.org/cgit/pkg-mysql/mariadb-10.0.git/diff/debian/?id2=debian/10.0.32-1&id=debian/10.0.33-0%2bdeb8u1)
Sorry for double submission. I thought the first email got lost in
cyberspace as there was no confirmation in 15 minutes, so I resent,
then in 3 minutes I got two confirmations...
diff --git a/debian/changelog b/debian/changelog
index 3b8346c8..84f917d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mariadb-10.0 (10.0.33-0+deb8u1) jessie; urgency=medium
+
+ * New upstream version 10.0.33. Includes fixes for the following
+ security vulnerabilities:
+ - CVE-2017-10378, MDEV-13819
+ - CVE-2017-10268
+ * Refresh patches on top of MariaDB 10.0.33
+
+ -- Otto Kekäläinen <otto@debian.org> Tue, 21 Nov 2017 11:05:51 +0100
+
mariadb-10.0 (10.0.32-1) jessie-security; urgency=medium
* New upstream version 10.0.32. Includes fixes for the following
diff --git a/debian/control b/debian/control
index ea171aca..7891fe3d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mariadb-10.0
Section: database
Priority: optional
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Uploaders: Otto Kekäläinen <otto@seravo.fi>, Arnaud Fontaine <arnau@debian.org>
+Uploaders: Otto Kekäläinen <otto@debian.org>, Ondřej Surý <ondrej@debian.org>
Build-Depends: bison,
chrpath,
cmake,
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 0067159e..b5914021 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -2,8 +2,8 @@ Description: Fix spelling errors
Author: Otto Kekäläinen <otto@seravo.fi>
Last-Update: 2014-10-02
---- mariadb-10.0.orig/storage/connect/tabxml.cpp
-+++ mariadb-10.0/storage/connect/tabxml.cpp
+--- a/storage/connect/tabxml.cpp
++++ b/storage/connect/tabxml.cpp
@@ -1845,7 +1845,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
if (N > Tdbp->Limit) {
@@ -13,9 +13,9 @@ Last-Update: 2014-10-02
PushWarning(g, Tdbp);
} // endif N
---- mariadb-10.0.orig/storage/connect/mysql-test/connect/r/xml_mult.result
-+++ mariadb-10.0/storage/connect/mysql-test/connect/r/xml_mult.result
-@@ -51,14 +51,14 @@ WEB XQuery Kick Start en Per Bothner 200
+--- a/storage/connect/mysql-test/connect/r/xml_mult.result
++++ b/storage/connect/mysql-test/connect/r/xml_mult.result
+@@ -49,14 +49,14 @@ WEB XQuery Kick Start en Per Bothner 200
WEB XQuery Kick Start en Kurt Cagle 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95
Warnings:
@@ -32,7 +32,7 @@ Last-Update: 2014-10-02
#
# Testing concatenated values
#
-@@ -91,12 +91,12 @@ CHILDREN Harry Potter en J K. Rowling 20
+@@ -89,12 +89,12 @@ CHILDREN Harry Potter en J K. Rowling 20
WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95
Warnings:
diff --git a/debian/patches/mysql-test__db_test.patch b/debian/patches/mysql-test__db_test.patch
index 3942d011..a5542ecc 100644
--- a/debian/patches/mysql-test__db_test.patch
+++ b/debian/patches/mysql-test__db_test.patch
@@ -4,17 +4,17 @@
## 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.
---- mariadb-10.0.orig/mysql-test/mysql-test-run.pl
-+++ mariadb-10.0/mysql-test/mysql-test-run.pl
-@@ -3603,6 +3603,11 @@ sub mysql_install_db {
- mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
- $bootstrap_sql_file);
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -3606,6 +3606,11 @@ sub mysql_install_db {
+ mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
+ $bootstrap_sql_file);
-+ mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n");
-+ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n");
-+ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n");
++ mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n");
++ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n");
++ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n");
+
+
- # Add test data for timezone - this is just a subset, on a real
- # system these tables will be populated either by mysql_tzinfo_to_sql
- # or by downloading the timezone table package from our website
+ # Add test data for timezone - this is just a subset, on a real
+ # system these tables will be populated either by mysql_tzinfo_to_sql
+ # or by downloading the timezone table package from our website
diff --git a/debian/patches/scripts__mysql_install_db.sh__no_test.patch b/debian/patches/scripts__mysql_install_db.sh__no_test.patch
index d0e36386..c200b6d5 100644
--- a/debian/patches/scripts__mysql_install_db.sh__no_test.patch
+++ b/debian/patches/scripts__mysql_install_db.sh__no_test.patch
@@ -4,9 +4,9 @@
## DP: scripts__mysql_install_db.sh__no_test
## DP: http://bugs.mysql.com/bug.php?id=6901
---- mariadb-10.0.orig/scripts/mysql_install_db.sh
-+++ mariadb-10.0/scripts/mysql_install_db.sh
-@@ -374,7 +374,7 @@ then
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
+@@ -376,7 +376,7 @@ then
fi
# Create database directories
Reply to: