Skip to content
GitLab
Commit a1b24a4a authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Updated changelog and refreshed patches after 10.0.25 import

parent b4113db2
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ a1b24a4a
mariadb-10.0 (10.0.24-8) UNRELEASED; urgency=low mariadb-10.0 (10.0.25-1) UNRELEASED; urgency=low
* Revert previous changes tailored for Ubuntu 16.04 compatibility. * Revert previous changes tailored for Ubuntu 16.04 compatibility.
* New upstream release 10.0.25. Includes fixes for the following
security vulnerabilities:
- CVE-2016-0666
- CVE-2016-0655
- CVE-2016-0648
- CVE-2016-0647
- CVE-2016-0643
* Updated old changelog entries to include new CVE identifiers.
* Upstream included changes to logrotate script that supports systems that
has multiple mysqld processes running (Closes: #810968).
-- Otto Kekäläinen <otto@debian.org> Sun, 24 Apr 2016 20:00:10 +0300 -- Otto Kekäläinen <otto@debian.org> Sat, 30 Apr 2016 21:00:18 +0300
mariadb-10.0 (10.0.24-7) unstable; urgency=low mariadb-10.0 (10.0.24-7) unstable; urgency=low
...@@ -70,6 +80,15 @@ mariadb-10.0 (10.0.24-1) unstable; urgency=low ...@@ -70,6 +80,15 @@ mariadb-10.0 (10.0.24-1) unstable; urgency=low
* New upstream release 10.0.24 * New upstream release 10.0.24
- Drop auth_socket patches as MDEV-8375 was partially fixed upstream - Drop auth_socket patches as MDEV-8375 was partially fixed upstream
- Refresh other patches - Refresh other patches
* New upstream release includes fixes for the following security
vulnerabilities:
- CVE-2016-0668
- CVE-2016-0650
- CVE-2016-0649
- CVE-2016-0646
- CVE-2016-0644
- CVE-2016-0641
- CVE-2016-0640
* Update filenames in d/copyright * Update filenames in d/copyright
[Ian Gilfillan] [Ian Gilfillan]
...@@ -118,6 +137,8 @@ mariadb-10.0 (10.0.23-1) unstable; urgency=low ...@@ -118,6 +137,8 @@ mariadb-10.0 (10.0.23-1) unstable; urgency=low
* New upstream release 10.0.23. Includes fixes for the following * New upstream release 10.0.23. Includes fixes for the following
security vulnerabilities: security vulnerabilities:
- CVE-2016-2047 - CVE-2016-2047
- CVE-2016-0651
- CVE-2016-0642
- CVE-2016-0616 - CVE-2016-0616
- CVE-2016-0609 - CVE-2016-0609
- CVE-2016-0608 - CVE-2016-0608
......
debian/patches/mdev-8375-built-in-auth-socket.patch
View file @ a1b24a4a
...@@ -18,4 +18,4 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375 ...@@ -18,4 +18,4 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375
+ +
# Create mtr database # Create mtr database
mtr_tofile($bootstrap_sql_file, mtr_tofile($bootstrap_sql_file,
"CREATE DATABASE mtr;\n"); "CREATE DATABASE mtr CHARSET=latin1;\n");
debian/patches/mdev-8375-passwordless-root-via-socket-auth.patch
View file @ a1b24a4a
...@@ -10,7 +10,7 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375 ...@@ -10,7 +10,7 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375
--- a/scripts/mysql_system_tables_data.sql --- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql +++ b/scripts/mysql_system_tables_data.sql
@@ -29,10 +29,7 @@ @@ -29,10 +29,7 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@
-- Fill "user" table with default users allowing root access -- Fill "user" table with default users allowing root access
-- from local machine if "user" table didn't exist before -- from local machine if "user" table didn't exist before
CREATE TEMPORARY TABLE tmp_user LIKE user; CREATE TEMPORARY TABLE tmp_user LIKE user;
...@@ -21,3 +21,4 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375 ...@@ -21,3 +21,4 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375
+INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N'); +INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N');
INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
DROP TABLE tmp_user; DROP TABLE tmp_user;
debian/patches/mdev-9528-mysql_embedded.patch
View file @ a1b24a4a
...@@ -22,10 +22,9 @@ Bug: https://jira.mariadb.org/browse/MDEV-9528 ...@@ -22,10 +22,9 @@ Bug: https://jira.mariadb.org/browse/MDEV-9528
+Use: For a full list of available options, see the mysql man page +Use: For a full list of available options, see the mysql man page
+.PP +.PP
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
--- a/man/CMakeLists.txt --- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt +++ b/man/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 @@ -26,7 +26,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_
SET(MAN8_SERVER mysqld.8) SET(MAN8_SERVER mysqld.8)
SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
......
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