Re: Request for permission to upload MariaDB 10.0.19 with debian/* bugfixes and security fixes together
On Wed, Jul 15, 2015 at 07:13:56AM +0200, Salvatore Bonaccorso wrote:
> I have uploaded Otto's package with attached (filtered) debdiff to
> security-master to be released with a DSA (as well including the
> still discussed changes).
... now really attached.
Regards,
Salvatore
--- mariadb-10.0-10.0.16/debian/changelog 2015-02-03 02:31:41.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/changelog 2015-07-14 21:20:04.000000000 +0200
@@ -1,3 +1,52 @@
+mariadb-10.0 (10.0.20-0+deb8u1) jessie-security; urgency=high
+
+ [ Otto Kekäläinen ]
+ * New upstream release 10.0.20. Includes fixes for the following security
+ vulnerabilities:
+ - CVE-2015-3152: Client command line option --ssl-verify-server-cert (and
+ MYSQL_OPT_SSL_VERIFY_SERVER_CERT option of the client API) when used
+ together with --ssl will ensure that the established connection is
+ * Includes fixes done in 10.0.18 for the following security vulnerabilities:
+ - CVE-2014-8964 bundled PCRE contained heap-based buffer overflow
+ vulnerability that allowed the server to crash or have other unspecified
+ impact via a crafted regular expression made possible with the
+ REGEXP_SUBSTR function (MDEV-8006).
+ - CVE-2015-0501
+ - CVE-2015-2571
+ - CVE-2015-0505
+ - CVE-2015-0499
+ * Includes fixes done in 10.0.17 for the following security vulnerabilities:
+ - CVE-2015-2568
+ - CVE-2015-2573
+ - CVE-2015-0433
+ - CVE-2015-0441
+ * Import of 10.0.17 included updated lines to the mariadb-server-10.0.postinst
+ (upstream commit dc94bd0) which add parameter '--disable-log-bin' to the
+ 'mysql_install_db' and 'mysqld --bootstrap' commands
+ * Security: improved hardening flags (hardening=+all,-pie) so that the
+ resulting binaries would have closer to the same security features as the
+ old binaries had when built using deprecated hardening-wrapper.
+ * Removed /var/log/mysql.log from logrotate. No mysql related log should be
+ directly under /var/log. The correct place is in /var/log/mysql
+ * d/control: Related to innochecksum manpage move, also break/replace
+ the mysql-client-5.5/6 packages (Closes: #779873)
+ * Documentation changes:
+ * Updated Swedish translation by Martin Bagge
+ and Anders Jonsson (Closes: #781684)
+ * Updated copyright file based on Lintian feedback
+
+ [ Robie Basak ]
+ * Move innochecksum back to mariadb-server-core-10.0 to align with other
+ variants (LP: #1421520).
+
+ [ Jan Wagner ]
+ * Adding mysqld_multi.server_lsb-header.patch, provides LSB headers for
+ example initscript (Closes: #778762)
+ * Adding mysqld_multi_confd.patch, makes mysqld_multi reading conf.d
+ (Closes: #778761)
+
+ -- Otto Kekäläinen <otto@seravo.fi> Sun, 10 May 2015 18:41:11 +0300
+
mariadb-10.0 (10.0.16-1) unstable; urgency=low
[ Julien Muchembled ]
--- mariadb-10.0-10.0.16/debian/control 2014-12-08 23:30:17.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/control 2015-07-14 21:20:04.000000000 +0200
@@ -111,11 +111,17 @@
Architecture: any
Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
Conflicts: mariadb-galera-server-5.5, mysql-server-5.5, mysql-server-5.6
-Breaks: mariadb-server-core-5.5,
+Breaks: mariadb-client-10.0 (<< ${source:Version}),
+ mariadb-server-core-5.5,
+ mysql-client-5.5,
+ mysql-client-5.6,
mysql-server-core-5.5,
mysql-server-core-5.6,
virtual-mysql-server-core
-Replaces: mariadb-server-core-5.5,
+Replaces: mariadb-client-10.0 (<< ${source:Version}),
+ mariadb-server-core-5.5,
+ mysql-client-5.5,
+ mysql-client-5.6,
mysql-server-core-5.5,
mysql-server-core-5.6,
virtual-mysql-server-core
--- mariadb-10.0-10.0.16/debian/copyright 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/copyright 2015-07-14 21:20:04.000000000 +0200
@@ -492,29 +492,6 @@
cmd-line-utils/libedit/readline/*
Copyright: 1997-2001 The NetBSD Foundation Inc
License: BSD-2-clause
- This code is derived from software contributed to The NetBSD Foundation
- by Jaromir Dolecek.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
Files: sql-bench/*.sh
Copyright: 2009 Sun Microsystems, Inc
@@ -617,16 +594,12 @@
2000,2002,2005-2011 Oracle and/or its affiliates
tommy@valley.ne.jp
License: LGPL
- On Debian and systems the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2`
Files: scripts/mysqld_safe.sh
support-files/mysql-multi.server.sh
support-files/mysql.server.sh
Copyright: 1996 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB
License: public-domain
- This file is public domain and comes with NO WARRANTY of any kind
Files: sql/sql_yacc.cc sql/sql_yacc.h storage/xtradb/fts/fts0pars.cc
storage/xtradb/include/fts0pars.h
@@ -713,18 +686,6 @@
2009-2011, Monty Program Ab
License: BSD-2-clause
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
Files: cmd-line-utils/libedit/np/strlcat.c
cmd-line-utils/libedit/np/strlcpy.c
Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -745,63 +706,16 @@
sql/nt_servc.h
Copyright: 1998 Abandoned Irena Pancirov - Irnet Snc
License: public-domain
- This file is public domain and comes with NO WARRANTY of any kind
Files: dbug/dbug.c
dbug/dbug_long.h
Copyright: 1987 Abandoned Fred Fish
License: public-domain
- N O T I C E
- .
- Copyright Abandoned, 1987, Fred Fish
- .
- .
- This previously copyrighted work has been placed into the public
- domain by the author and may be freely used for any purpose
- private or commercial.
- .
- Because of the number of inquiries I was receiving about the use
- of this product in commercially developed works I have decided to
- simply make it public domain to further its unrestricted use. I
- specifically would be most happy to see this material become a
- part of the standard Unix distributions by AT&T and the Berkeley
- Computer Science Research Group, and a standard part of the GNU
- system from the Free Software Foundation.
- .
- I would appreciate it, as a courtesy, if this notice is left in
- all copies and derivative works. Thank you.
- .
- The author makes no warranty of any kind with respect to this
- product and explicitly disclaims any implied warranties of mer-
- chantability or fitness for any particular purpose.
Files: cmd-line-utils/libedit/np/vis.c
Copyright: 1989-1993 The Regents of the University of California.
1999-2005 The NetBSD Foundation Inc
License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
Files: scripts/dheadgen.pl
Copyright: 2008-2009 Sun Microsystems Inc
@@ -896,7 +810,6 @@
Files: tests/mail_to_db.pl
Copyright: 1998 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB
License: public-domain
- This file is public domain and comes with NO WARRANTY of any kind
Files: scripts/mysqlaccess.conf
Copyright: 1997, Yves.Carlier@rug.ac.be
@@ -1064,6 +977,18 @@
License version 2 can be found in the file
`/usr/share/common-licenses/LGPL-2`
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
--- mariadb-10.0-10.0.16/debian/mariadb-client-10.0.install 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/mariadb-client-10.0.install 2015-07-14 21:19:36.000000000 +0200
@@ -1,6 +1,5 @@
debian/additions/innotop/innotop usr/bin/
debian/additions/mysqlreport usr/bin/
-usr/bin/innochecksum
usr/bin/mysql_find_rows
usr/bin/mysql_fix_extensions
usr/bin/mysql_waitpid
--- mariadb-10.0-10.0.16/debian/mariadb-client-10.0.manpages 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/mariadb-client-10.0.manpages 2015-07-14 21:19:36.000000000 +0200
@@ -11,4 +11,3 @@
debian/tmp/usr/share/man/man1/mysqlshow.1
debian/tmp/usr/share/man/man1/mysqlslap.1
debian/tmp/usr/share/man/man1/mysql_waitpid.1
-debian/tmp/usr/share/man/man1/innochecksum.1
--- mariadb-10.0-10.0.16/debian/mariadb-server-10.0.lintian-overrides 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/mariadb-server-10.0.lintian-overrides 2015-07-14 21:20:04.000000000 +0200
@@ -1,6 +1,10 @@
# OK, embedded has same source
mariadb-server-10.0: embedded-library usr/bin/mysqlbinlog: libmysqlclient
# ash's buildin has no "-e" so use /bin/echo
-mariadb-server-10.0: command-with-path-in-maintainer-script postinst:198 /bin/echo
-mariadb-server-10.0: command-with-path-in-maintainer-script postinst:212 /bin/echo
-mariadb-server-10.0: command-with-path-in-maintainer-script postinst:220 /bin/echo
+mariadb-server-10.0: command-with-path-in-maintainer-script postinst:199 /bin/echo
+mariadb-server-10.0: command-with-path-in-maintainer-script postinst:213 /bin/echo
+mariadb-server-10.0: command-with-path-in-maintainer-script postinst:221 /bin/echo
+# OK, path /usr/sbin/invoke-rc.d is only used in check, executes are run without the path
+mariadb-server-10.0: command-with-path-in-maintainer-script postinst:17 /usr/sbin/invoke-rc.d
+mariadb-server-10.0: command-with-path-in-maintainer-script postrm:15 /usr/sbin/invoke-rc.d
+mariadb-server-10.0: command-with-path-in-maintainer-script preinst:28 /usr/sbin/invoke-rc.d
--- mariadb-10.0-10.0.16/debian/mariadb-server-10.0.mysql-server.logrotate 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/mariadb-server-10.0.mysql-server.logrotate 2015-07-14 21:20:04.000000000 +0200
@@ -2,7 +2,7 @@
# flush-logs'd only once.
# Else the binary logs would automatically increase by n times every day.
# - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log {
+/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log {
daily
rotate 7
missingok
--- mariadb-10.0-10.0.16/debian/mariadb-server-10.0.postinst 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/mariadb-server-10.0.postinst 2015-07-14 21:20:04.000000000 +0200
@@ -21,7 +21,7 @@
fi
}
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam"
test_passwordless_root_login() {
mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
@@ -40,6 +40,7 @@
# this avoids us having to call "test" or "[" on $rootpw
cat << EOF > $tfile
USE mysql;
+SET sql_log_bin=0;
UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root';
FLUSH PRIVILEGES;
EOF
@@ -145,7 +146,7 @@
# Debian: beware of the bashisms...
# Debian: can safely run on upgrades with existing databases
set +e
- bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
+ bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
set -e
## On every reconfiguration the maintenance user is recreated.
--- mariadb-10.0-10.0.16/debian/mariadb-server-core-10.0.install 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/mariadb-server-core-10.0.install 2015-07-14 21:19:36.000000000 +0200
@@ -1,3 +1,4 @@
+usr/bin/innochecksum
usr/sbin/mysqld
usr/share/mysql/charsets
usr/share/mysql/czech
--- mariadb-10.0-10.0.16/debian/mariadb-server-core-10.0.manpages 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/mariadb-server-core-10.0.manpages 2015-07-14 21:19:36.000000000 +0200
@@ -1 +1,2 @@
debian/tmp/usr/share/man/man8/mysqld.8
+debian/tmp/usr/share/man/man1/innochecksum.1
--- mariadb-10.0-10.0.16/debian/mariadb-test-10.0.lintian-overrides 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/mariadb-test-10.0.lintian-overrides 2015-07-14 21:19:36.000000000 +0200
@@ -1,8 +1,3 @@
-# OK, embedded has same source
-mariadb-test-10.0: embedded-library usr/bin/mysql_client_test: libmysqlclient
-mariadb-test-10.0: embedded-library usr/bin/mysql_client_test_embedded: libmysqlclient
-mariadb-test-10.0: embedded-library usr/bin/mysqltest: libmysqlclient
-mariadb-test-10.0: embedded-library usr/bin/mysqltest_embedded: libmysqlclient
# OK, this file is part of test suite and only used for a test
mariadb-test-10.0: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
# OK, this file is part of test suite and only used for a test
@@ -23,4 +18,5 @@
mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result
-
+mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/maintainer-general-record.sh
+mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/lib/generate-ssl-certs.sh
--- mariadb-10.0-10.0.16/debian/patches/fix-spelling-errors.patch 2014-11-25 23:21:53.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/fix-spelling-errors.patch 2015-07-14 21:19:36.000000000 +0200
@@ -4,7 +4,7 @@
--- mariadb-10.0-10.0.13.orig/storage/connect/tabxml.cpp
+++ mariadb-10.0-10.0.13/storage/connect/tabxml.cpp
-@@ -1490,7 +1490,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
+@@ -1798,7 +1798,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
if (N > Tdbp->Limit) {
N = Tdbp->Limit;
--- mariadb-10.0-10.0.16/debian/patches/mysqld_multi_confd.patch 1970-01-01 01:00:00.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/mysqld_multi_confd.patch 2015-07-14 21:19:36.000000000 +0200
@@ -0,0 +1,12 @@
+Description: Makes mysqld_multi reading conf.d (Closes: #778761)
+Author: Jan Wagner <waja@cyconet.org>
+--- a/scripts/mysqld_multi.sh
++++ b/scripts/mysqld_multi.sh
+@@ -504,6 +504,7 @@
+ '@prefix@/my.cnf',
+ ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef),
+ $opt{'extra-file'},
++ </etc/mysql/conf.d/*.cnf>,
+ ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef));
+ }
+
--- mariadb-10.0-10.0.16/debian/patches/mysqld_multi.server_lsb-header.patch 1970-01-01 01:00:00.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/mysqld_multi.server_lsb-header.patch 2015-07-14 21:20:04.000000000 +0200
@@ -0,0 +1,31 @@
+Author: Jan Wagner <waja@cyconet.org>
+Description: Provides LSB headers for example initscript (Closes: #778762)
+--- a/support-files/mysqld_multi.server.sh
++++ b/support-files/mysqld_multi.server.sh
+@@ -14,8 +14,24 @@
+ # Version 1.0
+ #
+
+-basedir=/usr/local/mysql
+-bindir=/usr/local/mysql/bin
++### BEGIN INIT INFO
++# Provides: mysqld_multi
++# Required-Start: $remote_fs $syslog
++# Required-Stop: $remote_fs $syslog
++# Should-Start: $network $named $time
++# Should-Stop: $network $named $time
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++# Short-Description: Start and stop multiple mysql database server daemon instances
++# Description: Controls multiple MariaDB database server daemon instances
++### END INIT INFO
++
++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++NAME=mysqld_multi
++DESC=mysqld_multi
++
++basedir=/usr
++bindir=/usr/bin
+
+ if test -x $bindir/mysqld_multi
+ then
--- mariadb-10.0-10.0.16/debian/patches/mysql-test__db_test.patch 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/patches/mysql-test__db_test.patch 2015-07-14 21:19:36.000000000 +0200
@@ -6,14 +6,14 @@
## 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
-@@ -3588,6 +3588,11 @@ sub mysql_install_db {
+@@ -3602,6 +3602,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");
-+
++
+
# 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
--- mariadb-10.0-10.0.16/debian/patches/new_valid_certs.patch 2015-02-03 00:22:13.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/new_valid_certs.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,777 +0,0 @@
-Author: Otto Kekäläinen <otto@seravo.fi>
-Subject: Backported new cacert.pem and certs verified by it
-from commit https://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/4416
-Last-Update: 2015-01-29
-
-=== added file 'mysql-test/lib/generate-ssl-certs.sh'
---- old/mysql-test/lib/generate-ssl-certs.sh 1970-01-01 00:00:00 +0000
-+++ new/mysql-test/lib/generate-ssl-certs.sh 2015-01-29 13:34:31 +0000
-@@ -0,0 +1,31 @@
-+#/bin/sh -xe
-+
-+# simply run me from mysql-test/
-+cd std_data/
-+
-+# boilerplace for "openssl ca" and /etc/ssl/openssl.cnf
-+rm -rf demoCA
-+mkdir demoCA demoCA/private demoCA/newcerts
-+touch demoCA/index.txt
-+echo 01 > demoCA/serial
-+
-+# CA certificate, self-signed
-+openssl req -x509 -newkey rsa:2048 -keyout demoCA/private/cakey.pem -out cacert.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' -text
-+
-+# server certificate signing request and private key
-+openssl req -newkey rsa:1024 -keyout server-key.pem -out demoCA/server-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB/CN=localhost'
-+# convert the key to yassl compatible format
-+openssl rsa -in server-key.pem -out server-key.pem
-+# sign the server certificate with CA certificate
-+openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out server-cert.pem -infiles demoCA/server-req.pem
-+
-+openssl req -newkey rsa:8192 -keyout server8k-key.pem -out demoCA/server8k-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB/CN=server'
-+openssl rsa -in server8k-key.pem -out server8k-key.pem
-+openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out server8k-cert.pem -infiles demoCA/server8k-req.pem
-+
-+openssl req -newkey rsa:1024 -keyout client-key.pem -out demoCA/client-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB'
-+openssl rsa -in client-key.pem -out client-key.pem
-+# if the folloing will require a common name - that's defined in /etc/ssl/openssl.cnf, under policy_anything
-+openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out client-cert.pem -infiles demoCA/client-req.pem
-+
-+rm -rf demoCA
-
-=== modified file 'mysql-test/std_data/cacert.pem'
---- old/mysql-test/std_data/cacert.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/cacert.pem 2015-01-29 13:34:31 +0000
-@@ -1,22 +1,77 @@
-+Certificate:
-+ Data:
-+ Version: 3 (0x2)
-+ Serial Number: 18344029820145564920 (0xfe9315ee3af2fcf8)
-+ Signature Algorithm: sha1WithRSAEncryption
-+ Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-+ Validity
-+ Not Before: Jan 29 13:33:36 2015 GMT
-+ Not After : Jan 24 13:33:36 2035 GMT
-+ Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-+ Subject Public Key Info:
-+ Public Key Algorithm: rsaEncryption
-+ Public-Key: (2048 bit)
-+ Modulus:
-+ 00:ad:79:3b:d1:c4:f3:fd:72:e8:4a:9e:54:db:44:
-+ 86:c7:57:a9:53:2e:01:5a:5b:04:b8:b7:15:02:28:
-+ b2:e8:8a:8d:0e:32:29:a6:cc:63:00:fb:e4:7a:ec:
-+ 27:b0:09:8f:4d:34:95:c5:9e:2e:92:20:8b:ec:88:
-+ d3:08:75:c7:c0:61:46:60:79:bb:0f:5f:e4:08:d7:
-+ b2:20:08:1a:71:a9:ea:f2:d6:55:40:26:82:9b:2c:
-+ 6a:00:66:74:58:ea:e8:6c:77:74:81:10:3b:78:7f:
-+ 20:75:9c:ac:7a:63:af:0e:b6:7b:e8:94:13:00:b8:
-+ 7d:33:7a:c7:49:1f:b2:84:ce:0d:89:4a:97:ee:61:
-+ 0a:1d:8b:a7:8b:45:90:dc:cc:e6:56:dc:aa:28:b2:
-+ cb:83:09:e7:7b:9a:7c:3e:da:4f:11:d0:b2:95:0d:
-+ 96:c0:b0:41:63:2d:2b:45:2f:6d:46:38:5a:b0:93:
-+ e6:07:af:d1:2f:15:ff:84:f3:05:62:a5:28:1a:a4:
-+ 40:23:3d:c6:77:60:2c:55:7d:fd:af:da:4a:e8:fb:
-+ 16:03:9a:67:4b:76:a6:ec:96:ba:46:86:f2:fb:7c:
-+ eb:2c:59:5c:af:e7:79:50:26:05:d4:71:c3:d5:62:
-+ d5:2b:17:35:d3:32:4e:b4:df:30:7d:8b:fd:ba:c3:
-+ a6:5d
-+ Exponent: 65537 (0x10001)
-+ X509v3 extensions:
-+ X509v3 Subject Key Identifier:
-+ D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
-+ X509v3 Authority Key Identifier:
-+ keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
-+
-+ X509v3 Basic Constraints:
-+ CA:TRUE
-+ Signature Algorithm: sha1WithRSAEncryption
-+ 8d:9f:56:93:67:4b:77:e1:4c:f0:3c:6b:9c:8a:a0:a5:3d:5d:
-+ a7:21:72:5e:bc:4c:88:16:61:95:3d:e6:34:da:a6:b0:8c:6e:
-+ 94:4c:69:ea:c6:8a:fa:2c:3d:bf:f9:8e:b5:d1:69:ac:a1:46:
-+ 12:95:bc:fd:67:21:1e:ca:0f:49:77:f8:54:29:aa:06:5b:08:
-+ 0b:8e:0b:4f:9d:52:da:03:9e:a1:31:1b:4a:bb:df:cb:d7:ba:
-+ b1:20:d7:77:bc:3b:87:e4:ae:46:59:13:88:cd:76:ab:15:68:
-+ c5:90:d7:01:fb:7b:16:30:7f:f8:1e:c5:3d:a3:e2:61:d9:35:
-+ fe:70:af:9a:47:12:59:26:27:b1:f6:a2:d8:99:80:a1:a4:a3:
-+ a3:77:ad:40:90:8c:4e:7e:83:b0:c0:0e:fb:0b:c3:9f:ac:8d:
-+ ee:65:fe:7d:85:2b:b3:93:62:56:50:f3:ca:68:68:76:37:9d:
-+ e7:85:13:45:c1:c8:9e:c6:ba:eb:ef:24:85:e8:47:31:82:53:
-+ 1b:c4:66:b3:c3:e6:89:5f:3e:18:9f:f5:ed:66:19:9e:57:5b:
-+ 3d:6a:2f:fb:c2:e3:5a:40:d0:5b:2e:ac:f6:a4:c6:5b:ee:a5:
-+ 76:a0:af:a8:c0:c0:e1:2f:78:6c:7b:fa:fe:a8:2d:8b:cf:2b:
-+ c8:87:ee:09
- -----BEGIN CERTIFICATE-----
--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
- -----END CERTIFICATE-----
-
-=== modified file 'mysql-test/std_data/client-cert.pem'
---- old/mysql-test/std_data/client-cert.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/client-cert.pem 2015-01-29 13:34:31 +0000
-@@ -1,69 +1,68 @@
- Certificate:
- Data:
- Version: 3 (0x2)
-- Serial Number: 6 (0x6)
-- Signature Algorithm: sha1WithRSAEncryption
-+ Serial Number: 3 (0x3)
-+ Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
- Validity
-- Not Before: Feb 20 03:03:26 2010 GMT
-- Not After : Sep 3 03:03:26 2030 GMT
-+ Not Before: Jan 29 13:33:49 2015 GMT
-+ Not After : Jan 24 13:33:49 2035 GMT
- Subject: C=SE, ST=Uppsala, O=MySQL AB
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
-- RSA Public Key: (1024 bit)
-- Modulus (1024 bit):
-- 00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2:
-- 23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f:
-- 4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d:
-- 78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d:
-- 59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4:
-- 51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56:
-- bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df:
-- 65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4:
-- c1:60:19:5f:96:56:7e:55:19
-+ Public-Key: (1024 bit)
-+ Modulus:
-+ 00:c1:f6:6e:41:de:b5:80:fe:10:6d:c5:15:98:53:
-+ 85:4a:88:51:06:85:30:7f:c9:92:87:51:3a:d6:8d:
-+ d3:9c:0e:91:c2:39:30:e9:b2:6e:53:4a:3a:aa:a3:
-+ 8b:ce:c0:93:94:c9:65:db:89:8e:21:2b:af:2a:ff:
-+ 7b:5a:0f:b9:03:99:f0:eb:20:d4:2c:39:00:0e:5a:
-+ b7:2b:17:e6:78:54:4f:54:23:36:81:b2:db:3e:48:
-+ cd:8e:14:36:b4:4f:6e:4d:a1:84:64:29:b7:68:3c:
-+ 45:3e:eb:9a:9b:8f:e2:d0:35:a8:0c:e6:70:4e:ac:
-+ 78:74:d5:45:aa:67:33:81:0d
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Basic Constraints:
- CA:FALSE
-+ Netscape Comment:
-+ OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
-- 8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F
-+ 17:61:EA:3F:25:92:55:2B:04:1C:D8:C7:A9:F6:61:C9:D9:99:A4:C9
- X509v3 Authority Key Identifier:
-- keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-- DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-- serial:BE:58:AD:4C:1F:3D:25:95
-+ keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
-
- Signature Algorithm: sha1WithRSAEncryption
-- a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc:
-- b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17:
-- 6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79:
-- ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb:
-- 45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1:
-- 21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98:
-- 4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73:
-- 3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64:
-- 62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74:
-- e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18:
-- 55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff:
-- 12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2:
-- ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93:
-- 54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f:
-- 1d:c4:76:d0
-+ 78:ea:34:4f:ac:c5:0b:17:bd:c9:f4:28:bd:b2:b1:cd:a7:58:
-+ 74:4f:00:82:82:c8:a5:71:fe:f4:2f:54:d0:e0:ae:b0:57:87:
-+ 7d:e6:2e:14:4a:49:21:43:c3:b5:39:e4:7c:0f:fe:8b:c5:5d:
-+ 5e:84:bc:42:2a:2a:a1:69:10:30:dc:e8:a6:ba:79:8b:a0:56:
-+ 09:ab:a3:ce:db:32:b2:10:7a:9f:b7:7a:46:80:4a:90:59:af:
-+ 81:5c:c7:92:20:46:9d:0e:27:20:e5:9a:da:b3:26:96:37:3b:
-+ 87:e7:13:93:ba:8d:be:d3:9d:7a:cb:6d:96:75:36:54:e1:cd:
-+ 7e:ff:0d:2d:3c:6a:cd:50:b3:a5:73:a8:83:a0:a7:a2:aa:fa:
-+ 6e:49:b9:77:fc:03:16:21:bb:c7:8a:4a:79:5f:a9:7e:b9:21:
-+ 6d:84:a7:5f:96:60:38:42:f7:d0:82:de:87:74:d4:05:93:b8:
-+ 94:ae:d1:eb:0c:26:96:60:d5:d8:6c:cc:17:40:85:2f:ac:f8:
-+ 31:f5:f5:76:d0:f1:3f:aa:87:81:b9:a0:93:71:28:6a:b2:f6:
-+ 74:36:a1:fa:f8:dc:39:a8:cd:b7:75:79:d0:40:73:6c:d6:b2:
-+ dc:9e:58:a5:51:e5:09:f0:3d:c2:2f:3d:16:ab:41:26:ec:3b:
-+ 71:04:2d:eb
- -----BEGIN CERTIFICATE-----
--MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
--MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
--UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG
--EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ
--KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e
--Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE
--UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ
--X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl
--eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG
--MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz
--YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA
--A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q
--xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh
--gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7
--XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST
--YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU
--EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ
-+MIIC6DCCAdCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECAwHVXBwc2FsYTEQMA4GA1UEBwwHVXBwc2FsYTERMA8GA1UECgwITXlT
-+UUwgQUIwHhcNMTUwMTI5MTMzMzQ5WhcNMzUwMTI0MTMzMzQ5WjAyMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECAwHVXBwc2FsYTERMA8GA1UECgwITXlTUUwgQUIwgZ8wDQYJ
-+KoZIhvcNAQEBBQADgY0AMIGJAoGBAMH2bkHetYD+EG3FFZhThUqIUQaFMH/JkodR
-+OtaN05wOkcI5MOmyblNKOqqji87Ak5TJZduJjiErryr/e1oPuQOZ8Osg1Cw5AA5a
-+tysX5nhUT1QjNoGy2z5IzY4UNrRPbk2hhGQpt2g8RT7rmpuP4tA1qAzmcE6seHTV
-+RapnM4ENAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQXYeo/JZJVKwQc2Mep
-+9mHJ2ZmkyTAfBgNVHSMEGDAWgBTQJTbk5tuLbk+KTSBIpCE6WH7vxDANBgkqhkiG
-+9w0BAQUFAAOCAQEAeOo0T6zFCxe9yfQovbKxzadYdE8AgoLIpXH+9C9U0OCusFeH
-+feYuFEpJIUPDtTnkfA/+i8VdXoS8QioqoWkQMNzoprp5i6BWCaujztsyshB6n7d6
-+RoBKkFmvgVzHkiBGnQ4nIOWa2rMmljc7h+cTk7qNvtOdesttlnU2VOHNfv8NLTxq
-+zVCzpXOog6Cnoqr6bkm5d/wDFiG7x4pKeV+pfrkhbYSnX5ZgOEL30ILeh3TUBZO4
-+lK7R6wwmlmDV2GzMF0CFL6z4MfX1dtDxP6qHgbmgk3EoarL2dDah+vjcOajNt3V5
-+0EBzbNay3J5YpVHlCfA9wi89FqtBJuw7cQQt6w==
- -----END CERTIFICATE-----
-
-=== modified file 'mysql-test/std_data/client-key.pem'
---- old/mysql-test/std_data/client-key.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/client-key.pem 2015-01-29 13:34:31 +0000
-@@ -1,15 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I
--RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u
--sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB
--AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5
--MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM
--mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe
--ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA
--FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI
--iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty
--EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023
--bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE
--z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK
--Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg==
-+MIICXQIBAAKBgQDB9m5B3rWA/hBtxRWYU4VKiFEGhTB/yZKHUTrWjdOcDpHCOTDp
-+sm5TSjqqo4vOwJOUyWXbiY4hK68q/3taD7kDmfDrINQsOQAOWrcrF+Z4VE9UIzaB
-+sts+SM2OFDa0T25NoYRkKbdoPEU+65qbj+LQNagM5nBOrHh01UWqZzOBDQIDAQAB
-+AoGANRzgEFWF6i6oHQbs5OtqAoDVfy2VnEh8QWWy8PGhUoiCzWaPyE69+zzGV9e0
-+/wao4wNLSxSdwOOPcfzHsF/Bz4plBP4GOhq1BJ4TU13RMlVpU0G2CCJNmc7Fz/g/
-+iFk7NrhJ+hS22QuC5R/upQaDmKvn3USppXurh7NbayjQRhkCQQDsd2XEdHzOqr1A
-+fvd3tzAbmOoiSz05OHaVNJdHwsnWRASgn//YHCxaQCw/mt3hWjvxgRfS3kuDGFcy
-+KAwa/tbnAkEA0fwyfqZERZIRH1sSxXclqbmSRfF9PsDvS8DsjjUVkj/Td4KV7DKI
-+OWEv9d3VZvioIVaACeoGgmc6jdD6tAGN6wJBAN5Pyj+OfKAX6WEvfRzx/qqTctvW
-+/LJFIUdZcDipKvTkca1Jf1D/+7rFxlPuF1f8a4q7oVhAYaHYSnH/MJJYsFUCQQDB
-+ukofvGe6Q7NWWWCtG2p89r7zloM1VSywmBHmdSUso4QGe0yz+D7jqT1lOT872+bJ
-+sxM3klhlELXdxtK1JcX3AkBqnkbKafhVdIojRvxwY1NXD2HrxZGNbl+r/0usrQc9
-+viRpCxVsqPeseK9sxbL+xDJ6a1ofJrLg8YJLFapOqWTh
- -----END RSA PRIVATE KEY-----
-
-=== modified file 'mysql-test/std_data/server-cert.pem'
---- old/mysql-test/std_data/server-cert.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/server-cert.pem 2015-01-29 13:34:31 +0000
-@@ -1,69 +1,68 @@
- Certificate:
- Data:
- Version: 3 (0x2)
-- Serial Number: 4 (0x4)
-- Signature Algorithm: sha1WithRSAEncryption
-+ Serial Number: 1 (0x1)
-+ Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
- Validity
-- Not Before: Feb 20 02:55:06 2010 GMT
-- Not After : Sep 3 02:55:06 2030 GMT
-+ Not Before: Jan 29 13:33:36 2015 GMT
-+ Not After : Jan 24 13:33:36 2035 GMT
- Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
-- RSA Public Key: (1024 bit)
-- Modulus (1024 bit):
-- 00:e3:7d:4f:c2:23:77:a9:3a:2c:d2:69:59:a0:2f:
-- 4e:d1:51:4c:ae:8d:f5:17:cc:ce:58:9c:83:4f:0b:
-- a3:bb:29:a2:b8:1d:3e:1b:04:f9:a9:3e:e2:61:d0:
-- e6:7b:b9:7c:12:d8:1f:86:c9:53:b5:04:dd:df:26:
-- e9:c0:2b:de:4a:96:2e:f3:23:6f:79:6d:a9:d2:4e:
-- 17:af:2f:de:8b:68:44:ae:de:a3:e2:c4:37:1c:04:
-- ad:73:4b:85:f9:83:ac:fe:b7:c1:54:47:2e:96:d4:
-- 31:96:85:94:69:d6:5a:63:24:04:99:89:19:1d:56:
-- 8a:d1:77:aa:87:fb:38:cd:b7
-+ Public-Key: (1024 bit)
-+ Modulus:
-+ 00:9c:3a:93:e6:10:8c:b3:e2:57:2f:57:5d:03:4f:
-+ 0a:e6:fd:44:1a:f3:49:42:70:58:3a:d5:a3:96:ef:
-+ f2:98:39:09:fa:8c:57:12:d5:8b:1e:a5:b8:35:c0:
-+ 81:18:6d:45:c8:43:17:28:47:cc:67:8d:dc:3f:9e:
-+ 29:0a:f8:e5:99:ec:01:ca:d1:42:62:91:47:ee:85:
-+ 1b:b6:65:95:49:08:99:b8:b9:b6:2a:cf:04:05:e9:
-+ 5f:a3:7f:d1:c3:08:a0:37:3f:d6:fe:eb:d4:dd:7c:
-+ 0a:37:ad:00:43:d1:5d:cf:21:56:9c:d4:6b:d2:7c:
-+ 56:5e:25:fa:e4:2a:ef:14:95
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Basic Constraints:
- CA:FALSE
-+ Netscape Comment:
-+ OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
-- CC:8C:71:40:D0:0F:BF:D1:99:79:3F:1B:E9:10:76:19:67:36:0F:A3
-+ E2:04:9A:5D:CB:44:EC:98:C9:84:13:36:A4:7A:41:AC:34:3D:CD:0C
- X509v3 Authority Key Identifier:
-- keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-- DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-- serial:BE:58:AD:4C:1F:3D:25:95
-+ keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
-
- Signature Algorithm: sha1WithRSAEncryption
-- 6f:ad:5e:59:fa:84:3a:be:e2:72:b1:e8:66:2a:4e:f8:73:19:
-- 11:06:11:92:78:56:3e:d6:e8:68:29:90:8b:59:d2:fe:aa:ae:
-- 25:59:c7:e9:99:bb:4a:06:43:dd:40:bd:cb:f4:ae:79:95:7d:
-- 8e:90:ef:58:d2:a8:fc:bf:07:f3:37:b2:9b:bd:da:e6:8c:56:
-- dd:5e:c6:4a:70:7c:3e:3d:a1:e8:35:06:b8:a7:7b:ac:26:85:
-- 54:5d:09:a2:7b:77:b4:17:7f:72:31:cb:ff:cc:67:6d:e6:3e:
-- c6:dc:96:eb:4a:0a:ae:e9:48:ae:8a:e0:d6:73:57:6e:32:4c:
-- 00:dc:28:da:55:b3:9f:9f:d8:98:cc:d9:f1:b6:b3:14:67:2e:
-- a1:47:1e:51:11:cf:70:9f:31:8f:ba:59:29:f2:d0:88:0b:e2:
-- 51:6b:f8:31:ed:6d:ac:00:5e:d3:78:4c:95:97:02:cc:74:2b:
-- 3b:c6:28:e6:2a:c3:30:99:35:b4:4d:31:46:d4:90:f2:47:ed:
-- 64:85:1a:75:2a:72:0a:2f:c6:3a:2f:d2:ac:6b:31:cc:e5:a8:
-- 07:c2:d6:22:f3:c6:0f:bf:67:d9:d6:b2:79:cd:48:b5:c3:e0:
-- e3:18:7f:b5:74:c9:43:19:fb:c4:93:29:ca:cc:90:2b:1b:6f:
-- 45:f6:25:f9
-+ 28:f8:8b:22:d4:8e:00:29:cb:0e:b2:82:f1:a6:3b:e2:c6:76:
-+ 0a:79:b5:e3:6b:b2:80:c9:af:8b:df:c5:d7:f4:cb:ab:37:3c:
-+ b2:be:78:b7:2d:ac:77:f1:52:bd:6c:ae:a4:70:1d:98:92:e5:
-+ 07:71:99:6c:70:4e:f2:c5:9d:da:c4:31:29:3e:fb:df:82:90:
-+ 5c:76:97:0a:70:c3:dd:0c:cc:be:7d:4c:40:f7:25:9f:6f:d3:
-+ 37:c5:9b:1a:09:e1:fe:28:08:59:79:17:ac:64:cb:aa:e0:ac:
-+ 17:f3:3e:72:69:91:f2:16:8d:c6:3e:89:33:77:be:74:8f:69:
-+ ad:9f:4d:96:e1:51:68:ba:4c:7b:3f:26:7f:14:38:be:e9:07:
-+ 5d:2b:c2:fb:58:1d:40:c3:b8:21:a8:ee:0e:69:82:7a:21:67:
-+ 36:16:41:08:dc:71:e4:7c:d2:f1:58:3b:c8:7b:56:63:b4:1c:
-+ f6:7c:2a:3e:95:2b:03:9f:9c:41:b9:95:1a:bc:ab:b7:39:1b:
-+ 8e:68:6e:78:ac:2e:18:00:3c:bf:c6:42:c0:62:5f:ba:ec:9f:
-+ 81:da:0e:76:94:a7:88:68:71:22:ef:d1:4a:15:94:5e:cb:5a:
-+ 9c:af:59:b3:f7:1a:ad:8f:74:e8:fc:a5:b1:da:f9:4f:fc:d6:
-+ f8:11:4c:a9
- -----BEGIN CERTIFICATE-----
--MIIDJTCCAg2gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
--MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
--UUwgQUIwHhcNMTAwMjIwMDI1NTA2WhcNMzAwOTAzMDI1NTA2WjBGMQswCQYDVQQG
--EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
--BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA431PwiN3
--qTos0mlZoC9O0VFMro31F8zOWJyDTwujuymiuB0+GwT5qT7iYdDme7l8EtgfhslT
--tQTd3ybpwCveSpYu8yNveW2p0k4Xry/ei2hErt6j4sQ3HAStc0uF+YOs/rfBVEcu
--ltQxloWUadZaYyQEmYkZHVaK0Xeqh/s4zbcCAwEAAaOBozCBoDAJBgNVHRMEAjAA
--MB0GA1UdDgQWBBTMjHFA0A+/0Zl5PxvpEHYZZzYPozB0BgNVHSMEbTBrgBSx+353
--tUCNaBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1Vw
--cHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlit
--TB89JZUwDQYJKoZIhvcNAQEFBQADggEBAG+tXln6hDq+4nKx6GYqTvhzGREGEZJ4
--Vj7W6GgpkItZ0v6qriVZx+mZu0oGQ91Avcv0rnmVfY6Q71jSqPy/B/M3spu92uaM
--Vt1exkpwfD49oeg1Brine6wmhVRdCaJ7d7QXf3Ixy//MZ23mPsbclutKCq7pSK6K
--4NZzV24yTADcKNpVs5+f2JjM2fG2sxRnLqFHHlERz3CfMY+6WSny0IgL4lFr+DHt
--bawAXtN4TJWXAsx0KzvGKOYqwzCZNbRNMUbUkPJH7WSFGnUqcgovxjov0qxrMczl
--qAfC1iLzxg+/Z9nWsnnNSLXD4OMYf7V0yUMZ+8STKcrMkCsbb0X2Jfk=
-+MIIC/DCCAeSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECAwHVXBwc2FsYTEQMA4GA1UEBwwHVXBwc2FsYTERMA8GA1UECgwITXlT
-+UUwgQUIwHhcNMTUwMTI5MTMzMzM2WhcNMzUwMTI0MTMzMzM2WjBGMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECAwHVXBwc2FsYTERMA8GA1UECgwITXlTUUwgQUIxEjAQBgNV
-+BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnDqT5hCM
-+s+JXL1ddA08K5v1EGvNJQnBYOtWjlu/ymDkJ+oxXEtWLHqW4NcCBGG1FyEMXKEfM
-+Z43cP54pCvjlmewBytFCYpFH7oUbtmWVSQiZuLm2Ks8EBelfo3/RwwigNz/W/uvU
-+3XwKN60AQ9FdzyFWnNRr0nxWXiX65CrvFJUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-+BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-+VR0OBBYEFOIEml3LROyYyYQTNqR6Qaw0Pc0MMB8GA1UdIwQYMBaAFNAlNuTm24tu
-+T4pNIEikITpYfu/EMA0GCSqGSIb3DQEBBQUAA4IBAQAo+Isi1I4AKcsOsoLxpjvi
-+xnYKebXja7KAya+L38XX9MurNzyyvni3Lax38VK9bK6kcB2YkuUHcZlscE7yxZ3a
-+xDEpPvvfgpBcdpcKcMPdDMy+fUxA9yWfb9M3xZsaCeH+KAhZeResZMuq4KwX8z5y
-+aZHyFo3GPokzd750j2mtn02W4VFoukx7PyZ/FDi+6QddK8L7WB1Aw7ghqO4OaYJ6
-+IWc2FkEI3HHkfNLxWDvIe1ZjtBz2fCo+lSsDn5xBuZUavKu3ORuOaG54rC4YADy/
-+xkLAYl+67J+B2g52lKeIaHEi79FKFZRey1qcr1mz9xqtj3To/KWx2vlP/Nb4EUyp
- -----END CERTIFICATE-----
-
-=== modified file 'mysql-test/std_data/server-key.pem'
---- old/mysql-test/std_data/server-key.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/server-key.pem 2015-01-29 13:34:31 +0000
-@@ -1,15 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIICXgIBAAKBgQDjfU/CI3epOizSaVmgL07RUUyujfUXzM5YnINPC6O7KaK4HT4b
--BPmpPuJh0OZ7uXwS2B+GyVO1BN3fJunAK95Kli7zI295banSThevL96LaESu3qPi
--xDccBK1zS4X5g6z+t8FURy6W1DGWhZRp1lpjJASZiRkdVorRd6qH+zjNtwIDAQAB
--AoGAUb0o91y/FjMs/72S0pes/lDz+JRRSGfyjKxQEgrgndNsADOhqRu0iTdrKDJj
--XnlbN3ooecnFJfnFrvTQcJhSmlS30j6VrBw6LXpCBK3dvjYgJ9LOne7WK+dF1+vS
--FMQtsP04C56Sxy6HJDpMyWJ6oS3Bu169ygG2AxKo+Fk+E6ECQQD38w/MzmrARz2Z
--AGeEPDUnVZPYgtmXkmks95S0/2jSoLhmgpvJimzxwpYwVG/BG8dSDVuTDu5kp05D
--3bZIp3EzAkEA6uAwJsCZPtHXlWU3wYZJsA697rUNjPaCQOIaZ/lnh5RUHTmUiw1h
--Oj/VORqKB0kXqcDfawwLjZEvh1Xli+H5bQJBANTmhw2TvEPnp/OFTl1UGUvyBmXl
--TRMB639qAu07VfVtfYi/4ya1zn/0VmOfTOoigQ5qW9Q1AOu6YNCTQl62L9MCQQDc
--YfEsW2kvNYxYJHoVfuBjbuGuOnn1e1Oqd70ZND59S6NFLMMBWlORaVWzWACNZ3rp
--kAzSj6HDeqgjD2jsQONdAkEAt7S1YHUn8F760bRn4AnAto2TVOYdArtTP/wYjd4o
--9rJREO/d8AYkYJ96APLvF0SZ4n3t1pLwQRsKKN8ZGTmzLA==
-+MIICXAIBAAKBgQCcOpPmEIyz4lcvV10DTwrm/UQa80lCcFg61aOW7/KYOQn6jFcS
-+1Ysepbg1wIEYbUXIQxcoR8xnjdw/nikK+OWZ7AHK0UJikUfuhRu2ZZVJCJm4ubYq
-+zwQF6V+jf9HDCKA3P9b+69TdfAo3rQBD0V3PIVac1GvSfFZeJfrkKu8UlQIDAQAB
-+AoGAPWQDZD+SmslRi0fgRAGWfih9z71UR2hQM2ZqL1DA2rJnSm5FdSA21+c1GOI5
-+mHiwGD7M5cY4+2RSbSlgZXBjAFj+V0NReudoRMymTLCB8LsuaOSbPxMn92NffGKH
-+BQmZRncj+Sj+dTvTmnbaCzjGMEw6UUFBIus6nOH/dl3+TA0CQQDKuiwhreU2gUOT
-+ztmc+DggMWOWMs2Ji2jMJCpMrdxDSwxVas6jgaDesQ/9nL7F8RzPtliv6qaDCMfT
-+XoXGKPuvAkEAxUhfb/FkZ6MwDs2MyKCNhZjAoEvFESdGP/xiBzLlbDZSRDEUMNRS
-+sJrUYOIDUl3TIOvFJVh7tCQftygM3ciw+wJALcvy7kTPdAmtj3V6GYjFfRhLLAIc
-+Bod0zDEbUSkxig4pIh63wZ4mDkinmR5Qxnyaip3h2RPEO/O+2JQQ2lwlxwJBAKPi
-+TTXHB6t4SrHhWzRG+4mhrVL73oczYw5AcIaeZyuPrKNtSeKOXurKk+avmibQPlU4
-+xpsReCHbaGVUZevPjgUCQAU5WDLCV2DTXEb42PDuvRn7M7yw853CaN2d7j5Kliun
-+7lS42fcyaFttfLpopCvAhZ0fVRpJGgCcAvoA/zN8uco=
- -----END RSA PRIVATE KEY-----
-
-=== modified file 'mysql-test/std_data/server8k-cert.pem'
---- old/mysql-test/std_data/server8k-cert.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/server8k-cert.pem 2015-01-29 13:34:31 +0000
-@@ -1,69 +1,147 @@
- Certificate:
- Data:
- Version: 3 (0x2)
-- Serial Number: 5 (0x5)
-- Signature Algorithm: sha1WithRSAEncryption
-+ Serial Number: 2 (0x2)
-+ Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
- Validity
-- Not Before: Feb 20 03:00:54 2010 GMT
-- Not After : Sep 3 03:00:54 2030 GMT
-+ Not Before: Jan 29 13:33:49 2015 GMT
-+ Not After : Jan 24 13:33:49 2035 GMT
- Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
-- RSA Public Key: (1024 bit)
-- Modulus (1024 bit):
-- 00:c5:da:44:95:06:77:16:21:af:a0:c4:3c:e9:f8:
-- 1d:2d:95:f9:63:90:8c:3f:86:ba:77:76:4a:52:4b:
-- 6b:af:29:f5:1c:aa:d4:3f:3e:42:9f:6d:46:ba:86:
-- 90:b1:2d:cc:db:c6:33:15:a3:f4:af:53:33:4f:a1:
-- 56:d1:aa:3b:26:10:f7:64:b5:f9:bf:1b:b1:47:8e:
-- cc:a6:d6:0d:aa:4a:77:e3:a3:63:9d:2a:dc:65:f4:
-- 7f:91:17:38:2d:d6:cd:4e:8d:53:52:97:6e:87:fc:
-- 64:60:a6:a1:00:ac:96:6c:e4:42:94:75:17:46:6f:
-- 91:b5:dd:06:47:ed:05:e3:db
-+ Public-Key: (8192 bit)
-+ Modulus:
-+ 00:bd:48:03:11:06:b5:8b:92:f6:9f:2b:27:e0:3d:
-+ 6c:8b:87:cc:7b:cf:e5:7b:e9:5f:eb:8d:4c:95:36:
-+ 68:a6:1d:dc:81:10:83:c0:bb:97:c9:ac:4b:d1:c2:
-+ a1:64:2a:09:e2:1e:5f:26:14:42:6b:b8:8c:82:ea:
-+ 6a:d8:df:9b:dd:46:9a:23:52:66:03:51:25:90:2f:
-+ 96:d4:c2:ec:1f:6c:a7:de:3a:eb:49:7c:da:81:ae:
-+ 42:48:30:59:82:43:d6:ab:00:a1:22:80:e5:1c:f4:
-+ 74:3c:59:42:e4:a2:6b:5d:13:69:1e:74:a3:f9:a2:
-+ 71:eb:a6:b6:7b:ba:12:49:a8:4b:47:40:ed:f0:2e:
-+ 94:80:23:73:5c:51:7a:2a:5c:96:bc:a1:20:7b:bb:
-+ 38:b6:41:11:53:92:c4:1c:95:cf:d4:b2:62:ce:65:
-+ bc:dd:4a:34:76:71:8f:e3:3e:fb:4c:0c:8f:dd:51:
-+ 69:a3:e0:4c:c5:23:fa:c2:fd:5a:24:5d:cb:b1:fe:
-+ f1:21:3f:c4:16:f1:d1:53:09:0c:72:bb:9b:01:b6:
-+ c0:13:34:8e:bf:39:30:db:c5:f0:fc:6d:38:92:c3:
-+ a8:8c:91:59:cb:b1:ce:4f:2e:7b:2f:6c:65:69:d9:
-+ 8c:35:f9:b8:ae:1b:9d:2f:ee:b0:26:23:43:9b:d8:
-+ ab:08:90:6a:d0:1d:cb:09:73:64:a4:55:95:f4:6f:
-+ 0d:17:c5:ef:53:ea:6f:a0:13:3d:c1:cb:60:d0:1c:
-+ aa:02:a3:22:4b:05:0a:26:86:ae:ed:73:0e:b7:6c:
-+ b4:3b:ee:f1:34:01:60:9d:82:3d:e3:78:b0:ca:af:
-+ ed:8e:f2:56:ac:de:1c:9b:f7:2c:55:cc:58:94:11:
-+ 92:55:a9:38:75:61:71:c4:da:95:7a:d4:7f:03:2d:
-+ 9d:29:76:e3:f7:c9:69:56:54:a0:b9:db:b9:ea:46:
-+ e0:1a:55:a2:0f:cd:80:0f:4d:cf:7a:51:9c:f2:d5:
-+ e4:6d:9a:59:95:e1:7e:00:2e:2e:e5:30:14:6c:8e:
-+ 21:52:3b:f8:01:7c:9b:c8:ba:77:fd:41:1e:d4:b9:
-+ a3:58:e1:4e:6d:a6:45:7e:cf:4f:3b:bb:a3:dd:a6:
-+ 99:e8:d6:45:e3:28:d7:5b:b1:25:34:cb:15:3c:31:
-+ 16:91:3b:01:76:32:b4:dd:c0:07:e9:d9:d9:87:f6:
-+ c9:c2:6a:30:05:47:ba:d9:1b:98:b5:2b:50:9f:71:
-+ ee:41:76:d6:0a:f5:30:de:0d:c6:d2:e1:ec:f7:7c:
-+ 3e:97:13:5b:fb:2f:cf:82:7a:28:c0:98:e3:20:96:
-+ 2c:f0:a7:30:19:ee:3d:66:c6:1e:f9:e8:f1:aa:11:
-+ aa:fa:38:7f:89:c6:74:fa:7c:22:8e:37:5c:49:20:
-+ 98:ae:cd:bc:21:d5:76:7b:66:f8:cf:07:3f:bc:07:
-+ bf:75:ec:96:90:7f:62:10:31:eb:fe:60:c5:bf:78:
-+ d5:51:f5:87:70:d5:ce:a9:17:4d:f5:b4:69:7e:08:
-+ 98:19:cf:31:dd:f4:cd:b9:17:2d:46:d2:23:08:e4:
-+ d1:75:c8:c5:a1:c4:5c:d8:26:bc:d8:bc:10:71:e1:
-+ 5d:b7:2a:a3:c8:17:1c:7e:55:3c:d5:92:72:50:99:
-+ a7:6c:a0:0d:5a:46:89:1c:71:e8:2c:05:b8:60:3d:
-+ 03:74:05:2d:f4:20:4f:11:a7:04:82:ba:32:b8:5f:
-+ de:ee:b6:bb:b2:7a:c2:64:ff:cc:5a:08:1c:c4:d8:
-+ ac:e4:37:be:d4:1d:f2:7b:4a:db:5a:0d:07:25:88:
-+ e2:74:91:ec:30:3a:97:b4:87:68:de:d7:53:6a:b8:
-+ cd:54:cd:b0:de:55:95:f6:76:41:3f:3c:37:27:0a:
-+ d0:bb:54:42:cf:5a:9f:3f:bc:9f:2b:45:f7:64:1e:
-+ d5:f8:98:75:8b:e9:b1:9d:32:00:bf:6a:f1:78:eb:
-+ f3:db:0b:12:16:62:4b:b3:b3:a9:c4:e2:48:72:cb:
-+ c4:a7:f5:26:23:27:32:63:3d:b7:40:70:d0:14:e6:
-+ 93:56:e4:8b:c6:21:40:35:4b:2d:59:e2:21:97:df:
-+ cb:14:cb:eb:a5:27:a8:56:83:9c:94:ce:76:a6:2b:
-+ 25:5d:51:de:0b:40:86:29:ae:2c:e6:74:a7:7d:b8:
-+ d7:13:1a:df:fc:d3:de:f8:38:24:d6:69:5e:69:61:
-+ 6f:ad:ea:d7:94:61:22:30:6c:08:4a:3f:71:6f:c9:
-+ c0:d1:08:ca:06:ef:e4:12:a2:75:dd:a6:15:a2:56:
-+ 14:82:e2:5e:b8:fe:87:09:70:c1:12:7d:84:29:5d:
-+ cf:b1:a4:45:7a:c6:a6:d3:91:c9:83:ec:0b:d9:95:
-+ 25:5c:a7:fb:c4:75:2f:f7:13:31:1d:b5:48:20:2c:
-+ fb:eb:95:02:80:2e:81:bb:32:92:28:da:71:5b:42:
-+ 97:c7:66:3d:2c:be:b3:ab:ee:30:68:b0:6b:11:f9:
-+ 0d:5a:82:0d:5f:d6:3a:2a:99:f3:2a:e4:b5:47:c0:
-+ 34:ce:94:ac:17:68:68:cd:72:52:f5:83:bd:17:f9:
-+ 7b:ad:76:0a:98:6e:83:6f:4b:02:b6:af:bd:c2:e7:
-+ 60:68:e5:e8:a5:90:1c:30:ce:c6:bc:78:e6:0f:77:
-+ 7d:9c:7e:62:49:8c:54:4b:a5:98:be:31:b7:05:21:
-+ b1:6a:9c:2a:76:7f:20:f5:f5:1f:2a:40:80:b5:05:
-+ 57:12:b9:d0:29
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Basic Constraints:
- CA:FALSE
-+ Netscape Comment:
-+ OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
-- 6E:60:3F:29:13:60:99:ED:0C:F7:15:B5:DB:7B:1C:FB:6F:60:19:ED
-+ DF:F6:30:35:E7:24:29:DF:22:90:5F:EF:7C:1F:14:E9:5B:1C:98:1D
- X509v3 Authority Key Identifier:
-- keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-- DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-- serial:BE:58:AD:4C:1F:3D:25:95
-+ keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
-
- Signature Algorithm: sha1WithRSAEncryption
-- 63:2e:0f:07:14:06:cf:74:90:3d:37:42:f2:48:70:60:21:bc:
-- 34:52:31:f1:87:70:d2:b2:fb:ff:13:38:dc:f0:5e:43:d7:ee:
-- a7:c7:1f:ac:aa:d2:8c:4f:fa:3c:4c:73:f6:b6:c2:0c:a0:ea:
-- a2:c9:e2:73:61:c3:2e:78:40:0f:2a:d3:63:50:9b:b8:f9:89:
-- 40:ed:98:08:97:c3:07:24:17:34:b5:78:89:0a:bb:83:4c:e2:
-- 5c:2e:13:d6:21:30:ad:30:48:b5:70:12:ff:4a:6f:42:f0:f8:
-- 9f:b1:4b:bd:89:2b:f0:9d:e2:49:2b:35:69:18:1f:76:40:b4:
-- 76:bd:cb:dd:27:2f:c0:c1:e2:33:3e:6e:df:68:54:19:92:8a:
-- bb:13:9c:cf:d6:17:56:da:bf:0d:64:70:3a:45:b7:aa:5f:e3:
-- f5:96:ae:34:f2:17:37:27:d0:4b:e8:30:4a:c0:02:42:e2:d2:
-- 30:eb:eb:c7:d7:ec:d8:df:5c:43:58:e2:6f:b7:58:54:0d:c4:
-- 01:71:2d:59:8f:44:c7:a1:6c:0b:41:28:fa:b7:63:a7:68:d3:
-- 4f:c3:0f:17:9e:b2:32:50:e6:0b:87:3d:e2:39:47:c0:d8:0a:
-- 3b:f6:af:50:68:0f:9d:ef:6e:34:0d:3a:07:94:f8:a4:d7:24:
-- 86:32:d3:b4
-+ 78:18:7b:57:42:67:41:d3:b8:3e:2f:ad:74:e6:c0:de:2e:83:
-+ ea:fa:07:5c:06:fe:d6:47:46:85:5a:df:67:17:86:f3:da:52:
-+ 83:98:9a:5f:80:a3:a5:60:ab:07:f0:f0:d8:c5:9d:c5:09:53:
-+ ad:79:c4:c0:31:35:af:0c:e7:41:8e:b7:aa:ca:36:ee:90:6b:
-+ 34:a6:19:1c:3b:1a:90:3a:91:10:47:12:a0:31:49:0c:c2:38:
-+ 68:0e:38:57:24:d6:12:c6:4c:bb:b2:b4:d8:ab:9e:80:93:ad:
-+ af:84:01:d0:e8:2b:b3:ea:f6:c0:bc:4a:fa:01:b1:ce:fa:ab:
-+ eb:f1:08:b3:0d:83:fc:08:57:79:02:74:4c:09:56:14:0a:52:
-+ e0:02:74:76:44:66:2b:12:fe:8d:d4:8c:30:90:41:3b:4a:7b:
-+ 3f:1c:7c:86:74:97:94:66:43:39:da:7d:20:4a:ba:3a:17:49:
-+ ac:c7:fa:72:ee:d8:84:09:e6:f4:84:8d:e3:2a:7b:70:36:93:
-+ 88:f8:60:ef:7f:b8:e8:51:61:16:6f:a0:94:b8:7d:ff:3f:ec:
-+ 25:fe:42:cf:0e:0d:ab:06:07:88:7a:e2:ba:d5:62:ff:19:19:
-+ 37:43:ff:92:53:8c:ea:31:6f:a1:14:89:3b:b4:d1:3c:45:e8:
-+ 9c:ef:bb:2d
- -----BEGIN CERTIFICATE-----
--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
- -----END CERTIFICATE-----
-
-=== modified file 'mysql-test/std_data/server8k-key.pem'
---- old/mysql-test/std_data/server8k-key.pem 2014-02-19 20:40:34 +0000
-+++ new/mysql-test/std_data/server8k-key.pem 2015-01-29 13:34:31 +0000
-@@ -1,15 +1,99 @@
- -----BEGIN RSA PRIVATE KEY-----
--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
- -----END RSA PRIVATE KEY-----
-
--- mariadb-10.0-10.0.16/debian/patches/new_valid_certs_test_fix.patch 2015-02-03 02:31:41.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/new_valid_certs_test_fix.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-Author: Otto Kekäläinen <otto@seravo.fi>
-Subject: Update test main.sll to match backported new cacert.pem
-Last-Update: 2015-01-29
-
-diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
---- a/mysql-test/r/ssl.result
-+++ b/mysql-test/r/ssl.result
-@@ -3,10 +3,10 @@ Variable_name Value
- Ssl_cipher DHE-RSA-AES256-SHA
- SHOW STATUS LIKE 'Ssl_server_not_before';
- Variable_name Value
--Ssl_server_not_before Feb 20 02:55:06 2010 GMT
-+Ssl_server_not_before Jan 29 13:33:36 2015 GMT
- SHOW STATUS LIKE 'Ssl_server_not_after';
- Variable_name Value
--Ssl_server_not_after Sep 3 02:55:06 2030 GMT
-+Ssl_server_not_after Jan 24 13:33:36 2035 GMT
- drop table if exists t1,t2,t3,t4;
- CREATE TABLE t1 (
- Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
--- mariadb-10.0-10.0.16/debian/patches/remove_rename_mariadb-server_files_in.patch 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/patches/remove_rename_mariadb-server_files_in.patch 2015-07-14 21:20:04.000000000 +0200
@@ -3,10 +3,10 @@
--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200
+++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200
-@@ -484,12 +484,6 @@
- CONFIGURE_FILE(
- ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
-
+@@ -460,12 +460,6 @@ CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
+ ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+
-IF(DEB)
- CONFIGURE_FILE(
- ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files.in
--- mariadb-10.0-10.0.16/debian/patches/scripts__mysqld_safe.sh__signals.patch 2014-10-09 08:30:57.000000000 +0200
+++ mariadb-10.0-10.0.20/debian/patches/scripts__mysqld_safe.sh__signals.patch 2015-07-14 21:19:36.000000000 +0200
@@ -6,15 +6,15 @@
--- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000
+++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000
-@@ -32,7 +32,6 @@ err_log=
+@@ -33,7 +33,6 @@ err_log=
syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe
-
+
-trap '' 1 2 3 15 # we shouldn't let anyone kill us
-
+
# MySQL-specific environment variable. First off, it's not really a umask,
# it's the desired mode. Second, it follows umask(2), not umask(3) in that
-@@ -163,7 +162,7 @@ eval_log_error () {
+@@ -164,7 +163,7 @@ eval_log_error () {
# sed buffers output (only GNU sed supports a -u (unbuffered) option)
# which means that messages may not get sent to syslog until the
# mysqld process quits.
@@ -23,9 +23,9 @@
;;
*)
echo "Internal program error (non-fatal):" \
-@@ -795,6 +794,13 @@ then
+@@ -806,6 +805,13 @@ then
fi
-
+
#
+# From now on, we catch signals to do a proper shutdown of mysqld
+# when signalled to do so.
@@ -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
-
--- mariadb-10.0-10.0.16/debian/patches/series 2015-02-03 02:31:41.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/patches/series 2015-07-14 21:20:04.000000000 +0200
@@ -9,5 +9,5 @@
innodb_simulate_comp_test_speedup.patch
fix-spelling-errors.patch
mroonga-disable-switch.patch
-new_valid_certs.patch
-new_valid_certs_test_fix.patch
+mysqld_multi_confd.patch
+mysqld_multi.server_lsb-header.patch
--- mariadb-10.0-10.0.16/debian/po/sv.po 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/po/sv.po 2015-07-14 21:20:04.000000000 +0200
@@ -1,22 +1,22 @@
# Translation of mariadb-10.0 debconf template to Swedish
-# Copyright (C) 2014 Martin Bagge <brother@bsnet.se>
+# Copyright (C) 2015 Martin Bagge <brother@bsnet.se>
# This file is distributed under the same license as the mariadb-10.0 package.
#
# Andreas Henriksson <andreas@fatal.se>, 2007
-# Martin Bagge <brother@bsnet.se>, 2009, 2014
+# Martin Bagge <brother@bsnet.se>, 2009, 2015
msgid ""
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n"
"POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2014-09-25 10:20+0100\n"
+"PO-Revision-Date: 2015-04-01 18:11+0100\n"
"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"Language: Swedish\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
#. Type: boolean
#. Description
@@ -201,7 +201,7 @@
#. Description
#: ../mariadb-server-10.0.templates:10001
msgid "Really migrate to MariaDB?"
-msgstr "Verkligen byta till MariaDB?"
+msgstr "Ska migreringen till MariaDB fortsätta?"
#. Type: boolean
#. Description
@@ -210,8 +210,9 @@
"MariaDB is a drop-in replacement for MySQL. It will use your current "
"configuration file (my.cnf) and current databases."
msgstr ""
-"MariaDB ersätter MySQL rakt av. Den kommer att använda din nuvarande "
-"inställningsfil (my.cnf) och de databaser som finns tillgängliga."
+"MariaDB är en ersättare för MySQL som helt och hållet fyller platsen efter "
+"MySQL. Den kommer att använda din nuvarande inställningsfil (my.cnf) och "
+"nuvarande databaser."
#. Type: boolean
#. Description
@@ -221,24 +222,6 @@
"and thus migration back to MySQL might not always work, at least not as "
"automatically as migrating from MySQL to MariaDB."
msgstr ""
-"Observera att MariaDB har några ytterligare utvecklade funktioner som inte "
-"finns i MySQL. Att gå tillbaka till MySQL är inte garanterat något som "
-"kommer att fungera, åtminstone inte automatiskt som är fallet från MySQL "
-"till MariaDB."
-
-#~ msgid "Start the MariaDB server on boot?"
-#~ msgstr "Ska MariaDB startas vid systemets uppstart?"
-
-#~ msgid ""
-#~ "The MariaDB server can be launched automatically at boot time or manually "
-#~ "with the '/etc/init.d/mysql start' command."
-#~ msgstr ""
-#~ "MariaDB-servern kan startas vid systemets uppstart eller manuellt med "
-#~ "kommandot \"/etc/init.d/mysql start\"."
-
-#~ msgid ""
-#~ "To use MySQL, the following entries for users and groups should be added "
-#~ "to the system:"
-#~ msgstr ""
-#~ "För att använda MySQL måste följande användare och grupper läggas till i "
-#~ "systemet:"
+"Observera att det finns ett antal förbättrade funktioner som inte finns i "
+"MySQL, att gå tillbaka till MySQL är därför inte garanterat fungerande. "
+"Åtminstone med samma automatik som från MySQL till MariaDB."
--- mariadb-10.0-10.0.16/debian/rules 2015-02-03 00:22:05.000000000 +0100
+++ mariadb-10.0-10.0.20/debian/rules 2015-07-14 21:20:04.000000000 +0200
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
-# Used in mysql-5.6, might be needed here too but not added
-# until some confimation is found
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+
+# enable Debian Hardening
+# see: https://wiki.debian.org/Hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
Reply to: