Compare commits
No commits in common. "c8s-stream-4.046" and "c9-beta" have entirely different histories.
c8s-stream
...
c9-beta
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/DBD-mysql-4.046.tar.gz
|
||||
SOURCES/DBD-mysql-4.050.tar.gz
|
||||
|
@ -1 +1 @@
|
||||
cf9dad5cee866fb2d48ce11ce9814f4af993736d SOURCES/DBD-mysql-4.046.tar.gz
|
||||
ff19efb5c5a9add075eafa1ad082cc74c2214f2a SOURCES/DBD-mysql-4.050.tar.gz
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,13 +1,14 @@
|
||||
Name: perl-DBD-MySQL
|
||||
Version: 4.046
|
||||
Release: 3%{?dist}
|
||||
Version: 4.050
|
||||
Release: 13%{?dist}
|
||||
Summary: A MySQL interface for Perl
|
||||
Group: Development/Libraries
|
||||
License: GPL+ or Artistic
|
||||
URL: http://search.cpan.org/dist/DBD-mysql/
|
||||
Source0: http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
|
||||
# Fix for new version of MariaDB 10.2
|
||||
Patch0: DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch
|
||||
URL: https://metacpan.org/release/DBD-mysql
|
||||
Source0: https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-%{version}.tar.gz
|
||||
# Remove a useless shebang, bug #1813195,
|
||||
# <https://github.com/perl5-dbi/DBD-mysql/pull/321>
|
||||
Patch0: DBD-mysql-4.050-Remove-a-useless-shebang-from-DBD-mysql.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: gcc
|
||||
@ -22,6 +23,7 @@ BuildRequires: perl(Config)
|
||||
BuildRequires: perl(Data::Dumper)
|
||||
BuildRequires: perl(DBI) >= 1.609
|
||||
BuildRequires: perl(DBI::DBD)
|
||||
BuildRequires: perl(Devel::CheckLib) >= 1.09
|
||||
BuildRequires: perl(DynaLoader)
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
|
||||
BuildRequires: perl(File::Basename)
|
||||
@ -52,11 +54,12 @@ management system.
|
||||
find . -type f | xargs chmod -x
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
|
||||
make %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \
|
||||
NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||
%{make_build}
|
||||
|
||||
%install
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
%{make_install}
|
||||
find %{buildroot} -type f -name '*.bs' -empty -delete
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
@ -73,8 +76,61 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
|
||||
%{_mandir}/man3/*.3*
|
||||
|
||||
%changelog
|
||||
* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.046-3
|
||||
- Rebuild with enable hardening (bug #1636329)
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.050-13
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 4.050-12
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.050-11
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.050-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.050-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.050-8
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Fri Mar 13 2020 Petr Pisar <ppisar@redhat.com> - 4.050-7
|
||||
- Remove a useless shebang (bug #1813195)
|
||||
|
||||
* Tue Feb 04 2020 Tom Stellard <tstellar@redhat.com> - 4.050-6
|
||||
- Use make_build/make_install macros
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.050-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.050-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.050-3
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.050-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jan 10 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.050-1
|
||||
- 4.050 bump
|
||||
|
||||
* Mon Nov 19 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.049-1
|
||||
- 4.049 bump
|
||||
|
||||
* Mon Sep 17 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.048-1
|
||||
- 4.048 bump
|
||||
|
||||
* Mon Sep 10 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.047-1
|
||||
- 4.047 bump
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.046-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.046-3
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Mon Feb 19 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.046-2
|
||||
- Add build-require gcc
|
||||
|
Loading…
Reference in New Issue
Block a user