From 9030b8bf85e08a101e468be9d2da4c495183db190060cd8f82988421c7498eff Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 13 Sep 2018 08:38:29 +0000 Subject: [PATCH] Accepting request 635352 from home:pmonrealgonzalez:branches:devel:languages:perl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - updated to 4.047 * Add options needed for public key based security. * Allow several spaces after LIMIT clause. * Basic GTID tracking. * Fix GCC 8.1 warnings * Fix warning: unused variable ‘buffer_len’ * Fix warning about bind->is_null assignment with incompatible pointer type * Get rid of warning about unused variable ssl_verify_set * Fix space/tab issue which leads to misleading indentation * Change spaces/tabs to get rid of GCC8 warning - updated to 4.046_01 * Updated documentation re. multithreading * Remove #IFDEFs for code detecting ancient DBI versions. The minimum DBI version we require is version 1.609 from 2009! * ChopBlanks should not trim binary fields * Skipped test which failed on OpenBSD because Proc::ProcessTable does not come with a 'size' attribute on this platform * Improved test suite with regards to MySQL 8.0 * Improved macOS installation notes. * Use Devel::CheckLib 1.09 or newer, fixes https://github.com/perl5-dbi/DBD-mysql/issues/109 * Specify bigint as test dependency * Add recommends and suggests tests dependencies * Check only for libs via Devel::CheckLib in Makefile.PL * Remove param --with-mysql from Makefile.PL documentation * Check if specified Makefile.PL settings are working Fixes https://rt.cpan.org/Ticket/Display.html?id=119902 * Remember mysql_config value for Makefile.PL * Locate MySQL libs using Devel::CheckLib OBS-URL: https://build.opensuse.org/request/show/635352 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-DBD-mysql?expand=0&rev=64 --- DBD-mysql-4.046.tar.gz | 3 - DBD-mysql-4.047.tar.gz | 3 + perl-DBD-mysql-4.046-fix_00base_test.patch | 71 ---------------------- perl-DBD-mysql-MARIADB_BASE_VERSION.patch | 21 +++++++ perl-DBD-mysql.changes | 43 +++++++++++++ perl-DBD-mysql.spec | 5 +- 6 files changed, 70 insertions(+), 76 deletions(-) delete mode 100644 DBD-mysql-4.046.tar.gz create mode 100644 DBD-mysql-4.047.tar.gz delete mode 100644 perl-DBD-mysql-4.046-fix_00base_test.patch create mode 100644 perl-DBD-mysql-MARIADB_BASE_VERSION.patch diff --git a/DBD-mysql-4.046.tar.gz b/DBD-mysql-4.046.tar.gz deleted file mode 100644 index 202cad6..0000000 --- a/DBD-mysql-4.046.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6165652ec959d05b97f5413fa3dff014b78a44cf6de21ae87283b28378daf1f7 -size 155294 diff --git a/DBD-mysql-4.047.tar.gz b/DBD-mysql-4.047.tar.gz new file mode 100644 index 0000000..e282cee --- /dev/null +++ b/DBD-mysql-4.047.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a56d1b93a9748c25be6486075a72c416d66f61b8bb6e54492fa6408f2fbb145 +size 157309 diff --git a/perl-DBD-mysql-4.046-fix_00base_test.patch b/perl-DBD-mysql-4.046-fix_00base_test.patch deleted file mode 100644 index 9f7ec28..0000000 --- a/perl-DBD-mysql-4.046-fix_00base_test.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 051748825e77172677d9e3b319b870c3c0a70a38 Mon Sep 17 00:00:00 2001 -From: Jitka Plesnikova -Date: Fri, 14 Jul 2017 14:13:50 +0200 -Subject: [PATCH] Fix build failures for MariaDB 10.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - does not exist in mariadb-5.5.26. Do not include -it explicitly. Instead rely on including that transitively -includes or . This makes this -patch more portable. - -Signed-off-by: Petr Písař ---- - dbdimp.c | 7 +++++++ - mysql.xs | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -# Fixed in 4.045 -#diff --git a/dbdimp.c b/dbdimp.c -#index 71251da..97fa9c4 100644 -#--- a/dbdimp.c -#+++ b/dbdimp.c -#@@ -2104,6 +2104,9 @@ MYSQL *mysql_dr_connect( -# -# if (result) -# { -#+#if MYSQL_VERSION_ID >= 50013 -#+ my_bool reconnect= 1; -#+#endif -# #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION -# /* connection succeeded. */ -# /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs -#@@ -2122,7 +2125,11 @@ MYSQL *mysql_dr_connect( -# we turn off Mysql's auto reconnect and handle re-connecting ourselves -# so that we can keep track of when this happens. -# */ -#+#if MYSQL_VERSION_ID >= 50013 -#+ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect); -#+#else -# result->reconnect=0; -#+#endif -# } -# else { -# /* -diff --git a/mysql.xs b/mysql.xs -index 60cf9c6..750c763 100644 ---- a/mysql.xs -+++ b/mysql.xs -@@ -787,7 +787,7 @@ dbd_mysql_get_info(dbh, sql_info_type) - D_imp_dbh(dbh); - IV type = 0; - SV* retsv=NULL; --#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 - /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/ - IV buffer_len; - #endif -@@ -819,7 +819,7 @@ dbd_mysql_get_info(dbh, sql_info_type) - retsv = newSVpvn("`", 1); - break; - case SQL_MAXIMUM_STATEMENT_LENGTH: --#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 - /* MariaDB 10 is not MySQL source level compatible so this - only applies to MySQL*/ - /* mysql_get_option() was added in mysql 5.7.3 */ --- -2.13.6 - diff --git a/perl-DBD-mysql-MARIADB_BASE_VERSION.patch b/perl-DBD-mysql-MARIADB_BASE_VERSION.patch new file mode 100644 index 0000000..8ed9f00 --- /dev/null +++ b/perl-DBD-mysql-MARIADB_BASE_VERSION.patch @@ -0,0 +1,21 @@ +Index: DBD-mysql-4.047/dbdimp.c +=================================================================== +--- DBD-mysql-4.047.orig/dbdimp.c ++++ DBD-mysql-4.047/dbdimp.c +@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect( + (SvTRUE(*svp) ? "utf8" : "latin1")); + } + +-#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) { + my_bool server_get_pubkey = 1; + mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey); + } + #endif + +-#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) { + STRLEN plen; + char *server_pubkey = SvPV(*svp, plen); diff --git a/perl-DBD-mysql.changes b/perl-DBD-mysql.changes index 9a73c83..cc4882f 100644 --- a/perl-DBD-mysql.changes +++ b/perl-DBD-mysql.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Wed Sep 12 14:04:10 UTC 2018 - pmonrealgonzalez@suse.com + +- updated to 4.047 + * Add options needed for public key based security. + * Allow several spaces after LIMIT clause. + * Basic GTID tracking. + * Fix GCC 8.1 warnings + * Fix warning: unused variable ‘buffer_len’ + * Fix warning about bind->is_null assignment with incompatible pointer type + * Get rid of warning about unused variable ssl_verify_set + * Fix space/tab issue which leads to misleading indentation + * Change spaces/tabs to get rid of GCC8 warning + +- updated to 4.046_01 + * Updated documentation re. multithreading + * Remove #IFDEFs for code detecting ancient DBI versions. The minimum + DBI version we require is version 1.609 from 2009! + * ChopBlanks should not trim binary fields + * Skipped test which failed on OpenBSD because Proc::ProcessTable does not + come with a 'size' attribute on this platform + * Improved test suite with regards to MySQL 8.0 + * Improved macOS installation notes. + * Use Devel::CheckLib 1.09 or newer, fixes + https://github.com/perl5-dbi/DBD-mysql/issues/109 + * Specify bigint as test dependency + * Add recommends and suggests tests dependencies + * Check only for libs via Devel::CheckLib in Makefile.PL + * Remove param --with-mysql from Makefile.PL documentation + * Check if specified Makefile.PL settings are working + Fixes https://rt.cpan.org/Ticket/Display.html?id=119902 + * Remember mysql_config value for Makefile.PL + * Locate MySQL libs using Devel::CheckLib + * Added a fix for 30insertfetch failure when using server-side prepared + statements. The stmt was being freed for DML statements before + the handle attribute was read, mysql_info was reading back nulls + +- Dropped patch perl-DBD-mysql-4.046-fix_00base_test.patch as fixed + upstream in https://github.com/perl5-dbi/DBD-mysql/pull/231 + +- Added perl-DBD-mysql-MARIADB_BASE_VERSION.patch to fix compilation + errors as mentioned in https://github.com/perl5-dbi/DBD-mysql/issues/262 + ------------------------------------------------------------------- Mon Aug 27 09:28:19 UTC 2018 - tchvatal@suse.com diff --git a/perl-DBD-mysql.spec b/perl-DBD-mysql.spec index b274c6b..d96959c 100644 --- a/perl-DBD-mysql.spec +++ b/perl-DBD-mysql.spec @@ -18,7 +18,7 @@ %define cpan_name DBD-mysql Name: perl-DBD-mysql -Version: 4.046 +Version: 4.047 Release: 0 Summary: MySQL driver for the Perl5 Database Interface (DBI) License: Artistic-1.0 OR GPL-1.0-or-later @@ -26,7 +26,7 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/DBD-mysql/ Source0: http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml -Patch0: perl-DBD-mysql-4.046-fix_00base_test.patch +Patch0: perl-DBD-mysql-MARIADB_BASE_VERSION.patch BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(DBI) >= 1.609 @@ -52,6 +52,7 @@ no-one ever requested them. :-) %setup -q -n %{cpan_name}-%{version} find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %patch0 -p1 + %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags}