[Pkg-mysql-commits] r2053 - in mysql-5.5/branches/experimental/debian: . patches

[Nicholas Bamber]

tags 660799 pending
thanks

Author: periapt
Date: 2012-03-16 18:48:33 +0000 (Fri, 16 Mar 2012)
New Revision: 2053

Added:
   mysql-5.5/branches/experimental/debian/patches/2_main_openssl_1.patch
Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/patches/series
Log:
Added libssl-dev as a build dependency and patched main.openssl_1 test
so that it works with that library (Closes: #660799)

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-03-16 00:32:51 UTC (rev 2052)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-03-16 18:48:33 UTC (rev 2053)
@@ -40,6 +40,8 @@
 
   [ Nicholas Bamber ]
   * Added myself to Uploaders
+  * Added libssl-dev as a build dependency and patched main.openssl_1 test
+    so that it works with that library (Closes: #660799)
 
  -- Clint Byrum <clint at ubuntu.com>  Tue, 14 Feb 2012 11:48:47 -0800
 

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2012-03-16 00:32:51 UTC (rev 2052)
+++ mysql-5.5/branches/experimental/debian/control	2012-03-16 18:48:33 UTC (rev 2053)
@@ -4,7 +4,7 @@
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
  Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), 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, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), 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, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
 Standards-Version: 3.9.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Added: mysql-5.5/branches/experimental/debian/patches/2_main_openssl_1.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/2_main_openssl_1.patch	                        (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/2_main_openssl_1.patch	2012-03-16 18:48:33 UTC (rev 2053)
@@ -0,0 +1,22 @@
+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/experimental/debian/patches/series
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/series	2012-03-16 00:32:51 UTC (rev 2052)
+++ mysql-5.5/branches/experimental/debian/patches/series	2012-03-16 18:48:33 UTC (rev 2053)
@@ -1,3 +1,4 @@
+2_main_openssl_1.patch
 38_scripts__mysqld_safe.sh__signals.patch
 62_disable_tests.patch
 70_mysql_va_list.patch