Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
e5efc6c8c7
!9 Patch0 remove a useless shebang
From: @dillon_chen 
Reviewed-by: @zhengzhenyu 
Signed-off-by: @zhengzhenyu
2022-11-18 01:22:51 +00:00
dillon_chen
6657fff79c Patch0 remove a useless shebang 2022-11-17 16:38:18 +08:00
openeuler-ci-bot
d5ef1d0ffb
!8 [合规提升]spec文件的License声明有歧义
From: @plerks 
Reviewed-by: @bzhaoop 
Signed-off-by: @bzhaoop
2022-08-08 09:34:54 +00:00
Gou Xinyi
0f6ff8e80d
license compliance rectification 2022-06-25 08:35:15 +00:00
openeuler-ci-bot
68b102160a !6 perl-DBD-MySQL delete -Sgit from %autosetup, and delete BuildRequires git
From: @chenyanpanHW
Reviewed-by: @bzhaoop
Signed-off-by: @bzhaoop
2021-08-02 01:18:16 +00:00
chenyanpanHW
b05527dc87
delete -Sgit from %autosetup, and delete BuildRequires git 2021-07-30 23:14:39 +08:00
openeuler-ci-bot
69ab70f4ff !5 update to 4.050
From: @markeryang
Reviewed-by: @volcanodragon
Signed-off-by: @liuzhiqiang26
2021-01-29 12:13:45 +08:00
markeryang
2ef86d46f3 update to 4.050 2021-01-27 20:09:34 +08:00
openeuler-ci-bot
e13e0e00c7 !4 修复yaml文件
Merge pull request !4 from linfeilong835/master
2020-08-11 14:33:31 +08:00
linfeilong835
3a613a258c update perl-DBD-MySQL.yaml. 2020-08-10 16:15:50 +08:00
6 changed files with 58 additions and 82 deletions

View File

@ -1,71 +0,0 @@
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

Binary file not shown.

BIN
DBD-mysql-4.050.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,34 @@
From fc754728272e776b48b3a432ada9954335b783b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 13 Mar 2020 13:41:17 +0100
Subject: [PATCH] Remove a useless shebang from DBD::mysql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Shebang has only a meaning for an executable script. DBD::mysql Perl
module is not an executable script that someone would run as an
standalone program. Morover, the file would have to have set an
executable bit. It seems the erroneous shebang was added by a mistake
when removing an Emacs configuration line.
This patch removes the shebang.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/DBD/mysql.pm | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/DBD/mysql.pm b/lib/DBD/mysql.pm
index 2277fbe..5c90f3e 100644
--- a/lib/DBD/mysql.pm
+++ b/lib/DBD/mysql.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
use strict;
use warnings;
require 5.008_001; # just as DBI
--
2.21.1

View File

@ -1,19 +1,20 @@
Name: perl-DBD-MySQL
Version: 4.046
Release: 7
Version: 4.050
Release: 4
Summary: Perl [DBI] driver for access to MySQL databases.
License: GPL+ or Artistic
License: GPL-1.0-or-later or Artistic-1.0
URL: https://metacpan.org/release/DBD-mysql
Source0: https://cpan.metacpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
Source0: https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-%{version}.tar.gz
Patch0: backport-DBD-mysql-4.050-Remove-a-useless-shebang-from-DBD-mysql.patch
Patch0: 0000-DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch
BuildRequires: coreutils findutils gcc mariadb-connector-c mariadb-connector-c-devel openssl-devel perl-devel
BuildRequires: perl-generators perl-interpreter zlib-devel perl perl-macros perl-interpreter perl-File-Path
BuildRequires: perl-PathTools perl-Getopt-Long perl-libs perl-ExtUtils-MakeMaker perl-Data-Dumper git
BuildRequires: perl-PathTools perl-Getopt-Long perl-libs perl-ExtUtils-MakeMaker perl-Data-Dumper
BuildRequires: perl(DBI) >= 1.609
BuildRequires: perl(DBI::DBD)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Simple) >= 0.90
BuildRequires: perl(Devel::CheckLib) >= 1.09
Requires: perl-libs
Provides: perl-DBD-mysql = %{version}-%{release}
@ -33,7 +34,7 @@ Requires: man
This contains man files for the using of perl-DBD-MySQL.
%prep
%autosetup -Sgit -n DBD-mysql-%{version}
%autosetup -n DBD-mysql-%{version} -p1
find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
%build
@ -56,6 +57,18 @@ make test
%{_mandir}/man3/*.3*
%changelog
* Thu Nov 17 2022 dillon chen <dillon.chen@gmail.com> - 4.050-4
- Patch0 remove a useless shebang
* Sat Jun 25 2022 Xinyi Gou <plerks@163.com> - 4.050-3
- Specify license version
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.050-2
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Thu Jan 14 2021 yanglongkang <yanglongkang@huawei.com> - 4.050-1
- update version 4.050
* Mon Aug 10 2020 volcanodragon <linfeilong@huawei.com> - 4.064-7
- Type:enhancement
- ID:NA

View File

@ -1,5 +1,5 @@
version_control: git
src_repo: metacpan/metacpan-web
tag_prefix: "^v"
seperator: "."
version_control: github
src_repo: perl5-dbi/DBD-mysql
tag_prefix: ""
seperator: "_"