[Pkg-mysql-commits] r2197 - in mysql-5.5/branches/wheezy/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Wed Oct 24 05:50:17 UTC 2012
tags 690778 pending
thanks
Author: periapt
Date: 2012-10-24 05:50:17 +0000 (Wed, 24 Oct 2012)
New Revision: 2197
Removed:
mysql-5.5/branches/wheezy/debian/patches/2_main_openssl_1.patch
mysql-5.5/branches/wheezy/debian/patches/73_mysqlcheck_tests.patch
Modified:
mysql-5.5/branches/wheezy/debian/changelog
mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch
mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch
mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
mysql-5.5/branches/wheezy/debian/patches/series
Log:
* New upstream release (resolves CVE-2012-3163, CVE-2012-3158, CVE-2012-3177,
CVE-2012-3147, CVE-2012-3166, CVE-2012-3173, CVE-2012-3144, CVE-2012-3150,
CVE-2012-3180, CVE-2012-3149, CVE-2012-3156, CVE-2012-3167, CVE-2012-3197,
CVE-2012-3160) (Closes: #690778)
* Removed debian/patches/73_mysqlcheck_tests.patch and
debian/patches/2_main_openssl_1.patch as they did not apply cleanly and did
not seem to be required any longer
* Refreshed patches and updated headers:
- debian/patches/73_mysqlcheck_tests.patch
- debian/patches/94_spelling.patch
- debian/patches/70_mysql_va_list.patch
Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/changelog 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,3 +1,19 @@
+mysql-5.5 (5.5.28+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release (resolves CVE-2012-3163, CVE-2012-3158, CVE-2012-3177,
+ CVE-2012-3147, CVE-2012-3166, CVE-2012-3173, CVE-2012-3144, CVE-2012-3150,
+ CVE-2012-3180, CVE-2012-3149, CVE-2012-3156, CVE-2012-3167, CVE-2012-3197,
+ CVE-2012-3160) (Closes: #690778)
+ * Removed debian/patches/73_mysqlcheck_tests.patch and
+ debian/patches/2_main_openssl_1.patch as they did not apply cleanly and did
+ not seem to be required any longer
+ * Refreshed patches and updated headers:
+ - debian/patches/73_mysqlcheck_tests.patch
+ - debian/patches/94_spelling.patch
+ - debian/patches/70_mysql_va_list.patch
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Sun, 23 Sep 2012 08:04:50 +0100
+
mysql-5.5 (5.5.24+dfsg-9) unstable; urgency=low
* Danish debconf translation (Closes: #684566)
Deleted: mysql-5.5/branches/wheezy/debian/patches/2_main_openssl_1.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/2_main_openssl_1.patch 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/2_main_openssl_1.patch 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,22 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660799
-Forwarded: no
-Last-Update: 2012-03-02
-Subject: This test fails in the presence of libssl-dev
- and SSL functionality seems to fail without it.
-
---- a/mysql-test/r/openssl_1.result
-+++ b/mysql-test/r/openssl_1.result
-@@ -44,9 +44,9 @@
- drop user ssl_user1 at localhost, ssl_user2 at localhost,
- ssl_user3 at localhost, ssl_user4 at localhost, ssl_user5 at localhost;
- drop table t1;
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
- SSL error: Unable to get private key from ''
- mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key
- SSL error: Unable to get certificate from ''
Modified: mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,11 +1,12 @@
Bug: http://bugs.mysql.com/bug.php?id=62769
Bug-Ubuntu: http://pad.lv/700982
Description: make sure va_list usage is portable to fix FTBFS on ARM
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+Last-Update: 2012-10-24
-diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c
---- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400
-+++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400
-@@ -228,11 +228,13 @@
+--- a/sql-common/client_plugin.c
++++ b/sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
{
MYSQL mysql;
struct st_mysql_client_plugin **builtin;
@@ -19,7 +20,7 @@
pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
init_alloc_root(&mem_root, 128, 128);
-@@ -244,7 +246,7 @@
+@@ -249,7 +251,7 @@
pthread_mutex_lock(&LOCK_load_client_plugin);
for (builtin= mysql_client_builtins; *builtin; builtin++)
@@ -28,7 +29,7 @@
pthread_mutex_unlock(&LOCK_load_client_plugin);
-@@ -288,9 +290,13 @@
+@@ -293,9 +295,13 @@
mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin)
{
@@ -42,7 +43,7 @@
pthread_mutex_lock(&LOCK_load_client_plugin);
/* make sure the plugin wasn't loaded meanwhile */
-@@ -302,7 +308,7 @@
+@@ -307,7 +313,7 @@
plugin= NULL;
}
else
Modified: mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch 2012-10-24 05:50:17 UTC (rev 2197)
@@ -2,12 +2,11 @@
Description: makes mtr look in the standard location from the
mysql-testsuite-5.5 package.
Forwarded: not-needed
-
-Index: mysql-5.5/mysql-test/lib/mtr_cases.pm
-===================================================================
---- mysql-5.5.orig/mysql-test/lib/mtr_cases.pm 2011-11-14 15:35:04.238715000 -0800
-+++ mysql-5.5/mysql-test/lib/mtr_cases.pm 2011-11-25 14:41:00.433887578 -0800
-@@ -286,7 +286,8 @@
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+Last-Update: 2012-10-24
+--- a/mysql-test/lib/mtr_cases.pm
++++ b/mysql-test/lib/mtr_cases.pm
+@@ -287,7 +287,8 @@
else
{
$suitedir= my_find_dir($::basedir,
@@ -15,5 +14,5 @@
+ ["lib/mysql-testsuite/suite",
+ "share/mysql-test/suite",
"mysql-test/suite",
+ "internal/mysql-test/suite",
"mysql-test",
- # Look in storage engine specific suite dirs
Deleted: mysql-5.5/branches/wheezy/debian/patches/73_mysqlcheck_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/73_mysqlcheck_tests.patch 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/73_mysqlcheck_tests.patch 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,42 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Bug: http://bugs.mysql.com/bug.php?id=64773
-Date: 2012-03-27
-Subject: Large number of bugs that suddenly started to fail.
- Have not been able to isolate the exact trigger.
- However several involve mysqlcheck failing to execute
- and that at least might be easy to investigate further.
- mysql-test-run of course starts the database, and forks off mysql_upgrade.
- The latter forks off mysqlcheck.
- Some of the other tests might be easily patchable by updating
- the expected test results - run ./mysql-test-run --record <test name>
- and copy the results file into the source mysql-test directory.
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
-@@ -20,3 +20,12 @@
- mysqlslap : n/a 2012-04-29 Failed once on kfreebsd
- mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure
- mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure
-+plugin_auth : Bug#64773 2012-03-27 Debian local
-+ssl_8k_key : Bug#64773 2012-03-27 Debian local
-+log_tables_upgrade : Bug#64773 2012-03-27 Debian local
-+mysql_upgrade : Bug#64773 2012-03-27 Debian local
-+mysql_upgrade_ssl : Bug#64773 2012-03-27 Debian local
-+mysqladmin : Bug#64773 2012-03-27 Debian local
-+ssl_compress : Bug#64773 2012-03-27 Debian local
-+ssl : Bug#64773 2012-03-27 Debian local
-+openssl_1 : Bug#64773 2012-03-27 Debian local
---- a/mysql-test/suite/perfschema/t/disabled.def
-+++ b/mysql-test/suite/perfschema/t/disabled.def
-@@ -9,4 +9,4 @@
- # Do not use any TAB characters for whitespace.
- #
- ##############################################################################
--
-+pfs_upgrade: BUG#64773
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -16,3 +16,4 @@
- rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
-+rpl_mysql_upgrade: Fails on Debian #64773
Modified: mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,7 +1,7 @@
Author <nicholas at periapt.co.uk>
Subject: spelling errors
Preceeding -> preceding
-Last-Update: 2012-05-20
+Last-Update: 2012-10-24
Forwarded: no
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -108,7 +108,7 @@
--echo **** On Master ****
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
-@@ -3236,7 +3236,7 @@
+@@ -3267,7 +3267,7 @@
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
{
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
Modified: mysql-5.5/branches/wheezy/debian/patches/series
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/series 2012-09-22 21:50:47 UTC (rev 2196)
+++ mysql-5.5/branches/wheezy/debian/patches/series 2012-10-24 05:50:17 UTC (rev 2197)
@@ -1,11 +1,9 @@
1_hurd.patch
-2_main_openssl_1.patch
38_scripts__mysqld_safe.sh__signals.patch
62_disable_tests.patch
70_mysql_va_list.patch
71_disable_rpl_tests.patch
72_fix_standalone_tests.patch
-73_mysqlcheck_tests.patch
93_kfreebsd_tests.patch
94_spelling.patch
regex_plus.patch
More information about the Pkg-mysql-commits
mailing list