From 9f358f809d1db46f3206d4a09a5366f13c93e777 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 1 Feb 2016 10:18:31 +0100 Subject: Configure a default trust store for openssl --- .../perl-modules/lwp-protocol-https-cert-file.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch (limited to 'pkgs/development/perl-modules') diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch deleted file mode 100644 index 4a4b49a829d2..000000000000 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 @@ - } - 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'}; -+ } -+ } -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; - }; -- cgit 1.4.1 From cf463bbd1ab63235d15996f3b46452f50d63ae24 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 16 Feb 2016 16:18:05 +0100 Subject: perl-DBIx-Class: 0.082820 -> 0.082821 Also remove patches for issues that have been resolved upstream. --- ...-dependency-tests-to-work-on-newer-libsql.patch | 95 ---------------------- .../perl-modules/dbix-class-fix-52leaks.patch | 23 ------ pkgs/top-level/perl-packages.nix | 9 +- 3 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch delete mode 100644 pkgs/development/perl-modules/dbix-class-fix-52leaks.patch (limited to 'pkgs/development/perl-modules') 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?= -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 -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ř ---- - 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 -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/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c1c23f34540..73dec8b1925c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3339,18 +3339,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.082820"; + name = "DBIx-Class-0.082821"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "7b6083a1273d474d785aa93581dc1da334bbe5d83c741574ee2e3942559daeb9"; + sha256 = "1picibywz5sdpaa1pmbv7xfw52nbz6fh32afb1p2qwsgzbkhqvnw"; }; buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; - patches = [ - # Fix test error inside t/52leaks.t - ../development/perl-modules/dbix-class-fix-52leaks.patch - ../development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch - ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; -- cgit 1.4.1 From 3a9842c7c5cf8685420fbc7d2d3632feed8dd166 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 27 Feb 2016 17:13:49 +0100 Subject: perl-LWP: 6.13 -> 6.15 Also remove no longer needed patch. --- .../perl-modules/lwp-test-with-localhost.patch | 75 ---------------------- pkgs/top-level/perl-packages.nix | 7 +- 2 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 pkgs/development/perl-modules/lwp-test-with-localhost.patch (limited to 'pkgs/development/perl-modules') 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?= -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ř ---- - 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, ">\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, ">\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, ">\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 - diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e2581b6a293..89fad8071a68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6900,13 +6900,12 @@ let self = _self // overrides; _self = with self; { }; }; - LWP = buildPerlPackage rec { - name = "libwww-perl-6.13"; + "LWP" = buildPerlPackage rec { + name = "libwww-perl-6.15"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz"; + sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322"; }; - patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ]; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = with stdenv.lib; { description = "The World-Wide Web library for Perl"; -- cgit 1.4.1 From bd7f379a3f4d661a0ae611e7ca4d7d85297f13d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Mar 2016 15:00:32 +0100 Subject: LWP::Protocol::https: Fix SSL cert handling We lost this in 9f358f809d1db46f3206d4a09a5366f13c93e777. Updated to use /etc/ssl/certs/ca-certificates.crt if it exists and SSL_CERT_FILE is not set. --- .../perl-modules/lwp-protocol-https-cert-file.patch | 15 +++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch (limited to 'pkgs/development/perl-modules') diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch new file mode 100644 index 000000000000..119c8b61da36 --- /dev/null +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -0,0 +1,15 @@ +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}) { ++ $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/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e61f24ae3c2a..18ef6145df0f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6950,6 +6950,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz; sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy"; }; + patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ LWP IOSocketSSL ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { -- cgit 1.4.1