25701723 Update DBD::mysql to 4.0.42
authorVladimir Marek <Vladimir.Marek@oracle.com>
Thu, 09 Mar 2017 21:29:54 +0100
changeset 7753 6a89cfcaaa50
parent 7752 a1b5c046f5f3
child 7754 9db565f67d81
25701723 Update DBD::mysql to 4.0.42
components/perl_modules/dbd-mysql/Makefile
components/perl_modules/dbd-mysql/patches/01_disable_devel_checklib.patch
components/perl_modules/dbd-mysql/patches/01_fix_test.patch
components/perl_modules/dbd-mysql/test/results-all.master
--- a/components/perl_modules/dbd-mysql/Makefile	Tue Mar 14 15:01:07 2017 -0700
+++ b/components/perl_modules/dbd-mysql/Makefile	Thu Mar 09 21:29:54 2017 +0100
@@ -32,11 +32,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		DBD-mysql
-COMPONENT_VERSION=	4.041
-IPS_COMPONENT_VERSION=  4041
+COMPONENT_VERSION=	4.042
+IPS_COMPONENT_VERSION=  4042
 HUMAN_VERSION=		$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:4777de11c464b515db9da95c08c225900d0594b65ba3256982dc21f9f9379040
+	sha256:dadb6884788dc3fdf40b13b72d8c60d5a83680cc2aeec7515c3e5999e064b455
 COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	https://github.com/perl5-dbi/DBD-mysql
 COMPONENT_BUGDB=	perl-mod/dbd-mysql
@@ -135,7 +135,7 @@
 	ln -s $(MYSQL_TEST_DATADIR) "$$TEST_LINK"; \
 	\
 	: "alter the tests to use the path we just created"; \
-	$(PERL) -pi -e "s,('testsocket' => ').*?',\$$1/$$TEST_LINK/socket'," t/mysql.mtest ;\
+	$(PERL) -pi -e "s,('testsocket' => ')CHANGEME',\$$1/$$TEST_LINK/socket'," t/mysql.mtest ;\
 	\
 	: "Initialize mysql DB"; \
 	"$(MYSQL_BINDIR)/mysqld" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/dbd-mysql/patches/01_disable_devel_checklib.patch	Thu Mar 09 21:29:54 2017 +0100
@@ -0,0 +1,27 @@
+DBD-mysql started to use Devel::Checklib module to make sure that the mysql
+libraries are available. We don't have the module. We know our libraries are
+where we said they will be so easiest thing is to disable this check.
+
+Not suitable for upstream.
+
+--- DBD-mysql-4.042/Makefile.PL	2017-03-09 21:42:28.549917296 +0100
++++ DBD-mysql-4.042/Makefile.PL	2017-03-09 21:42:04.418265160 +0100
[email protected]@ -9,7 +9,6 @@ use Config;
+ use Getopt::Long;
+ use ExtUtils::MakeMaker;
+ use Data::Dumper;
+-use Devel::CheckLib;
+ use File::Path;
+ use File::Copy;
+ use File::Basename;
[email protected]@ -205,10 +204,6 @@ MSG
+ 
+ print "Checking if libs are available for compiling...\n";
+ 
+-assert_lib(
+-  LIBS => ($opt->{'embedded'} ? $opt->{'embedded'} : $opt->{libs}),
+-);
+-
+ print "Looks good.\n\n";
+ 
+ sleep 1;
--- a/components/perl_modules/dbd-mysql/patches/01_fix_test.patch	Tue Mar 14 15:01:07 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-https://rt.cpan.org/Public/Bug/Display.html?id=118837
-
---- DBD-mysql-4.038/t/05dbcreate.t	st říj  5 14:44:00 2016
-+++ DBD-mysql-4.037/t/05dbcreate.t	po říj  3 08:52:35 2016
[email protected]@ -10,7 +10,7 @@
- require 'lib.pl';
- 
- # remove database from DSN
--$test_dsn =~ s/^DBI:mysql:([^:]+)(:?)/DBI:mysql:$2/;
-+$test_dsn =~ s/^DBI:mysql:([^:;]+)([:;]?)/DBI:mysql:$2/;
- 
- my $dbh;
- eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
--- a/components/perl_modules/dbd-mysql/test/results-all.master	Tue Mar 14 15:01:07 2017 -0700
+++ b/components/perl_modules/dbd-mysql/test/results-all.master	Thu Mar 09 21:29:54 2017 +0100
@@ -14,6 +14,7 @@
 # SQL_DBMS_VER is <REMOVED>
 # Default storage engine is: InnoDB
 t/10connect.t ........................... ok
+DBD::mysql::st DESTROY failed: MySQL server has gone away.
 t/15reconnect.t ......................... ok
 t/16dbi-get_info.t ...................... ok
 t/20createdrop.t ........................ ok
@@ -49,6 +50,7 @@
 t/52comment.t ........................... ok
 t/53comment.t ........................... ok
 t/55utf8.t .............................. ok
+t/55utf8_jp.t ........................... ok
 t/55utf8mb4.t ........................... ok
 t/56connattr.t .......................... ok
 t/60leaks.t ............................. skipped: Skip $ENV{EXTENDED_TESTING} is not set
@@ -65,11 +67,15 @@
 t/87async.t ............................. skipped: Test::Deep is not installed!
 t/88async-multi-stmts.t ................. ok
 t/89async-method-check.t ................ ok
-t/90no-async.t .......................... skipped: Async support was built into this version of DBD::mysql
+t/90utf8_params.t ....................... ok
 t/91errcheck.t .......................... ok
 t/99_bug_server_prepare_blob_null.t ..... ok
+t/cve-2017-3302.t ....................... ok
+t/magic.t ............................... ok
 t/manifest.t ............................ skipped: these tests are for release testing
 t/pod.t ................................. skipped: Test::Pod 1.00 required for testing POD
+t/rt110983-valid-mysqlfd.t .............. ok
+t/rt118977-zerofill.t ................... ok
 t/rt25389-bin-case.t .................... ok
 t/rt50304-column_info_parentheses.t ..... ok
 t/rt61849-bind-param-buffer-overflow.t .. ok
@@ -81,6 +87,6 @@
 t/rt91715.t ............................. ok
 t/version.t ............................. ok
 All tests successful.
-Files=69, Tests=2052, <TIMINGS REMOVED>
+Files=74, Tests=2982, <TIMINGS REMOVED>
 Result: PASS
 make[1]: Leaving directory '$(@D)'