diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/development/perl-modules | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) | |
download | nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.gz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.bz2 nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.lz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.xz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.zst nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.zip |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/development/perl-modules')
4 files changed, 8 insertions, 203 deletions
diff --git a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch b/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch deleted file mode 100644 index b080771b17dc..000000000000 --- a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 5de3b12e4eecd4efb47e1896dc1d5432bc532568 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Tue, 3 Nov 2015 15:22:54 +0100 -Subject: [PATCH] Adjust view-dependency tests to work on newer libsqlite -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Port upstream fix for SQLite-3.9.0 to 0.082820: - -commit 26c663f123032941cb3f61d6cd11869b86716d6d -Author: Peter Rabbitson <ribasushi@cpan.org> -Date: Tue Nov 3 14:35:35 2015 +0100 - - Adjust view-dependency tests to work on newer libsqlite - - The test and mechanism behind it is largely useless in these cases, but old - sqlite installations will lurk around for ever, so keep the check while moving - it to xt/ - -The original fix makes the tests author's tests, so they are not run -at all. Let's keep the test running by default until upstream releases -new version. - -CPAN RT#107852 - -Signed-off-by: Petr Písař <ppisar@redhat.com> ---- - t/105view_deps.t | 29 ++++++++++++++++------------- - 1 file changed, 16 insertions(+), 13 deletions(-) - -diff --git a/t/105view_deps.t b/t/105view_deps.t -index 21aa92b..39bb632 100644 ---- a/t/105view_deps.t -+++ b/t/105view_deps.t -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy'; - - use strict; - use warnings; -@@ -11,15 +11,6 @@ use DBICTest; - use ViewDeps; - use ViewDepsBad; - --BEGIN { -- require DBIx::Class; -- plan skip_all => 'Test needs ' . -- DBIx::Class::Optional::Dependencies->req_missing_for('deploy') -- unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy'); --} -- --use_ok('DBIx::Class::ResultSource::View'); -- - #################### SANITY - - my $view = DBIx::Class::ResultSource::View->new; -@@ -73,10 +64,16 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; - = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') ); - ok( $schema2, 'Connected to ViewDepsBad schema OK' ); - -+ my $lazy_view_validity = !( -+ $schema2->storage->_server_info->{normalized_dbms_version} -+ < -+ 3.009 -+ ); -+ - #################### DEPLOY2 - - warnings_exist { $schema2->deploy } -- [qr/no such table: main.aba_name_artists/], -+ [ $lazy_view_validity ? () : qr/no such table: main.aba_name_artists/ ], - "Deploying the bad schema produces a warning: aba_name_artists was not created."; - - #################### DOES ORDERING WORK 2? -@@ -106,9 +103,15 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; - } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ } - @{ [ $schema2->sources ] }; - -+ $schema2->storage->dbh->do(q( DROP VIEW "aba_name_artists" )) -+ if $lazy_view_validity; -+ - throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next } -- qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/, -- "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist" -+ qr/no such table: (?:main\.)?aba_name_artists/, -+ sprintf( -+ "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the%s view does not exist", -+ $lazy_view_validity ? ' underlying' : '' -+ ) - ; - } - --- -2.4.3 diff --git a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch b/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch deleted file mode 100644 index 84af4a5acf1c..000000000000 --- a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e9d552de92cde6552f35cd45a3572df1e25609cc Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson <ribasushi@cpan.org> -Date: Tue, 19 May 2015 05:49:48 +0200 -Subject: [PATCH] Make sure tests pass without a compiler present (another step - to RT#74706) - ---- a/t/52leaks.t -+++ b/t/52leaks.t -@@ -446,6 +446,14 @@ for my $addr (keys %$weak_registry) { - delete $weak_registry->{$addr} - unless $cleared->{hash_merge_singleton}{$weak_registry->{$addr}{weakref}{behavior}}++; - } -+ elsif ($names =~ /^B::Hooks::EndOfScope::PP::_TieHintHashFieldHash/m) { -+ # there is one tied lexical which stays alive until GC time -+ # https://metacpan.org/source/ETHER/B-Hooks-EndOfScope-0.15/lib/B/Hooks/EndOfScope/PP/FieldHash.pm#L24 -+ # simply ignore it here, instead of teaching the leaktracer to examine ties -+ # the latter is possible yet terrible: https://github.com/dbsrgits/dbix-class/blob/v0.082820/t/lib/DBICTest/Util/LeakTracer.pm#L113-L117 -+ delete $weak_registry->{$addr} -+ unless $cleared->{bheos_pptiehinthashfieldhash}++; -+ } - elsif ($names =~ /^DateTime::TimeZone::UTC/m) { - # DT is going through a refactor it seems - let it leak zones for now - delete $weak_registry->{$addr}; diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index 4a4b49a829d2..119c8b61da36 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,16 +1,14 @@ -Use $SSL_CERT_FILE to get the CA certificates. - -diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm ---- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm 2011-03-27 13:54:01.000000000 +0200 -+++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm 2011-10-07 13:23:41.398628375 +0200 -@@ -21,6 +21,11 @@ +diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm +--- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm 2013-04-29 23:16:18.000000000 +0200 ++++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm 2016-03-02 14:59:01.639844511 +0100 +@@ -24,6 +24,11 @@ } if ($ssl_opts{SSL_verify_mode}) { unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ if (defined $ENV{'SSL_CERT_FILE'}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}; -+ } -+ } ++ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}; ++ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" ++ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; ++ } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { eval { require Mozilla::CA; diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch deleted file mode 100644 index 25b96796d234..000000000000 --- a/pkgs/development/perl-modules/lwp-test-with-localhost.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 2d7a479b39bb20a0d61f067ba6c2df92117fcb8c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Wed, 23 Apr 2014 12:45:38 +0200 -Subject: [PATCH] Connect to localhost instead of hostname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The hostname does not have to be resolvable nor reachable. It's just -a machine name. - -Signed-off-by: Petr Písař <ppisar@redhat.com> ---- - t/local/http.t | 2 +- - t/robot/ua-get.t | 2 +- - t/robot/ua.t | 2 +- - talk-to-ourself | 3 +-- - 4 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/t/local/http.t b/t/local/http.t -index 779cc21..534b4c8 100644 ---- a/t/local/http.t -+++ b/t/local/http.t -@@ -20,7 +20,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = HTTP::Daemon->new(Timeout => 10); -+ my $d = HTTP::Daemon->new(Timeout => 10, LocalAddr => 'localhost'); - - print "Please to meet you at: <URL:", $d->url, ">\n"; - open(STDOUT, $^O eq 'VMS'? ">nl: " : ">/dev/null"); -diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t -index 5754c4b..bf24589 100644 ---- a/t/robot/ua-get.t -+++ b/t/robot/ua-get.t -@@ -19,7 +19,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = new HTTP::Daemon Timeout => 10; -+ my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost'; - - print "Please to meet you at: <URL:", $d->url, ">\n"; - open(STDOUT, $^O eq 'MSWin32' ? ">nul" : $^O eq 'VMS' ? ">NL:" : ">/dev/null"); -diff --git a/t/robot/ua.t b/t/robot/ua.t -index 21ad5c8..11fafa8 100644 ---- a/t/robot/ua.t -+++ b/t/robot/ua.t -@@ -19,7 +19,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = new HTTP::Daemon Timeout => 10; -+ my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost'; - - print "Please to meet you at: <URL:", $d->url, ">\n"; - open(STDOUT, $^O eq 'MSWin32' ? ">nul" : $^O eq 'VMS' ? ">NL:" : ">/dev/null"); -diff --git a/talk-to-ourself b/talk-to-ourself -index 6c0257a..b4acda2 100644 ---- a/talk-to-ourself -+++ b/talk-to-ourself -@@ -9,8 +9,7 @@ require IO::Socket; - - if (@ARGV >= 2 && $ARGV[0] eq "--port") { - my $port = $ARGV[1]; -- require Sys::Hostname; -- my $host = Sys::Hostname::hostname(); -+ my $host = 'localhost'; - if (my $socket = IO::Socket::INET->new(PeerAddr => "$host:$port", Timeout => 5)) { - require IO::Select; - if (IO::Select->new($socket)->can_read(1)) { --- -1.9.0 - |