Accepting request 599996 from devel:languages:perl
OBS-URL: https://build.opensuse.org/request/show/599996 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-DBD-mysql?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
136535a33a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99
|
||||
size 151690
|
||||
3
DBD-mysql-4.046.tar.gz
Normal file
3
DBD-mysql-4.046.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6165652ec959d05b97f5413fa3dff014b78a44cf6de21ae87283b28378daf1f7
|
||||
size 155294
|
||||
@ -8,7 +8,7 @@ description_paragraphs: 1
|
||||
# foo.patch: -p1
|
||||
# bar.patch:
|
||||
preamble: |-
|
||||
BuildRequires: libmysqlclient-devel
|
||||
BuildRequires: libmariadb-devel
|
||||
#post_prep: |-
|
||||
# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'`
|
||||
# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 9ce10cfae7138c37c3a0cb2ba2a1d682482943d0 Mon Sep 17 00:00:00 2001
|
||||
From: Pali <pali@cpan.org>
|
||||
Date: Sun, 25 Jun 2017 10:07:39 +0200
|
||||
Subject: [PATCH] Fix use-after-free after calling mysql_stmt_close()
|
||||
|
||||
Ignore return value from mysql_stmt_close() and also its error message
|
||||
because it points to freed memory after mysql_stmt_close() was called.
|
||||
---
|
||||
dbdimp.c | 8 ++------
|
||||
mysql.xs | 7 ++-----
|
||||
2 files changed, 4 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/dbdimp.c b/dbdimp.c
|
||||
index c60a5f6..a6410e5 100644
|
||||
--- a/dbdimp.c
|
||||
+++ b/dbdimp.c
|
||||
@@ -4894,12 +4894,8 @@ void dbd_st_destroy(SV *sth, imp_sth_t *imp_sth) {
|
||||
|
||||
if (imp_sth->stmt)
|
||||
{
|
||||
- if (mysql_stmt_close(imp_sth->stmt))
|
||||
- {
|
||||
- do_error(DBIc_PARENT_H(imp_sth), mysql_stmt_errno(imp_sth->stmt),
|
||||
- mysql_stmt_error(imp_sth->stmt),
|
||||
- mysql_stmt_sqlstate(imp_sth->stmt));
|
||||
- }
|
||||
+ mysql_stmt_close(imp_sth->stmt);
|
||||
+ imp_sth->stmt= NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/mysql.xs b/mysql.xs
|
||||
index 55376e1..affde59 100644
|
||||
--- a/mysql.xs
|
||||
+++ b/mysql.xs
|
||||
@@ -434,11 +434,8 @@ do(dbh, statement, attr=Nullsv, ...)
|
||||
if (bind)
|
||||
Safefree(bind);
|
||||
|
||||
- if(mysql_stmt_close(stmt))
|
||||
- {
|
||||
- fprintf(stderr, "\n failed while closing the statement");
|
||||
- fprintf(stderr, "\n %s", mysql_stmt_error(stmt));
|
||||
- }
|
||||
+ mysql_stmt_close(stmt);
|
||||
+ stmt= NULL;
|
||||
|
||||
if (retval == -2) /* -2 means error */
|
||||
{
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
diff --git a/dbdimp.c b/dbdimp.c
|
||||
index 9b8b313..fa628b0 100644
|
||||
--- a/dbdimp.c
|
||||
+++ b/dbdimp.c
|
||||
@@ -1979,6 +1979,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
|
||||
@@ -1997,7 +2000,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/dbdimp.h b/dbdimp.h
|
||||
index 935256e..3a5fcaa 100644
|
||||
--- a/dbdimp.h
|
||||
+++ b/dbdimp.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <DBIXS.h> /* installed by the DBI module */
|
||||
#include <mysql.h> /* Comes with MySQL-devel */
|
||||
#include <mysqld_error.h> /* Comes MySQL */
|
||||
+#include <mysql_version.h> /* For MYSQL_VERSION_ID */
|
||||
|
||||
#include <errmsg.h> /* Comes with MySQL-devel */
|
||||
|
||||
71
perl-DBD-mysql-4.046-fix_00base_test.patch
Normal file
71
perl-DBD-mysql-4.046-fix_00base_test.patch
Normal file
@ -0,0 +1,71 @@
|
||||
From 051748825e77172677d9e3b319b870c3c0a70a38 Mon Sep 17 00:00:00 2001
|
||||
From: Jitka Plesnikova <jplesnik@redhat.com>
|
||||
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
|
||||
|
||||
<mariadb_version.h> does not exist in mariadb-5.5.26. Do not include
|
||||
it explicitly. Instead rely on including <mysql.h> that transitively
|
||||
includes <mariadb_version.h> or <mysql_version.h>. This makes this
|
||||
patch more portable.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
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
|
||||
|
||||
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 18 15:35:43 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
- updated to 4.046
|
||||
4.046
|
||||
* Version bump because of issue with META file in 4.045 release.
|
||||
4.045
|
||||
* Use API function for reconnect; fixes compilation on MariaDB
|
||||
10.2.6+.
|
||||
* Fixed broken link to MySQL download page
|
||||
* Spelling fixes
|
||||
4.044
|
||||
* Reapply https://github.com/perl5-dbi/DBD-mysql/pull/114
|
||||
"Improve SSL settings, reflect changes for BACKRONYM and
|
||||
Riddle vulnerabilities, enforce SSL encryption when mysql_ssl=1
|
||||
is set" [bsc#1047059] [CVE-2017-10789]
|
||||
* Fix parsing configure libs from mysql_config --libs output
|
||||
in Makefile.PL. Libraries in mysql_config --libs output can be
|
||||
specified by library name with the -l prefix or by absolute path
|
||||
to library name without any prefix. Parameters must start with a
|
||||
hyphen, so treat all options without leading hyphen in
|
||||
mysql_config --libs output as libraries with full path.
|
||||
Partially fixes bug
|
||||
https://rt.cpan.org/Public/Bug/Display.html?id=100898
|
||||
* Return INTs with ZEROFILL as strings.
|
||||
https://rt.cpan.org/Public/Bug/Display.html?id=118977
|
||||
* Correct require on relative path for perl 5.26.
|
||||
https://github.com/perl5-dbi/DBD-mysql/pull/136
|
||||
- remove the following patches that are no longer needed:
|
||||
* perl-DBD-mysql-4.043-CVE-2017-10788.patch
|
||||
* perl-DBD-mysql-4.043-Fix-build-failures-for-MariaDB.patch
|
||||
- add perl-DBD-mysql-4.046-fix_00base_test.patch to fix 00base test
|
||||
- add Devel::CheckLib BuildRequires
|
||||
- switch from libmysqlclient-devel to libmariadb-devel
|
||||
- run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 14 17:12:32 UTC 2017 - pmonrealgonzalez@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-DBD-mysql
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,30 +16,27 @@
|
||||
#
|
||||
|
||||
|
||||
Name: perl-DBD-mysql
|
||||
Version: 4.043
|
||||
Release: 0
|
||||
%define cpan_name DBD-mysql
|
||||
Name: perl-DBD-mysql
|
||||
Version: 4.046
|
||||
Release: 0
|
||||
Summary: MySQL driver for the Perl5 Database Interface (DBI)
|
||||
License: Artistic-1.0 or GPL-1.0+
|
||||
License: Artistic-1.0 OR GPL-1.0-or-later
|
||||
Group: Development/Libraries/Perl
|
||||
Url: http://search.cpan.org/dist/DBD-mysql/
|
||||
Source0: https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/%{cpan_name}-%{version}.tar.gz
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/%{cpan_name}-%{version}.tar.gz
|
||||
Source1: cpanspec.yml
|
||||
# PATCH-FIX-UPSTREAM CVE-2017-10788 bsc#1047095 pmonrealgonzalez@suse.com - DoS or possibly RCE through use-after-free
|
||||
Patch1: perl-DBD-mysql-4.043-CVE-2017-10788.patch
|
||||
# bsc#1067882 perl-DBD-mysql-4.043-Fix-build-failures-for-MariaDB.patch
|
||||
Patch2: perl-DBD-mysql-4.043-Fix-build-failures-for-MariaDB.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Patch0: perl-DBD-mysql-4.046-fix_00base_test.patch
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
BuildRequires: perl(DBI) >= 1.609
|
||||
BuildRequires: perl(Devel::CheckLib) >= 1.09
|
||||
BuildRequires: perl(Test::Deep)
|
||||
BuildRequires: perl(Test::Simple) >= 0.90
|
||||
Requires: perl(DBI) >= 1.609
|
||||
%{perl_requires}
|
||||
# MANUAL BEGIN
|
||||
BuildRequires: libmysqlclient-devel
|
||||
BuildRequires: libmariadb-devel
|
||||
# MANUAL END
|
||||
|
||||
%description
|
||||
@ -53,15 +50,13 @@ no-one ever requested them. :-)
|
||||
%prep
|
||||
%setup -q -n %{cpan_name}-%{version}
|
||||
find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%patch0 -p1
|
||||
%build
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
%{__make} %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
%{__make} test
|
||||
make %{?_smp_mflags} test
|
||||
|
||||
%install
|
||||
%perl_make_install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user