Fix default value for nossl option (bug #1366773)

This commit is contained in:
Jitka Plesnikova 2016-08-16 17:49:06 +02:00
parent 4800a4cbf2
commit d67f20babf
2 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,14 @@
diff -up DBD-mysql-4.035/Makefile.PL.orig DBD-mysql-4.035/Makefile.PL
--- DBD-mysql-4.035/Makefile.PL.orig 2016-08-16 15:10:57.626484971 +0200
+++ DBD-mysql-4.035/Makefile.PL 2016-08-16 16:05:56.739956566 +0200
@@ -680,8 +680,8 @@ section "Linker flags" or type
MSG
}
elsif ($param eq "nossl") {
- $opt->{$param} = ($opt->{"libs"} =~ /ssl/) ? 1 : 0;
- $source->{$param} = $opt->{$param} ? "choice" : "default";
+ #$opt->{$param} = ($opt->{"libs"} =~ /ssl/) ? 1 : 0;
+ #$source->{$param} = $opt->{$param} ? "choice" : "default";
}
elsif ($param eq "ssl") {
# default, for legacy reasons

View File

@ -1,11 +1,12 @@
Name: perl-DBD-MySQL
Version: 4.035
Release: 1%{?dist}
Release: 2%{?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/M/MI/MICHIELB/DBD-mysql-%{version}.tar.gz
Patch0: DBD-mysql-4.035-Fix-nossl-option.patch
BuildRequires: mariadb, mariadb-devel, zlib-devel
BuildRequires: coreutils
BuildRequires: findutils
@ -40,6 +41,8 @@ management system.
%prep
%setup -q -n DBD-mysql-%{version}
%patch0 -p1
# Correct file permissions
find . -type f | xargs chmod -x
@ -50,7 +53,7 @@ for file in lib/DBD/mysql.pm Changes; do
done
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" --ssl
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%install
@ -72,6 +75,9 @@ find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
%{_mandir}/man3/*.3*
%changelog
* Tue Aug 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.035-2
- Fix default value for nossl option (bug #1366773)
* Mon Jul 11 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.035-1
- 4.035 bump