From 1f5bdf1f58f3993f2b8402e51070d086db63a291 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2007 13:32:49 +0000
Subject: [PATCH] * Email::Send and dependencies.

svn path=/nixpkgs/trunk/; revision=8279
---
 .../perl-modules/module-pluggable.patch       | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 44 +++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 pkgs/development/perl-modules/module-pluggable.patch

diff --git a/pkgs/development/perl-modules/module-pluggable.patch b/pkgs/development/perl-modules/module-pluggable.patch
new file mode 100644
index 00000000000..defe8e01ff6
--- /dev/null
+++ b/pkgs/development/perl-modules/module-pluggable.patch
@@ -0,0 +1,65 @@
+diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm
+*** Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm	2007-01-30 00:13:00.000000000 +0100
+--- Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm	2007-03-13 14:29:34.000000000 +0100
+***************
+*** 136,147 ****
+          my $sp = catdir($dir, (split /::/, $searchpath));
+  
+          # if it doesn't exist or it's not a dir then skip it
+!         next unless ( -e $sp && -d _ ); # Use the cached stat the second time
+  
+          my @files = $self->find_files($sp);
+  
+          # foreach one we've found 
+          foreach my $file (@files) {
+              # untaint the file; accept .pm only
+              next unless ($file) = ($file =~ /(.*$file_regex)$/); 
+              # parse the file to get the name
+--- 136,148 ----
+          my $sp = catdir($dir, (split /::/, $searchpath));
+  
+          # if it doesn't exist or it's not a dir then skip it
+!         next unless ( -d $sp );
+  
+          my @files = $self->find_files($sp);
+  
+          # foreach one we've found 
+          foreach my $file (@files) {
++              
+              # untaint the file; accept .pm only
+              next unless ($file) = ($file =~ /(.*$file_regex)$/); 
+              # parse the file to get the name
+***************
+*** 161,167 ****
+  
+              my $err = $self->handle_finding_plugin($plugin);
+              carp "Couldn't require $plugin : $err" if $err;
+!              
+              push @plugins, $plugin;
+          }
+  
+--- 162,168 ----
+  
+              my $err = $self->handle_finding_plugin($plugin);
+              carp "Couldn't require $plugin : $err" if $err;
+! 
+              push @plugins, $plugin;
+          }
+  
+***************
+*** 201,207 ****
+                               (my $path = $File::Find::name) =~ s#^\\./##;
+                               push @files, $path;
+                             }
+!                       }, $search_path );
+      }
+      #chdir $cwd;
+      return @files;
+--- 202,208 ----
+                               (my $path = $File::Find::name) =~ s#^\\./##;
+                               push @files, $path;
+                             }
+!                       }, "$search_path/." );
+      }
+      #chdir $cwd;
+      return @files;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfd42af96e7..2aba63d8771 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1878,6 +1878,31 @@ rec {
     };
   };
 
+  perlEmailAddress = import ../development/perl-modules/generic perl {
+    name = "Email-Address-1.886";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Address-1.886.tar.gz;
+      sha256 = "01qgl66pv1s6g9awwjpnikhl8av4xnn6a47365dnf6hazrm1dh2f";
+    };
+  };
+
+  perlEmailSend = import ../development/perl-modules/generic perl {
+    name = "Email-Send-2.185";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz;
+      sha256 = "0pbgnnbmv6z3zzqaiq1sdcv5d26ijhw4p8k8kp6ac7arvldblamz";
+    };
+    propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue];
+  };
+
+  perlEmailSimple = import ../development/perl-modules/generic perl {
+    name = "Email-Simple-1.998";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Simple-1.998.tar.gz;
+      sha256 = "0zpna7wla1hwfydlnfpjvvq9xq9al2ddkm8w993035vik70vssg7";
+    };
+  };
+
   perlHTMLParser = import ../development/perl-modules/generic perl {
     name = "HTML-Parser-3.45";
     src = fetchurl {
@@ -1919,6 +1944,25 @@ rec {
     propagatedBuildInputs = [perlURI perlHTMLParser];
   };
 
+  perlModulePluggable = import ../development/perl-modules/generic perl {
+    name = "Module-Pluggable-3.5";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz;
+      sha256 = "08rywi79pqn2c8zr17fmd18lpj5hm8lxd1j4v2k002ni8vhl43nv";
+    };
+    patches = [
+      ../development/perl-modules/module-pluggable.patch
+    ];
+  };
+
+  perlReturnValue = import ../development/perl-modules/generic perl {
+    name = "Return-Value-1.302";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
+      sha256 = "0hf5rmfap49jh8dnggdpvapy5r4awgx5hdc3acc9ff0vfqav8azm";
+    };
+  };
+
   perlTermReadKey = import ../development/perl-modules/generic perl {
     name = "TermReadKey-2.30";
     src = fetchurl {