81 files changed, 1596 insertions, 955 deletions

diff --git a/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch b/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch
deleted file mode 100644
index b1787ce4df..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2ed4b0c66fe7c7282922798eb3271b8f101359d1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 19 Jun 2014 19:34:56 +0800
-Subject: [PATCH] Makefile.SH: fix do_install failed
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile.SH | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/Makefile.SH b/Makefile.SH
-index f5d2d0f..e468c1b 100755
---- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -1074,8 +1074,7 @@ EOT
-         $spitshell >>$Makefile <<EOT
- 
- install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
--       \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
--       \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags
-+       ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags  \$(INSTALLFLAGS) \$(STRIPFLAGS)
- EOT
-     fi
- 
-@@ -1104,19 +1103,6 @@ else
-        $spitshell >>$Makefile <<'!NO!SUBS!'
- install.perl:  $(INSTALL_DEPENDENCE) installperl
-        ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
--
--# XXX Experimental. Hardwired values, but useful for testing.
--# Eventually Configure could ask for some of these values.
--install.html: all installhtml
--       -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
--       $(RUN_PERL) installhtml   \
--      --podroot=. --podpath=. --recurse  \
--      --htmldir=$(privlib)/html   \
--      --htmlroot=$(privlib)/html  \
--      --splithead=pod/perlipc     \
--      --splititem=pod/perlfunc    \
--      --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
--      --verbose
- !NO!SUBS!
- fi
- 
--- 
-1.8.1.2
-
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff
deleted file mode 100644
index 66208a2661..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From 651aaac47361c03d15681b6cfdba0056a348fbb7 Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <dom@earth.li>
-Date: Sun, 27 Nov 2011 16:27:07 +0000
-Subject: Disable failing GNU/Hurd tests dist/threads/t/stack.t
-
-These tests fail on GNU/Hurd owing to libpthread using fixed-size stacks.
-This is a known limitation that should get fixed in the future.
-
-For now, disable the tests.
-
-Bug-Debian: http://bugs.debian.org/650175
-
-Patch-Name: debian/hurd_test_skip_stack.diff
----
- dist/threads/t/stack.t | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dist/threads/t/stack.t b/dist/threads/t/stack.t
-index cfd6cf7..84cc527 100644
---- a/dist/threads/t/stack.t
-+++ b/dist/threads/t/stack.t
-@@ -7,6 +7,10 @@ BEGIN {
-         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
-         exit(0);
-     }
-+    if ($^O eq 'gnu') {
-+        print("1..0 # SKIP fails on GNU/Hurd (Debian #650175)\n");
-+        exit(0);
-+    }
- }
- 
- use ExtUtils::testlib;
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff
deleted file mode 100644
index 894e9533fc..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From 333efa7c9da43d94272a872a59a6cd28da8ca245 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 8 May 2008 14:32:33 +0300
-Subject: Adjust Module::Build manual page extensions for the Debian Perl
- policy
-
-Bug-Debian: http://bugs.debian.org/479460
-
-Patch-Name: debian/module_build_man_extensions.diff
----
- cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++--
- 1 file 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 84e137f..4422cd4 100644
---- a/cpan/Module-Build/lib/Module/Build/Base.pm
-+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -3226,7 +3226,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( %podman_args );
-+    my $parser  = Pod::Man->new( %podman_args, section => '1p' ); # binaries go in section 1p
-     my $manpage = $self->man1page_name( $file ) . '.' .
-                   $self->config( 'man1ext' );
-     my $outfile = File::Spec->catfile($mandir, $manpage);
-@@ -3252,7 +3252,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( %podman_args );
-+    my $parser  = Pod::Man->new( %podman_args, section => '3pm' ); # libraries go in section 3pm
-     my $manpage = $self->man3page_name( $relfile ) . '.' .
-                   $self->config( 'man3ext' );
-     my $outfile = File::Spec->catfile( $mandir, $manpage);
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff
deleted file mode 100644
index 09fe1a965e..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 127c026bbb63907b196febf3558842d8f01e52ef Mon Sep 17 00:00:00 2001
-From: Brendan O'Dea <bod@debian.org>
-Date: Tue, 8 Mar 2005 19:30:38 +1100
-Subject: Don't install .packlist or perllocal.pod for perl or vendor
-
-Patch-Name: debian/no_packlist_perllocal.diff
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++----------------------
- 1 file changed, 4 insertions(+), 32 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index f977476..0a6797f 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2079,11 +2079,6 @@ pure_perl_install :: all
- };
- 
-     push @m,
--q{             read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
--               write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
--} unless $self->{NO_PACKLIST};
--
--    push @m,
- q{             $(INST_LIB) $(DESTINSTALLPRIVLIB) \
-                $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
-                $(INST_BIN) $(DESTINSTALLBIN) \
-@@ -2115,10 +2110,6 @@ q{               $(INST_LIB) $(DESTINSTALLSITELIB) \
- pure_vendor_install :: all
-        $(NOECHO) umask 022; $(MOD_INSTALL) \
- };
--    push @m,
--q{             read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
--               write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
--} unless $self->{NO_PACKLIST};
- 
-     push @m,
- q{             $(INST_LIB) $(DESTINSTALLVENDORLIB) \
-@@ -2144,37 +2135,19 @@ doc_vendor_install :: all
- 
-     push @m, q{
- doc_perl_install :: all
--       $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--       -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
--       -$(NOECHO) umask 022; $(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) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
-+       $(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) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
--       -$(NOECHO) umask 022; $(DOC_INSTALL) \
--               "Module" "$(NAME)" \
--               "installed into" "$(INSTALLVENDORLIB)" \
--               LINKTYPE "$(LINKTYPE)" \
--               VERSION "$(VERSION)" \
--               EXE_FILES "$(EXE_FILES)" \
--               >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
- 
- } unless $self->{NO_PERLLOCAL};
- 
-@@ -2183,13 +2156,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);
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch
deleted file mode 100644
index 9ec041c833..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Backport
-Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591
-  From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001
-  From: Tony Cook <tony@develop-help.com>
-  Date: Mon, 19 Jan 2015 16:03:18 +1100
-  Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time
-
-  Previously this would crash in FF_MORE because chophere was still NULL.
-
-Signed-off-by: Gary Thomas <gary@mlbassoc.com>
-Index: perl-5.20.0/pp_ctl.c
-===================================================================
---- perl-5.20.0.orig/pp_ctl.c
-+++ perl-5.20.0/pp_ctl.c
-@@ -590,6 +590,7 @@ PP(pp_formline)
-                         break;
-                 }
-                 itembytes = s - item;
-+                chophere = s;
-                break;
-            }
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch b/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch
deleted file mode 100644
index aafe0e24db..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Upstream-Status:Inappropriate [debian patch]
-
-Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++----------------------
- 1 file changed, 4 insertions(+), 32 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2079,11 +2079,6 @@ pure_perl_install :: all
- };
- 
-     push @m,
--q{             read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
--               write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
--} unless $self->{NO_PACKLIST};
--
--    push @m,
- q{             $(INST_LIB) $(DESTINSTALLPRIVLIB) \
-                $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
-                $(INST_BIN) $(DESTINSTALLBIN) \
-@@ -2115,10 +2110,6 @@ q{               $(INST_LIB) $(DESTINSTALLSITELIB) \
- pure_vendor_install :: all
-        $(NOECHO) $(MOD_INSTALL) \
- };
--    push @m,
--q{             read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
--               write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
--} unless $self->{NO_PACKLIST};
- 
-     push @m,
- q{             $(INST_LIB) $(DESTINSTALLVENDORLIB) \
-@@ -2144,37 +2135,19 @@ doc_vendor_install :: all
- 
-     push @m, q{
- 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) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
-+       -$(NOECHO) $(MKPATH) $(DESTINSTALLSITEARCH)
-        -$(NOECHO) $(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{
- 
- } unless $self->{NO_PERLLOCAL};
- 
-@@ -2183,13 +2156,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);
--- 
-1.8.1.2
-
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch
deleted file mode 100644
index e0dcf412bb..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-perl:fix for CVE-2010-4777
-
-Upstream-Status: Backport
-    
-The Perl_reg_numbered_buff_fetch function in Perl 5.10.0, 5.12.0,
-5.14.0, and other versions, when running with debugging enabled,
-allows context-dependent attackers to cause a denial of service
-(assertion failure and application exit) via crafted input that
-is not properly handled when using certain regular expressions,
-as demonstrated by causing SpamAssassin and OCSInventory to
-crash.
-
-http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4777
-
-Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com>
---- a/regcomp.c
-+++ b/regcomp.c
-@@ -11868,8 +11868,25 @@ Perl_save_re_context(pTHX)
- 
-                if (gvp) {
-                    GV * const gv = *gvp;
--                   if (SvTYPE(gv) == SVt_PVGV && GvSV(gv))
--                       save_scalar(gv);
-+                   if (SvTYPE(gv) == SVt_PVGV && GvSV(gv)) {
-+                       /* this is a copy of save_scalar() without the GETMAGIC call, RT#76538 */
-+                       SV ** const sptr = &GvSVn(gv);
-+                       SV * osv = *sptr;
-+                       SV * nsv = newSV(0);
-+                       save_pushptrptr(SvREFCNT_inc_simple(gv),
-+                       SvREFCNT_inc(osv), SAVEt_SV);
-+                       if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) &&
-+                           SvTYPE(osv) != SVt_PVGV) {
-+                           if (SvGMAGICAL(osv)) {
-+                               const bool oldtainted = PL_tainted;
-+                               SvFLAGS(osv) |= (SvFLAGS(osv) &
-+                                   (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
-+                               PL_tainted = oldtainted;
-+                           }
-+                           mg_localize(osv, nsv, 1);
-+                       }
-+                       *sptr = nsv;
-+                   }
-                }
-            }
-        }
diff --git a/meta/recipes-devtools/perl/perl-native_5.20.0.bb b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index 586a347c0f..dbfd82d23f 100644
--- a/meta/recipes-devtools/perl/perl-native_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -6,10 +6,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
 LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
                     file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
 
-# 5.10.1 has Module::Build built-in
-PROVIDES += "libmodule-build-perl-native"
-
-SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
+SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
            file://Configure-multilib.patch \
            file://perl-configpm-switch.patch \
            file://native-nopacklist.patch \
@@ -17,10 +14,10 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
            file://MM_Unix.pm.patch \
            file://debian/errno_ver.diff \
            file://dynaloaderhack.patch \
-           file://perl-5.14.3-fix-CVE-2010-4777.patch "
+          "
 
-SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
-SRC_URI[sha256sum] = "4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"
+SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
+SRC_URI[sha256sum] = "be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196"
 
 S = "${WORKDIR}/perl-${PV}"
 
diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc b/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc
index e39663c7d6..7f886f34ab 100644
--- a/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc
+++ b/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc
@@ -10,7 +10,7 @@
 #| grep -v -e "\-vms\-" -e module-5 -e "^$" -e "\\$" -e your -e tk -e autoperl -e html -e http -e parse-cpan -e perl-ostype -e ndbm-file -e module-mac -e fcgi -e lwp -e dbd -e dbix 
 #| sort -u 
 #| sed 's/^/RDEPENDS_/;s/perl-module-/${PN}-module-/g;s/module-\(module-\)/\1/g;s/\(module-load\)-conditional/\1/g;s/encode-configlocal/&-pm/;' 
-#| egrep -wv '=>|module-a|module-apache.?|module-apr|module-authen-sasl|module-b-asmdata|module-build-.*|module-convert-ebcdic|module-devel-size|module-digest-perl-md5|module-dumpvalue|module-extutils-constant-aaargh56hash|module-extutils-xssymset|module-file-bsdglob|module-for|module-it|module-io-string|module-ipc-system-simple|module-lexical|module-local-lib|metadata|module-modperl-util|module-pluggable-object|module-test-builder-io-scalar|module-text-unidecode|module-win32|objects\sload|syscall.ph|systeminfo.ph|%s' > /tmp/
+#| egrep -wv '=>|module-a|module-apache.?|module-apr|module-authen-sasl|module-b-asmdata|module-convert-ebcdic|module-devel-size|module-digest-perl-md5|module-dumpvalue|module-extutils-constant-aaargh56hash|module-extutils-xssymset|module-file-bsdglob|module-for|module-it|module-io-string|module-ipc-system-simple|module-lexical|module-local-lib|metadata|module-modperl-util|module-pluggable-object|module-test-builder-io-scalar|module-text-unidecode|module-win32|objects\sload|syscall.ph|systeminfo.ph|%s' > /tmp/perl-rdepends
 
 RDEPENDS_perl-misc += "perl"
 RDEPENDS_${PN}-pod += "perl"
@@ -22,7 +22,7 @@ RDEPENDS_${PN}-module-thread-queue += "${PN}-module-attributes"
 
 
 # Depends list
-# copy contents of /tmp/1 in this file
+# copy contents of /tmp/perl-rdepends in this file
 RDEPENDS_${PN}-module-anydbm-file += "${PN}-module-strict"
 RDEPENDS_${PN}-module-anydbm-file += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-app-cpan += "${PN}-module-carp"
@@ -49,6 +49,7 @@ RDEPENDS_${PN}-module-app-prove += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-app-prove += "${PN}-module-getopt-long"
 RDEPENDS_${PN}-module-app-prove += "${PN}-module-strict"
 RDEPENDS_${PN}-module-app-prove += "${PN}-module-tap-harness"
+RDEPENDS_${PN}-module-app-prove += "${PN}-module-tap-harness-env"
 RDEPENDS_${PN}-module-app-prove += "${PN}-module-text-parsewords"
 RDEPENDS_${PN}-module-app-prove += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-app-prove-state += "${PN}-module-app-prove-state-result"
@@ -108,26 +109,33 @@ RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-carp"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-constant"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-fatal"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-fcntl"
-RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-if"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-overload"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-strict"
 RDEPENDS_${PN}-module-autodie-exception += "${PN}-module-warnings"
-RDEPENDS_${PN}-module-autodie-exception-system += "${PN}-module-base"
 RDEPENDS_${PN}-module-autodie-exception-system += "${PN}-module-carp"
+RDEPENDS_${PN}-module-autodie-exception-system += "${PN}-module-parent"
 RDEPENDS_${PN}-module-autodie-exception-system += "${PN}-module-strict"
 RDEPENDS_${PN}-module-autodie-exception-system += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-b"
-RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-base"
 RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-carp"
 RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-constant"
 RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-strict"
 RDEPENDS_${PN}-module-autodie-hints += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-autodie += "${PN}-module-carp"
 RDEPENDS_${PN}-module-autodie += "${PN}-module-constant"
-RDEPENDS_${PN}-module-autodie += "${PN}-module-fatal"
 RDEPENDS_${PN}-module-autodie += "${PN}-module-lib"
+RDEPENDS_${PN}-module-autodie += "${PN}-module-parent"
 RDEPENDS_${PN}-module-autodie += "${PN}-module-strict"
 RDEPENDS_${PN}-module-autodie += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-autodie-scope-guard += "${PN}-module-strict"
+RDEPENDS_${PN}-module-autodie-scope-guard += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-autodie-scope-guard"
+RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-strict"
+RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-autodie-scope-guardstack"
+RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-strict"
+RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-autodie-skip += "${PN}-module-strict"
 RDEPENDS_${PN}-module-autodie-skip += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-autoloader += "${PN}-module-carp"
@@ -144,6 +152,7 @@ RDEPENDS_${PN}-module-base += "${PN}-module-carp"
 RDEPENDS_${PN}-module-base += "${PN}-module-strict"
 RDEPENDS_${PN}-module-base += "${PN}-module-vars"
 RDEPENDS_${PN}-module-b-concise += "${PN}-module-b"
+RDEPENDS_${PN}-module-b-concise += "${PN}-module-b-op-private"
 RDEPENDS_${PN}-module-b-concise += "${PN}-module-config"
 RDEPENDS_${PN}-module-b-concise += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-b-concise += "${PN}-module-strict"
@@ -205,37 +214,6 @@ RDEPENDS_${PN}-module-b-terse += "${PN}-module-b"
 RDEPENDS_${PN}-module-b-terse += "${PN}-module-b-concise"
 RDEPENDS_${PN}-module-b-terse += "${PN}-module-carp"
 RDEPENDS_${PN}-module-b-terse += "${PN}-module-strict"
-RDEPENDS_${PN}-module-build += "${PN}-module-autosplit"
-RDEPENDS_${PN}-module-build += "${PN}-module-carp"
-RDEPENDS_${PN}-module-build += "${PN}-module-config"
-RDEPENDS_${PN}-module-build += "${PN}-module-cpan"
-RDEPENDS_${PN}-module-build += "${PN}-module-cwd"
-RDEPENDS_${PN}-module-build += "${PN}-module-data-dumper"
-RDEPENDS_${PN}-module-build += "${PN}-module-dynaloader"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-cbuilder"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-install"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-installed"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-makemaker"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-manifest"
-RDEPENDS_${PN}-module-build += "${PN}-module-extutils-mkbootstrap"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-basename"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-compare"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-copy"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-find"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-path"
-RDEPENDS_${PN}-module-build += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-build += "${PN}-module-getopt-long"
-RDEPENDS_${PN}-module-build += "${PN}-module-if"
-RDEPENDS_${PN}-module-build += "${PN}-module-inc-latest"
-RDEPENDS_${PN}-module-build += "${PN}-module-build"
-RDEPENDS_${PN}-module-build += "${PN}-module-pod-man"
-RDEPENDS_${PN}-module-build += "${PN}-module-strict"
-RDEPENDS_${PN}-module-build += "${PN}-module-tap-harness"
-RDEPENDS_${PN}-module-build += "${PN}-module-test-harness"
-RDEPENDS_${PN}-module-build += "${PN}-module-text-parsewords"
-RDEPENDS_${PN}-module-build += "${PN}-module-vars"
-RDEPENDS_${PN}-module-build += "${PN}-module-version"
-RDEPENDS_${PN}-module-build += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-b-xref += "${PN}-module-b"
 RDEPENDS_${PN}-module-b-xref += "${PN}-module-config"
 RDEPENDS_${PN}-module-b-xref += "${PN}-module-strict"
@@ -245,55 +223,11 @@ RDEPENDS_${PN}-module-carp-heavy += "${PN}-module-carp"
 RDEPENDS_${PN}-module-carp += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-carp += "${PN}-module-strict"
 RDEPENDS_${PN}-module-carp += "${PN}-module-warnings"
-RDEPENDS_${PN}-module-cgi-apache += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-apache += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-carp += "${PN}-module-carp"
-RDEPENDS_${PN}-module-cgi-carp += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-cgi-carp += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-cgi-carp += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-cgi-util"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-overload"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-strict"
-RDEPENDS_${PN}-module-cgi-cookie += "${PN}-module-warnings"
-RDEPENDS_${PN}-module-cgi-fast += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-fast += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-fast += "${PN}-module-strict"
-RDEPENDS_${PN}-module-cgi-fast += "${PN}-module-vars"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-carp"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-cgi-cookie"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-cgi-util"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-config"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-constant"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-fcntl"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi += "${PN}-module-overload "
-RDEPENDS_${PN}-module-cgi += "${PN}-module-text-parsewords"
-RDEPENDS_${PN}-module-cgi-pretty += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-pretty += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-pretty += "${PN}-module-strict"
-RDEPENDS_${PN}-module-cgi-push += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-push += "${PN}-module-cgi-util"
-RDEPENDS_${PN}-module-cgi-push += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-switch += "${PN}-module-cgi"
-RDEPENDS_${PN}-module-cgi-switch += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-util += "${PN}-module-base"
-RDEPENDS_${PN}-module-cgi-util += "${PN}-module-constant"
-RDEPENDS_${PN}-module-cgi-util += "${PN}-module-if"
-RDEPENDS_${PN}-module-cgi-util += "${PN}-module-strict"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-bytes"
 RDEPENDS_${PN}-module-charnames += "${PN}-module-bytes"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-carp"
-RDEPENDS_${PN}-module-charnames += "${PN}-module--charnames"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-re"
+RDEPENDS_${PN}-module-charnames += "${PN}-module-carp"
+RDEPENDS_${PN}-module-charnames += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-charnames += "${PN}-module-re"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-strict"
 RDEPENDS_${PN}-module-charnames += "${PN}-module-strict"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-unicore"
-RDEPENDS_${PN}-module-charnames += "${PN}-module-unicore"
-RDEPENDS_${PN}-module--charnames += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-charnames += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-class-struct += "${PN}-module-carp"
 RDEPENDS_${PN}-module-class-struct += "${PN}-module-exporter"
@@ -339,7 +273,6 @@ RDEPENDS_${PN}-module-config-perl-v += "${PN}-module-vars"
 RDEPENDS_${PN}-module-config-perl-v += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-constant += "${PN}-module-carp"
 RDEPENDS_${PN}-module-constant += "${PN}-module-strict"
-RDEPENDS_${PN}-module-constant += "${PN}-module-vars"
 RDEPENDS_${PN}-module-constant += "${PN}-module-warnings-register"
 RDEPENDS_${PN}-module-corelist += "${PN}-module-list-util"
 RDEPENDS_${PN}-module-corelist += "${PN}-module-corelist"
@@ -347,58 +280,36 @@ RDEPENDS_${PN}-module-corelist += "${PN}-module-strict"
 RDEPENDS_${PN}-module-corelist += "${PN}-module-vars"
 RDEPENDS_${PN}-module-corelist += "${PN}-module-version"
 RDEPENDS_${PN}-module-corelist += "${PN}-module-warnings"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-archive-tar"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-b"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-build"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-carp"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-config"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-config-git"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-compress-zlib"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-cpan"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-cwd"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-data-dumper"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-digest-md5"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-digest-sha"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-dirhandle"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-extutils-cbuilder"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-extutils-makemaker"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-extutils-manifest"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-extutils-mm"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-extutils-mm-unix"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-fcntl"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-file-basename"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-file-copy"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-file-find"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-file-glob"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-filehandle"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-file-path"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-file-temp"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-http-tiny"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-io-compress-base"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-json-pp"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-lib"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-list-util"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-mime-base64"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-net-ftp"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-net-ping"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-overload"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-parse-cpan-meta"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-posix"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-safe"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-scalar-util"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-strict"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-sys-hostname"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-term-readline"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-test-harness"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-test-more"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-text-parsewords"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-text-wrap"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-time-local"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-unicore"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-vars"
-RDEPENDS_${PN}-module-cpan += "${PN}-module-version"
 RDEPENDS_${PN}-module-cpan += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-cwd += "${PN}-module-dynaloader"
 RDEPENDS_${PN}-module-cwd += "${PN}-module-exporter"
@@ -471,6 +382,7 @@ RDEPENDS_${PN}-module-digest-sha += "${PN}-module-fcntl"
 RDEPENDS_${PN}-module-digest-sha += "${PN}-module-integer"
 RDEPENDS_${PN}-module-digest-sha += "${PN}-module-strict"
 RDEPENDS_${PN}-module-digest-sha += "${PN}-module-vars"
+RDEPENDS_${PN}-module-digest-sha += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-dirhandle += "${PN}-module-carp"
 RDEPENDS_${PN}-module-dirhandle += "${PN}-module-symbol"
 RDEPENDS_${PN}-module-dynaloader += "${PN}-module-carp"
@@ -625,6 +537,7 @@ RDEPENDS_${PN}-module-errno += "${PN}-module-strict"
 RDEPENDS_${PN}-module-experimental += "${PN}-module-carp"
 RDEPENDS_${PN}-module-experimental += "${PN}-module-feature"
 RDEPENDS_${PN}-module-experimental += "${PN}-module-strict"
+RDEPENDS_${PN}-module-experimental += "${PN}-module-version"
 RDEPENDS_${PN}-module-experimental += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-exporter-heavy += "${PN}-module-carp"
 RDEPENDS_${PN}-module-exporter-heavy += "${PN}-module-exporter"
@@ -640,7 +553,6 @@ RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-file-temp"
 RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-ipc-cmd"
 RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-text-parsewords"
-RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-vars"
 RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-basename"
 RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-path"
 RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-spec"
@@ -649,6 +561,7 @@ RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-extutils-c
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-config"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-extutils-cbuilder-platform-unix"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-strict"
@@ -675,9 +588,6 @@ RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-extutils-c
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-file-spec-functions"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-vars"
-RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-bcc += "${PN}-module-vars"
-RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-gcc += "${PN}-module-vars"
-RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-msvc += "${PN}-module-vars"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-extutils-cbuilder-base"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-file-basename"
 RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-file-spec"
@@ -695,11 +605,10 @@ RDEPENDS_${PN}-module-extutils-command-mm += "${PN}-module-test-harness"
 RDEPENDS_${PN}-module-extutils-command-mm += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-carp"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-basename"
-RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-compare"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-copy"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-find"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-path"
+RDEPENDS_${PN}-module-extutils-command += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-command += "${PN}-module-vars"
 RDEPENDS_${PN}-module-extutils-constant-base += "${PN}-module-carp"
@@ -777,10 +686,17 @@ RDEPENDS_${PN}-module-extutils-liblist += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-liblist += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-makemaker-config += "${PN}-module-config"
 RDEPENDS_${PN}-module-extutils-makemaker-config += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-makemaker-locale += "${PN}-module-base"
+RDEPENDS_${PN}-module-extutils-makemaker-locale += "${PN}-module-encode"
+RDEPENDS_${PN}-module-extutils-makemaker-locale += "${PN}-module-encode-alias"
+RDEPENDS_${PN}-module-extutils-makemaker-locale += "${PN}-module-i18n-langinfo"
+RDEPENDS_${PN}-module-extutils-makemaker-locale += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-b"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-carp"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-cwd"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-extutils-makemaker-config"
+RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-extutils-makemaker-version"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-extutils-manifest"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-extutils-mm"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-extutils-my"
@@ -788,6 +704,21 @@ RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-file-path"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-version"
+RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-extutils-makemaker-version-regex"
+RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-makemaker-version-regex += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-makemaker-version-regex += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-b"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-carp"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-config"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-constant"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-extutils-makemaker-version-regex"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-locale"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-overload"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-universal"
+RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-vars"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-carp"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-config"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-exporter"
@@ -797,7 +728,7 @@ RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-file-find"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-file-path"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-strict"
-RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-extutils-miniperl += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-extutils-miniperl += "${PN}-module-extutils-embed"
 RDEPENDS_${PN}-module-extutils-miniperl += "${PN}-module-strict"
@@ -829,7 +760,6 @@ RDEPENDS_${PN}-module-extutils-mm-beos += "${PN}-module-extutils-mm-any"
 RDEPENDS_${PN}-module-extutils-mm-beos += "${PN}-module-extutils-mm-unix"
 RDEPENDS_${PN}-module-extutils-mm-beos += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-extutils-mm-beos += "${PN}-module-strict"
-RDEPENDS_${PN}-module-extutils-mm-cygwin += "${PN}-module-extutils-mm-unix"
 RDEPENDS_${PN}-module-extutils-mm-cygwin += "${PN}-module-extutils-makemaker-config"
 RDEPENDS_${PN}-module-extutils-mm-cygwin += "${PN}-module-extutils-mm-unix"
 RDEPENDS_${PN}-module-extutils-mm-cygwin += "${PN}-module-extutils-mm-win32"
@@ -860,6 +790,7 @@ RDEPENDS_${PN}-module-extutils-mm-qnx += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-carp"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-cwd"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-dirhandle"
+RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-encode"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-extutils-liblist"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-extutils-makemaker"
 RDEPENDS_${PN}-module-extutils-mm-unix += "${PN}-module-extutils-makemaker-config"
@@ -922,7 +853,6 @@ RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-extutils-parsexs-constants"
 RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-extutils-typemaps"
 RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-lib"
 RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-parsexs-utilities += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-extutils-testlib += "${PN}-module-cwd"
@@ -951,6 +881,7 @@ RDEPENDS_${PN}-module-extutils-typemaps-type += "${PN}-module-strict"
 RDEPENDS_${PN}-module-extutils-typemaps-type += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-exception-system"
 RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-hints"
+RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-scopeutil"
 RDEPENDS_${PN}-module-fatal += "${PN}-module-carp"
 RDEPENDS_${PN}-module-fatal += "${PN}-module-config"
 RDEPENDS_${PN}-module-fatal += "${PN}-module-constant"
@@ -1151,21 +1082,6 @@ RDEPENDS_${PN}-module-i18n-langtags += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-i18n-langtags += "${PN}-module-i18n-langtags"
 RDEPENDS_${PN}-module-i18n-langtags += "${PN}-module-strict"
 RDEPENDS_${PN}-module-i18n-langtags += "${PN}-module-vars"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-carp"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-extutils-installed"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-file-basename"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-file-copy"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-file-path"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-if"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-inc-latest-private"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-strict"
-RDEPENDS_${PN}-module-inc-latest += "${PN}-module-vars"
-RDEPENDS_${PN}-module-inc-latest-private += "${PN}-module-extutils-makemaker"
-RDEPENDS_${PN}-module-inc-latest-private += "${PN}-module-file-spec"
-RDEPENDS_${PN}-module-inc-latest-private += "${PN}-module-if"
-RDEPENDS_${PN}-module-inc-latest-private += "${PN}-module-strict"
-RDEPENDS_${PN}-module-inc-latest-private += "${PN}-module-vars"
 RDEPENDS_${PN}-module-io-compress-adapter-bzip2 += "${PN}-module-bytes"
 RDEPENDS_${PN}-module-io-compress-adapter-bzip2 += "${PN}-module-compress-raw-bzip2"
 RDEPENDS_${PN}-module-io-compress-adapter-bzip2 += "${PN}-module-io-compress-base-common"
@@ -1232,10 +1148,10 @@ RDEPENDS_${PN}-module-io-compress-gzip += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-bytes"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-compress-raw-zlib"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-exporter "
+RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-fcntl"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-io-compress-adapter-deflate"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-io-compress-base"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-io-compress-base-common"
-RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-io-seekable"
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-strict "
 RDEPENDS_${PN}-module-io-compress-rawdeflate += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-io-compress-zip-constants += "${PN}-module-constant"
@@ -1707,6 +1623,8 @@ RDEPENDS_${PN}-module-memoize += "${PN}-module-vars"
 RDEPENDS_${PN}-module-memoize-sdbm-file += "${PN}-module-sdbm-file"
 RDEPENDS_${PN}-module-memoize-storable += "${PN}-module-carp"
 RDEPENDS_${PN}-module-memoize-storable += "${PN}-module-storable"
+RDEPENDS_${PN}-module-meta-notation += "${PN}-module-strict"
+RDEPENDS_${PN}-module-meta-notation += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-mime-base64 += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-mime-base64 += "${PN}-module-strict"
 RDEPENDS_${PN}-module-mime-base64 += "${PN}-module-vars"
@@ -1719,38 +1637,47 @@ RDEPENDS_${PN}-module-mro += "${PN}-module-strict"
 RDEPENDS_${PN}-module-mro += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-mro += "${PN}-module-xsloader"
 RDEPENDS_${PN}-module-net-cmd += "${PN}-module-carp"
+RDEPENDS_${PN}-module-net-cmd += "${PN}-module-constant"
 RDEPENDS_${PN}-module-net-cmd += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-cmd += "${PN}-module-strict"
 RDEPENDS_${PN}-module-net-cmd += "${PN}-module-symbol"
-RDEPENDS_${PN}-module-net-cmd += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-cmd += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-config += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-config += "${PN}-module-socket"
 RDEPENDS_${PN}-module-net-config += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-config += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-config += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-posix"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-socket"
 RDEPENDS_${PN}-module-net-domain += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-domain += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-domain += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp-a += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-ftp-a += "${PN}-module-net-ftp-dataconn"
 RDEPENDS_${PN}-module-net-ftp-a += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-ftp-a += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-ftp-a += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-errno"
 RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-net-cmd"
-RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-strict"
+RDEPENDS_${PN}-module-net-ftp-dataconn += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp-e += "${PN}-module-net-ftp-i"
+RDEPENDS_${PN}-module-net-ftp-e += "${PN}-module-strict"
+RDEPENDS_${PN}-module-net-ftp-e += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp-i += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-ftp-i += "${PN}-module-net-ftp-dataconn"
-RDEPENDS_${PN}-module-net-ftp-i += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-ftp-i += "${PN}-module-strict"
+RDEPENDS_${PN}-module-net-ftp-i += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp-l += "${PN}-module-net-ftp-i"
+RDEPENDS_${PN}-module-net-ftp-l += "${PN}-module-strict"
+RDEPENDS_${PN}-module-net-ftp-l += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-carp"
+RDEPENDS_${PN}-module-net-ftp += "${PN}-module-constant"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-fcntl"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-file-basename"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-io-socket"
+RDEPENDS_${PN}-module-net-ftp += "${PN}-module-io-socket-ip"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-net-cmd"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-net-ftp-a"
@@ -1758,7 +1685,7 @@ RDEPENDS_${PN}-module-net-ftp += "${PN}-module-net-netrc"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-socket"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-strict"
 RDEPENDS_${PN}-module-net-ftp += "${PN}-module-time-local"
-RDEPENDS_${PN}-module-net-ftp += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-ftp += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-hostent += "${PN}-module-class-struct"
 RDEPENDS_${PN}-module-net-hostent += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-hostent += "${PN}-module-socket"
@@ -1772,14 +1699,15 @@ RDEPENDS_${PN}-module-net-netent += "${PN}-module-vars"
 RDEPENDS_${PN}-module-net-netrc += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-netrc += "${PN}-module-filehandle"
 RDEPENDS_${PN}-module-net-netrc += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-netrc += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-netrc += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-io-socket"
+RDEPENDS_${PN}-module-net-nntp += "${PN}-module-io-socket-ip"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-net-cmd"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-strict"
 RDEPENDS_${PN}-module-net-nntp += "${PN}-module-time-local"
-RDEPENDS_${PN}-module-net-nntp += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-nntp += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-ping += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-ping += "${PN}-module-constant"
 RDEPENDS_${PN}-module-net-ping += "${PN}-module-exporter"
@@ -1792,12 +1720,13 @@ RDEPENDS_${PN}-module-net-ping += "${PN}-module-time-hires"
 RDEPENDS_${PN}-module-net-ping += "${PN}-module-vars"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-io-socket"
+RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-io-socket-ip"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-mime-base64"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-net-cmd"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-net-netrc"
 RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-pop3 += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-protoent += "${PN}-module-class-struct"
 RDEPENDS_${PN}-module-net-protoent += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-protoent += "${PN}-module-strict"
@@ -1808,22 +1737,29 @@ RDEPENDS_${PN}-module-net-servent += "${PN}-module-strict"
 RDEPENDS_${PN}-module-net-servent += "${PN}-module-vars"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-io-socket"
+RDEPENDS_${PN}-module-net-smtp += "${PN}-module-io-socket-ip"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-mime-base64"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-net-cmd"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-socket"
 RDEPENDS_${PN}-module-net-smtp += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-smtp += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-smtp += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-carp"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-io-select"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-io-socket"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-net-config"
 RDEPENDS_${PN}-module-net-time += "${PN}-module-strict"
-RDEPENDS_${PN}-module-net-time += "${PN}-module-vars"
+RDEPENDS_${PN}-module-net-time += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-next += "${PN}-module-carp"
 RDEPENDS_${PN}-module-next += "${PN}-module-overload"
 RDEPENDS_${PN}-module-next += "${PN}-module-strict"
+RDEPENDS_${PN}-module-odbm-file += "${PN}-module-strict"
+RDEPENDS_${PN}-module-odbm-file += "${PN}-module-tie-hash"
+RDEPENDS_${PN}-module-odbm-file += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-odbm-file += "${PN}-module-xsloader"
+RDEPENDS_${PN}-module-ok += "${PN}-module-strict"
+RDEPENDS_${PN}-module-ok += "${PN}-module-test-more"
 RDEPENDS_${PN}-module-opcode += "${PN}-module-carp"
 RDEPENDS_${PN}-module-opcode += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-opcode += "${PN}-module-strict"
@@ -1841,10 +1777,6 @@ RDEPENDS_${PN}-module-overloading += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-overload += "${PN}-module-mro"
 RDEPENDS_${PN}-module-overload += "${PN}-module-scalar-util"
 RDEPENDS_${PN}-module-overload += "${PN}-module-warnings-register"
-RDEPENDS_${PN}-module-overload += "${PN}-module-overloading"
-RDEPENDS_${PN}-module-package-constants += "${PN}-module-if"
-RDEPENDS_${PN}-module-package-constants += "${PN}-module-strict"
-RDEPENDS_${PN}-module-package-constants += "${PN}-module-vars"
 RDEPENDS_${PN}-module-params-check += "${PN}-module-carp"
 RDEPENDS_${PN}-module-params-check += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-params-check += "${PN}-module-locale-maketext-simple"
@@ -1852,6 +1784,8 @@ RDEPENDS_${PN}-module-params-check += "${PN}-module-strict"
 RDEPENDS_${PN}-module-params-check += "${PN}-module-vars"
 RDEPENDS_${PN}-module-parent += "${PN}-module-strict"
 RDEPENDS_${PN}-module-parent += "${PN}-module-vars"
+RDEPENDS_${PN}-module-perlfaq += "${PN}-module-strict"
+RDEPENDS_${PN}-module-perlfaq += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-perlio-encoding += "${PN}-module-strict"
 RDEPENDS_${PN}-module-perlio-encoding += "${PN}-module-xsloader"
 RDEPENDS_${PN}-module-perlio-mmap += "${PN}-module-strict"
@@ -1914,13 +1848,13 @@ RDEPENDS_${PN}-module-pod-perldoc-getoptsoo += "${PN}-module-strict"
 RDEPENDS_${PN}-module-pod-perldoc-getoptsoo += "${PN}-module-vars"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-carp"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-config"
+RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-encode"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-fcntl"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-file-basename"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-file-spec-functions"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-file-temp"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-pod-perldoc-getoptsoo"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-strict"
-RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-symbol"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-text-parsewords"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-vars"
 RDEPENDS_${PN}-module-pod-perldoc += "${PN}-module-warnings"
@@ -2156,6 +2090,10 @@ RDEPENDS_${PN}-module-storable += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-storable += "${PN}-module-io-file"
 RDEPENDS_${PN}-module-storable += "${PN}-module-vars"
 RDEPENDS_${PN}-module-storable += "${PN}-module-xsloader"
+RDEPENDS_${PN}-module-sub-util += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-sub-util += "${PN}-module-list-util"
+RDEPENDS_${PN}-module-sub-util += "${PN}-module-strict"
+RDEPENDS_${PN}-module-sub-util += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-symbol += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-sys-hostname += "${PN}-module-carp"
 RDEPENDS_${PN}-module-sys-hostname += "${PN}-module-exporter"
@@ -2424,6 +2362,23 @@ RDEPENDS_${PN}-module-test += "${PN}-module-strict"
 RDEPENDS_${PN}-module-test += "${PN}-module-vars"
 RDEPENDS_${PN}-module-test-simple += "${PN}-module-strict"
 RDEPENDS_${PN}-module-test-simple += "${PN}-module-test-builder-module"
+RDEPENDS_${PN}-module-test-tester-capture += "${PN}-module-config"
+RDEPENDS_${PN}-module-test-tester-capture += "${PN}-module-strict"
+RDEPENDS_${PN}-module-test-tester-capture += "${PN}-module-test-builder"
+RDEPENDS_${PN}-module-test-tester-capture += "${PN}-module-threads-shared"
+RDEPENDS_${PN}-module-test-tester-capture += "${PN}-module-vars"
+RDEPENDS_${PN}-module-test-tester-capturerunner += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-test-tester-capturerunner += "${PN}-module-strict"
+RDEPENDS_${PN}-module-test-tester-capturerunner += "${PN}-module-test-tester-capture"
+RDEPENDS_${PN}-module-test-tester-delegate += "${PN}-module-strict"
+RDEPENDS_${PN}-module-test-tester-delegate += "${PN}-module-vars"
+RDEPENDS_${PN}-module-test-tester-delegate += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-strict"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-test-builder"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-test-tester-capturerunner"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-test-tester-delegate"
+RDEPENDS_${PN}-module-test-tester += "${PN}-module-vars"
 RDEPENDS_${PN}-module-text-abbrev += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-text-balanced += "${PN}-module-carp"
 RDEPENDS_${PN}-module-text-balanced += "${PN}-module-exporter"
@@ -2535,16 +2490,24 @@ RDEPENDS_${PN}-module-time-seconds += "${PN}-module-vars"
 RDEPENDS_${PN}-module-time-tm += "${PN}-module-class-struct"
 RDEPENDS_${PN}-module-time-tm += "${PN}-module-strict"
 RDEPENDS_${PN}-module-unicode-collate-cjk-big5 += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-big5 += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-gb2312 += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-gb2312 += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-jisx0208 += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-jisx0208 += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-strict"
 RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-unicode-collate"
+RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-pinyin += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-pinyin += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-stroke += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-stroke += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-cjk-zhuyin += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-cjk-zhuyin += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate-locale += "${PN}-module-base"
 RDEPENDS_${PN}-module-unicode-collate-locale += "${PN}-module-carp"
 RDEPENDS_${PN}-module-unicode-collate-locale += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-collate-locale += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-carp"
 RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-constant"
 RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-dynaloader"
@@ -2552,8 +2515,9 @@ RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-strict"
 RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-carp"
-RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-dynaloader"
+RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-constant"
 RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-strict"
 RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-carp"
@@ -2564,12 +2528,12 @@ RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-file-spec"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-if"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-integer"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-strict"
+RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-unicode-normalize"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-unicore"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-utf8-heavy"
 RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-warnings"
 RDEPENDS_${PN}-module-unicore += "${PN}-module-integer"
-RDEPENDS_${PN}-module-universal += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-universal += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-universal += "${PN}-module-carp"
 RDEPENDS_${PN}-module-user-grent += "${PN}-module-class-struct"
 RDEPENDS_${PN}-module-user-grent += "${PN}-module-exporter"
 RDEPENDS_${PN}-module-user-grent += "${PN}-module-strict"
diff --git a/meta/recipes-devtools/perl/perl-rprovides.inc b/meta/recipes-devtools/perl/perl-rprovides.inc
deleted file mode 100644
index 3cfcb7d7dd..0000000000
--- a/meta/recipes-devtools/perl/perl-rprovides.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Some packages changed names in 5.8.7-r14, RPROVIDE them for things that
-# depend on the old name
-#
-RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
-RPROVIDES_perl-module-b-assembler = "perl-module-${TARGET_SYS}-b-assembler"
-RPROVIDES_perl-module-b-bblock = "perl-module-${TARGET_SYS}-b-bblock"
-RPROVIDES_perl-module-build += "perl-module-module-build"
-RPROVIDES_perl-module-b-bytecode = "perl-module-${TARGET_SYS}-b-bytecode"
-RPROVIDES_perl-module-b-cc = "perl-module-${TARGET_SYS}-b-cc"
-RPROVIDES_perl-module-b-concise = "perl-module-${TARGET_SYS}-b-concise"
-RPROVIDES_perl-module-b-debug = "perl-module-${TARGET_SYS}-b-debug"
-RPROVIDES_perl-module-b-deparse = "perl-module-${TARGET_SYS}-b-deparse"
-RPROVIDES_perl-module-b-disassembler = "perl-module-${TARGET_SYS}-b-disassembler"
-RPROVIDES_perl-module-b-lint = "perl-module-${TARGET_SYS}-b-lint"
-RPROVIDES_perl-module-b-showlex = "perl-module-${TARGET_SYS}-b-showlex"
-RPROVIDES_perl-module-b-stackobj = "perl-module-${TARGET_SYS}-b-stackobj"
-RPROVIDES_perl-module-b-stash = "perl-module-${TARGET_SYS}-b-stash"
-RPROVIDES_perl-module-b-terse = "perl-module-${TARGET_SYS}-b-terse"
-RPROVIDES_perl-module-b-xref = "perl-module-${TARGET_SYS}-b-xref"
-RPROVIDES_perl-lib += " \
-    perl-module-config \
-    perl-module-config-heavy \
-    perl-module-${TARGET_SYS}-config \
-    perl-module-${TARGET_SYS}-config-heavy"
-RPROVIDES_perl-module-encode-alias = "perl-module-${TARGET_SYS}-encode-alias"
-RPROVIDES_perl-module-encode-cjkconstants = "perl-module-${TARGET_SYS}-encode-cjkconstants"
-RPROVIDES_perl-module-encode-config = "perl-module-${TARGET_SYS}-encode-config"
-RPROVIDES_perl-module-encode-encoder = "perl-module-${TARGET_SYS}-encode-encoder"
-RPROVIDES_perl-module-encode-encoding = "perl-module-${TARGET_SYS}-encode-encoding"
-RPROVIDES_perl-module-encode-guess = "perl-module-${TARGET_SYS}-encode-guess"
-RPROVIDES_perl-module-encoding = "perl-module-${TARGET_SYS}-encoding"
-RPROVIDES_perl-module-errno = "perl-module-${TARGET_SYS}-errno"
-RPROVIDES_perl-module-io-dir = "perl-module-${TARGET_SYS}-io-dir"
-RPROVIDES_perl-module-io-file = "perl-module-${TARGET_SYS}-io-file"
-RPROVIDES_perl-module-io-handle = "perl-module-${TARGET_SYS}-io-handle"
-RPROVIDES_perl-module-io-pipe = "perl-module-${TARGET_SYS}-io-pipe"
-RPROVIDES_perl-module-io-poll = "perl-module-${TARGET_SYS}-io-poll"
-RPROVIDES_perl-module-io-seekable = "perl-module-${TARGET_SYS}-io-seekable"
-RPROVIDES_perl-module-io-select = "perl-module-${TARGET_SYS}-io-select"
-RPROVIDES_perl-module-io-socket = "perl-module-${TARGET_SYS}-io-socket"
-RPROVIDES_perl-module-ipc-msg = "perl-module-${TARGET_SYS}-ipc-msg"
-RPROVIDES_perl-module-ipc-semaphore = "perl-module-${TARGET_SYS}-ipc-semaphore"
-RPROVIDES_perl-module-lib = "perl-module-${TARGET_SYS}-lib"
-RPROVIDES_perl-module-mime-quotedprint = "perl-module-${TARGET_SYS}-mime-quotedprint"
-RPROVIDES_perl-module-o = "perl-module-${TARGET_SYS}-o"
-RPROVIDES_perl-module-ops = "perl-module-${TARGET_SYS}-ops"
-RPROVIDES_perl-module-safe = "perl-module-${TARGET_SYS}-safe"
-RPROVIDES_perl-module-xsloader = "perl-module-${TARGET_SYS}-xsloader"
diff --git a/meta/recipes-devtools/perl/perl-rprovides_5.20.0.inc b/meta/recipes-devtools/perl/perl-rprovides_5.20.0.inc
deleted file mode 100644
index 9a648dbf2f..0000000000
--- a/meta/recipes-devtools/perl/perl-rprovides_5.20.0.inc
+++ /dev/null
@@ -1 +0,0 @@
-RPROVIDES_perl-module-module-build += "libmodule-build-perl"
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch b/meta/recipes-devtools/perl/perl/Configure-multilib.patch
index 9625b0b84e..9625b0b84e 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch
+++ b/meta/recipes-devtools/perl/perl/Configure-multilib.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch b/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
index eb92ccb678..eb92ccb678 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch
+++ b/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index 689d394931..3de233128d 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
@@ -2,10 +2,11 @@ Upstream-Status:Inappropriate [embedded specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- Makefile.SH | 130 ++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 66 insertions(+), 64 deletions(-)
+ Makefile.SH |  145 +++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 67 insertions(+), 78 deletions(-)
 
 diff --git a/Makefile.SH b/Makefile.SH
+index 034d812..67e08fd 100755
 --- a/Makefile.SH
 +++ b/Makefile.SH
 @@ -39,10 +39,10 @@ case "$useshrplib" in
@@ -59,14 +60,14 @@ diff --git a/Makefile.SH b/Makefile.SH
             ;;
         os390)  test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
                 ;;
-@@ -565,9 +555,19 @@ splintfiles = $(c1)
+@@ -566,13 +556,23 @@ splintfiles = $(c1)
         @echo `$(CCCMDSRC)` -S $*.c
         @`$(CCCMDSRC)` -S $*.c
  
--all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
 -       @echo " ";
 -       @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
-+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
++#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
 +#      @echo " ";
 +#      @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
 +
@@ -75,14 +76,21 @@ diff --git a/Makefile.SH b/Makefile.SH
 +more: $(generated_pods) $(private) $(public)
 +
 +more2: $(dynamic_ext)
-+
+ 
+-$(MANIFEST_SRT):       MANIFEST $(PERL_EXE)
+-       @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
+-           $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
 +more3: $(nonxs_ext)
 +
-+more4: extras.make
- 
- .PHONY: all translators utilities
++more4: extras.make $(MANIFEST_SRT)
++
++$(MANIFEST_SRT):       MANIFEST
++       @$(MINIPERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
++           $(MINIPERL) Porting/manisort -q -o MANIFEST; sh -c true)
+        @touch $(MANIFEST_SRT)
  
-@@ -575,7 +575,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile
+ .PHONY: all utilities
+@@ -581,7 +581,7 @@ $(MANIFEST_SRT):    MANIFEST $(PERL_EXE)
  # by make_patchnum.pl.
  git_version.h: lib/Config_git.pl
  
@@ -91,27 +99,25 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) make_patchnum.pl
  
  # make sure that we recompile perl.c if the git version changes
-@@ -588,8 +588,8 @@ perl$(OBJ_EXT): git_version.h
+@@ -594,7 +594,7 @@ perl$(OBJ_EXT): git_version.h
  # loading, we need to build perl first.
  case "$usedl$static_cwd" in
  defineundef)
 -    util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
--     x2p_deps="\$(MINIPERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
 +    util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
-+     x2p_deps="\$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
      ;;
  definedefine)
      util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
-@@ -613,7 +613,7 @@ x2p/s2p: $x2p_deps
- x2p/find2perl: $x2p_deps
-        cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
+@@ -604,7 +604,7 @@ definedefine)
+ esac
  
+ $spitshell >>$Makefile <<!GROK!THIS!
 -utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL
 +utils/Makefile: \$(CONFIGPM) utils/Makefile.PL
         \$(MINIPERL) -Ilib utils/Makefile.PL
  
  utilities:     utils/Makefile $util_deps
-@@ -708,7 +708,7 @@ esac
+@@ -699,7 +699,7 @@ esac
  
  
  $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -120,7 +126,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext)
  
  # The file ext.libs is a list of libraries that must be linked in
-@@ -769,7 +769,7 @@ PERLEXPORT          = perl.exp
+@@ -760,7 +760,7 @@ PERLEXPORT          = perl.exp
         ;;
         esac
         $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -129,7 +135,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp
  
  !NO!SUBS!
-@@ -778,7 +778,7 @@ os2)
+@@ -769,7 +769,7 @@ os2)
         $spitshell >>$Makefile <<'!NO!SUBS!'
  MINIPERLEXP            = miniperl
  
@@ -138,7 +144,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
  
  !NO!SUBS!
-@@ -838,7 +838,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
+@@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
         true)
                 $spitshell >>$Makefile <<'!NO!SUBS!'
         rm -f $@
@@ -147,7 +153,7 @@ diff --git a/Makefile.SH b/Makefile.SH
  !NO!SUBS!
                 case "$osname" in
                 aix)
-@@ -886,7 +886,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
+@@ -877,7 +877,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
                 $spitshell >>$Makefile <<'!NO!SUBS!'
  lib/buildcustomize.pl: $& $(mini_obj)
         $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs)
@@ -158,7 +164,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) -f write_buildcustomize.pl
  !NO!SUBS!
                 ;;
-@@ -894,7 +896,9 @@ lib/buildcustomize.pl: $& $(mini_obj)
+@@ -885,7 +887,9 @@ lib/buildcustomize.pl: $& $(mini_obj)
                 $spitshell >>$Makefile <<'!NO!SUBS!'
  lib/buildcustomize.pl: $& $(mini_obj) write    ldcustomize.pl
         $(CC) -o $(MINIPERL_EXE) $(mini_obj    libs)
@@ -169,7 +175,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) -f write_buildcustomize.pl    
  !NO!SUBS!
                 ;;
-@@ -916,7 +920,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
+@@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
         -@rm -f miniperl.xok
         $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
             $(mini_obj) $(libs)
@@ -180,7 +186,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) -f write_buildcustomize.pl
  !NO!SUBS!
                 ;;
-@@ -927,7 +933,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl
+@@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl
         -@rm -f miniperl.xok
         -@rm \$(MINIPERL_EXE)
         \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
@@ -191,7 +197,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
  !GROK!THIS!
                 else
-@@ -936,7 +944,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
+@@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
         -@rm -f miniperl.xok
         $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
             $(mini_obj) $(libs)
@@ -202,7 +208,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) -f write_buildcustomize.pl
  !NO!SUBS!
                 fi
-@@ -967,7 +977,7 @@ case "${osname}" in
+@@ -971,7 +981,7 @@ case "${osname}" in
  catamount)
  $spitshell >>$Makefile <<!GROK!THIS!
  .PHONY: makeppport
@@ -211,7 +217,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
         (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
         done
-@@ -977,7 +987,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
+@@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
  *)
  $spitshell >>$Makefile <<'!NO!SUBS!'
  .PHONY: makeppport
@@ -220,7 +226,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) mkppport
  
  !NO!SUBS!
-@@ -987,16 +997,16 @@ esac
+@@ -991,16 +1001,16 @@ esac
  $spitshell >>$Makefile <<'!NO!SUBS!'
  
  .PHONY: preplibrary
@@ -240,7 +246,7 @@ diff --git a/Makefile.SH b/Makefile.SH
         $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
  #      Commented out so always runs, mktables looks at far more files than we
  #      can in this makefile to decide if needs to run or not
-@@ -1005,22 +1015,22 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
+@@ -1009,12 +1019,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
  # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
  # But also this ensures that all extensions are built before we try to scan
  # them, which picks up Devel::PPPort's documentation.
@@ -255,20 +261,27 @@ diff --git a/Makefile.SH b/Makefile.SH
 +pod/perlintern.pod: autodoc.pl embed.fnc
         $(MINIPERL) autodoc.pl
  
--pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
-+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
-        $(MINIPERL) pod/perlmodlib.PL -q
- 
- pod/perl5200delta.pod: pod/perldelta.pod
-        $(RMS) pod/perl5200delta.pod
-        $(LNS) perldelta.pod pod/perl5200delta.pod
+ pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
+@@ -1024,7 +1034,7 @@ pod/perl5220delta.pod: pod/perldelta.pod
+        $(RMS) pod/perl5220delta.pod
+        $(LNS) perldelta.pod pod/perl5220delta.pod
  
 -extra.pods: $(MINIPERL_EXE)
 +extra.pods:
         -@test ! -f extra.pods || rm -f `cat extra.pods`
         -@rm -f extra.pods
         -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -1075,11 +1085,7 @@ done
+@@ -1068,8 +1078,7 @@ EOT
+         $spitshell >>$Makefile <<EOT
+ 
+ install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
+-       \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
+-       \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags
++       ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags  \$(INSTALLFLAGS) \$(STRIPFLAGS)
+ EOT
+     fi
+ 
+@@ -1079,11 +1088,7 @@ done
  if test "X$hostperl" != X; then
         $spitshell >>$Makefile <<'!NO!SUBS!'
  install.perl:  $(INSTALL_DEPENDENCE) installperl
@@ -281,68 +294,76 @@ diff --git a/Makefile.SH b/Makefile.SH
  
  # XXX Experimental. Hardwired values, but useful for testing.
  # Eventually Configure could ask for some of these values.
-@@ -1097,11 +1103,7 @@ install.html: all installhtml
+@@ -1101,24 +1106,8 @@ install.html: all installhtml
  else
         $spitshell >>$Makefile <<'!NO!SUBS!'
  install.perl:  $(INSTALL_DEPENDENCE) installperl
 -       $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
 -       -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
--
++       ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+ 
 -install.man:   all installman
 -       $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
-+       ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+-
+-# XXX Experimental. Hardwired values, but useful for testing.
+-# Eventually Configure could ask for some of these values.
+-install.html: all installhtml
+-       -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
+-       $(RUN_PERL) installhtml   \
+-      --podroot=. --podpath=. --recurse  \
+-      --htmldir=$(privlib)/html   \
+-      --htmlroot=$(privlib)/html  \
+-      --splithead=pod/perlipc     \
+-      --splititem=pod/perlfunc    \
+-      --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
+-      --verbose
+ !NO!SUBS!
+ fi
  
- # XXX Experimental. Hardwired values, but useful for testing.
- # Eventually Configure could ask for some of these values.
-@@ -1206,16 +1208,16 @@ manicheck:      FORCE
+@@ -1210,13 +1199,13 @@ manicheck:      FORCE
  #
  # DynaLoader may be needed for extensions that use Makefile.PL.
  
 -$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
 +$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
-        $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
+        $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
  
 -d_dummy $(dynamic_ext):        $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
 +d_dummy $(dynamic_ext):        lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
-        $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+        $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
  
 -s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
 +s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
-        $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
- 
--n_dummy $(nonxs_ext):  $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
-+n_dummy $(nonxs_ext):  lib/buildcustomize.pl preplibrary FORCE
-        $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
- !NO!SUBS!
+        $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
  
-@@ -1409,7 +1411,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
+ n_dummy $(nonxs_ext):  $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
+@@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
  
  case "$targethost" in
  '') $spitshell >>$Makefile <<'!NO!SUBS!'
 -test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
 +test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \
-        $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
-        $(generated_pods)
+        $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods)
         cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
-@@ -1417,7 +1419,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+ 
  !NO!SUBS!
  ;;
  *) $spitshell >>$Makefile <<!GROK!THIS!
 -test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \
 +test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \
-        \$(dynamic_ext) \$(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
+        \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \
         \$(generated_pods)
         $to libperl.*
-@@ -1469,7 +1471,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
+@@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
  esac
  
  $spitshell >>$Makefile <<'!NO!SUBS!'
 -test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
 +test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
-        $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+        $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
         cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
  !NO!SUBS!
-@@ -1520,7 +1522,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!'
+@@ -1516,7 +1505,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!'
  
  # Can't depend on lib/Config.pm because that might be where miniperl
  # is crashing.
@@ -351,6 +372,3 @@ diff --git a/Makefile.SH b/Makefile.SH
         -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
         @echo " "
         @echo "You may see some irrelevant test failures if you have been unable"
--- 
-1.8.1.2
-
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch b/meta/recipes-devtools/perl/perl/Makefile.patch
index 858e2e10fb..858e2e10fb 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh b/meta/recipes-devtools/perl/perl/config.sh
index 1ac1355829..d80f0c0bfa 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh
+++ b/meta/recipes-devtools/perl/perl/config.sh
@@ -8,13 +8,13 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Tue Jun 24 03:00:02 UTC 2014
+# Configuration time: Thu Jun 18 05:37:27 UTC 2015
 # Configured by     : Open Embedded
-# Target system     : linux qemuarm 3.14.5-yocto-standard #1 preempt mon jun 23 19:42:18 cst 2014 armv5tejl gnulinux 
+# Target system     : linux qemux86-64 3.19.5-yocto-standard #1 smp preempt tue jun 16 00:28:17 pdt 2015 x86_64 gnulinux
 
 : Configure command line arguments.
 config_arg0='Configure'
-config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.20.0 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
+config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.22.0 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=@USRBIN@/less -isr'
 config_argc=28
 config_arg1='-des'
 config_arg2='-Doptimize=-O2'
@@ -26,7 +26,7 @@ config_arg7='-Dinstallprefix=@EXECPREFIX@'
 config_arg8='-Dprefix=@EXECPREFIX@'
 config_arg9='-Dvendorprefix=@EXECPREFIX@'
 config_arg10='-Dsiteprefix=@EXECPREFIX@'
-config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.20.0'
+config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.22.0'
 config_arg12='-Duseshrplib'
 config_arg13='-Dusethreads'
 config_arg14='-Duseithreads'
@@ -43,16 +43,16 @@ config_arg24='-Duseperlio'
 config_arg25='-Dinstallusrbinperl'
 config_arg26='-Ubincompat5005'
 config_arg27='-Uversiononly'
-config_arg28='-Dpager=/usr/bin/less -isr'
+config_arg28='-Dpager=@USRBIN@/less -isr'
 
 Author=''
-Date='$Date'
+Date=''
 Header=''
-Id='$Id'
+Id=''
 Locker=''
-Log='$Log'
-RCSfile='$RCSfile'
-Revision='$Revision'
+Log=''
+RCSfile=''
+Revision=''
 Source=''
 State=''
 _a='.a'
@@ -60,16 +60,17 @@ _exe=''
 _o='.o'
 afs='false'
 afsroot='/afs'
+alignbytes='8'
 ansi2knr=''
 aphostname=''
 api_revision='5'
 api_subversion='0'
-api_version='14'
-api_versionstring='5.14.0'
+api_version='22'
+api_versionstring='5.22.0'
 ar='ar'
-archlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
-archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
-archlib_exp='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
+archlib='@LIBDIR@/perl/5.22.0/@ARCH@-thread-multi'
+archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.22.0/@ARCH@-thread-multi'
+archlib_exp='@LIBDIR@/perl/5.22.0/@ARCH@-thread-multi'
 archname64=''
 archname='@ARCH@-thread-multi'
 archobjs=''
@@ -82,19 +83,21 @@ bin_ELF='define'
 binexp='@USRBIN@'
 bison='bison'
 byacc='byacc'
+byteorder='12345678'
 c=''
 castflags='0'
 cat='cat'
 cc='gcc'
 cccdlflags='-fPIC'
-ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi/CORE'
-ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.22.0/@ARCH@-thread-multi/CORE'
+ccflags='-D_REENTRANT -D_GNU_SOURCE -fwrapv -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='gcc'
 ccsymbols=''
 ccversion=''
 cf_by='Open Embedded'
 cf_email='Open Embedded@localhost.localdomain'
+cf_time='Thu Jun 18 05:37:27 UTC 2015'
 charbits='8'
 charsize='1'
 chgrp=''
@@ -109,11 +112,11 @@ cpio=''
 cpp='cpp'
 cpp_stuff='42'
 cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector'
+cppflags='-D_REENTRANT -D_GNU_SOURCE -fwrapv -fno-strict-aliasing -pipe'
 cpplast='-'
 cppminus='-'
-cpprun='gcc -E'
-cppstdin='gcc -E'
+cpprun='gcc  -E'
+cppstdin='gcc  -E'
 crypt_r_proto='REENTRANT_PROTO_B_CCS'
 cryptlib=''
 csh='csh'
@@ -136,11 +139,14 @@ d_SCNfldbl='define'
 d__fwalk='undef'
 d_access='define'
 d_accessx='undef'
+d_acosh='define'
 d_aintl='undef'
 d_alarm='define'
 d_archlib='define'
 d_asctime64='undef'
 d_asctime_r='define'
+d_asinh='define'
+d_atanh='define'
 d_atolf='undef'
 d_atoll='define'
 d_attribute_deprecated='define'
@@ -151,6 +157,7 @@ d_attribute_noreturn='define'
 d_attribute_pure='define'
 d_attribute_unused='define'
 d_attribute_warn_unused_result='define'
+d_backtrace='define'
 d_bcmp='define'
 d_bcopy='define'
 d_bsd='undef'
@@ -160,8 +167,9 @@ d_builtin_choose_expr='define'
 d_builtin_expect='define'
 d_bzero='define'
 d_c99_variadic_macros='define'
-d_casti32='undef'
+d_casti32='define'
 d_castneg='define'
+d_cbrt='define'
 d_charvspr='undef'
 d_chown='define'
 d_chroot='define'
@@ -171,6 +179,7 @@ d_clearenv='define'
 d_closedir='define'
 d_cmsghdr_s='define'
 d_const='define'
+d_copysign='define'
 d_copysignl='define'
 d_cplusplus='undef'
 d_crypt='define'
@@ -182,12 +191,13 @@ d_ctime64='undef'
 d_ctime_r='define'
 d_cuserid='define'
 d_dbl_dig='define'
-d_dbminitproto='undef'
+d_dbminitproto='define'
 d_difftime64='undef'
 d_difftime='define'
 d_dir_dd_fd='undef'
 d_dirfd='define'
 d_dirnamlen='undef'
+d_dladdr='define'
 d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
@@ -209,8 +219,12 @@ d_endpwent_r='undef'
 d_endsent='define'
 d_endservent_r='undef'
 d_eofnblk='define'
+d_erf='define'
+d_erfc='define'
 d_eunice='undef'
-d_faststdio='define'
+d_exp2='define'
+d_expm1='define'
+d_faststdio='undef'
 d_fchdir='define'
 d_fchmod='define'
 d_fchown='define'
@@ -218,19 +232,27 @@ d_fcntl='define'
 d_fcntl_can_lock='define'
 d_fd_macros='define'
 d_fd_set='define'
+d_fdim='define'
 d_fds_bits='define'
+d_fegetround='define'
 d_fgetpos='define'
 d_finite='define'
 d_finitel='define'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
+d_fma='define'
+d_fmax='define'
+d_fmin='define'
 d_fork='define'
 d_fp_class='undef'
+d_fp_classify='undef'
+d_fp_classl='undef'
 d_fpathconf='define'
 d_fpclass='undef'
-d_fpclassify='undef'
+d_fpclassify='define'
 d_fpclassl='undef'
+d_fpgetround='undef'
 d_fpos64_t='undef'
 d_frexpl='define'
 d_fs_data_s='undef'
@@ -243,7 +265,7 @@ d_ftello='define'
 d_ftime='undef'
 d_futimes='define'
 d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='define'
 d_getaddrinfo='define'
 d_getcwd='define'
 d_getespwnam='undef'
@@ -308,6 +330,8 @@ d_gnulibc='define'
 d_grpasswd='define'
 d_hasmntopt='define'
 d_htonl='define'
+d_hypot='define'
+d_ilogb='define'
 d_ilogbl='define'
 d_inc_version_list='undef'
 d_index='undef'
@@ -315,23 +339,50 @@ d_inetaton='define'
 d_inetntop='define'
 d_inetpton='define'
 d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='define'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
-d_isfinite='undef'
+d_isblank='define'
+d_isfinite='define'
+d_isfinitel='undef'
 d_isinf='define'
+d_isinfl='define'
+d_isless='undef'
 d_isnan='define'
 d_isnanl='define'
+d_isnormal='define'
+d_j0='define'
+d_j0l='define'
 d_killpg='define'
+d_lc_monetary_2008='define'
 d_lchown='define'
 d_ldbl_dig='define'
+d_ldexpl='define'
+d_lgamma='define'
+d_lgamma_r='define'
 d_libm_lib_version='define'
+d_libname_unique='undef'
 d_link='define'
+d_llrint='define'
+d_llrintl='define'
+d_llround='define'
+d_llroundl='define'
 d_localtime64='undef'
 d_localtime_r='define'
 d_localtime_r_needs_tzset='define'
 d_locconv='define'
 d_lockf='define'
+d_log1p='define'
+d_log2='define'
+d_logb='define'
 d_longdbl='define'
 d_longlong='define'
+d_lrint='define'
+d_lrintl='define'
+d_lround='define'
+d_lroundl='define'
 d_lseekproto='define'
 d_lstat='define'
 d_madvise='define'
@@ -371,10 +422,15 @@ d_msgsnd='define'
 d_msync='define'
 d_munmap='define'
 d_mymalloc='undef'
-d_ndbm='undef'
+d_nan='define'
+d_ndbm='define'
 d_ndbm_h_uses_prototypes='undef'
+d_nearbyint='define'
+d_nextafter='define'
+d_nexttoward='define'
 d_nice='define'
 d_nl_langinfo='define'
+d_nv_preserves_uv='undef'
 d_nv_zero_is_allbits_zero='define'
 d_off64_t='define'
 d_old_pthread_create_joinable='undef'
@@ -388,11 +444,15 @@ d_phostname='undef'
 d_pipe='define'
 d_poll='define'
 d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='undef'
 d_procselfexe='define'
 d_pseudofork='undef'
 d_pthread_atfork='define'
 d_pthread_attr_setscope='define'
 d_pthread_yield='define'
+d_ptrdiff_t='define'
 d_pwage='undef'
 d_pwchange='undef'
 d_pwclass='undef'
@@ -404,19 +464,27 @@ d_pwquota='undef'
 d_qgcvt='define'
 d_quad='define'
 d_random_r='define'
+d_re_comp='undef'
 d_readdir64_r='define'
 d_readdir='define'
 d_readdir_r='define'
 d_readlink='define'
 d_readv='define'
 d_recvmsg='define'
+d_regcmp='undef'
+d_regcomp='define'
+d_remainder='define'
+d_remquo='define'
 d_rename='define'
 d_rewinddir='define'
+d_rint='define'
 d_rmdir='define'
+d_round='define'
 d_safebcpy='undef'
 d_safemcpy='undef'
 d_sanemcmp='define'
 d_sbrkproto='define'
+d_scalbn='define'
 d_scalbnl='define'
 d_sched_yield='define'
 d_scm_rights='define'
@@ -461,7 +529,6 @@ d_setsent='define'
 d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='define'
 d_shmat='define'
 d_shmatprototype='define'
@@ -472,8 +539,11 @@ d_sigaction='define'
 d_signbit='define'
 d_sigprocmask='define'
 d_sigsetjmp='define'
+d_sin6_scope_id='define'
 d_sitearch='define'
 d_snprintf='define'
+d_sockaddr_in6='define'
+d_sockaddr_sa_len='undef'
 d_sockatmark='define'
 d_sockatmarkproto='define'
 d_socket='define'
@@ -486,17 +556,19 @@ d_srand48_r='define'
 d_srandom_r='define'
 d_sresgproto='define'
 d_sresuproto='define'
+d_stat='define'
 d_statblks='define'
-d_statfs_f_flags='undef'
+d_statfs_f_flags='define'
 d_statfs_s='define'
+d_static_inline='define'
 d_statvfs='define'
 d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='define'
+d_stdio_ptr_lval='undef'
 d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='define'
+d_stdio_ptr_lval_sets_cnt='undef'
 d_stdio_stream_array='undef'
-d_stdiobase='define'
-d_stdstdio='define'
+d_stdiobase='undef'
+d_stdstdio='undef'
 d_strchr='define'
 d_strcoll='define'
 d_strctcpy='define'
@@ -527,15 +599,19 @@ d_tcgetpgrp='define'
 d_tcsetpgrp='define'
 d_telldir='define'
 d_telldirproto='define'
+d_tgamma='define'
 d_time='define'
 d_timegm='define'
 d_times='define'
 d_tm_tm_gmtoff='define'
 d_tm_tm_zone='define'
 d_tmpnam_r='define'
+d_trunc='define'
 d_truncate='define'
+d_truncl='define'
 d_ttyname_r='define'
 d_tzname='define'
+d_u32align='define'
 d_ualarm='define'
 d_umask='define'
 d_uname='define'
@@ -558,7 +634,9 @@ d_vprintf='define'
 d_vsnprintf='define'
 d_wait4='define'
 d_waitpid='define'
+d_wcscmp='define'
 d_wcstombs='define'
+d_wcsxfrm='define'
 d_wctomb='define'
 d_writev='define'
 d_xenix='undef'
@@ -568,15 +646,15 @@ db_prefixtype='size_t'
 db_version_major=''
 db_version_minor=''
 db_version_patch=''
-defvoidused='15'
 direntrytype='struct dirent'
 dlext='so'
 dlsrc='dl_dlopen.xs'
+doublekind='3'
 doublesize='8'
-drand01='drand48()'
+drand01='Perl_drand48()'
 drand48_r_proto='REENTRANT_PROTO_I_ST'
 dtrace=''
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -591,7 +669,7 @@ endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local Unicode/Normalize XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
 extern_C='extern'
 extras=''
 fflushNULL='define'
@@ -608,7 +686,7 @@ full_csh='csh'
 full_sed='sed'
 gccansipedantic=''
 gccosandvers=''
-gccversion='4.9.0'
+gccversion='4.9.2'
 getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
 getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
 getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
@@ -629,13 +707,14 @@ getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
 getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
 getservent_r_proto='REENTRANT_PROTO_I_SBWR'
 getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+gidformat='"u"'
 gidsign='1'
 gidsize='4'
 gidtype='gid_t'
-glibpth='@EXECPREFIX@/shlib @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@/386 @EXECPREFIX@/ccs/lib @EXECPREFIX@/ucblib @EXECPREFIX@/local/lib '
+glibpth='@EXECPREFIX@/shlib  @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@386 @EXECPREFIX@/ccs@BASELIBDIR@ @EXECPREFIX@/ucblib @EXECPREFIX@/local@BASELIBDIR@ @BASELIBDIR@ @LIBDIR@ @EXECPREFIX@/local@BASELIBDIR@ '
 gmake='gmake'
 gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version='2.19'
+gnulibc_version='2.21'
 grep='grep'
 groupcat='cat /etc/group'
 groupstype='gid_t'
@@ -644,6 +723,9 @@ h_fcntl='false'
 h_sysfile='true'
 hint='recommended'
 hostcat='cat /etc/hosts'
+hostgenerate=''
+hostosname=''
+hostperl=''
 html1dir=' '
 html1direxp=''
 html3dir=' '
@@ -651,25 +733,29 @@ html3direxp=''
 i16size='2'
 i16type='short'
 i32size='4'
+i32type='int'
 i64size='8'
+i64type='long'
 i8size='1'
 i8type='signed char'
 i_arpainet='define'
 i_assert='define'
+i_bfd='define'
 i_bsdioctl=''
 i_crypt='define'
 i_db='undef'
-i_dbm='undef'
+i_dbm='define'
 i_dirent='define'
-i_dld='undef'
 i_dlfcn='define'
+i_execinfo='define'
 i_fcntl='undef'
+i_fenv='define'
 i_float='define'
 i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
+i_gdbmndbm='define'
 i_grp='define'
 i_ieeefp='undef'
 i_inttypes='define'
@@ -692,13 +778,15 @@ i_poll='define'
 i_prot='undef'
 i_pthread='define'
 i_pwd='define'
+i_quadmath='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='define'
 i_socks='undef'
 i_stdarg='define'
+i_stdbool='define'
 i_stddef='define'
+i_stdint='define'
 i_stdlib='define'
 i_string='define'
 i_sunmath='undef'
@@ -747,7 +835,7 @@ inc_version_list_init='0'
 incpath=''
 inews=''
 initialinstalllocation='@USRBIN@'
-installarchlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
+installarchlib='@LIBDIR@/perl/5.22.0/@ARCH@-thread-multi'
 installbin='@USRBIN@'
 installhtml1dir=''
 installhtml3dir=''
@@ -755,48 +843,50 @@ installman1dir=''
 installman3dir=''
 installprefix='@EXECPREFIX@'
 installprefixexp='@EXECPREFIX@'
-installprivlib='@LIBDIR@/perl/5.20.0'
+installprivlib='@LIBDIR@/perl/5.22.0'
 installscript='@USRBIN@'
-installsitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
+installsitearch='@LIBDIR@/perl/site_perl/5.22.0/@ARCH@-thread-multi'
 installsitebin='@USRBIN@'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='@LIBDIR@/perl/site_perl/5.20.0'
+installsitelib='@LIBDIR@/perl/site_perl/5.22.0'
 installsiteman1dir=''
 installsiteman3dir=''
 installsitescript='@USRBIN@'
 installstyle='lib/perl'
 installusrbinperl='define'
-installvendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
+installvendorarch='@LIBDIR@/perl/vendor_perl/5.22.0/@ARCH@-thread-multi'
 installvendorbin='@USRBIN@'
 installvendorhtml1dir=''
 installvendorhtml3dir=''
-installvendorlib='@LIBDIR@/perl/vendor_perl/5.20.0'
+installvendorlib='@LIBDIR@/perl/vendor_perl/5.22.0'
 installvendorman1dir=''
 installvendorman3dir=''
 installvendorscript='@USRBIN@'
 intsize='4'
 issymlink='test -h'
 ivdformat='"ld"'
+ivsize='8'
 ivtype='long'
-known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version '
+known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version '
 ksh=''
 ld='gcc'
-lddlflags='-shared -O2 -fstack-protector'
-ldflags=' -fstack-protector'
+ld_can_script='define'
+lddlflags='-shared -O2'
+ldflags=''
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
-libc='@BASELIBDIR@/libc-2.19.so'
+libc='libc-2.21.so'
 libperl='libperl.so'
-libpth='@BASELIBDIR@ @LIBDIR@'
-libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
+libpth='@LIBDIR@ @BASELIBDIR@'
+libs='-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat'
 libsdirs=' @LIBDIR@'
-libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-libsfound=' @LIBDIR@/libnsl.so @LIBDIR@/libgdbm.so @LIBDIR@/libdb.so @LIBDIR@/libdl.so @LIBDIR@/libm.so @LIBDIR@/libcrypt.so @LIBDIR@/libutil.so @LIBDIR@/libpthread.so @LIBDIR@/libc.so'
-libspath=' @BASELIBDIR@ @LIBDIR@'
-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD gdbm_compat'
+libsfiles=' libpthread.so libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so'
+libsfound=' @LIBDIR@/libpthread.so @LIBDIR@/libnsl.so @LIBDIR@/libgdbm.so @LIBDIR@/libdb.so @LIBDIR@/libdl.so @LIBDIR@/libm.so @LIBDIR@/libcrypt.so @LIBDIR@/libutil.so @LIBDIR@/libc.so @LIBDIR@/libgdbm_compat.so'
+libspath=' @LIBDIR@ @BASELIBDIR@'
+libswanted='cl pthread socket inet nsl nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -805,17 +895,16 @@ ln='ln'
 lns='/bin/ln -s'
 localtime_r_proto='REENTRANT_PROTO_S_TS'
 locincpth='@EXECPREFIX@/local/include /opt/local/include @EXECPREFIX@/gnu/include /opt/gnu/include @EXECPREFIX@/GNU/include /opt/GNU/include'
-loclibpth='@EXECPREFIX@/local/lib /opt/local/lib @EXECPREFIX@/gnu/lib /opt/gnu/lib @EXECPREFIX@/GNU/lib /opt/GNU/lib'
+loclibpth='@EXECPREFIX@/local@BASELIBDIR@ /opt/local@BASELIBDIR@ @EXECPREFIX@/gnu@BASELIBDIR@ /opt/gnu@BASELIBDIR@ @EXECPREFIX@/GNU@BASELIBDIR@ /opt/GNU@BASELIBDIR@'
+longdblkind='3'
+longdblsize='16'
 longlongsize='8'
+longsize='8'
 lp=''
 lpr=''
 ls='ls'
 lseeksize='8'
 lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
 mail=''
 mailx=''
 make='make'
@@ -840,19 +929,23 @@ mv=''
 myarchname='@ARCH@'
 mydomain='.localdomain'
 myhostname='localhost'
+myuname='linux qemux86-64 3.19.5-yocto-standard #1 smp preempt tue jun 16 00:28:17 pdt 2015 x86_64 gnulinux '
 n='-n'
+need_va_copy='define'
 netdb_hlen_type='size_t'
+netdb_host_type='char *'
 netdb_name_type='const char *'
 netdb_net_type='in_addr_t'
 nm='nm'
 nm_opt=''
 nm_so_opt='--dynamic'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local Unicode/Normalize XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
 nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
 nvGUformat='"G"'
 nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='53'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -864,35 +957,39 @@ old_pthread_create_joinable=''
 optimize='-O2'
 orderlib='false'
 osname='linux'
-osvers='3.14.5-yocto-standard'
-otherlibdirs='@LIBDIR@/perl/5.20.0'
-package='perl5'
+osvers='3.19.5-yocto-standard'
+otherlibdirs='@LIBDIR@/perl/5.22.0'
+package='perl'
 pager='/usr/bin/less -isr'
 passcat='cat /etc/passwd'
-patchlevel='20'
+patchlevel='22'
 path_sep=':'
 perl5='@USRBIN@/perl'
-perl=''
+perl='perl'
 perl_patchlevel=''
+perl_static_inline='static __inline__'
 perladmin='root@localhost'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
+perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc'
 perlpath='@USRBIN@/perl'
 pg='pg'
 phostname=''
 pidtype='pid_t'
-plibpth=''
+plibpth='@LIBDIR@ @BASELIBDIR@'
 pmake=''
 pr=''
 prefix='@EXECPREFIX@'
 prefixexp='@EXECPREFIX@'
-privlib='@LIBDIR@/perl/5.20.0'
-privlibexp='@LIBDIR@/perl/5.20.0'
+privlib='@LIBDIR@/perl/5.22.0'
+privlibexp='@LIBDIR@/perl/5.22.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
+ptrsize='8'
+quadkind='2'
+quadtype='long'
 randbits='48'
-randfunc='drand48'
+randfunc='Perl_drand48'
 random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
+randseedtype='U32'
 ranlib=':'
 rd_nodata='-1'
 readdir64_r_proto='REENTRANT_PROTO_I_TSR'
@@ -903,18 +1000,29 @@ rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
 rmail=''
 run=''
 runnm='false'
+sGMTIME_max='67768036191676799'
+sGMTIME_min='-62167219200'
+sLOCALTIME_max='67768036191676799'
+sLOCALTIME_min='-62167219200'
 sPRIEUldbl='"LE"'
 sPRIFUldbl='"LF"'
 sPRIGUldbl='"LG"'
+sPRIXU64='"lX"'
+sPRId64='"ld"'
 sPRIeldbl='"Le"'
 sPRIfldbl='"Lf"'
 sPRIgldbl='"Lg"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
 scriptdir='@USRBIN@'
 scriptdirexp='@USRBIN@'
 sed='sed'
-seedfunc='srand48'
+seedfunc='Perl_drand48_init'
+selectminbits='64'
 selecttype='fd_set *'
 sendmail=''
 setgrent_r_proto='0'
@@ -938,17 +1046,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
-sitearchexp='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
+sitearch='@LIBDIR@/perl/site_perl/5.22.0/@ARCH@-thread-multi'
+sitearchexp='@LIBDIR@/perl/site_perl/5.22.0/@ARCH@-thread-multi'
 sitebin='@USRBIN@'
 sitebinexp='@USRBIN@'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='@LIBDIR@/perl/site_perl/5.20.0'
+sitelib='@LIBDIR@/perl/site_perl/5.22.0'
 sitelib_stem='@LIBDIR@/perl/site_perl'
-sitelibexp='@LIBDIR@/perl/site_perl/5.20.0'
+sitelibexp='@LIBDIR@/perl/site_perl/5.22.0'
 siteman1dir=''
 siteman1direxp=''
 siteman3dir=''
@@ -957,6 +1065,7 @@ siteprefix='@EXECPREFIX@'
 siteprefixexp='@EXECPREFIX@'
 sitescript='@USRBIN@'
 sitescriptexp='@USRBIN@'
+sizesize='8'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -971,6 +1080,8 @@ srand48_r_proto='REENTRANT_PROTO_I_LS'
 srandom_r_proto='REENTRANT_PROTO_I_TS'
 src='.'
 ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
 startperl='#!@USRBIN@/perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -984,11 +1095,18 @@ stdio_stream_array=''
 strerror_r_proto='REENTRANT_PROTO_B_IBW'
 strings='@INCLUDEDIR@/string.h'
 submit=''
-subversion='2'
+subversion='0'
 sysman='@EXECPREFIX@/share/man/man1'
+sysroot=''
 tail=''
 tar=''
 targetarch=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
 tbl=''
 tee=''
 test='test'
@@ -1004,21 +1122,29 @@ ttyname_r_proto='REENTRANT_PROTO_I_IBW'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
+u32type='unsigned int'
 u64size='8'
+u64type='unsigned long'
 u8size='1'
 u8type='unsigned char'
+uidformat='"u"'
 uidsign='1'
 uidsize='4'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
+uquadtype='unsigned long'
 use5005threads='undef'
+use64bitall='define'
+use64bitint='define'
+usecbacktrace='undef'
 usecrosscompile='define'
 usedevel='undef'
 usedl='define'
 usedtrace='undef'
 usefaststdio='undef'
 useithreads='define'
+usekernprocpathname='undef'
 uselargefiles='define'
 uselongdouble='undef'
 usemallocwrap='define'
@@ -1026,85 +1152,68 @@ usemorebits='undef'
 usemultiplicity='define'
 usemymalloc='n'
 usenm='false'
+usensgetexecutablepath='undef'
 useopcode='true'
 useperlio='define'
 useposix='true'
+usequadmath='undef'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
 usethreads='define'
 usevendorprefix='define'
+useversionedarchname='undef'
 usevfork='false'
 usrinc='@INCLUDEDIR@'
 uuname=''
 uvXUformat='"lX"'
 uvoformat='"lo"'
+uvsize='8'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
 vaproto='define'
-vendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
-vendorarchexp='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
+vendorarch='@LIBDIR@/perl/vendor_perl/5.22.0/@ARCH@-thread-multi'
+vendorarchexp='@LIBDIR@/perl/vendor_perl/5.22.0/@ARCH@-thread-multi'
 vendorbin='@USRBIN@'
 vendorbinexp='@USRBIN@'
 vendorhtml1dir=' '
 vendorhtml1direxp=''
 vendorhtml3dir=' '
 vendorhtml3direxp=''
-vendorlib='@LIBDIR@/perl/vendor_perl/5.20.0'
+vendorlib='@LIBDIR@/perl/vendor_perl/5.22.0'
 vendorlib_stem='@LIBDIR@/perl/vendor_perl'
-vendorlibexp='@LIBDIR@/perl/vendor_perl/5.20.0'
+vendorlibexp='@LIBDIR@/perl/vendor_perl/5.22.0'
 vendorman1dir=' '
 vendorman1direxp=''
 vendorman3dir=' '
 vendorman3direxp=''
-vendorprefix='/usr'
-vendorprefixexp='/usr'
+vendorprefix='@EXECPREFIX@'
+vendorprefixexp='@EXECPREFIX@'
 vendorscript='@USRBIN@'
 vendorscriptexp='@USRBIN@'
-version='5.20.0'
-version_patchlevel_string='version 14 subversion 2'
+version='5.22.0'
+version_patchlevel_string='version 22 subversion 0'
 versiononly='undef'
 vi=''
-voidflags='15'
-xlibpth='@LIBDIR@/386 @BASELIBDIR@/386'
+xlibpth='@LIBDIR@/386 @BASELIBDIR@386'
 yacc='yacc'
 yaccflags=''
 zcat=''
 zip='zip'
 PERL_REVISION=5
-PERL_VERSION=20
+PERL_VERSION=22
 PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=20
+PERL_API_VERSION=22
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=''
 PERL_CONFIG_SH=true
 : Variables propagated from previous config.sh file.
 libdb_needs_pthread='N'
 
-d_static_inline='define'
-d_sockaddr_sa_len='undef'
-d_sin6_scope_id='define'
-d_prctl='define'
-d_prctl_set_name='define'
-perl_static_inline='static __inline__'
-d_sockaddr_in6='undef'
-d_ip_mreq='undef'
-d_ip_mreq_source='undef'
-d_ipv6_mreq='undef'
-d_ipv6_mreq_source='undef'
-bootstrap_charset='undef'
-d_isblank='define'
-i_stdbool='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-st_ino_sign='1'
-st_ino_size='4'
-
 # for Time-HiRes
 d_clock_nanosleep='define'
 d_clock_gettime='define'
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32 b/meta/recipes-devtools/perl/perl/config.sh-32
index 7259a0c6ae..7259a0c6ae 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32
+++ b/meta/recipes-devtools/perl/perl/config.sh-32
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be b/meta/recipes-devtools/perl/perl/config.sh-32-be
index a59a9abb5e..a59a9abb5e 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be
+++ b/meta/recipes-devtools/perl/perl/config.sh-32-be
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le b/meta/recipes-devtools/perl/perl/config.sh-32-le
index 10e4226567..10e4226567 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le
+++ b/meta/recipes-devtools/perl/perl/config.sh-32-le
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64 b/meta/recipes-devtools/perl/perl/config.sh-64
index 6929d3a09d..6929d3a09d 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64
+++ b/meta/recipes-devtools/perl/perl/config.sh-64
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be b/meta/recipes-devtools/perl/perl/config.sh-64-be
index c08ce3c431..c08ce3c431 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be
+++ b/meta/recipes-devtools/perl/perl/config.sh-64-be
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le b/meta/recipes-devtools/perl/perl/config.sh-64-le
index 277d2a9bee..277d2a9bee 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le
+++ b/meta/recipes-devtools/perl/perl/config.sh-64-le
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
index a00ad61d90..a00ad61d90 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch
+++ b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
index a5eb71e153..a63b968317 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
@@ -1,4 +1,4 @@
-From 25994ac1124566398adee13806ef9a73d2cae150 Mon Sep 17 00:00:00 2001
+From d33d46963035ef726144dc66be2ae9c00aec0333 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Tue, 16 Oct 2012 23:07:56 +0300
 Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent
@@ -18,10 +18,10 @@ Patch-Name: debian/cpan-missing-site-dirs.diff
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 4416072..187f5c4 100644
+index 33054cd..7b0becf 100644
 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm
 +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -2045,11 +2045,34 @@ sub _print_urllist {
+@@ -2057,11 +2057,34 @@ sub _print_urllist {
      };
  }
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
index 77a2ee9940..6b5295045c 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
@@ -1,4 +1,4 @@
-From 64c9ad40c26f051a275a8b963cc849ca0ddd3cbb Mon Sep 17 00:00:00 2001
+From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Provide a sensible INSTALLDIRS default for modules installed from
@@ -14,10 +14,10 @@ Patch-Name: debian/cpan_definstalldirs.diff
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index d1a8eef..4416072 100644
+index 918e009..33054cd 100644
 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm
 +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -1023,7 +1023,7 @@ sub init {
+@@ -1024,7 +1024,7 @@ sub init {
      my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
  
      if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
@@ -26,7 +26,7 @@ index d1a8eef..4416072 100644
          my_dflt_prompt(make_arg => "", $matcher);
          if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
              $CPAN::Frontend->mywarn(
-@@ -1055,7 +1055,7 @@ sub init {
+@@ -1056,7 +1056,7 @@ sub init {
      my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
                     $matcher);
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
index 9557560a1c..280bf11706 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
+++ b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
@@ -1,4 +1,4 @@
-From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001
+From 01421f8a80d5c623959695ba2b8167f30112d333 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove overly restrictive DB_File version check.
diff --git a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
new file mode 100644
index 0000000000..601ee4c304
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
@@ -0,0 +1,56 @@
+From def4aa3817f98aae625e601b791ef068276f05d5 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Mon, 17 May 2010 13:23:07 +0300
+Subject: Point users to Debian packages of deprecated core modules
+
+Bug-Debian: http://bugs.debian.org/747628
+
+Several modules are being deprecated with perl 5.20.
+To get a clean transition, perl/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. This is taking place for perl 5.20/jessie.
+
+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.
+
+Patch-Name: debian/deprecate-with-apt.diff
+---
+ lib/deprecate.pm | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/lib/deprecate.pm b/lib/deprecate.pm
+index 47bc112..b0c61df 100644
+--- a/lib/deprecate.pm
++++ b/lib/deprecate.pm
+@@ -7,6 +7,13 @@ our $VERSION = 0.03;
+ our %Config;
+ unless (%Config) { require Config; *Config = \%Config::Config; }
+ 
++# Debian-specific change: recommend the separate Debian packages of
++# deprecated modules where available
++
++our %DEBIAN_PACKAGES = (
++    # None for the perl 5.22 cycle
++);
++
+ # This isn't a public API. It's internal to code maintained by the perl-porters
+ # If you would like it to be a public API, please send a patch with
+ # documentation and tests. Until then, it may change without warning.
+@@ -58,9 +65,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
++               }
+        }
+     }
+ }
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff b/meta/recipes-devtools/perl/perl/debian/doc_info.diff
index 7643759667..fbea2ee228 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff
+++ b/meta/recipes-devtools/perl/perl/debian/doc_info.diff
@@ -1,4 +1,4 @@
-From 2f3e4b35da039600de403083b5a0c7391751d02e Mon Sep 17 00:00:00 2001
+From e18f81e69c55d698abd293e71063d6b6b275cc07 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Replace generic man(1) instructions with Debian-specific information.
@@ -11,10 +11,10 @@ Patch-Name: debian/doc_info.diff
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/pod/perl.pod b/pod/perl.pod
-index 2e8d0d8..8810769 100644
+index 364e957..f97e103 100644
 --- a/pod/perl.pod
 +++ b/pod/perl.pod
-@@ -274,8 +274,16 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp
+@@ -291,8 +291,16 @@ aux c2ph h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp
  
  =for buildtoc __END__
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
index 4650b0bef8..e074b20fdf 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
@@ -1,4 +1,4 @@
-From 98e7248580af353d781b24715b42af5b6a4caf35 Mon Sep 17 00:00:00 2001
+From 7fe59a3d0601c6d8634eae4f99dae3024cd02a92 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
@@ -17,10 +17,10 @@ Patch-Name: debian/enc2xs_inc.diff
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index c44487d..a9af54f 100644
+index 19f2b2b..4d64e38 100644
 --- a/cpan/Encode/bin/enc2xs
 +++ b/cpan/Encode/bin/enc2xs
-@@ -929,11 +929,11 @@ use vars qw(
+@@ -944,11 +944,11 @@ use vars qw(
  sub find_e2x{
      eval { require File::Find; };
      my (@inc, %e2x_dir);
@@ -34,7 +34,7 @@ index c44487d..a9af54f 100644
           my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
               $atime,$mtime,$ctime,$blksize,$blocks)
               = lstat($_) or return;
-@@ -943,7 +943,7 @@ sub find_e2x{
+@@ -958,7 +958,7 @@ sub find_e2x{
               $e2x_dir{$File::Find::dir} ||= $mtime;
           }
           return;
@@ -43,7 +43,7 @@ index c44487d..a9af54f 100644
      warn join("\n", keys %e2x_dir), "\n";
      for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
      $_E2X = $d;
-@@ -1010,7 +1010,7 @@ sub make_configlocal_pm {
+@@ -1025,7 +1025,7 @@ sub make_configlocal_pm {
             $LocalMod{$enc} ||= $mod;
         }
      };
@@ -53,10 +53,10 @@ index c44487d..a9af54f 100644
      for my $enc ( sort keys %LocalMod ) {
          $_ModLines .=
 diff --git a/t/porting/customized.t b/t/porting/customized.t
-index a769c58..6b9977f 100644
+index 45fcafb..3bd6adb 100644
 --- a/t/porting/customized.t
 +++ b/t/porting/customized.t
-@@ -99,8 +99,11 @@ foreach my $module ( sort keys %Modules ) {
+@@ -101,8 +101,11 @@ foreach my $module ( sort keys %Modules ) {
        print $data_fh join(' ', $module, $file, $id), "\n";
        next;
      }
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
index d8885a70b1..bcb59c69e0 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff
+++ b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
@@ -1,4 +1,4 @@
-From 81255b67014bda2ec127e0856436acfa554a068c Mon Sep 17 00:00:00 2001
+From 827eee225897c35ec97194a5971bf4bfcf250748 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove Errno version check due to upgrade problems with long-running
@@ -16,10 +16,10 @@ Patch-Name: debian/errno_ver.diff
  1 file changed, 5 deletions(-)
 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 55ad01a..e4a31ef 100644
+index c6bfa06..519e5c7 100644
 --- a/ext/Errno/Errno_pm.PL
 +++ b/ext/Errno/Errno_pm.PL
-@@ -277,13 +277,8 @@ sub write_errno_pm {
+@@ -278,13 +278,8 @@ sub write_errno_pm {
  
  package Errno;
  require Exporter;
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
index 53fd1f616e..adb4bd9910 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
@@ -1,4 +1,4 @@
-From 2870b992e4b5e8bb0b9c44c9aff81adaaf9de439 Mon Sep 17 00:00:00 2001
+From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Sat, 10 May 2014 23:34:14 +0300
 Subject: EU:MM: set location of libperl.a under /usr/lib
@@ -13,10 +13,10 @@ Patch-Name: debian/extutils_set_libperl_path.diff
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 8b86a24..f977476 100644
+index 5f1b87f..570a631 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2462,7 +2462,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
+@@ -2505,7 +2505,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
         ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
      }
      unless ($libperl && -f $lperl) { # Ilya's code...
@@ -26,7 +26,7 @@ index 8b86a24..f977476 100644
         $libperl ||= "libperl$self->{LIB_EXT}";
         $libperl   = "$dir/$libperl";
 diff --git a/pp.c b/pp.c
-index 4ec6887..a44c137 100644
+index 42f156a..77c1279 100644
 --- a/pp.c
 +++ b/pp.c
 @@ -1,4 +1,4 @@
diff --git a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
new file mode 100644
index 0000000000..ec461cfe52
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
@@ -0,0 +1,42 @@
+From 27ae7b18078d801a2c943aa6de2f7e9808177251 Mon Sep 17 00:00:00 2001
+From: Brendan O'Dea <bod@debian.org>
+Date: Fri, 18 Mar 2005 22:22:25 +1100
+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.
+
+Patch-Name: debian/fakeroot.diff
+---
+ Makefile.SH | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.SH b/Makefile.SH
+index 034d812..04dd7d5 100755
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -39,10 +39,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=` quote "$pwd" `" ;;
+-       *)   ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
+-       esac
++       ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `"'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
+ 
+        pldlflags="$cccdlflags"
+        static_ldflags=''
+@@ -113,7 +110,7 @@ true)
+            ;;
+        esac
+        case "$ldlibpthname" in
+-       '') ;;
++       ''|LD_LIBRARY_PATH) ;;
+        *)
+            case "$osname" in
+            os2)
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
index c0e1949f5f..d319e7518b 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
+++ b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
@@ -1,4 +1,4 @@
-From 8deb14b24ee17694a2f23a78e8782b24c116daae Mon Sep 17 00:00:00 2001
+From c81dbdedff9e9b4fb75ac028aa718838c0292d2f Mon Sep 17 00:00:00 2001
 From: Andreas Marschke <andreas.marschke@googlemail.com>
 Date: Sat, 17 Sep 2011 11:38:42 +0100
 Subject: Configure CPAN::Distribution with correct name of html2text
@@ -21,10 +21,10 @@ functionality].
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
-index 9a08707..332a627 100644
+index 092b781..5c2bae1 100644
 --- a/cpan/CPAN/lib/CPAN/Distribution.pm
 +++ b/cpan/CPAN/lib/CPAN/Distribution.pm
-@@ -4031,7 +4031,7 @@ sub _display_url {
+@@ -4099,7 +4099,7 @@ sub _display_url {
        if $CPAN::DEBUG;
  
      # should we define it in the config instead?
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
index f4050c01f4..61a92712e7 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
@@ -1,4 +1,4 @@
-From c7ffe0cc3105cb627fbbb7d0c7dbb53f1f236a17 Mon Sep 17 00:00:00 2001
+From 9faf6dcc3a5c4154484d812eb3cc3dd78b35563b Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Mon, 30 May 2011 22:54:24 +0300
 Subject: Document that CCFLAGS should include $Config{ccflags}
@@ -15,10 +15,10 @@ Patch-Name: fixes/document_makemaker_ccflags.diff
  1 file changed, 4 insertions(+)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-index d2fabf6..fabb021 100644
+index fe95b27..90403e8 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-@@ -1716,6 +1716,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
+@@ -1774,6 +1774,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
  String that will be included in the compiler call command line between
  the arguments INC and OPTIMIZE.
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff b/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
index b9d61c713e..525f962c1a 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
@@ -1,4 +1,4 @@
-From 8b7b31d6b2368717514a05dc0e968c1357511733 Mon Sep 17 00:00:00 2001
+From 55d430eb02fc116581847304ca20321687978269 Mon Sep 17 00:00:00 2001
 From: Jonathan Nieder <jrnieder@gmail.com>
 Date: Fri, 27 Jul 2012 10:35:07 -0500
 Subject: Memoize::Storable: respect 'nstore' option not respected
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
index b7ccc5757c..3c31972c64 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
@@ -1,4 +1,4 @@
-From e2e1127a521d942bd9aea4c1290cdf46c15c35fd Mon Sep 17 00:00:00 2001
+From fa085fedd9c406edcd4a1a256c025d5ff7f6c6de Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Thu, 20 Sep 2007 19:47:14 +1000
 Subject: Document the Net::SMTP 'Port' option
@@ -8,14 +8,14 @@ Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
 
 Patch-Name: fixes/net_smtp_docs.diff
 ---
- cpan/libnet/Net/SMTP.pm | 1 +
+ cpan/libnet/lib/Net/SMTP.pm | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
-index 705b5c5..17c1d21 100644
---- a/cpan/libnet/Net/SMTP.pm
-+++ b/cpan/libnet/Net/SMTP.pm
-@@ -637,6 +637,7 @@ Net::SMTP will attempt to extract the address from the value passed.
+diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm
+index afd017a..6ae7d9e 100644
+--- a/cpan/libnet/lib/Net/SMTP.pm
++++ b/cpan/libnet/lib/Net/SMTP.pm
+@@ -738,6 +738,7 @@ Net::SMTP will attempt to extract the address from the value passed.
  
  B<Debug> - Enable debugging information
  
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff b/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
new file mode 100644
index 0000000000..b5564fdbc0
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
@@ -0,0 +1,73 @@
+From 0ecf83f259db09cb38cb37c9b22e72be185afa8f Mon Sep 17 00:00:00 2001
+From: Hugo van der Sanden <hv@crypt.org>
+Date: Thu, 11 Jun 2015 12:25:40 +0100
+Subject: fix -Cnn parsing
+
+Commit 22ff313068 for [perl #123814] inadvertently changed the logic when
+parsing a numeric parameter to the -C option, such that the successfully
+parsed number was not saved as the option value if it parsed to the end
+of the argument.
+
+Bug: https://rt.perl.org/Ticket/Display.html?id=125381
+Bug-Debian: https://bugs.debian.org/788636
+Origin: upstream, http://perl5.git.perl.org/perl.git/commit/89d84ff965
+Patch-Name: fixes/perl-Cnn.diff
+---
+ t/run/switchC.t |  7 ++++++-
+ util.c          | 17 ++++++++---------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/t/run/switchC.t b/t/run/switchC.t
+index f6aa868..4f63c3b 100644
+--- a/t/run/switchC.t
++++ b/t/run/switchC.t
+@@ -11,7 +11,7 @@ BEGIN {
+     skip_all_if_miniperl('-C and $ENV{PERL_UNICODE} are disabled on miniperl');
+ }
+ 
+-plan(tests => 13);
++plan(tests => 14);
+ 
+ my $r;
+ 
+@@ -25,6 +25,11 @@ $r = runperl( switches => [ '-CO', '-w' ],
+               stderr   => 1 );
+ like( $r, qr/^$b(?:\r?\n)?$/s, '-CO: no warning on UTF-8 output' );
+ 
++$r = runperl( switches => [ '-C2', '-w' ],
++             prog     => 'print chr(256)',
++              stderr   => 1 );
++like( $r, qr/^$b(?:\r?\n)?$/s, '-C2: no warning on UTF-8 output' );
++
+ SKIP: {
+     if (exists $ENV{PERL_UNICODE} &&
+        ($ENV{PERL_UNICODE} eq "" || $ENV{PERL_UNICODE} =~ /[SO]/)) {
+diff --git a/util.c b/util.c
+index 8cf62f5..ee23314 100644
+--- a/util.c
++++ b/util.c
+@@ -4420,16 +4420,15 @@ Perl_parse_unicode_opts(pTHX_ const char **popt)
+        if (isDIGIT(*p)) {
+             const char* endptr;
+             UV uv;
+-            if (grok_atoUV(p, &uv, &endptr)
+-                && uv <= U32_MAX
+-                && (p = endptr)
+-                && *p && *p != '\n' && *p != '\r'
+-            ) {
++            if (grok_atoUV(p, &uv, &endptr) && uv <= U32_MAX) {
+                 opt = (U32)uv;
+-                if (isSPACE(*p))
+-                    goto the_end_of_the_opts_parser;
+-                else
+-                    Perl_croak(aTHX_ "Unknown Unicode option letter '%c'", *p);
++                p = endptr;
++                if (p && *p && *p != '\n' && *p != '\r') {
++                    if (isSPACE(*p))
++                        goto the_end_of_the_opts_parser;
++                    else
++                        Perl_croak(aTHX_ "Unknown Unicode option letter '%c'", *p);
++                }
+             }
+         }
+         else {
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff b/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
new file mode 100644
index 0000000000..7c9ca867a9
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
@@ -0,0 +1,170 @@
+From 9057adc106d6bbef53c9e706523cd94f1a7a08d4 Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@debian.org>
+Date: Sat, 30 Aug 2014 15:10:41 -0700
+Subject: Support POD_MAN_DATE in Pod::Man for the left-hand footer
+
+Honor the environment variable POD_MAN_DATE and use its contents, if
+set, as the value of the left-hand footer if the date option is not
+set, overriding the timestamp of the input file.  This is primarily
+useful to ensure reproducible builds of the same output file given the
+same souce and Pod::Man version, even when file timestamps may not be
+consistent.  Thanks, Niko Tyni.
+
+Bug-Debian: http://bugs.debian.org/759405
+Origin: upstream
+Patch-Name: fixes/pod_man_reproducible_date.diff
+---
+ cpan/podlators/lib/Pod/Man.pm  | 69 +++++++++++++++++++++++++++++++-----------
+ cpan/podlators/t/devise-date.t | 29 +++++++++++++-----
+ 2 files changed, 72 insertions(+), 26 deletions(-)
+
+diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
+index 72ca9ff..0536662 100644
+--- a/cpan/podlators/lib/Pod/Man.pm
++++ b/cpan/podlators/lib/Pod/Man.pm
+@@ -876,25 +876,42 @@ sub devise_title {
+ }
+ 
+ # Determine the modification date and return that, properly formatted in ISO
+-# format.  If we can't get the modification date of the input, instead use the
+-# current time.  Pod::Simple returns a completely unuseful stringified file
+-# handle as the source_filename for input from a file handle, so we have to
+-# deal with that as well.
++# format.
++#
++# If POD_MAN_DATE is set, that overrides anything else.  This can be used for
++# reproducible generation of the same file even if the input file timestamps
++# are unpredictable or the POD coms from standard input.
++#
++# Otherwise, use the modification date of the input if we can stat it.  Be
++# aware that Pod::Simple returns the stringification of the file handle as
++# source_filename for input from a file handle, so we'll stat some random ref
++# string in that case.  If that fails, instead use the current time.
++#
++# $self - Pod::Man object, used to get the source file
++#
++# Returns: YYYY-MM-DD date suitable for the left-hand footer
+ sub devise_date {
+     my ($self) = @_;
++
++    # If POD_MAN_DATE is set, always use it.
++    if ($ENV{POD_MAN_DATE}) {
++        return $ENV{POD_MAN_DATE};
++    }
++
++    # Otherwise, get the input filename and try to stat it.  If that fails,
++    # use the current time.
+     my $input = $self->source_filename;
+     my $time;
+     if ($input) {
+-        $time = (stat $input)[9] || time;
++        $time = (stat($input))[9] || time();
+     } else {
+-        $time = time;
++        $time = time();
+     }
+ 
+-    # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker
+-    # uses this and it has to work in the core which can't load dynamic
+-    # libraries.
+-    my ($year, $month, $day) = (localtime $time)[5,4,3];
+-    return sprintf ("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
++    # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses
++    # this and it has to work in the core which can't load dynamic libraries.
++    my ($year, $month, $day) = (localtime($time))[5,4,3];
++    return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
+ }
+ 
+ # Print out the preamble and the title.  The meaning of the arguments to .TH
+@@ -1632,6 +1649,15 @@ argument.
+ Sets the centered page header to use instead of "User Contributed Perl
+ Documentation".
+ 
++=item date
++
++Sets the left-hand footer.  If this option is not set, the contents of the
++environment variable POD_MAN_DATE, if set, will be used.  Failing that,
++the modification date of the input file will be used, or the current time
++if stat() can't find that file (which will be the case if the input is
++from C<STDIN>).  If obtained from the file modification date or the
++current time, he date will be formatted as C<YYYY-MM-DD>.
++
+ =item errors
+ 
+ How to report errors.  C<die> says to throw an exception on any POD
+@@ -1642,13 +1668,6 @@ POD errors entirely, as much as possible.
+ 
+ The default is C<pod>.
+ 
+-=item date
+-
+-Sets the left-hand footer.  By default, the modification date of the input
+-file will be used, or the current date if stat() can't find that file (the
+-case if the input is from C<STDIN>), and the date will be formatted as
+-C<YYYY-MM-DD>.
+-
+ =item fixed
+ 
+ The fixed-width font to use for verbatim text and code.  Defaults to
+@@ -1810,6 +1829,20 @@ option was set to C<die>.
+ 
+ =back
+ 
++=head1 ENVIRONMENT
++
++=over 4
++
++=item POD_MAN_DATE
++
++If set, this will be used as the value of the left-hand footer unless the
++C<date> option is explicitly set, overriding the timestamp of the input
++file or the current time.  This is primarily useful to ensure reproducible
++builds of the same output file given the same souce and Pod::Man version,
++even when file timestamps may not be consistent.
++
++=back
++
+ =head1 BUGS
+ 
+ Encoding handling assumes that PerlIO is available and does not work
+diff --git a/cpan/podlators/t/devise-date.t b/cpan/podlators/t/devise-date.t
+index 3cce9f5..c610dd9 100644
+--- a/cpan/podlators/t/devise-date.t
++++ b/cpan/podlators/t/devise-date.t
+@@ -1,15 +1,28 @@
+-#!/usr/bin/perl -w
+-
+-# In order for MakeMaker to build in the core, nothing can use
+-# Fcntl which includes POSIX.  devise_date()'s use of strftime()
+-# was replaced.  This tests that it's identical.
++#!/usr/bin/perl
++#
++# In order for MakeMaker to build in the core, nothing can use Fcntl which
++# includes POSIX.  devise_date()'s use of strftime() was replaced.  This tests
++# that it's identical.  It also tests special handling of the POD_MAN_DATE
++# environment variable.
+ 
++use 5.006;
+ use strict;
+-
+-use Test::More tests => 1;
++use warnings;
+ 
+ use Pod::Man;
+ use POSIX qw(strftime);
+ 
++use Test::More tests => 2;
++
++# Check that the results of device_date matches strftime.  There is no input
++# file name, so this will use the current time.
+ my $parser = Pod::Man->new;
+-is $parser->devise_date, strftime("%Y-%m-%d", localtime);
++is(
++    $parser->devise_date,
++    strftime('%Y-%m-%d', localtime()),
++    'devise_date matches strftime'
++);
++
++# Set the override environment variable and ensure that it's honored.
++local $ENV{POD_MAN_DATE} = '2014-01-01';
++is($parser->devise_date, '2014-01-01', 'devise_date honors POD_MAN_DATE');
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
new file mode 100644
index 0000000000..7ebbf9c602
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
@@ -0,0 +1,51 @@
+From 183bb4af7ad862a2cf31d0dcb3dd45c100f76776 Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@cpan.org>
+Date: Wed, 15 Apr 2015 22:21:25 -0700
+Subject: Support an empty POD_MAN_DATE environment variable
+
+One may want to set this to an empty string.  Handle that correctly.
+
+(backported to Perl 5.20.2 by Niko Tyni <ntyni@debian.org>)
+
+Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=e0e9fcb53e8fc954b2b1955385eea18c27f869af
+Bug-Debian: https://bugs.debian.org/780259
+Patch-Name: fixes/podman-empty-date.diff
+---
+ cpan/podlators/lib/Pod/Man.pm  | 2 +-
+ cpan/podlators/t/devise-date.t | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
+index 365892e..8997a15 100644
+--- a/cpan/podlators/lib/Pod/Man.pm
++++ b/cpan/podlators/lib/Pod/Man.pm
+@@ -894,7 +894,7 @@ sub devise_date {
+     my ($self) = @_;
+ 
+     # If POD_MAN_DATE is set, always use it.
+-    if ($ENV{POD_MAN_DATE}) {
++    if (defined($ENV{POD_MAN_DATE})) {
+         return $ENV{POD_MAN_DATE};
+     }
+ 
+diff --git a/cpan/podlators/t/devise-date.t b/cpan/podlators/t/devise-date.t
+index 9da9d1b..27271d9 100644
+--- a/cpan/podlators/t/devise-date.t
++++ b/cpan/podlators/t/devise-date.t
+@@ -12,7 +12,7 @@ use warnings;
+ use Pod::Man;
+ use POSIX qw(strftime);
+ 
+-use Test::More tests => 2;
++use Test::More tests => 3;
+ 
+ # Check that the results of device_date matches strftime.  There is no input
+ # file name, so this will use the current time.
+@@ -26,3 +26,7 @@ is(
+ # Set the override environment variable and ensure that it's honored.
+ local $ENV{POD_MAN_DATE} = '2014-01-01';
+ is($parser->devise_date, '2014-01-01', 'devise_date honors POD_MAN_DATE');
++
++# Check that an empty environment variable is honored.
++local $ENV{POD_MAN_DATE} = q{};
++is($parser->devise_date, q{}, 'devise_date honors empty POD_MAN_DATE');
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
new file mode 100644
index 0000000000..1a60361160
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
@@ -0,0 +1,109 @@
+From 7671d101baa75d7a79bfbd8c75c1595fbb3f53ba Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@cpan.org>
+Date: Sat, 7 Feb 2015 19:03:34 -0800
+Subject: Better errors for man pages from standard input
+
+[Pod::Man] Attempt to detect if the input came from a pipe and
+therefore has a completely unhelpful (and nonreproducible) source file
+name, and diagnose this as an error.  Document that the name option
+(--name to pod2man) is required when processing POD source from
+standard input.  (Debian Bug#777405)
+
+(backported to Perl 5.20.2 by Niko Tyni <ntyni@debian.org>)
+
+Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=d98872e46c93861b7aba14949e1258712087dc55
+Bug-Debian: https://bugs.debian.org/777405
+Patch-Name: fixes/podman-pipe.diff
+---
+ cpan/podlators/lib/Pod/Man.pm     | 15 +++++++++++++++
+ cpan/podlators/scripts/pod2man.PL |  4 ++++
+ cpan/podlators/t/devise-title.t   | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 51 insertions(+)
+ create mode 100755 cpan/podlators/t/devise-title.t
+
+diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
+index 8997a15..969eaff 100644
+--- a/cpan/podlators/lib/Pod/Man.pm
++++ b/cpan/podlators/lib/Pod/Man.pm
+@@ -828,6 +828,17 @@ sub devise_title {
+     $section = 3 if (!$$self{section} && $name =~ /\.pm\z/i);
+     $name =~ s/\.p(od|[lm])\z//i;
+ 
++    # If Pod::Parser gave us an IO::File reference as the source file name,
++    # convert that to the empty string as well.  Then, if we don't have a
++    # valid name, emit a warning and convert it to STDIN.
++    if ($name =~ /^IO::File(?:=\w+)\(0x[\da-f]+\)$/i) {
++        $name = '';
++    }
++    if ($name eq '') {
++        $self->whine (1, 'No name given for document');
++        $name = 'STDIN';
++    }
++
+     # If the section isn't 3, then the name defaults to just the basename of
+     # the file.  Otherwise, assume we're dealing with a module.  We want to
+     # figure out the full module name from the path to the file, but we don't
+@@ -1705,6 +1716,10 @@ module path.  If it is, a path like C<.../lib/Pod/Man.pm> is converted into
+ a name like C<Pod::Man>.  This option, if given, overrides any automatic
+ determination of the name.
+ 
++If generating a manual page from standard input, this option is required,
++since there's otherwise no way for Pod::Man to know what to use for the
++manual page name.
++
+ =item nourls
+ 
+ Normally, LZ<><> formatting codes with a URL but anchor text are formatted
+diff --git a/cpan/podlators/scripts/pod2man.PL b/cpan/podlators/scripts/pod2man.PL
+index 38695f8..43e35df 100644
+--- a/cpan/podlators/scripts/pod2man.PL
++++ b/cpan/podlators/scripts/pod2man.PL
+@@ -236,6 +236,10 @@ Note that this option is probably not useful when converting multiple POD
+ files at once.  The convention for Unix man pages for commands is for the
+ man page title to be in all-uppercase even if the command isn't.
+ 
++When converting POD source from standard input, this option is required,
++since there's otherwise no way to know what to use as the name of the
++manual page.
++
+ =item B<--nourls>
+ 
+ Normally, LZ<><> formatting codes with a URL but anchor text are formatted
+diff --git a/cpan/podlators/t/devise-title.t b/cpan/podlators/t/devise-title.t
+new file mode 100755
+index 0000000..8639441
+--- /dev/null
++++ b/cpan/podlators/t/devise-title.t
+@@ -0,0 +1,32 @@
++#!/usr/bin/perl
++#
++# Tests for the automatic determination of the manual page title if not
++# specified via options to pod2man or the Pod::Man constructor.
++
++use 5.006;
++use strict;
++use warnings;
++
++use File::Spec;
++use IO::File;
++use Test::More tests => 3;
++
++BEGIN {
++    use_ok('Pod::Man');
++}
++
++# Create a parser and set it up with an input source.  There isn't a way to do
++# this in Pod::Simple without actually parsing the document, so send the
++# output to a string that we'll ignore.
++my $path = File::Spec->catdir('t', 'data', 'basic.pod');
++my $handle = IO::File->new($path, 'r');
++my $parser = Pod::Man->new(errors => 'pod');
++my $output;
++$parser->output_string(\$output);
++$parser->parse_file($handle);
++
++# Check the results of devise_title for this.  We should get back STDIN, and
++# we should have reported an error.
++my ($name, $section) = $parser->devise_title;
++is($name, 'STDIN', 'devise_title uses STDIN for file handle input');
++ok($parser->errors_seen, '...and errors were seen');
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
new file mode 100644
index 0000000000..0cdfeffd1f
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
@@ -0,0 +1,86 @@
+From 6198856b5323d6204094293f01b890472618f182 Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@cpan.org>
+Date: Wed, 15 Apr 2015 20:49:07 -0700
+Subject: Documentation and test suite updates for UTC fix
+
+Update the Pod::Man and pod2man documentation and the test suite
+for the new UTC-based default page footer, and add a Changes
+entry.
+
+(backported to Perl 5.20.2 by Niko Tyni <ntyni@debian.org>)
+
+Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=52db93bf80e4a06f8497e4ebade0506b6ee0e70d
+Bug-Debian: https://bugs.debian.org/780259
+Patch-Name: fixes/podman-utc-docs.diff
+---
+ cpan/podlators/lib/Pod/Man.pm     |  6 +++++-
+ cpan/podlators/scripts/pod2man.PL | 11 ++++++-----
+ cpan/podlators/t/devise-date.t    |  2 +-
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
+index c3ba201..365892e 100644
+--- a/cpan/podlators/lib/Pod/Man.pm
++++ b/cpan/podlators/lib/Pod/Man.pm
+@@ -910,6 +910,8 @@ sub devise_date {
+ 
+     # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses
+     # this and it has to work in the core which can't load dynamic libraries.
++    # Use gmtime instead of localtime so that the generated man page does not
++    # depend on the local time zone setting and is more reproducible
+     my ($year, $month, $day) = (gmtime($time))[5,4,3];
+     return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
+ }
+@@ -1656,7 +1658,9 @@ environment variable POD_MAN_DATE, if set, will be used.  Failing that,
+ the modification date of the input file will be used, or the current time
+ if stat() can't find that file (which will be the case if the input is
+ from C<STDIN>).  If obtained from the file modification date or the
+-current time, he date will be formatted as C<YYYY-MM-DD>.
++current time, the date will be formatted as C<YYYY-MM-DD> and will be based
++on UTC (so that the output will be reproducible regardless of local time
++zone).
+ 
+ =item errors
+ 
+diff --git a/cpan/podlators/scripts/pod2man.PL b/cpan/podlators/scripts/pod2man.PL
+index 6af3474..38695f8 100644
+--- a/cpan/podlators/scripts/pod2man.PL
++++ b/cpan/podlators/scripts/pod2man.PL
+@@ -174,9 +174,10 @@ Contributed Perl Documentation", but also see B<--official> below.
+ 
+ =item B<-d> I<string>, B<--date>=I<string>
+ 
+-Set the left-hand footer string to this value.  By default, the modification
+-date of the input file will be used, or the current date if input comes from
+-C<STDIN>.
++Set the left-hand footer string to this value.  By default, the
++modification date of the input file will be used, or the current date if
++input comes from C<STDIN>, and will be based on UTC (so that the output
++will be reproducible regardless of local time zone).
+ 
+ =item B<-errors>=I<style>
+ 
+@@ -383,8 +384,8 @@ B<pod2man> by Larry Wall and Tom Christiansen.
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013 Russ
+-Allbery <rra@stanford.edu>.
++Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013, 2014,
++2015 Russ Allbery <rra@cpan.org>.
+ 
+ This program is free software; you may redistribute it and/or modify it
+ under the same terms as Perl itself.
+diff --git a/cpan/podlators/t/devise-date.t b/cpan/podlators/t/devise-date.t
+index c610dd9..9da9d1b 100644
+--- a/cpan/podlators/t/devise-date.t
++++ b/cpan/podlators/t/devise-date.t
+@@ -19,7 +19,7 @@ use Test::More tests => 2;
+ my $parser = Pod::Man->new;
+ is(
+     $parser->devise_date,
+-    strftime('%Y-%m-%d', localtime()),
++    strftime('%Y-%m-%d', gmtime()),
+     'devise_date matches strftime'
+ );
+ 
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
new file mode 100644
index 0000000000..fbd7b9db99
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
@@ -0,0 +1,33 @@
+From c796775cdbd2cce06acbb7ac355187d4063017a2 Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Wed, 15 Apr 2015 20:42:53 -0700
+Subject: Make the embedded date from Pod::Man reproducible
+
+While working on the "reproducible builds" effort, we have noticed
+that Pod::Man generates output that varies depending on the current
+timezone.
+
+The attached patch fixes this by using GMT (~UTC) dates instead.
+
+(backported to Perl 5.20.2 by Niko Tyni <ntyni@debian.org>)
+
+Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=913fbb2bd2ce071e20128629302ae2852554cad4
+Bug-Debian: https://bugs.debian.org/780259
+Patch-Name: fixes/podman-utc.diff
+---
+ cpan/podlators/lib/Pod/Man.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
+index 0536662..c3ba201 100644
+--- a/cpan/podlators/lib/Pod/Man.pm
++++ b/cpan/podlators/lib/Pod/Man.pm
+@@ -910,7 +910,7 @@ sub devise_date {
+ 
+     # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses
+     # this and it has to work in the core which can't load dynamic libraries.
+-    my ($year, $month, $day) = (localtime($time))[5,4,3];
++    my ($year, $month, $day) = (gmtime($time))[5,4,3];
+     return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
+ }
+ 
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
index e5f116abd4..d1b498b527 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/respect_umask.diff
+++ b/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
@@ -1,4 +1,4 @@
-From f290a5ebd91e89d63b2a1958420f53e22d20c4ee Mon Sep 17 00:00:00 2001
+From d9d535ef97f57af6e9728075944c33f3b0b5372f Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Respect umask during installation
@@ -8,79 +8,15 @@ site directories.
 
 Patch-Name: fixes/respect_umask.diff
 ---
+ cpan/ExtUtils-Install/lib/ExtUtils/Install.pm   | 18 +++++++++---------
  cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++---------
- dist/ExtUtils-Install/lib/ExtUtils/Install.pm   | 18 +++++++++---------
  2 files changed, 18 insertions(+), 18 deletions(-)
 
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 4140432..8fdb67c 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2075,7 +2075,7 @@ doc__install : doc_site_install
-        $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
- 
- pure_perl_install :: all
--       $(NOECHO) $(MOD_INSTALL) \
-+       $(NOECHO) umask 022; $(MOD_INSTALL) \
- };
- 
-     push @m,
-@@ -2095,7 +2095,7 @@ q{                $(INST_LIB) $(DESTINSTALLPRIVLIB) \
- 
- 
- pure_site_install :: all
--       $(NOECHO) $(MOD_INSTALL) \
-+       $(NOECHO) umask 022; $(MOD_INSTALL) \
- };
-     push @m,
- q{             read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-@@ -2113,7 +2113,7 @@ q{                $(INST_LIB) $(DESTINSTALLSITELIB) \
-                }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
- 
- pure_vendor_install :: all
--       $(NOECHO) $(MOD_INSTALL) \
-+       $(NOECHO) umask 022; $(MOD_INSTALL) \
- };
-     push @m,
- q{             read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-@@ -2145,8 +2145,8 @@ doc_vendor_install :: all
-     push @m, q{
- doc_perl_install :: all
-        $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--       -$(NOECHO) $(DOC_INSTALL) \
-+       -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
-+       -$(NOECHO) umask 022; $(DOC_INSTALL) \
-                "Module" "$(NAME)" \
-                "installed into" "$(INSTALLPRIVLIB)" \
-                LINKTYPE "$(LINKTYPE)" \
-@@ -2156,8 +2156,8 @@ doc_perl_install :: all
- 
- doc_site_install :: all
-        $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--       -$(NOECHO) $(DOC_INSTALL) \
-+       -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
-+       -$(NOECHO) umask 022; $(DOC_INSTALL) \
-                "Module" "$(NAME)" \
-                "installed into" "$(INSTALLSITELIB)" \
-                LINKTYPE "$(LINKTYPE)" \
-@@ -2167,8 +2167,8 @@ doc_site_install :: all
- 
- doc_vendor_install :: all
-        $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
--       -$(NOECHO) $(DOC_INSTALL) \
-+       -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
-+       -$(NOECHO) umask 022; $(DOC_INSTALL) \
-                "Module" "$(NAME)" \
-                "installed into" "$(INSTALLVENDORLIB)" \
-                LINKTYPE "$(LINKTYPE)" \
-diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-index eec57aa..06cc530 100644
---- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-@@ -450,7 +450,7 @@ sub _can_write_dir {
+diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+index 1e8ac4c..3e79121 100644
+--- a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
++++ b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+@@ -451,7 +451,7 @@ sub _can_write_dir {
  
  =pod
  
@@ -89,7 +25,7 @@ index eec57aa..06cc530 100644
  
  Wrapper around File::Path::mkpath() to handle errors.
  
-@@ -467,13 +467,13 @@ writable.
+@@ -468,13 +468,13 @@ writable.
  =cut
  
  sub _mkpath {
@@ -106,7 +42,7 @@ index eec57aa..06cc530 100644
              _choke("Can't create '$dir'","$@");
          }
  
-@@ -782,7 +782,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -783,7 +783,7 @@ sub install { #XXX OS-SPECIFIC
          _chdir($cwd);
      }
      foreach my $targetdir (sort keys %check_dirs) {
@@ -115,7 +51,7 @@ index eec57aa..06cc530 100644
      }
      foreach my $found (@found_files) {
          my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
-@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -797,7 +797,7 @@ sub install { #XXX OS-SPECIFIC
                      $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
                          unless $dry_run;
                  } elsif ( ! -d $targetdir ) {
@@ -124,7 +60,7 @@ index eec57aa..06cc530 100644
                  }
                  print "Installing $targetfile\n";
  
-@@ -836,7 +836,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -837,7 +837,7 @@ sub install { #XXX OS-SPECIFIC
  
      if ($pack{'write'}) {
          $dir = install_rooted_dir(dirname($pack{'write'}));
@@ -133,7 +69,7 @@ index eec57aa..06cc530 100644
          print "Writing $pack{'write'}\n" if $verbose;
          $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
      }
-@@ -1176,7 +1176,7 @@ be prepended as a directory to each installed file (and directory).
+@@ -1180,7 +1180,7 @@ environment variable will silence this output.
  sub pm_to_blib {
      my($fromto,$autodir,$pm_filter) = @_;
  
@@ -141,8 +77,8 @@ index eec57aa..06cc530 100644
 +    _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";
-@@ -1199,7 +1199,7 @@ sub pm_to_blib {
+             print "Skip $to (unchanged)\n" unless $INSTALL_QUIET;
+@@ -1203,7 +1203,7 @@ sub pm_to_blib {
              # we wont try hard here. its too likely to mess things up.
              forceunlink($to);
          } else {
@@ -151,3 +87,67 @@ index eec57aa..06cc530 100644
          }
          if ($need_filtering) {
              run_filter($pm_filter, $from, $to);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index f63145c..197f102 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2118,7 +2118,7 @@ doc__install : doc_site_install
+        $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+ 
+ pure_perl_install :: all
+-       $(NOECHO) $(MOD_INSTALL) \
++       $(NOECHO) umask 022; $(MOD_INSTALL) \
+ };
+ 
+     push @m,
+@@ -2138,7 +2138,7 @@ q{                "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
+ 
+ 
+ pure_site_install :: all
+-       $(NOECHO) $(MOD_INSTALL) \
++       $(NOECHO) umask 022; $(MOD_INSTALL) \
+ };
+     push @m,
+ q{             read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+@@ -2156,7 +2156,7 @@ q{                "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
+                "}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{"
+ 
+ pure_vendor_install :: all
+-       $(NOECHO) $(MOD_INSTALL) \
++       $(NOECHO) umask 022; $(MOD_INSTALL) \
+ };
+     push @m,
+ q{             read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+@@ -2188,8 +2188,8 @@ doc_vendor_install :: all
+     push @m, q{
+ doc_perl_install :: all
+        $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
+-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+-       -$(NOECHO) $(DOC_INSTALL) \
++       -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
++       -$(NOECHO) umask 022; $(DOC_INSTALL) \
+                "Module" "$(NAME)" \
+                "installed into" $(INSTALLPRIVLIB) \
+                LINKTYPE "$(LINKTYPE)" \
+@@ -2199,8 +2199,8 @@ doc_perl_install :: all
+ 
+ doc_site_install :: all
+        $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
+-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+-       -$(NOECHO) $(DOC_INSTALL) \
++       -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
++       -$(NOECHO) umask 022; $(DOC_INSTALL) \
+                "Module" "$(NAME)" \
+                "installed into" $(INSTALLSITELIB) \
+                LINKTYPE "$(LINKTYPE)" \
+@@ -2210,8 +2210,8 @@ doc_site_install :: all
+ 
+ doc_vendor_install :: all
+        $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
+-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+-       -$(NOECHO) $(DOC_INSTALL) \
++       -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
++       -$(NOECHO) umask 022; $(DOC_INSTALL) \
+                "Module" "$(NAME)" \
+                "installed into" $(INSTALLVENDORLIB) \
+                LINKTYPE "$(LINKTYPE)" \
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
index 569acb8a23..a62c746e94 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
@@ -1,4 +1,4 @@
-From 035ae97a9c2bf8ed73031e8879a0f860797544c1 Mon Sep 17 00:00:00 2001
+From 26209b55201a1b2d25252ac3b425bc49081299de Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Debian policy doesn't install .packlist files for core or vendor.
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
index fa0039f27a..d80f86c21a 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
@@ -1,4 +1,4 @@
-From c089c8eb475a2018e8028e23b07defb5789a5633 Mon Sep 17 00:00:00 2001
+From 53ce69085918232a1b7e26e7762c1b2f70b1eb4a Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.
@@ -9,7 +9,7 @@ Patch-Name: debian/ld_run_path.diff
  1 file changed, 3 insertions(+)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-index e39c8b2..0b933ce 100644
+index 37bcfd4..bd66e65 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
 @@ -56,6 +56,9 @@ sub _unix_os2_ext {
@@ -20,5 +20,5 @@ index e39c8b2..0b933ce 100644
 +    $ld_run_path_seen{$_}++ for @libpath;
 +
      foreach my $thislib ( split ' ', $potential_libs ) {
+         my ( $custom_name ) = '';
  
-         # Handle possible linker path arguments.
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
index 0a11cd7ae8..54ef9640ec 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
@@ -1,4 +1,4 @@
-From 54e202518f081aa42d5ff733d56c4d42395bcba4 Mon Sep 17 00:00:00 2001
+From a7f6d453e60256d329469a75b642cca854cebea1 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be
@@ -6,16 +6,16 @@ Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be
 
 Patch-Name: debian/libnet_config_path.diff
 ---
- cpan/libnet/Net/Config.pm | 7 +++----
+ cpan/libnet/lib/Net/Config.pm | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm
-index ba16332..4b1ea19 100644
---- a/cpan/libnet/Net/Config.pm
-+++ b/cpan/libnet/Net/Config.pm
-@@ -57,9 +57,8 @@ my %nc = (
- }
+diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
+index 953a826..61ba12a 100644
+--- a/cpan/libnet/lib/Net/Config.pm
++++ b/cpan/libnet/lib/Net/Config.pm
+@@ -68,9 +68,8 @@ my %nc = (
  TRY_INTERNET_CONFIG
+ }
  
 -my $file = __FILE__;
 +my $file = '/etc/perl/Net/libnet.cfg';
@@ -24,7 +24,7 @@ index ba16332..4b1ea19 100644
  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
+@@ -142,8 +141,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.
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff b/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
index 7b9bd75e6c..76b805451c 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
@@ -1,4 +1,4 @@
-From 967a87e268bd348423f72dec993eda444ce9f53d Mon Sep 17 00:00:00 2001
+From fb8bdbb4bf56382de099e62c2564286b9dfda46d Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Note that libperl-dev package is required for embedded linking
diff --git a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff b/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
new file mode 100644
index 0000000000..fd471ed7a5
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
@@ -0,0 +1,52 @@
+From 289eaf87f8de4d9ebfd661d4e4299c2952435243 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 10 Apr 2015 10:19:51 +0300
+Subject: Make t/run/locale.t survive missing locales masked by LC_ALL
+
+If LC_ALL is set to a valid locale but another LC_* setting like LC_CTYPE
+isn't, t/run/locale.t would fail because it explicitly unsets LC_ALL,
+unmasking the problem underneath. All the other tests survive such
+a scenario.
+
+While this is clearly an error in the build environment, it's easy to make
+the test more robust by first clearing all the locale relevant variables.
+
+Bug: https://rt.perl.org/Ticket/Display.html?id=124310
+Bug-Debian: https://bugs.debian.org/782068
+Patch-Name: debian/locale-robustness.diff
+---
+ t/run/locale.t | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/t/run/locale.t b/t/run/locale.t
+index bd1a034..2105339 100644
+--- a/t/run/locale.t
++++ b/t/run/locale.t
+@@ -27,6 +27,9 @@ my @locales = eval { find_locales( [ &LC_ALL, &LC_CTYPE, &LC_NUMERIC ],
+                                  ) };
+ skip_all("no locales available") unless @locales;
+ 
++# reset the locale environment
++local @ENV{'LANG', (grep /^LC_/, keys %ENV)};
++
+ plan tests => &last;
+ 
+ my $non_C_locale;
+@@ -58,9 +61,6 @@ EOF
+ SKIP: {
+     skip("Windows stores locale defaults in the registry", 1 )
+                                                             if $^O eq 'MSWin32';
+-    local $ENV{LC_NUMERIC}; # So not taken as a default
+-    local $ENV{LC_ALL}; # so it never overrides LC_NUMERIC
+-    local $ENV{LANG};   # So not taken as a default
+     fresh_perl_is("for (qw(@locales)) {\n" . <<'EOF',
+         use POSIX qw(locale_h);
+         use locale;
+@@ -348,7 +348,6 @@ EOF
+ 
+     {
+        local $ENV{LC_NUMERIC} = $different;
+-       local $ENV{LC_ALL}; # so it never overrides LC_NUMERIC
+        fresh_perl_is(<<"EOF",
+            use POSIX qw(locale_h);
+ 
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff b/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
new file mode 100644
index 0000000000..fa0f9daf96
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
@@ -0,0 +1,30 @@
+From 593dd52f535b1f439dfd0afe52211ae8960e980a Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 24 Aug 2014 12:56:11 -0700
+Subject: Pass LD settings through to subdirectories
+
+[rt.cpan.org #28632] fixed most issues with passing LD down to
+subdirectory Makefile.PL files. However, there are some distributions
+(including Wx, Par::Packer, and Verilog-Perl) that explicitly set
+LD. Those still can't be overridden from the command line. Adding LD to
+the PASTHRU list fixes this.
+
+Bug-Debian: https://bugs.debian.org/758471
+Patch-Name: debian/makemaker-pasthru.diff
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 4a8e14c..548d98e 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2793,7 +2793,7 @@ sub pasthru {
+     my($sep) = $Is{VMS} ? ',' : '';
+     $sep .= "\\\n\t";
+ 
+-    foreach my $key (qw(LIB LIBPERL_A LINKTYPE OPTIMIZE
++    foreach my $key (qw(LIB LIBPERL_A LINKTYPE OPTIMIZE LD
+                      PREFIX INSTALL_BASE)
+                  )
+     {
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff b/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
new file mode 100644
index 0000000000..b1b4cb9a68
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
@@ -0,0 +1,42 @@
+From 634449066a9c810e81506425d2ca925b2fd72ab2 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 23 May 2015 21:15:06 +0200
+Subject: Update t/porting/customized.dat for files patched in Debian
+
+Patch-Name: debian/makemaker_customized.diff
+---
+ t/porting/customized.dat | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/t/porting/customized.dat b/t/porting/customized.dat
+index 7df398d..f857bd2 100644
+--- a/t/porting/customized.dat
++++ b/t/porting/customized.dat
+@@ -1,7 +1,7 @@
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 7f4dfd0fe884bd42412bcf04ca80ef97b39c1d54
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm bef099988b15fb0b2a1f5ac48c01af1f7f36d329
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8168e18f0e3ce3ece4bb7e7c72d57ec07c67c402
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 7115e97a53559cb3ec061dd6f7f344e522724c4a
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 3493ae6f93264e967f58dedaa3dbf3dbcb249853
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 3d7abd674b15ed323f743594ef0bd09db76b1aee
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm f8db8d4245bf0684b8210c811f50d7cfb1a27d78
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 757bffb47857521311f8f3bde43ebe165f8d5191
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 82be06851deb84c6419ad003ce9b6d1957f395f3
+@@ -13,7 +13,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 58872d66
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm ab80029ab16d38d4f2e41dc88d2ceb9f3790e477
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 453e0abbc4bb38db4c0820ad5c4846f313b66291
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm c1b1babda8f43ae7a2caba1cb4f70f92af5a0e34
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 6f90d94ad3e7aa0045a3b1a10a1bb18391f89f57
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 21bde53290bf1a4da4457290b65bd1b0ca6f1d16
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm cab2b3ce08b71a4ce89aa630f236eb08b852439d
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 61fced0faf518bf87c265fcb51ed330ba354623f
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm ae0ef51a7b6dd0b05aa61c779df7167dda5f5119
+@@ -22,7 +22,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 0544301f712
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 433135eecb85b4b1d90d3027432f329436c78447
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 1fbb5605bfb47feee4083feba8aa85e659628f70
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 5b66d1f485a6034d96fc24ba1665b1bad9e447f1
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 8cef99a9bd370ecfd07ddb0efbdcbb4101255e45
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm c455c915fb7dc3eeb1200ed1cd19048e6f21e6b1
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 939572fde3d59ba77c2e677fe2df2bed4bed5898
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 09c2049bfd25b735e2a5bcf56a6cff7b4827f9c8
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm d65d63f8217a55c36f62e249814988974f593c79
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
index 49805a015f..ae15907609 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff
+++ b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
@@ -1,4 +1,4 @@
-From f994a741e51287494ed62b10738be6856aadce71 Mon Sep 17 00:00:00 2001
+From 6c6cf14e204f3c031372bfd9604ad524d5691186 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Tweak @INC ordering for Debian
@@ -22,10 +22,10 @@ Patch-Name: debian/mod_paths.diff
  1 file changed, 58 insertions(+)
 
 diff --git a/perl.c b/perl.c
-index 27d0d9e..1fe2f1c 100644
+index 086645b..e64f1f4 100644
 --- a/perl.c
 +++ b/perl.c
-@@ -4367,6 +4367,11 @@ S_init_perllib(pTHX)
+@@ -4373,6 +4373,11 @@ S_init_perllib(pTHX)
                       INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
  #endif
  
@@ -37,7 +37,7 @@ index 27d0d9e..1fe2f1c 100644
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
       * DLL-based path intuition to work correctly */
-@@ -4484,6 +4489,59 @@ S_init_perllib(pTHX)
+@@ -4490,6 +4495,59 @@ S_init_perllib(pTHX)
                       INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
  #endif
  
diff --git a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
new file mode 100644
index 0000000000..b911fd2762
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
@@ -0,0 +1,92 @@
+From 240f2f4aeb3850bc0c5370b9fbc3909573bed9b3 Mon Sep 17 00:00:00 2001
+From: Brendan O'Dea <bod@debian.org>
+Date: Tue, 8 Mar 2005 19:30:38 +1100
+Subject: Don't install .packlist or perllocal.pod for perl or vendor
+
+Patch-Name: debian/no_packlist_perllocal.diff
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 35 +++----------------------
+ 1 file changed, 3 insertions(+), 32 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 570a631..391dc22 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2122,11 +2122,6 @@ pure_perl_install :: all
+ };
+ 
+     push @m,
+-q{             read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+-               write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+-} unless $self->{NO_PACKLIST};
+-
+-    push @m,
+ q{             "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
+                "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
+                "$(INST_BIN)" "$(DESTINSTALLBIN)" \
+@@ -2158,10 +2153,6 @@ q{               "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
+ pure_vendor_install :: all
+        $(NOECHO) umask 022; $(MOD_INSTALL) \
+ };
+-    push @m,
+-q{             read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+-               write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
+-} unless $self->{NO_PACKLIST};
+ 
+     push @m,
+ q{             "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
+@@ -2187,37 +2178,19 @@ doc_vendor_install :: all
+ 
+     push @m, q{
+ doc_perl_install :: all
+-       $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
+-       -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
+-       -$(NOECHO) umask 022; $(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) umask 02; $(MKPATH) "$(DESTINSTALLARCHLIB)"
++       $(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) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
+-       -$(NOECHO) umask 022; $(DOC_INSTALL) \
+-               "Module" "$(NAME)" \
+-               "installed into" $(INSTALLVENDORLIB) \
+-               LINKTYPE "$(LINKTYPE)" \
+-               VERSION "$(VERSION)" \
+-               EXE_FILES "$(EXE_FILES)" \
+-               >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+ 
+ } unless $self->{NO_PERLLOCAL};
+ 
+@@ -2226,13 +2199,11 @@ 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);
diff --git a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
new file mode 100644
index 0000000000..8656b027e8
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
@@ -0,0 +1,30 @@
+From b517c5e15d0871e36d0f1187661fe1dd28ddf820 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 15 May 2011 19:35:58 +0300
+Subject: List packaged patches in patchlevel.h
+
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/567489
+
+The list of packaged patches is in patchlevel-debian.h, which is generated
+from the debian/patches/ directory when building the package.
+
+Patch-Name: debian/patchlevel.diff
+---
+ patchlevel.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/patchlevel.h b/patchlevel.h
+index a0ad78b..01367b7 100644
+--- a/patchlevel.h
++++ b/patchlevel.h
+@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
+        ,"uncommitted-changes"
+ #endif
+        PERL_GIT_UNPUSHED_COMMITS       /* do not remove this line */
++#ifdef DEBIAN
++#include "patchlevel-debian.h"
++#endif
+        ,NULL
+ };
+ 
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch b/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
index 82a9f1a400..533952cac7 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch
+++ b/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
@@ -1,4 +1,4 @@
-From dc495a233b95d7e3e6900845847035da8f01aa59 Mon Sep 17 00:00:00 2001
+From c99c61e8f863a508a0793168011c98dc74abbd05 Mon Sep 17 00:00:00 2001
 From: Dominic Hargreaves <dom@earth.li>
 Date: Sat, 14 Apr 2012 11:34:05 +0100
 Subject: Invoke x-terminal-emulator rather than xterm in perl5db.pl
@@ -15,10 +15,10 @@ Patch-Name: debian/perl5db-x-terminal-emulator.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/perl5db.pl b/lib/perl5db.pl
-index 707d04d..6ac4d36 100644
+index 7e7194e..c466bf3 100644
 --- a/lib/perl5db.pl
 +++ b/lib/perl5db.pl
-@@ -6945,7 +6945,7 @@ properly set up.
+@@ -6960,7 +6960,7 @@ properly set up.
  sub xterm_get_fork_TTY {
      ( my $name = $0 ) =~ s,^.*[/\\],,s;
      open XT,
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
index 60a714f8bb..2c1eab9709 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff
+++ b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
@@ -1,4 +1,4 @@
-From 70eb3e56e884e62bcf837c1f8cd32e35e5552889 Mon Sep 17 00:00:00 2001
+From fbfbeb7a690d703a3cdc56f923e89eb7b7997d31 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Fri, 9 Jan 2009 18:54:47 +0200
 Subject: Make perlivp skip include directories in /usr/local
diff --git a/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff b/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
new file mode 100644
index 0000000000..6270b87318
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
@@ -0,0 +1,23 @@
+From 27a4952c2e531947dc9f2f02e2063d117e2e699a Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 18 Apr 2015 17:39:32 +0300
+Subject: Update porting/customized.dat for pod2man modifications
+
+Patch-Name: debian/pod2man-customized.diff
+---
+ t/porting/customized.dat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/porting/customized.dat b/t/porting/customized.dat
+index 0eed9f7..7df398d 100644
+--- a/t/porting/customized.dat
++++ b/t/porting/customized.dat
+@@ -42,7 +42,7 @@ Win32API::File cpan/Win32API-File/Makefile.PL 605d0aee31aebe84a99408f9ab5f644db5
+ Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3d78
+ Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d
+ Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a
+-podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
++podlators cpan/podlators/scripts/pod2man.PL 761f35d3fcf91c1bc2f9e024a9fa5c62fd3fc338
+ podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
+ version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1
+ version vutil.c 668f17ca43e2527645674d29ba772b86330d5663
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff b/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
index 535a90d5e2..c41efbe3e8 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff
+++ b/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
@@ -1,4 +1,4 @@
-From 9ff12f918da84dc355b75fbaa5374a8e276f76d7 Mon Sep 17 00:00:00 2001
+From 914948f026efce02cf0abff8b0312aaad96592ed Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Fiddle with *PREFIX and variables written to the makefile
@@ -17,10 +17,10 @@ Patch-Name: debian/prefix_changes.diff
  4 files changed, 13 insertions(+), 16 deletions(-)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-index 2066311..0a1fb49 100644
+index 4c00129..1ea2035 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-@@ -765,8 +765,6 @@ all POD files in MAN1PODS and MAN3PODS.
+@@ -902,8 +902,6 @@ all POD files in MAN1PODS and MAN3PODS.
  sub manifypods_target {
      my($self) = shift;
  
@@ -29,16 +29,16 @@ index 2066311..0a1fb49 100644
      my $dependencies  = '';
  
      # populate manXpods & dependencies:
-@@ -782,7 +780,7 @@ END
+@@ -919,7 +917,7 @@ END
      foreach my $section (qw(1 3)) {
          my $pods = $self->{"MAN${section}PODS"};
-         push @man_cmds, $self->split_command(<<CMD, map {($_,$pods->{$_})} sort keys %$pods);
--       \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
-+       \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
+         my $p2m = sprintf <<CMD, $] > 5.008 ? " -u" : "";
+-       \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)%s
++       \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)%s
  CMD
+         push @man_cmds, $self->split_command($p2m, map {($_,$pods->{$_})} sort keys %$pods);
      }
- 
-@@ -1748,9 +1746,11 @@ sub init_INSTALL_from_PREFIX {
+@@ -1875,9 +1873,11 @@ sub init_INSTALL_from_PREFIX {
          $self->{SITEPREFIX}   ||= $sprefix;
          $self->{VENDORPREFIX} ||= $vprefix;
  
@@ -54,10 +54,10 @@ index 2066311..0a1fb49 100644
  
      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 0a6797f..c19a5f9 100644
+index 391dc22..4a8e14c 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -3029,8 +3029,7 @@ sub prefixify {
+@@ -3077,8 +3077,7 @@ sub prefixify {
      warn "  prefixify $var => $path\n" if $Verbose >= 2;
      warn "    from $sprefix to $rprefix\n" if $Verbose >= 2;
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
index 50bcc47ccd..b4443f6476 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
@@ -1,4 +1,4 @@
-From f2d2ddd656999f51148c66a3efce76bda8d2f9ca Mon Sep 17 00:00:00 2001
+From 21bc033755f0b609f9bb2aa9e98b10d58424406f Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Prune the list of libraries wanted to what we actually need.
@@ -14,20 +14,20 @@ Patch-Name: debian/prune_libs.diff
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/Configure b/Configure
-index 293ef61..3f80a76 100755
+index 0a405d3..6fcc3bc 100755
 --- a/Configure
 +++ b/Configure
-@@ -1387,8 +1387,7 @@ libswanted_uselargefiles=''
+@@ -1454,8 +1454,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="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
--libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+-libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
+-libswanted="$libswanted sun 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 ! !'`
-@@ -22796,7 +22795,7 @@ sunos*X4*)
+@@ -23593,7 +23592,7 @@ sunos*X4*)
      ;;
  *) case "$usedl" in
      $define|true|[yY]*)
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff b/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
index 50bc97c94b..8a3fc9912c 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff
+++ b/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
@@ -1,4 +1,4 @@
-From 55a3d4b004595a9f171d79329c9d218f0b850bd8 Mon Sep 17 00:00:00 2001
+From cb3e98e17a666896150b109694e9eb9278620845 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Sat, 17 May 2014 14:57:01 +0300
 Subject: Skip a regeneration check in unrelated git repositories
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff b/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
index f7cc55570b..ecfc0bc62f 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff
+++ b/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
@@ -1,4 +1,4 @@
-From 21747cdd5381a9466fc75ead783980ced8b184a3 Mon Sep 17 00:00:00 2001
+From 42853af65a28066b119d23d96e964e94b55a8541 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Fri, 5 Aug 2011 10:50:18 +0300
 Subject: Skip a crashing test case in t/op/threads.t on GNU/kFreeBSD
@@ -17,7 +17,7 @@ Patch-Name: debian/skip-kfreebsd-crash.diff
  1 file changed, 4 insertions(+)
 
 diff --git a/t/op/threads.t b/t/op/threads.t
-index 6fb2410..67b5f4a 100644
+index e76c956..bec210b 100644
 --- a/t/op/threads.t
 +++ b/t/op/threads.t
 @@ -376,6 +376,9 @@ EOF
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
index 7110298f04..4c87104cce 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
+++ b/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
@@ -1,4 +1,4 @@
-From 4d1b20bcec1610d22b718ffae154427a7a218632 Mon Sep 17 00:00:00 2001
+From ae9b645d6da2990fd055368eca2c67c449474e38 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Fri, 22 Apr 2011 11:15:32 +0300
 Subject: Skip tests specific to the upstream Git repository
@@ -14,10 +14,10 @@ Patch-Name: debian/skip-upstream-git-tests.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/t/test.pl b/t/test.pl
-index 30db88c..0fdc4f4 100644
+index cda3840..af579a2 100644
 --- a/t/test.pl
 +++ b/t/test.pl
-@@ -159,7 +159,7 @@ sub skip_all_without_config {
+@@ -174,7 +174,7 @@ sub skip_all_without_unicode_tables { # (but only under miniperl)
  
  sub find_git_or_skip {
      my ($source_dir, $reason);
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
index 5c1900498b..cb31457761 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff
+++ b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
@@ -1,4 +1,4 @@
-From 2f332eeedbf63f72f6b1b157a912282a31a25d3b Mon Sep 17 00:00:00 2001
+From 487a6d6ada0b08e6a7276520ebc61cd851005e7c Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Sun, 3 Oct 2010 21:36:17 +0300
 Subject: Squelch locale warnings in Debian package maintainer scripts
@@ -15,30 +15,31 @@ the warning will be triggered normally again at that point.
 
 Patch-Name: debian/squelch-locale-warnings.diff
 ---
- locale.c           | 4 ++++
+ locale.c           | 5 ++++-
  pod/perllocale.pod | 8 ++++++++
- 2 files changed, 12 insertions(+)
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/locale.c b/locale.c
-index 6e8728c..f55c4b2 100644
+index 7a4a418..fdf911d 100644
 --- a/locale.c
 +++ b/locale.c
-@@ -512,6 +512,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))));
-     bool done = FALSE;
-     const char *system_default_locale = NULL;
+@@ -674,7 +674,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+ 
+     const bool locwarn = (printwarn > 1
+                           || (printwarn
+-                              && (! bad_lang_use_once
++                              &&
++                                 /* Debian specific change - see http://bugs.debian.org/508764 */
++                                 (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
++                                 (! bad_lang_use_once
+                                   || (
+                                     /* disallow with "" or "0" */
+                                     *bad_lang_use_once
 diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index 914281f..15de0d4 100644
+index 701b422..58cabaf 100644
 --- a/pod/perllocale.pod
 +++ b/pod/perllocale.pod
-@@ -1151,6 +1151,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
+@@ -1217,6 +1217,14 @@ B<NOTE>: C<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.
  
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff b/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
index f73f8bbabe..53adc2f4db 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
@@ -1,4 +1,4 @@
-From f33f120f0fdf7cd100066390fe0bc426d45b1929 Mon Sep 17 00:00:00 2001
+From 591c1f9b7d4755bfc59d9665bab1f2ca410de765 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Set umask approproately for site install directories
@@ -11,10 +11,10 @@ Patch-Name: debian/writable_site_dirs.diff
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 8fdb67c..8b86a24 100644
+index 197f102..5f1b87f 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2095,7 +2095,7 @@ q{                $(INST_LIB) $(DESTINSTALLPRIVLIB) \
+@@ -2138,7 +2138,7 @@ q{                "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
  
  
  pure_site_install :: all
@@ -22,15 +22,15 @@ index 8fdb67c..8b86a24 100644
 +       $(NOECHO) umask 02; $(MOD_INSTALL) \
  };
      push @m,
- q{             read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-@@ -2156,8 +2156,8 @@ doc_perl_install :: all
+ q{             read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+@@ -2199,8 +2199,8 @@ doc_perl_install :: all
  
  doc_site_install :: all
-        $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
--       -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
+        $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
+-       -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
 -       -$(NOECHO) umask 022; $(DOC_INSTALL) \
-+       -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
++       -$(NOECHO) umask 02; $(MKPATH) "$(DESTINSTALLARCHLIB)"
 +       -$(NOECHO) umask 02; $(DOC_INSTALL) \
                 "Module" "$(NAME)" \
-                "installed into" "$(INSTALLSITELIB)" \
+                "installed into" $(INSTALLSITELIB) \
                 LINKTYPE "$(LINKTYPE)" \
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
index 3df593346c..3df593346c 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch
+++ b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
index 69ac434779..69ac434779 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch
+++ b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch b/meta/recipes-devtools/perl/perl/generate-sh.patch
index 27f6e691c0..27f6e691c0 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch
+++ b/meta/recipes-devtools/perl/perl/generate-sh.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/installperl.patch b/meta/recipes-devtools/perl/perl/installperl.patch
index 456012376e..456012376e 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/installperl.patch
+++ b/meta/recipes-devtools/perl/perl/installperl.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch b/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
index 5161e4c8b6..5161e4c8b6 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch
+++ b/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
index de6f65294c..de6f65294c 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
+++ b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
diff --git a/meta/recipes-devtools/perl/perl/native-nopacklist.patch b/meta/recipes-devtools/perl/perl/native-nopacklist.patch
new file mode 100644
index 0000000000..5482dcb79c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/native-nopacklist.patch
@@ -0,0 +1,91 @@
+Upstream-Status:Inappropriate [debian patch]
+
+Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   35 ++---------------------
+ 1 file changed, 3 insertions(+), 32 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index f63145c..a589710 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2122,11 +2122,6 @@ pure_perl_install :: all
+ };
+ 
+     push @m,
+-q{             read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+-               write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+-} unless $self->{NO_PACKLIST};
+-
+-    push @m,
+ q{             "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
+                "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
+                "$(INST_BIN)" "$(DESTINSTALLBIN)" \
+@@ -2158,10 +2153,6 @@ q{               "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
+ pure_vendor_install :: all
+        $(NOECHO) $(MOD_INSTALL) \
+ };
+-    push @m,
+-q{             read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+-               write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
+-} unless $self->{NO_PACKLIST};
+ 
+     push @m,
+ q{             "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
+@@ -2187,37 +2178,19 @@ doc_vendor_install :: all
+ 
+     push @m, q{
+ 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) $(ECHO) Appending installation info to "$(DESTINSTALLSITEARCH)/perllocal.pod"
++       -$(NOECHO) $(MKPATH) "$(DESTINSTALLSITEARCH)"
+        -$(NOECHO) $(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{"
+ 
+ } unless $self->{NO_PERLLOCAL};
+ 
+@@ -2226,13 +2199,11 @@ 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);
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch b/meta/recipes-devtools/perl/perl/native-perlinc.patch
index f0bb1f6596..f0bb1f6596 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/perl/native-perlinc.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
index d912d0031e..d912d0031e 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch
+++ b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
index c6cc15c93f..c6cc15c93f 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch
+++ b/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh b/meta/recipes-devtools/perl/perl/perl-configure.sh
index e72ce49f99..e72ce49f99 100755
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh
+++ b/meta/recipes-devtools/perl/perl/perl-configure.sh
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
index 035beba66a..035beba66a 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
index aa83fca5ae..aa83fca5ae 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch
+++ b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch b/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
index 59ce85a7a3..59ce85a7a3 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch
+++ b/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/run-ptest b/meta/recipes-devtools/perl/perl/run-ptest
index 1e2dd1b66d..1e2dd1b66d 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/run-ptest
+++ b/meta/recipes-devtools/perl/perl/run-ptest
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch b/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
index 08a6b0a5fd..08a6b0a5fd 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch
+++ b/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch b/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
index 1ee818c27b..1ee818c27b 100644
--- a/meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
+++ b/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb
index d100ff9b82..8022f47275 100644
--- a/meta/recipes-devtools/perl/perl_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -7,16 +7,12 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r1"
 
-# 5.10.1 has Module::Build built-in
-PROVIDES += "libmodule-build-perl"
-
-SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
+SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
 "
 
 # Pick up patches from debian
-# http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
+# http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.22.0-1.debian.tar.xz
 SRC_URI += " \
         file://debian/cpan_definstalldirs.diff \
         file://debian/db_file_ver.diff \
@@ -33,7 +29,6 @@ SRC_URI += " \
         file://debian/ld_run_path.diff \
         file://debian/libnet_config_path.diff \
         file://debian/mod_paths.diff \
-        file://debian/module_build_man_extensions.diff \
         file://debian/prune_libs.diff \
         file://debian/fixes/net_smtp_docs.diff \
         file://debian/perlivp.diff \
@@ -42,7 +37,6 @@ SRC_URI += " \
         file://debian/skip-kfreebsd-crash.diff \
         file://debian/fixes/document_makemaker_ccflags.diff \
         file://debian/find_html2text.diff \
-        file://debian/hurd_test_skip_stack.diff \
         file://debian/perl5db-x-terminal-emulator.patch \
         file://debian/cpan-missing-site-dirs.diff \
         file://debian/fixes/memoize_storable_nstore.diff \
@@ -63,7 +57,6 @@ SRC_URI += " \
         file://fix_bad_rpath.patch \
         file://perl-archlib-exp.patch \
         file://dynaloaderhack.patch \
-        file://fix-FF_MORE-crash.patch \
         \
         \
         file://config.sh \
@@ -73,8 +66,6 @@ SRC_URI += " \
         file://config.sh-64 \
         file://config.sh-64-le \
         file://config.sh-64-be \
-        file://perl-5.14.3-fix-CVE-2010-4777.patch \
-        file://0001-Makefile.SH-fix-do_install-failed.patch \
         file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
 "
 
@@ -84,8 +75,8 @@ SRC_URI_append_class-target = " \
             file://test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch \
            "
 
-SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
-SRC_URI[sha256sum] = "4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"
+SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
+SRC_URI[sha256sum] = "be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196"
 
 inherit perlnative siteinfo
 
@@ -379,8 +370,6 @@ PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*"
 RPROVIDES_perl-lib = "perl-lib"
 
 require perl-rdepends_${PV}.inc
-require perl-rprovides.inc
-require perl-rprovides_${PV}.inc
 require perl-ptest.inc
 
 SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh"