perl: upgrade from 5.12.2 to 5.12.3

And changed the perl tarball URL to more stable cpan location.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

33 files changed, 0 insertions, 1766 deletions

diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
deleted file mode 100644
index c86ddc90c..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Description: Downgrade the optimization of sv.c on arm due to a gcc-4.4 bug
-Bug-Debian: http://bugs.debian.org/580334
-
-Regression from gcc-4.3, not reported yet.
-
- perl -e '"-2" =~ /(.+)/; @foo=(); push @foo, $_ for $1..undef; print @foo ? "ok\n" : "not ok\n"'
-
-
----
- cflags.SH |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/cflags.SH b/cflags.SH
-index a5d71b9..6914ba6 100755
---- a/cflags.SH
-+++ b/cflags.SH
-@@ -312,7 +312,11 @@ for file do
-     regexec) ;;
-     run) ;;
-     scope) ;;
--    sv) ;;
-+    sv)
-+	case $archname in
-+	arm-*|armeb-*)
-+	    optimize=-O0;;
-+	esac;;
-     taint) ;;
-     toke) ;;
-     universal) ;;
--- 
-tg: (c823880..) debian/arm_optim (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
deleted file mode 100644
index c4b4c1339..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate slower build hosts
-Bug-Debian: http://bugs.debian.org/501970
-
-
----
- dist/threads-shared/t/stress.t |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
-index adfd1ed..652a3e6 100755
---- a/dist/threads-shared/t/stress.t
-+++ b/dist/threads-shared/t/stress.t
-@@ -34,7 +34,7 @@ use threads::shared;
- {
-     my $cnt = 50;
- 
--    my $TIMEOUT = 60;
-+    my $TIMEOUT = 150;
- 
-     my $mutex = 1;
-     share($mutex);
--- 
-tg: (c823880..) debian/arm_thread_stress_timeout (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
deleted file mode 100644
index 4a349b4c7..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Set location of CPAN::Config to /etc/perl as /usr may not be writable.
-
-
----
- cpan/CPAN/lib/CPAN/HandleConfig.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cpan/CPAN/lib/CPAN/HandleConfig.pm b/cpan/CPAN/lib/CPAN/HandleConfig.pm
-index 76cd81e..65a3b27 100644
---- a/cpan/CPAN/lib/CPAN/HandleConfig.pm
-+++ b/cpan/CPAN/lib/CPAN/HandleConfig.pm
-@@ -543,7 +543,7 @@ sub load {
-         $configpm = $INC{"CPAN/MyConfig.pm"};
-         $redo++;
-     } else {
--        my($path_to_cpan) = File::Basename::dirname($INC{"CPAN.pm"});
-+        my($path_to_cpan) = '/etc/perl';
-         my($configpmdir) = File::Spec->catdir($path_to_cpan,"CPAN");
-         my($configpmtest) = File::Spec->catfile($configpmdir,"Config.pm");
-         my $inc_key;
--- 
-tg: (c823880..) debian/cpan_config_path (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
deleted file mode 100644
index 3e3e53f2a..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Provide a sensible INSTALLDIRS default for modules installed from CPAN.
-
-Some modules which are included in core set INSTALLDIRS => 'perl'
-explicitly in Makefile.PL or Build.PL.  This makes sense for the normal @INC
-ordering, but not ours.
-
-
----
- cpan/CPAN/lib/CPAN/FirstTime.pm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 53ffbf1..53976ff 100644
---- a/cpan/CPAN/lib/CPAN/FirstTime.pm
-+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -947,7 +947,7 @@ sub init {
-     my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
- 
-     if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
--        my_dflt_prompt(makepl_arg => "", $matcher);
-+        my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
-         my_dflt_prompt(make_arg => "", $matcher);
-         if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
-             $CPAN::Frontend->mywarn( 
-@@ -969,7 +969,7 @@ sub init {
-     my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
-                    $matcher);
- 
--    my_dflt_prompt(mbuildpl_arg => "", $matcher);
-+    my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher);
-     my_dflt_prompt(mbuild_arg => "", $matcher);
- 
-     if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}
--- 
-tg: (c823880..) debian/cpan_definstalldirs (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
deleted file mode 100644
index 65101194a..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
-    
-This is a configuration file and needs to go in /etc by policy.
-Besides, /usr may not even be writable.
-    
-This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
-
-See #533707.
-
----
- cpan/CPANPLUS/lib/CPANPLUS/Configure.pm           |    1 +
- cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm |    3 +++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-index baac91d..a3794de 100644
---- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-@@ -276,6 +276,7 @@ Saves the configuration to the package name you provided.
- If this package is not C<CPANPLUS::Config::System>, it will
- be saved in your C<.cpanplus> directory, otherwise it will
- be attempted to be saved in the system wide directory.
-+(On Debian systems, this system wide directory is /etc/perl.)
- 
- If no argument is provided, it will default to your personal
- config.
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-index 1a38200..6ee0d82 100644
---- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-@@ -199,6 +199,9 @@ use constant CONFIG_USER_FILE    => sub {
-                                     ) . '.pm';
-                                 };
- use constant CONFIG_SYSTEM_FILE  => sub {
-+                                    # Debian-specific shortcut
-+                                    return '/etc/perl/CPANPLUS/Config/System.pm';
-+                                    
-                                     require CPANPLUS::Internals;
-                                     require File::Basename;
-                                     my $dir = File::Basename::dirname(
--- 
-tg: (c823880..) debian/cpanplus_config_path (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
deleted file mode 100644
index 2ec063cbd..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Configure CPANPLUS to use the site directories by default.
-Closes: 533707
-    
-The core modules usually default to INSTALLDIRS=perl (ExtUtils::MakeMaker)
-or installdirs=core (Module::Build), so we need to explicitly ask for
-the site destination to get upgraded versions into /usr/local.
-
-See also the sister patch, debian/cpan_definstalldirs .
-
----
- cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm |   30 +++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
-new file mode 100644
-index 0000000..5e6e11e
---- /dev/null
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
-@@ -0,0 +1,30 @@
-+### minimal pod, so you can find it with perldoc -l, etc
-+=pod
-+
-+=head1 NAME
-+
-+CPANPLUS::Config::System
-+
-+=head1 DESCRIPTION
-+
-+This is a CPANPLUS configuration file that sets appropriate default
-+settings on Debian systems.
-+
-+The only preconfigured settings are C<makemakerflags> (set to
-+C<INSTALLDIRS=site>) and C<buildflags> (set to C<--installdirs site>).
-+
-+These settings will not have any effect if
-+C</etc/perl/CPANPLUS/Config/System.pm> is present.
-+
-+=cut
-+
-+
-+package CPANPLUS::Config::System;
-+
-+sub setup {
-+    my $conf = shift;
-+    $conf->set_conf( makemakerflags => 'INSTALLDIRS=site' );    
-+    $conf->set_conf( buildflags => '--installdirs site' );    
-+}
-+
-+1;
--- 
-tg: (c823880..) debian/cpanplus_definstalldirs (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
deleted file mode 100644
index a974d08ea..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Remove overly restrictive DB_File version check.
-Bug-Debian: http://bugs.debian.org/340047
-
-Package dependencies ensure the correct library is linked at run-time.
-
-
----
- cpan/DB_File/version.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
-index 47158d3..67ccdff 100644
---- a/cpan/DB_File/version.c
-+++ b/cpan/DB_File/version.c
-@@ -48,6 +48,7 @@ __getBerkeleyDBInfo()
- 
-     (void)db_version(&Major, &Minor, &Patch) ;
- 
-+#ifndef DEBIAN
-     /* Check that the versions of db.h and libdb.a are the same */
-     if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR )
- 		/* || Patch != DB_VERSION_PATCH) */
-@@ -55,6 +56,7 @@ __getBerkeleyDBInfo()
- 	croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n",
- 		DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, 
- 		Major, Minor, Patch) ;
-+#endif /* DEBIAN */
-     
-     /* check that libdb is recent enough  -- we need 2.3.4 or greater */
-     if (Major == 2 && (Minor < 3 || (Minor ==  3 && Patch < 4)))
--- 
-tg: (c823880..) debian/db_file_ver (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
deleted file mode 100644
index e580466cc..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Point users to Debian packages of deprecated core modules
-Bug-Debian: http://bugs.debian.org/580034
-
-Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
-deprecated from the Perl core in 5.12.0.
-
-To get a clean transition, perl-modules is going to recommend the separate
-Debian packages of these for one release cycle so that they will be
-pulled in by default on upgrades.
-
-However, on systems configured to ignore recommendations the deprecation
-warnings will still be useful, so modify them slightly to point to the
-separate packages instead.
-
----
- lib/deprecate.pm |   18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/lib/deprecate.pm b/lib/deprecate.pm
-index 7b92e0b..9db7330 100644
---- a/lib/deprecate.pm
-+++ b/lib/deprecate.pm
-@@ -7,6 +7,16 @@ our $VERSION = 0.01;
- our %Config;
- unless (%Config) { require Config; *Config = \%Config::Config; }
- 
-+# Debian-specific change: recommend the separate Debian packages of
-+# deprecated modules where available
-+
-+my %DEBIAN_PACKAGES = (
-+    "Class::ISA"	=> "libclass-isa-perl",
-+    "Pod::Plainer"	=> "libpod-plainer-perl",
-+    "Switch"		=> "libswitch-perl",
-+    "Shell"		=> "libshell-perl",
-+);
-+
- sub import {
-     my ($package, $file, $line) = caller;
-     my $expect_leaf = "$package.pm";
-@@ -44,9 +54,15 @@ EOM
- 	    if (defined $callers_bitmask
-             	&& (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
- 		    || vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
--		warn <<"EOM";
-+		if (my $deb = $DEBIAN_PACKAGES{$package}) {
-+		    warn <<"EOM";
-+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line.
-+EOM
-+		} else {
-+		    warn <<"EOM";
- $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line.
- EOM
-+		}
- 	    }
- 	    return;
- 	}
--- 
-tg: (c823880..) debian/deprecate-with-apt (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
deleted file mode 100644
index c65601000..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Work around an ICE on ia64
-Closes: 548943
-
-Temporarily work around an internal compiler error in Devel::PPPort
-on ia64+gcc-4.3.
-
-
----
- cpan/Devel-PPPort/Makefile.PL |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/Devel-PPPort/Makefile.PL b/cpan/Devel-PPPort/Makefile.PL
-index 67eebc1..f1ef7a2 100644
---- a/cpan/Devel-PPPort/Makefile.PL
-+++ b/cpan/Devel-PPPort/Makefile.PL
-@@ -75,6 +75,13 @@ sub configure
-     push @moreopts, INSTALLDIRS => ($] >= 5.007003 ? 'perl' : 'site');
-   }
- 
-+
-+  # temporary Debian hack, see http://bugs.debian.org/548943
-+  require Config;
-+  if ($Config::Config{archname} =~ /^ia64/) {
-+    push @moreopts, OPTIMIZE => '-g -O0';
-+  }
-+
-   if ($opt{'apicheck'}) {
-     $PL_FILES{'apicheck_c.PL'} = 'apicheck.c';
-     push @C_FILES, qw{ apicheck.c };
--- 
-tg: (c823880..) debian/devel-ppport-ia64-optim (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
deleted file mode 100644
index e036dc53e..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Disable zlib bundling in Compress::Raw::Zlib
-
-Compress::Raw::Zlib statically links its bundled version of zlib
-by default, but we use the system library instead.
-
----
- cpan/Compress-Raw-Zlib/config.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cpan/Compress-Raw-Zlib/config.in b/cpan/Compress-Raw-Zlib/config.in
-index c56cc03..2c6659b 100644
---- a/cpan/Compress-Raw-Zlib/config.in
-+++ b/cpan/Compress-Raw-Zlib/config.in
-@@ -16,9 +16,9 @@
- #    Setting the Gzip OS Code
- #
- 
--BUILD_ZLIB      = True
--INCLUDE         = ./zlib-src
--LIB             = ./zlib-src
-+BUILD_ZLIB      = False
-+INCLUDE         = /usr/include
-+LIB             = /usr/lib
- 
- OLD_ZLIB        = False
- GZIP_OS_CODE    = AUTO_DETECT
--- 
-tg: (c823880..) debian/disable-zlib-bundling (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
deleted file mode 100644
index 2f5d9a4fb..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Replace generic man(1) instructions with Debian-specific information.
-
-Indicate that the user needs to install the perl-doc package.
-
-
----
- pod/perl.pod |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/pod/perl.pod b/pod/perl.pod
-index e48e526..3b0bbf6 100644
---- a/pod/perl.pod
-+++ b/pod/perl.pod
-@@ -241,8 +241,16 @@ For ease of access, the Perl manual has been split up into several sections.
-     perlwin32		Perl notes for Windows
- 
- 
--On a Unix-like system, these documentation files will usually also be
--available as manpages for use with the F<man> program.
-+On Debian systems, you need to install the B<perl-doc> package which
-+contains the majority of the standard Perl documentation and the
-+F<perldoc> program.
-+
-+Extensive additional documentation for Perl modules is available, both
-+those distributed with Perl and third-party modules which are packaged
-+or locally installed.
-+
-+You should be able to view Perl's documentation with your man(1)
-+program or perldoc(1).
- 
- In general, if something strange has gone wrong with your program and you're
- not sure where you should look for help, try the B<-w> switch first.  It will
--- 
-tg: (c823880..) debian/doc_info (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
deleted file mode 100644
index e96d53d8f..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
-Bug-Debian: http://bugs.debian.org/290336
-
-- ignore missing directories,
-- follow symlinks (/usr/share/perl/5.8 -> 5.8.4).
-
-
----
- cpan/Encode/bin/enc2xs |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index 773c0a0..049ecf9 100644
---- a/cpan/Encode/bin/enc2xs
-+++ b/cpan/Encode/bin/enc2xs
-@@ -924,11 +924,11 @@ use vars qw(
- sub find_e2x{
-     eval { require File::Find; };
-     my (@inc, %e2x_dir);
--    for my $inc (@INC){
-+    for my $inc (grep -d, @INC){
-     push @inc, $inc unless $inc eq '.'; #skip current dir
-     }
-     File::Find::find(
--         sub {
-+         { wanted => sub {
-          my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-              $atime,$mtime,$ctime,$blksize,$blocks)
-              = lstat($_) or return;
-@@ -938,7 +938,7 @@ sub find_e2x{
-              $e2x_dir{$File::Find::dir} ||= $mtime;
-          }
-          return;
--         }, @inc);
-+         }, follow => 1}, @inc);
-     warn join("\n", keys %e2x_dir), "\n";
-     for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
-     $_E2X = $d;
-@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
- 	    $LocalMod{$enc} ||= $mod;
- 	}
-     };
--    File::Find::find({wanted => $wanted}, @INC);
-+    File::Find::find({wanted => $wanted, follow => 1}, grep -d, @INC);
-     $_ModLines = "";
-     for my $enc ( sort keys %LocalMod ) {
-         $_ModLines .=
--- 
-tg: (c823880..) debian/enc2xs_inc (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
deleted file mode 100644
index b28b4bca8..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Remove Errno version check due to upgrade problems with long-running processes.
-Bug-Debian: http://bugs.debian.org/343351
-
-Remove version check which can cause problems for long running
-processes embedding perl when upgrading to a newer version,
-compatible, but built on a different machine.
-
-
----
- ext/Errno/Errno_pm.PL |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 124b8fc..b554cd4 100644
---- a/ext/Errno/Errno_pm.PL
-+++ b/ext/Errno/Errno_pm.PL
-@@ -341,13 +341,8 @@ EOF
- package Errno;
- our (\@EXPORT_OK,\%EXPORT_TAGS,\@ISA,\$VERSION,\%errno,\$AUTOLOAD);
- use Exporter ();
--use Config;
- use strict;
- 
--"\$Config{'archname'}-\$Config{'osvers'}" eq
--"$Config{'archname'}-$Config{'osvers'}" or
--	die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
--
- \$VERSION = "$VERSION";
- \$VERSION = eval \$VERSION;
- \@ISA = qw(Exporter);
--- 
-tg: (c823880..) debian/errno_ver (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
deleted file mode 100644
index 1fb635da2..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
+++ /dev/null
@@ -1,315 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Various debian-specific ExtUtils changes
-
- * Respect umask during installation, and set as appropriate for each of
-   perl, vendor and site (policy requires group writable site dirs).
-
- * Don't install .packlist or perllocal.pod for perl or vendor.
- * Fiddle with *PREFIX and variables written to the makefile so that
-   install directories may be changed when make is run by passing
-   PREFIX= to the "make install" command (used when packaging
-   modules).
-
- * Set location of libperl.a to /usr/lib.
- * Note that libperl-dev package is required for embedded linking.
- * Change install target dependencies to facilitate parallel makes.
-
-
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm  |   12 +++---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   44 +++++-----------------
- cpan/ExtUtils-MakeMaker/t/INST.t                |    4 +--
- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t         |   10 +++---
- dist/ExtUtils-Install/lib/ExtUtils/Install.pm   |   18 +++++-----
- lib/ExtUtils/Embed.pm                           |    3 ++
- 6 files changed, 34 insertions(+), 57 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-index 4905aeb..a80ac20 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS.
- sub manifypods_target {
-     my($self) = shift;
- 
--    my $man1pods      = '';
--    my $man3pods      = '';
-     my $dependencies  = '';
- 
-     # populate manXpods & dependencies:
-@@ -718,7 +716,7 @@ END
-     foreach my $section (qw(1 3)) {
-         my $pods = $self->{"MAN${section}PODS"};
-         push @man_cmds, $self->split_command(<<CMD, %$pods);
--	\$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
-+	\$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
- CMD
-     }
- 
-@@ -1428,9 +1426,11 @@ sub init_INSTALL_from_PREFIX {
-         $self->{SITEPREFIX}   ||= $sprefix;
-         $self->{VENDORPREFIX} ||= $vprefix;
- 
--        # Lots of MM extension authors like to use $(PREFIX) so we
--        # put something sensible in there no matter what.
--        $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
-+	my $p = $self->{PREFIX} = $self->{PERLPREFIX};
-+	for my $t (qw/PERL SITE VENDOR/)
-+	{
-+	    $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
-+	}
-     }
- 
-     my $arch    = $Config{archname};
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 239d6df..940de38 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2046,9 +2046,7 @@ doc__install : doc_site_install
- 	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
- 
- pure_perl_install :: all
--	$(NOECHO) $(MOD_INSTALL) \
--		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
--		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
-+	$(NOECHO) umask 022; $(MOD_INSTALL) \
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
- 		$(INST_BIN) $(DESTINSTALLBIN) \
-@@ -2060,7 +2058,7 @@ pure_perl_install :: all
- 
- 
- pure_site_install :: all
--	$(NOECHO) $(MOD_INSTALL) \
-+	$(NOECHO) umask 02; $(MOD_INSTALL) \
- 		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLSITELIB) \
-@@ -2073,9 +2071,7 @@ pure_site_install :: all
- 		}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
- 
- pure_vendor_install :: all
--	$(NOECHO) $(MOD_INSTALL) \
--		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
--		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
-+	$(NOECHO) umask 022; $(MOD_INSTALL) \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
- 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
-@@ -2084,37 +2080,19 @@ pure_vendor_install :: all
- 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
- 
- doc_perl_install :: all
--	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--	-$(NOECHO) $(DOC_INSTALL) \
--		"Module" "$(NAME)" \
--		"installed into" "$(INSTALLPRIVLIB)" \
--		LINKTYPE "$(LINKTYPE)" \
--		VERSION "$(VERSION)" \
--		EXE_FILES "$(EXE_FILES)" \
--		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
- 
- doc_site_install :: all
--	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--	-$(NOECHO) $(DOC_INSTALL) \
-+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
-+	-$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH)
-+	-$(NOECHO) umask 02; $(DOC_INSTALL) \
- 		"Module" "$(NAME)" \
- 		"installed into" "$(INSTALLSITELIB)" \
- 		LINKTYPE "$(LINKTYPE)" \
- 		VERSION "$(VERSION)" \
- 		EXE_FILES "$(EXE_FILES)" \
--		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
-+		>> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
- 
- doc_vendor_install :: all
--	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--	-$(NOECHO) $(DOC_INSTALL) \
--		"Module" "$(NAME)" \
--		"installed into" "$(INSTALLVENDORLIB)" \
--		LINKTYPE "$(LINKTYPE)" \
--		VERSION "$(VERSION)" \
--		EXE_FILES "$(EXE_FILES)" \
--		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
- 
- };
- 
-@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
- 	$(NOECHO) $(NOOP)
- 
- uninstall_from_perldirs ::
--	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
- 
- uninstall_from_sitedirs ::
- 	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
- 
- uninstall_from_vendordirs ::
--	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
-+
- };
- 
-     join("",@m);
-@@ -2402,7 +2379,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
- 	($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
-     }
-     unless ($libperl && -f $lperl) { # Ilya's code...
--	my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
-+	my $dir = $self->{PERL_SRC} || "/usr/lib";
- 	$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
- 	$libperl ||= "libperl$self->{LIB_EXT}";
- 	$libperl   = "$dir/$libperl";
-@@ -2998,8 +2975,7 @@ sub prefixify {
-     print STDERR "  prefixify $var => $path\n" if $Verbose >= 2;
-     print STDERR "    from $sprefix to $rprefix\n" if $Verbose >= 2;
- 
--    if( $self->{ARGS}{PREFIX} &&
--        $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) 
-+    if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
-     {
- 
-         print STDERR "    cannot prefix, using default.\n" if $Verbose >= 2;
-diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
-index 8a140eb..cf1410e 100755
---- a/cpan/ExtUtils-MakeMaker/t/INST.t
-+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
-@@ -59,9 +59,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
- is( $mm->{NAME}, 'Big::Dummy',  'NAME' );
- is( $mm->{VERSION}, 0.01,            'VERSION' );
- 
--my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
--                    $Config{prefixexp}        || $Config{prefix};
--is( $mm->{PERLPREFIX}, $config_prefix,   'PERLPREFIX' );
-+is( $mm->{PERLPREFIX}, '$(PREFIX)',   'PERLPREFIX' );
- 
- is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
- 
-diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-index 8bb9db8..316546d 100755
---- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-@@ -10,7 +10,7 @@ BEGIN {
- }
- 
- use strict;
--use Test::More tests => 52;
-+use Test::More tests => 47;
- use MakeMaker::Test::Utils;
- use MakeMaker::Test::Setup::BFD;
- use ExtUtils::MakeMaker;
-@@ -56,16 +56,16 @@ like( $stdout->read, qr{
-                         Writing\ $Makefile\ for\ Big::Dummy\n
- }x );
- 
--is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
-+#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
- 
- isa_ok( $mm, 'ExtUtils::MakeMaker' );
- 
- is( $mm->{NAME}, 'Big::Dummy',  'NAME' );
- is( $mm->{VERSION}, 0.01,            'VERSION' );
- 
--foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
--    unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
--}
-+#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
-+#    unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
-+#}
- 
- 
- my $PREFIX = File::Spec->catdir('foo', 'bar');
-diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-index da58365..d6d5c11 100644
---- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-@@ -468,7 +468,7 @@ sub _can_write_dir {
- 
- =pod
- 
--=item _mkpath($dir,$show,$mode,$verbose,$dry_run)
-+=item _mkpath($dir,$show,$verbose,$dry_run)
- 
- Wrapper around File::Path::mkpath() to handle errors.
- 
-@@ -485,13 +485,13 @@ writable.
- =cut
- 
- sub _mkpath {
--    my ($dir,$show,$mode,$verbose,$dry_run)=@_;
-+    my ($dir,$show,$verbose,$dry_run)=@_;
-     if ( $verbose && $verbose > 1 && ! -d $dir) {
-         $show= 1;
--        printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode;
-+        printf "mkpath(%s,%d)\n", $dir, $show;
-     }
-     if (!$dry_run) {
--        if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) {
-+        if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) {
-             _choke("Can't create '$dir'","$@");
-         }
- 
-@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
-         _chdir($cwd);
-     }
-     foreach my $targetdir (sort keys %check_dirs) {
--        _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
-+        _mkpath( $targetdir, 0, $verbose, $dry_run );
-     }
-     foreach my $found (@found_files) {
-         my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
-@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC
-                     $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
-                         unless $dry_run;
-                 } elsif ( ! -d $targetdir ) {
--                    _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
-+                    _mkpath( $targetdir, 0, $verbose, $dry_run );
-                 }
-                 print "Installing $targetfile\n";
- 
-@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC
- 
-     if ($pack{'write'}) {
-         $dir = install_rooted_dir(dirname($pack{'write'}));
--        _mkpath( $dir, 0, 0755, $verbose, $dry_run );
-+        _mkpath( $dir, 0, $verbose, $dry_run );
-         print "Writing $pack{'write'}\n" if $verbose;
-         $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
-     }
-@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory).
- sub pm_to_blib {
-     my($fromto,$autodir,$pm_filter) = @_;
- 
--    _mkpath($autodir,0,0755);
-+    _mkpath($autodir,0);
-     while(my($from, $to) = each %$fromto) {
-         if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
-             print "Skip $to (unchanged)\n";
-@@ -1213,7 +1213,7 @@ sub pm_to_blib {
-             # we wont try hard here. its too likely to mess things up.
-             forceunlink($to);
-         } else {
--            _mkpath(dirname($to),0,0755);
-+            _mkpath(dirname($to),0);
-         }
-         if ($need_filtering) {
-             run_filter($pm_filter, $from, $to);
-diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
-index 24ae909..12d421d 100644
---- a/lib/ExtUtils/Embed.pm
-+++ b/lib/ExtUtils/Embed.pm
-@@ -305,6 +305,9 @@ and extensions in your C/C++ applications.
- Typically, an application B<Makefile> will invoke ExtUtils::Embed
- functions while building your application.  
- 
-+Note that on Debian systems the B<libperl-dev> package is required for
-+compiling applications which embed an interpreter.
-+
- =head1 @EXPORT
- 
- ExtUtils::Embed exports the following functions:
--- 
-tg: (c823880..) debian/extutils_hacks (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
deleted file mode 100644
index 380955b52..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
-
-Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
-time the rule is evaluated rather than when the Makefile is created.
-
-This is required when building packages with dpkg-buildpackage and fakeroot,
-since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
-rule where the Makefile is created, but is for the clean/binary* targets.
-
-
----
- Makefile.SH |    9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.SH b/Makefile.SH
-index c039938..15184d8 100755
---- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -50,12 +50,7 @@ case "$useshrplib" in
- true)
- 	# Prefix all runs of 'miniperl' and 'perl' with
- 	# $ldlibpth so that ./perl finds *this* shared libperl.
--	case "$LD_LIBRARY_PATH" in
--	'')
--		ldlibpth="LD_LIBRARY_PATH=`pwd`";;
--	*)
--		ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
--	esac
-+	ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
- 
- 	pldlflags="$cccdlflags"
- 	static_ldflags=''
-@@ -126,7 +121,7 @@ true)
- 	    ;;
- 	esac
- 	case "$ldlibpthname" in
--	'') ;;
-+	''|LD_LIBRARY_PATH) ;;
- 	*)
- 	    case "$osname" in
- 	    os2)
--- 
-tg: (c823880..) debian/fakeroot (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
deleted file mode 100644
index 1e2c1ad47..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
+++ /dev/null
@@ -1,100 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Allow for flock returning EAGAIN instead of EWOULDBLOCK on linux/parisc
-Bug-Debian: http://bugs.debian.org/543731
-Origin: upstream, http://github.com/pfenwick/autodie/commit/037738e11a6097734b0e1dabdd77b92e5fe35219
-
-
----
- cpan/autodie/lib/Fatal.pm |   14 +++++++++++++-
- cpan/autodie/t/flock.t    |   12 ++++++++++--
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/cpan/autodie/lib/Fatal.pm b/cpan/autodie/lib/Fatal.pm
-old mode 100644
-new mode 100755
-index 18e71ed..c17a257
---- a/cpan/autodie/lib/Fatal.pm
-+++ b/cpan/autodie/lib/Fatal.pm
-@@ -5,6 +5,7 @@ use Carp;
- use strict;
- use warnings;
- use Tie::RefHash;   # To cache subroutine refs
-+use Config;
- 
- use constant PERL510     => ( $] >= 5.010 );
- 
-@@ -52,6 +53,10 @@ our %_EWOULDBLOCK = (
-     MSWin32 => 33,
- );
- 
-+# the linux parisc port has separate EAGAIN and EWOULDBLOCK,
-+# and the kernel returns EAGAIN
-+my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
-+
- # We have some tags that can be passed in for use with import.
- # These are all assumed to be CORE::
- 
-@@ -720,6 +725,11 @@ sub _one_invocation {
-         my $EWOULDBLOCK = eval { POSIX::EWOULDBLOCK(); }
-                           || $_EWOULDBLOCK{$^O}
-                           || _autocroak("Internal error - can't overload flock - EWOULDBLOCK not defined on this system.");
-+        my $EAGAIN = $EWOULDBLOCK;
-+        if ($try_EAGAIN) {
-+            $EAGAIN = eval { POSIX::EAGAIN(); }
-+                          || _autocroak("Internal error - can't overload flock - EAGAIN not defined on this system.");
-+        }
- 
-         require Fcntl;      # For Fcntl::LOCK_NB
- 
-@@ -735,7 +745,9 @@ sub _one_invocation {
-             # If we failed, but we're using LOCK_NB and
-             # returned EWOULDBLOCK, it's not a real error.
- 
--            if (\$_[1] & Fcntl::LOCK_NB() and \$! == $EWOULDBLOCK ) {
-+            if (\$_[1] & Fcntl::LOCK_NB() and
-+                (\$! == $EWOULDBLOCK or
-+                ($try_EAGAIN and \$! == $EAGAIN ))) {
-                 return \$retval;
-             }
- 
-diff --git a/cpan/autodie/t/flock.t b/cpan/autodie/t/flock.t
-index a7550ba..6421a56 100755
---- a/cpan/autodie/t/flock.t
-+++ b/cpan/autodie/t/flock.t
-@@ -2,7 +2,8 @@
- use strict;
- use Test::More;
- use Fcntl qw(:flock);
--use POSIX qw(EWOULDBLOCK);
-+use POSIX qw(EWOULDBLOCK EAGAIN);
-+use Config;
- 
- require Fatal;
- 
-@@ -10,6 +11,9 @@ my $EWOULDBLOCK = eval { EWOULDBLOCK() }
-                   || $Fatal::_EWOULDBLOCK{$^O}
-                   || plan skip_all => "EWOULDBLOCK not defined on this system";
- 
-+my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
-+my $EAGAIN = eval { EAGAIN() };
-+
- my ($self_fh, $self_fh2);
- 
- eval {
-@@ -55,7 +59,11 @@ eval {
-     $return = flock($self_fh2, LOCK_EX | LOCK_NB);
- };
- 
--is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
-+if (!$try_EAGAIN) {
-+    is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
-+} else {
-+    ok($!+0 == $EWOULDBLOCK || $!+0 == $EAGAIN, "Double-flocking should be EWOULDBLOCK or EAGAIN");
-+}
- ok(!$return, "flocking a file twice should fail");
- is($@, "", "Non-blocking flock should not fail on EWOULDBLOCK");
- 
--- 
-tg: (c823880..) fixes/autodie-flock (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
deleted file mode 100644
index ef21261dc..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Fix stack pointer corruption in pp_concat() with 'use encoding'
-Bug-Debian: http://bugs.debian.org/596105
-Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78674
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e3393f51d48d8b790e26324eb0336fac9689fa46
-
-If the stack is reallocated during pp_concat() and 'use encoding' in
-effect, the stack pointer gets corrupted, causing memory allocation bugs
-and the like.
-
----
- pp_hot.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/pp_hot.c b/pp_hot.c
-index 3371e88..e9cccf3 100644
---- a/pp_hot.c
-+++ b/pp_hot.c
-@@ -271,6 +271,8 @@ PP(pp_concat)
- 	rbyte = !DO_UTF8(right);
-     }
-     if (lbyte != rbyte) {
-+	/* sv_utf8_upgrade_nomg() may reallocate the stack */
-+	PUTBACK;
- 	if (lbyte)
- 	    sv_utf8_upgrade_nomg(TARG);
- 	else {
-@@ -279,6 +281,7 @@ PP(pp_concat)
- 	    sv_utf8_upgrade_nomg(right);
- 	    rpv = SvPV_const(right, rlen);
- 	}
-+	SPAGAIN;
-     }
-     sv_catpvn_nomg(TARG, rpv, rlen);
- 
--- 
-tg: (c823880..) fixes/concat-stack-corruption (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
deleted file mode 100644
index 798b7c201..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Fix CPANPLUS test failures when HOME doesn't exist
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=52988
-Bug-Debian: http://bugs.debian.org/577011
-Origin: upstream
-
-The Debian autobuilders are configured with a non-existing $ENV{HOME},
-triggering a bug in CPANPLUS that causes test failures.
-
-Fix from CPANPLUS-0.9001.
-
----
- cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
-index 27d2abc..8475c36 100644
---- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
-@@ -5,7 +5,7 @@ use strict;
- use CPANPLUS::Error;
- use CPANPLUS::Internals::Constants;
- 
--use Cwd qw[chdir];
-+use Cwd                         qw[chdir cwd];
- use File::Copy;
- use Params::Check               qw[check];
- use Module::Load::Conditional   qw[can_load];
--- 
-tg: (c823880..) fixes/cpanplus-without-home (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
deleted file mode 100644
index 49d797c31..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Author: Robin Barker <rmbarker@cpan.org>
-Subject: h2ph fix for gcc 4.5
-Bug-Debian: http://bugs.debian.org/599933
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/8d66b3f930dc6d88b524d103e304308ae73a46e7 
-
-Fix h2ph and test. Needed to build with GCC 4.5.
-
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100755
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-tg: (c823880..) fixes/h2ph-gcc-4.5 (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
deleted file mode 100644
index d7b43e982..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Author: Samuel Thibault <sthibault@debian.org>
-Subject: Make hints/gnu.sh append to $ccflags rather than overriding them
-Bug-Debian: http://bugs.debian.org/587901
-
-Don't override possible extra $ccflags values given to Configure
-on GNU/Hurd.
-
----
- hints/gnu.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hints/gnu.sh b/hints/gnu.sh
-index 2cfce54..c1ba2db 100644
---- a/hints/gnu.sh
-+++ b/hints/gnu.sh
-@@ -19,7 +19,7 @@ lddlflags='-shared'
- ccdlflags='-Wl,-E'
- 
- # Debian bug #258618
--ccflags='-D_GNU_SOURCE'
-+ccflags="-D_GNU_SOURCE $ccflags"
- 
- # The following routines are only available as stubs in GNU libc.
- # XXX remove this once metaconf detects the GNU libc stubs.
--- 
-tg: (c823880..) fixes/hurd-ccflags (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
deleted file mode 100644
index ece4989f4..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: LC_NUMERIC documentation fixes
-Bug-Debian: http://bugs.debian.org/379329
-Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78452
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/903eb63f7d8d47a38971a8e9af7201b9927882cf
-
-LC_NUMERIC documentation updates fixing two errors:
-
-    - the early parts of perllocale.pod still say printf() uses LC_NUMERIC
-      with just 'use locale' when actually a POSIX::setlocale() call is
-      also needed
-    
-    - format() hasn't used LC_NUMERIC unconditionally since 5.005_03
-      (commit 097ee67dff1c60f201bc09435bc6eaeeafcd8123).
-
-Test cases from the upstream commit dropped for the sake of simplicity.
-
----
- pod/perlform.pod   |   20 ++++++++------------
- pod/perllocale.pod |   15 ++++++---------
- 2 files changed, 14 insertions(+), 21 deletions(-)
-
-diff --git a/pod/perlform.pod b/pod/perlform.pod
-index 3cfa1b7..df0f0a1 100644
---- a/pod/perlform.pod
-+++ b/pod/perlform.pod
-@@ -166,9 +166,9 @@ token on the first line.  If an expression evaluates to a number with a
- decimal part, and if the corresponding picture specifies that the decimal
- part should appear in the output (that is, any picture except multiple "#"
- characters B<without> an embedded "."), the character used for the decimal
--point is B<always> determined by the current LC_NUMERIC locale.  This
--means that, if, for example, the run-time environment happens to specify a
--German locale, "," will be used instead of the default ".".  See
-+point is determined by the current LC_NUMERIC locale if C<use locale> is in
-+effect.  This means that, if, for example, the run-time environment happens
-+to specify a German locale, "," will be used instead of the default ".".  See
- L<perllocale> and L<"WARNINGS"> for more information.
- 
- 
-@@ -442,15 +442,11 @@ Lexical variables (declared with "my") are not visible within a
- format unless the format is declared within the scope of the lexical
- variable.  (They weren't visible at all before version 5.001.)
- 
--Formats are the only part of Perl that unconditionally use information
--from a program's locale; if a program's environment specifies an
--LC_NUMERIC locale, it is always used to specify the decimal point
--character in formatted output.  Perl ignores all other aspects of locale
--handling unless the C<use locale> pragma is in effect.  Formatted output
--cannot be controlled by C<use locale> because the pragma is tied to the
--block structure of the program, and, for historical reasons, formats
--exist outside that block structure.  See L<perllocale> for further
--discussion of locale handling.
-+If a program's environment specifies an LC_NUMERIC locale and C<use
-+locale> is in effect when the format is declared, the locale is used
-+to specify the decimal point character in formatted output.  Formatted
-+output cannot be controlled by C<use locale> at the time when write()
-+is called. See L<perllocale> for further discussion of locale handling.
- 
- Within strings that are to be displayed in a fixed length text field,
- each control character is substituted by a space. (But remember the
-diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index 0dbabe7..0bec423 100644
---- a/pod/perllocale.pod
-+++ b/pod/perllocale.pod
-@@ -115,8 +115,7 @@ ucfirst(), and lcfirst()) use C<LC_CTYPE>
- 
- =item *
- 
--B<The formatting functions> (printf(), sprintf() and write()) use
--C<LC_NUMERIC>
-+B<Format declarations> (format()) use C<LC_NUMERIC>
- 
- =item *
- 
-@@ -967,13 +966,11 @@ system's implementation of the locale system than by Perl.
- 
- =head2 write() and LC_NUMERIC
- 
--Formats are the only part of Perl that unconditionally use information
--from a program's locale; if a program's environment specifies an
--LC_NUMERIC locale, it is always used to specify the decimal point
--character in formatted output.  Formatted output cannot be controlled by
--C<use locale> because the pragma is tied to the block structure of the
--program, and, for historical reasons, formats exist outside that block
--structure.
-+If a program's environment specifies an LC_NUMERIC locale and C<use
-+locale> is in effect when the format is declared, the locale is used
-+to specify the decimal point character in formatted output.  Formatted
-+output cannot be controlled by C<use locale> at the time when write()
-+is called.
- 
- =head2 Freely available locale definitions
- 
--- 
-tg: (c823880..) fixes/lc-numeric-docs (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
deleted file mode 100644
index b150e72e5..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Fix sprintf not to ignore LC_NUMERIC with constants
-Bug-Debian: http://bugs.debian.org/601549
-Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78632
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/b3fd61496ebc585b1115807e3195f17714662a09
-
-Don't fold constants in sprintf() if locales are used
-    
-An upstream regression in 5.10.1 made sprintf() ignore LC_NUMERIC for
-numeric constants.
-
----
- op.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/op.c b/op.c
-index e94f158..3c6badb 100644
---- a/op.c
-+++ b/op.c
-@@ -2503,6 +2503,7 @@ S_fold_constants(pTHX_ register OP *o)
-     case OP_SLE:
-     case OP_SGE:
-     case OP_SCMP:
-+    case OP_SPRINTF:
- 	/* XXX what about the numeric ops? */
- 	if (PL_hints & HINT_LOCALE)
- 	    goto nope;
--- 
-tg: (c823880..) fixes/lc-numeric-sprintf (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
deleted file mode 100644
index f7b5e428b..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Document the Net::SMTP 'Port' option
-Bug-Debian: http://bugs.debian.org/100195
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
-
-
----
- cpan/libnet/Net/SMTP.pm |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
-index a28496d..07b2498 100644
---- a/cpan/libnet/Net/SMTP.pm
-+++ b/cpan/libnet/Net/SMTP.pm
-@@ -625,6 +625,7 @@ Net::SMTP will attempt to extract the address from the value passed.
- 
- B<Debug> - Enable debugging information
- 
-+B<Port> - Select a port on the remote host to connect to (default is 25)
- 
- Example:
- 
--- 
-tg: (c823880..) fixes/net_smtp_docs (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
deleted file mode 100644
index 3b645d136..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Always use PERLRUNINST when building perl modules.
-Bug-Debian: http://bugs.debian.org/357264
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=17224
-
-Revert part of upstream change 24524 to always use PERLRUNINST when
-building perl modules:  Some PDL demos expect blib to be implicitly
-searched.
-
-
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 239d6df..294d266 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -3043,14 +3043,11 @@ sub processPL {
- 	    # pm_to_blib depends on then it can't depend on pm_to_blib
- 	    # else we have a dependency loop.
- 	    my $pm_dep;
--	    my $perlrun;
- 	    if( defined $self->{PM}{$target} ) {
- 		$pm_dep  = '';
--		$perlrun = 'PERLRUN';
- 	    }
- 	    else {
- 		$pm_dep  = 'pm_to_blib';
--		$perlrun = 'PERLRUNINST';
- 	    }
- 
-             $m .= <<MAKE_FRAG;
-@@ -3059,7 +3056,7 @@ all :: $target
- 	\$(NOECHO) \$(NOOP)
- 
- $target :: $plfile $pm_dep
--	\$($perlrun) $plfile $target
-+	\$(PERLRUNINST) $plfile $target
- MAKE_FRAG
- 
- 	}
--- 
-tg: (c823880..) fixes/processPL (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
deleted file mode 100644
index cfc57fa61..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Debian policy doesn't install .packlist files for core or vendor.
-
-
----
- cpan/ExtUtils-MakeMaker/bin/instmodsh |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-index 5874aa6..6a2f03e 100644
---- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
-+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-@@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules
- 
- =head1 DESCRIPTION
- 
--A little interface to ExtUtils::Installed to examine installed modules,
-+A little interface to ExtUtils::Installed to examine locally* installed modules,
- validate your packlists and even create a tarball from an installed module.
- 
-+*On Debian system, B<core> and B<vendor> modules are managed by C<dpkg>.
-+
- =head1 SEE ALSO
- 
- ExtUtils::Installed
--- 
-tg: (c823880..) debian/instmodsh_doc (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
deleted file mode 100644
index ced1e8f94..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.
-
-
----
- .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-index b807e97..6c955d7 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-@@ -53,6 +53,9 @@ sub _unix_os2_ext {
-     my($pwd) = cwd(); # from Cwd.pm
-     my($found) = 0;
- 
-+    # Debian-specific: don't use LD_RUN_PATH for standard dirs
-+    $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
-+
-     foreach my $thislib (split ' ', $potential_libs) {
- 
- 	# Handle possible linker path arguments.
--- 
-tg: (c823880..) debian/ld_run_path (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
deleted file mode 100644
index ef0f3698f..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable.
-
-
----
- cpan/libnet/Net/Config.pm |    7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm
-index db51c1f..8404593 100644
---- a/cpan/libnet/Net/Config.pm
-+++ b/cpan/libnet/Net/Config.pm
-@@ -57,9 +57,8 @@ my %nc = (
- }
- TRY_INTERNET_CONFIG
- 
--my $file = __FILE__;
-+my $file = '/etc/perl/Net/libnet.cfg';
- my $ref;
--$file =~ s/Config.pm/libnet.cfg/;
- if (-f $file) {
-   $ref = eval { local $SIG{__DIE__}; do $file };
-   if (ref($ref) eq 'HASH') {
-@@ -132,8 +131,8 @@ Net::Config - Local configuration data for libnet
- C<Net::Config> holds configuration data for the modules in the libnet
- distribution. During installation you will be asked for these values.
- 
--The configuration data is held globally in a file in the perl installation
--tree, but a user may override any of these values by providing their own. This
-+The configuration data is held globally in C</etc/perl/Net/libnet.cfg>,
-+but a user may override any of these values by providing their own. This
- can be done by having a C<.libnetrc> file in their home directory. This file
- should return a reference to a HASH containing the keys described below.
- For example
--- 
-tg: (c823880..) debian/libnet_config_path (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
deleted file mode 100644
index d27a67763..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Disable some threads tests on m68k for now due to missing TLS.
-Closes: #495826, #517938
-
-
----
- dist/threads-shared/t/stress.t    |    4 ++++
- dist/threads-shared/t/waithires.t |    6 ++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
-index adfd1ed..8573f1a 100755
---- a/dist/threads-shared/t/stress.t
-+++ b/dist/threads-shared/t/stress.t
-@@ -11,6 +11,10 @@ BEGIN {
-         print("1..0 # SKIP Broken under HP-UX 10.20\n");
-         exit(0);
-     }
-+    if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
-+        print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
-+        exit(0);
-+    }
- }
- 
- use ExtUtils::testlib;
-diff --git a/dist/threads-shared/t/waithires.t b/dist/threads-shared/t/waithires.t
-index e3a1086..633374e 100755
---- a/dist/threads-shared/t/waithires.t
-+++ b/dist/threads-shared/t/waithires.t
-@@ -16,6 +16,12 @@ BEGIN {
-     if (! eval 'use Time::HiRes "time"; 1') {
-         Test::skip_all('Time::HiRes not available');
-     }
-+
-+    if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
-+        print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
-+        exit(0);
-+    }
-+
- }
- 
- use ExtUtils::testlib;
--- 
-tg: (c823880..) debian/m68k_thread_stress (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
deleted file mode 100644
index 96fe4dfef..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
+++ /dev/null
@@ -1,100 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Tweak @INC ordering for Debian
-
-Our order is:
-
-    etc (for config files)
-    site (5.8.1)
-    vendor (all)
-    core (5.8.1)
-    site (version-indep)
-    site (pre-5.8.1)
-
-The rationale being that an admin (via site), or module packager
-(vendor) can chose to shadow core modules when there is a newer
-version than is included in core.
-
-
----
- perl.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 58 insertions(+), 0 deletions(-)
-
-diff --git a/perl.c b/perl.c
-index 05cea40..023d6a0 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4125,6 +4125,11 @@ S_init_perllib(pTHX)
- 		      INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
- #endif
- 
-+#ifdef DEBIAN
-+    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
-+    S_incpush_use_sep(aTHX_ STR_WITH_LEN("/etc/perl"), 0x0);
-+#endif
-+
- #ifdef SITEARCH_EXP
-     /* sitearch is always relative to sitelib on Windows for
-      * DLL-based path intuition to work correctly */
-@@ -4242,6 +4247,59 @@ S_init_perllib(pTHX)
- 		      INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
- #endif
- 
-+#ifdef DEBIAN
-+    /* Non-versioned site directory for local modules and for
-+       compatability with the previous packages' site dirs */
-+    S_incpush_use_sep(aTHX_ STR_WITH_LEN("/usr/local/lib/site_perl"),
-+		      INCPUSH_ADD_SUB_DIRS);
-+
-+#ifdef PERL_INC_VERSION_LIST
-+    {
-+	struct stat s;
-+
-+	/* add small buffer in case old versions are longer than the
-+	   current version */
-+	char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
-+	char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
-+	char const *vers[] = { PERL_INC_VERSION_LIST };
-+	char const **p;
-+
-+	char *arch_vers = strrchr(sitearch, '/');
-+	char *lib_vers = strrchr(sitelib, '/');
-+
-+	if (arch_vers && isdigit(*++arch_vers))
-+	    *arch_vers = 0;
-+	else
-+	    arch_vers = 0;
-+
-+	if (lib_vers && isdigit(*++lib_vers))
-+	    *lib_vers = 0;
-+	else
-+	    lib_vers = 0;
-+
-+	/* there is some duplication here as incpush does something
-+	   similar internally, but required as sitearch is not a
-+	   subdirectory of sitelib */
-+	for (p = vers; *p; p++)
-+	{
-+	    if (arch_vers)
-+	    {
-+		strcpy(arch_vers, *p);
-+		if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
-+		    S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0);
-+	    }
-+
-+	    if (lib_vers)
-+	    {
-+		strcpy(lib_vers, *p);
-+		if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
-+		    S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0);
-+	    }
-+	}
-+    }
-+#endif
-+#endif
-+
- #ifdef PERL_OTHERLIBDIRS
-     S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
- 		      INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS
--- 
-tg: (c823880..) debian/mod_paths (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
deleted file mode 100644
index bc7fd9e60..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Adjust Module::Build manual page extensions for the Debian Perl policy
-Bug-Debian: http://bugs.debian.org/479460
-
----
- cpan/Module-Build/lib/Module/Build/Base.pm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
-index 5bd8ec7..b4e606a 100644
---- a/cpan/Module-Build/lib/Module/Build/Base.pm
-+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -3071,7 +3071,7 @@ sub manify_bin_pods {
-   foreach my $file (keys %$files) {
-     # Pod::Simple based parsers only support one document per instance.
-     # This is expected to change in a future version (Pod::Simple > 3.03).
--    my $parser  = Pod::Man->new( section => 1 ); # binaries go in section 1
-+    my $parser  = Pod::Man->new( section => '1p' ); # binaries go in section 1p
-     my $manpage = $self->man1page_name( $file ) . '.' .
- 	          $self->config( 'man1ext' );
-     my $outfile = File::Spec->catfile($mandir, $manpage);
-@@ -3096,7 +3096,7 @@ sub manify_lib_pods {
-   while (my ($file, $relfile) = each %$files) {
-     # Pod::Simple based parsers only support one document per instance.
-     # This is expected to change in a future version (Pod::Simple > 3.03).
--    my $parser  = Pod::Man->new( section => 3 ); # libraries go in section 3
-+    my $parser  = Pod::Man->new( section => '3pm' ); # libraries go in section 3pm
-     my $manpage = $self->man3page_name( $relfile ) . '.' .
- 	          $self->config( 'man3ext' );
-     my $outfile = File::Spec->catfile( $mandir, $manpage);
--- 
-tg: (c823880..) debian/module_build_man_extensions (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
deleted file mode 100644
index ebe942cbf..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Make perlivp skip include directories in /usr/local
-Closes: 510895
-
-On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
-> On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote:
-
-> > We could create the directories in a postinst script, but I'm not sure
-> > I see the point. They will be created automatically when installing
-> > CPAN modules.
->
-> The directories are intentionally not created, as this way they are
-> excluded from the search path at start-up, saving a bunch of wasted
-> stats at use/require time in the common case that the user has not
-> installed any local packages.  As Niko points out, they will be
-> created as required.
-
-
-Signed-off-by: Niko Tyni <ntyni@debian.org>
-
----
- utils/perlivp.PL |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/utils/perlivp.PL b/utils/perlivp.PL
-index 9783261..156146f 100644
---- a/utils/perlivp.PL
-+++ b/utils/perlivp.PL
-@@ -142,6 +142,7 @@ my $INC_total = 0;
- my $INC_there = 0;
- foreach (@INC) {
-     next if $_ eq '.'; # skip -d test here
-+    next if m|/usr/local|; # not shipped on Debian
-     if ($^O eq 'MacOS') {
-         next if $_ eq ':'; # skip -d test here
-         next if $_ eq 'Dev:Pseudo:'; # why is this in @INC?
--- 
-tg: (c823880..) debian/perlivp (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
deleted file mode 100644
index 0f498951c..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Subject: Prune the list of libraries wanted to what we actually need.
-Bug-Debian: http://bugs.debian.org/128355
-
-We want to keep the dependencies on perl-base as small as possible,
-and some of the original list may be present on buildds (see Bug#128355).
-
-
----
- Configure |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Configure b/Configure
-index 3a8732b..6013c86 100755
---- a/Configure
-+++ b/Configure
-@@ -1363,8 +1363,7 @@ libswanted_uselargefiles=''
- : set usesocks on the Configure command line to enable socks.
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
--libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
--libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
-+libswanted='gdbm gdbm_compat db dl m c crypt'
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-@@ -22179,7 +22178,7 @@ sunos*X4*)
-     ;;
- *) case "$usedl" in
-     $define|true|[yY]*)
--	    set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 
-+	    set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'` 
- 	    shift
- 	    perllibs="$*"
- 	    ;;
--- 
-tg: (c823880..) debian/prune_libs (depends on: upstream)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
deleted file mode 100644
index 68c1a35b6..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-From: Niko Tyni <ntyni@debian.org>
-Subject: Squelch locale warnings in Debian package maintainer scripts
-Bug-Debian: http://bugs.debian.org/508764
-
-The system locales are rather frequently out of sync with the C library
-during package upgrades, causing a huge amount of useless Perl locale
-warnings. Squelch them when running package maintainer scripts, detected
-by the DPKG_RUNNING_VERSION environment variable.
-
-Any real locale problem will show up after the system upgrade too, and
-the warning will be triggered normally again at that point.
-
----
- locale.c           |    4 ++++
- pod/perllocale.pod |    8 ++++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/locale.c b/locale.c
-index 16ccce8..2592b3c 100644
---- a/locale.c
-+++ b/locale.c
-@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
- 	char *p;
- 	const bool locwarn = (printwarn > 1 ||
- 			(printwarn &&
-+
-+			 /* Debian specific change - see http://bugs.debian.org/508764 */
-+			 (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
-+
- 			 (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
- 
- 	if (locwarn) {
-diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index 0dbabe7..60b7bab 100644
---- a/pod/perllocale.pod
-+++ b/pod/perllocale.pod
-@@ -844,6 +844,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
- The message tells about some problem in your system's locale support,
- and you should investigate what the problem is.
- 
-+=item DPKG_RUNNING_VERSION
-+
-+On Debian systems, if the DPKG_RUNNING_VERSION environment variable is
-+set (to any value), the locale failure warnings will be suppressed just
-+like with a zero PERL_BADLANG setting. This is done to avoid floods
-+of spurious warnings during system upgrades.
-+See L<http://bugs.debian.org/508764>.
-+
- =back
- 
- The following environment variables are not specific to Perl: They are
--- 
-tg: (c823880..) debian/squelch-locale-warnings (depends on: upstream)