summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2018-09-06 22:00:25 -0700
committerTim Orling <timothy.t.orling@linux.intel.com>2018-09-06 22:07:29 -0700
commit610991e483d2cf6a6b82322406630ed30547e844 (patch)
tree574c2ad4fee17b8ab5d3dc3dc359b16f96de1187
parent0191456d81500f312569f5813f8c4d5ddadc17a7 (diff)
downloadopenembedded-core-contrib-timo/perl-5.26.2.tar.gz
openembedded-core-contrib-timo/perl-5.26.2.tar.bz2
openembedded-core-contrib-timo/perl-5.26.2.zip
perl: [WIP] upgrade to 5.26.2timo/perl-5.26.2
Bring in patches from debian, best effort at getting past do_patch task. Needs more work. Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.26.2.bb (renamed from meta/recipes-devtools/perl/perl-native_5.24.4.bb)78
-rw-r--r--meta/recipes-devtools/perl/perl-rdepends_5.26.2.inc (renamed from meta/recipes-devtools/perl/perl-rdepends_5.24.4.inc)0
-rw-r--r--meta/recipes-devtools/perl/perl/Makefile.patch17
-rw-r--r--meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log149
-rw-r--r--meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch19
-rw-r--r--meta/recipes-devtools/perl/perl/debian/configure-regen.diff128
-rw-r--r--meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff12
-rw-r--r--meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff14
-rw-r--r--meta/recipes-devtools/perl/perl/debian/db_file_ver.diff6
-rw-r--r--meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff6
-rw-r--r--meta/recipes-devtools/perl/perl/debian/doc_info.diff11
-rw-r--r--meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff15
-rw-r--r--meta/recipes-devtools/perl/perl/debian/errno_ver.diff40
-rw-r--r--meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff23
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fakeroot.diff12
-rw-r--r--meta/recipes-devtools/perl/perl/debian/find_html2text.diff10
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff26
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff74
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff171
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff52
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff110
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff87
-rw-r--r--meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff34
-rw-r--r--meta/recipes-devtools/perl/perl/debian/hppa_op_optimize_workaround.diff35
-rw-r--r--meta/recipes-devtools/perl/perl/debian/hppa_opmini_optimize_workaround.diff28
-rw-r--r--meta/recipes-devtools/perl/perl/debian/hurd-softupdates.diff26
-rw-r--r--meta/recipes-devtools/perl/perl/debian/installman-utf8.diff29
-rw-r--r--meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff11
-rw-r--r--meta/recipes-devtools/perl/perl/debian/kfreebsd-softupdates.diff30
-rw-r--r--meta/recipes-devtools/perl/perl/debian/ld_run_path.diff10
-rw-r--r--meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff14
-rw-r--r--meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff9
-rw-r--r--meta/recipes-devtools/perl/perl/debian/locale-robustness.diff53
-rw-r--r--meta/recipes-devtools/perl/perl/debian/makemaker-manext.diff32
-rw-r--r--meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff10
-rw-r--r--meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff43
-rw-r--r--meta/recipes-devtools/perl/perl/debian/mod_paths.diff22
-rw-r--r--meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff19
-rw-r--r--meta/recipes-devtools/perl/perl/debian/patchlevel.diff8
-rw-r--r--meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch10
-rw-r--r--meta/recipes-devtools/perl/perl/debian/perldoc-pager.diff29
-rw-r--r--meta/recipes-devtools/perl/perl/debian/perlivp.diff10
-rw-r--r--meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff24
-rw-r--r--meta/recipes-devtools/perl/perl/debian/prefix_changes.diff119
-rw-r--r--meta/recipes-devtools/perl/perl/debian/prune_libs.diff36
-rw-r--r--meta/recipes-devtools/perl/perl/debian/regen-skip.diff28
-rw-r--r--meta/recipes-devtools/perl/perl/debian/sh4_op_optimize_workaround.diff31
-rw-r--r--meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff41
-rw-r--r--meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff29
-rw-r--r--meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff14
-rw-r--r--meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff11
-rw-r--r--meta/recipes-devtools/perl/perl/dynaloaderhack.patch9
-rw-r--r--meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch7
-rw-r--r--meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch12
-rw-r--r--meta/recipes-devtools/perl/perl/fix_bad_rpath.patch23
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff44
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/CVE-2018-6797-testcase.diff33
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/autodie-scope.diff100
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/cpan_web_link.diff27
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/document_makemaker_ccflags.diff (renamed from meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff)10
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/encode-alias-regexp.diff27
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/extutils_file_path_compat.diff53
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/extutils_makemaker_reproducible.diff41
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/file_path_chmod_race.diff163
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/file_path_hurd_errno.diff32
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/getopt-long-2.diff58
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/getopt-long-3.diff41
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/getopt-long-4.diff31
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/json-pp-example.diff27
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/math_complex_doc_angle_units.diff29
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/math_complex_doc_great_circle.diff26
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/math_complex_doc_see_also.diff26
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/memoize-pod.diff35
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/memoize_storable_nstore.diff (renamed from meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff)7
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/packaging_test_skips.diff121
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase1.diff55
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase2.diff55
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/respect_umask.diff (renamed from meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff)25
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/test-builder-reset.diff70
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/test-printf-null.diff67
-rw-r--r--meta/recipes-devtools/perl/perl/fixes/time_piece_doc.diff30
-rw-r--r--meta/recipes-devtools/perl/perl/generate-sh.patch23
-rw-r--r--meta/recipes-devtools/perl/perl/installperl.patch17
-rw-r--r--meta/recipes-devtools/perl/perl/letgcc-find-errno.patch23
-rw-r--r--meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch16
-rw-r--r--meta/recipes-devtools/perl/perl/native-perlinc.patch19
-rw-r--r--meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch17
-rw-r--r--meta/recipes-devtools/perl/perl/perl-archlib-exp.patch28
-rw-r--r--meta/recipes-devtools/perl/perl/perl-dynloader.patch17
-rw-r--r--meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch13
-rw-r--r--meta/recipes-devtools/perl/perl/perl-moreconfig.patch17
-rw-r--r--meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch12
-rw-r--r--meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch10
-rw-r--r--meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch14
-rw-r--r--meta/recipes-devtools/perl/perl_5.26.2.bb (renamed from meta/recipes-devtools/perl/perl_5.24.4.bb)99
95 files changed, 2228 insertions, 1236 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.24.4.bb b/meta/recipes-devtools/perl/perl-native_5.26.2.bb
index affc9d5d78..acac9dc6de 100644
--- a/meta/recipes-devtools/perl/perl-native_5.24.4.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.26.2.bb
@@ -5,21 +5,69 @@ DEPENDS = "db-native grep-native gdbm-native zlib-native"
EXTRA_OEMAKE = "-e MAKEFLAGS="
+#file://debian/hppa_opmini_optimize_workaround.diff
+#file://debian/hurd-softupdates.diff
+#file://debian/no_packlist_perllocal.diff
+#file://debian/prune_libs.diff
+#file://debian/sh4_op_optimize_workaround.diff
+#file://debian/writable_site_dirs.diff
+#file://fixes/rename-filexp.U-phase2.diff
+#file://fixes/test-printf-null.diff
SRC_URI += "\
- file://Configure-multilib.patch \
- file://perl-configpm-switch.patch \
- file://native-nopacklist.patch \
- file://native-perlinc.patch \
- file://MM_Unix.pm.patch \
- file://debian/errno_ver.diff \
- file://dynaloaderhack.patch \
- file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
- file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
- file://perl-5.26.1-guard_old_libcrypt_fix.patch \
- "
-
-SRC_URI[md5sum] = "04622bc4d3941dc7eb571c52b7c02993"
-SRC_URI[sha256sum] = "7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84"
+ file://debian/configure-regen.diff \
+ file://debian/cpan_definstalldirs.diff \
+ file://debian/cpan-missing-site-dirs.diff \
+ file://debian/db_file_ver.diff \
+ file://debian/deprecate-with-apt.diff \
+ file://debian/doc_info.diff \
+ file://debian/enc2xs_inc.diff \
+ file://debian/errno_ver.diff \
+ file://debian/extutils_set_libperl_path.diff \
+ file://debian/fakeroot.diff \
+ file://debian/find_html2text.diff \
+ file://debian/hppa_op_optimize_workaround.diff \
+ file://debian/installman-utf8.diff \
+ file://debian/instmodsh_doc.diff \
+ file://debian/kfreebsd-softupdates.diff \
+ file://debian/ld_run_path.diff \
+ file://debian/libnet_config_path.diff \
+ file://debian/libperl_embed_doc.diff \
+ file://debian/makemaker-manext.diff \
+ file://debian/makemaker-pasthru.diff \
+ file://debian/mod_paths.diff \
+ file://debian/patchlevel.diff \
+ file://debian/perl5db-x-terminal-emulator.patch \
+ file://debian/perldoc-pager.diff \
+ file://debian/perlivp.diff \
+ file://debian/squelch-locale-warnings.diff \
+ file://fixes/autodie-scope.diff \
+ file://fixes/cpan_web_link.diff \
+ file://fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff \
+ file://fixes/CVE-2018-6797-testcase.diff \
+ file://fixes/document_makemaker_ccflags.diff \
+ file://fixes/encode-alias-regexp.diff \
+ file://fixes/extutils_file_path_compat.diff \
+ file://fixes/extutils_makemaker_reproducible.diff \
+ file://fixes/file_path_chmod_race.diff \
+ file://fixes/file_path_hurd_errno.diff \
+ file://fixes/getopt-long-2.diff \
+ file://fixes/getopt-long-3.diff \
+ file://fixes/getopt-long-4.diff \
+ file://fixes/json-pp-example.diff \
+ file://fixes/math_complex_doc_angle_units.diff \
+ file://fixes/math_complex_doc_great_circle.diff \
+ file://fixes/math_complex_doc_see_also.diff \
+ file://fixes/memoize-pod.diff \
+ file://fixes/memoize_storable_nstore.diff \
+ file://fixes/packaging_test_skips.diff \
+ file://fixes/rename-filexp.U-phase1.diff \
+ file://fixes/respect_umask.diff \
+ file://fixes/test-builder-reset.diff \
+ file://fixes/time_piece_doc.diff \
+ "
+
+SRC_URI[md5sum] = "1fa1b53eeff76aa37b17bfc9b2771671"
+SRC_URI[sha256sum] = "0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c"
inherit native
@@ -135,5 +183,5 @@ EOF
# Fix the path in sstate
SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh"
+PACKAGES_DYNAMIC_class-native += "^perl-module-.*native$"
-PACKAGES_DYNAMIC_class-native = "^perl-module-.*native$"
diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.24.4.inc b/meta/recipes-devtools/perl/perl-rdepends_5.26.2.inc
index 10e3c0429f..10e3c0429f 100644
--- a/meta/recipes-devtools/perl/perl-rdepends_5.24.4.inc
+++ b/meta/recipes-devtools/perl/perl-rdepends_5.26.2.inc
diff --git a/meta/recipes-devtools/perl/perl/Makefile.patch b/meta/recipes-devtools/perl/perl/Makefile.patch
index 858e2e10fb..9bad6b4deb 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.patch
@@ -1,9 +1,18 @@
+From 02b98c2bfe7d6b8e2034ea76c59d4301a8bf94b2 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Wed, 31 Aug 2005 10:45:47 +0000
+Subject: [PATCH] Initial population
+
Upstream-Status:Inappropriate [embedded specific]
-Index: perl-5.14.2/Cross/Makefile
-===================================================================
---- perl-5.14.2.orig/Cross/Makefile
-+++ perl-5.14.2/Cross/Makefile
+---
+ Cross/Makefile | 24 +++++++-----------------
+ 1 file changed, 7 insertions(+), 17 deletions(-)
+
+diff --git a/Cross/Makefile b/Cross/Makefile
+index 1c91b29..0064336 100644
+--- a/Cross/Makefile
++++ b/Cross/Makefile
@@ -1,6 +1,7 @@
## Toplevel Makefile for cross-compilation of perl
diff --git a/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log b/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log
new file mode 100644
index 0000000000..1d618b63cb
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log
@@ -0,0 +1,149 @@
+--- Starting bitbake server pid 12649 at 2018-07-05 21:16:13.428575 ---
+Started bitbake server pid 12649
+DEBUG: Found bblayers.conf (/var/build/build-timo-perl-5.28.0/conf/bblayers.conf)
+DEBUG: Adding layer /home/ttorling/Projects/openembedded-core/meta
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:746: including conf/abi_version.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:747: including conf/site.conf
+DEBUG: CONF file 'conf/site.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:748: including conf/auto.conf
+DEBUG: CONF file 'conf/auto.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:749: including conf/local.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:750: including conf/multiconfig/default.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:751: including conf/machine/qemux86.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:10: including conf/machine/include/qemu.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:11: including conf/machine/include/tune-i586.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/include/tune-i586.inc:3: including conf/machine/include/x86/arch-x86.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:12: including conf/machine/include/qemuboot-x86.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:752: including conf/machine-sdk/x86_64.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:753: including conf/distro/nodistro.conf
+DEBUG: CONF file 'conf/distro/nodistro.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:754: including conf/distro/defaultsetup.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:1: including conf/distro/include/default-providers.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:2: including conf/distro/include/default-versions.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:3: including conf/distro/include/default-distrovars.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:4: including conf/distro/include/world-broken.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:7: including conf/distro/include/tcmode-default.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:10: including conf/distro/include/tclibc-glibc.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:12: including conf/distro/include/uninative-flags.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:755: including conf/documentation.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:756: including conf/licenses.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:757: including conf/sanity.conf
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:4)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/terminal.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass:11)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/staging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:5)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/mirrors.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:7)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utils.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:8)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utility-tasks.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:9)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/metadata_scm.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:10)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/logging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:11)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass:1)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/packagedata.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:41)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/chrpath.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:42)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/insane.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:45)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/buildstats.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/linuxloader.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass:5)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-prelink.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/debian.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/devshell.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sstate.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/license.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/remove-libtool.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/blacklist.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sanity.bbclass (from configuration INHERITs:0)
+DEBUG: Clearing SRCREV cache due to cache policy of: clear
+DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/local_file_checksum_cache.dat'
+DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/bb_codeparser.dat'
+Entering server connection loop
+Accepting [<socket.socket fd=7, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>]
+Connecting Client
+Running command ['setFeatures', [2]]
+Running command ['updateConfig', {'abort': True, 'force': False, 'invalidate_stamp': None, 'verbose': False, 'debug': 0, 'dry_run': False, 'dump_signatures': [], 'debug_domains': [], 'extra_assume_provided': [], 'profile': False, 'prefile': [], 'postfile': [], 'server_timeout': None}, {'HTTP_PROXY': 'http://proxy-us.intel.com:911/', 'USER': 'ttorling', 'FTP_PROXY': 'http://proxy.jf.intel.com:1080/', 'PWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl', 'HOME': '/home/ttorling', 'BBPATH': '/var/build/build-timo-perl-5.28.0', 'https_proxy': 'https://proxy-us.intel.com:912/', 'http_proxy': 'http://proxy-us.intel.com:911/', 'BB_ENV_EXTRAWHITE': 'ALL_PROXY BBPATH_EXTRA BB_NO_NETWORK BB_NUMBER_THREADS BB_SETSCENE_ENFORCE BB_SRCREV_POLICY DISTRO FTPS_PROXY FTP_PROXY GIT_PROXY_COMMAND HTTPS_PROXY HTTP_PROXY MACHINE NO_PROXY PARALLEL_MAKE SCREENDIR SDKMACHINE SOCKS5_PASSWD SOCKS5_USER SSH_AGENT_PID SSH_AUTH_SOCK STAMPS_DIR TCLIBC TCMODE all_proxy ftp_proxy ftps_proxy http_proxy https_proxy no_proxy ', 'ALL_PROXY': 'socks://proxy-us.intel.com:1080/', 'no_proxy': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'NO_PROXY': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'GIT_PROXY_COMMAND': '/usr/bin/oe-git-proxy', 'HTTPS_PROXY': 'https://proxy-us.intel.com:912/', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'all_proxy': 'socks://proxy-us.intel.com:1080/', 'LOGNAME': 'ttorling', 'PATH': '/home/ttorling/Projects/openembedded-core/scripts:/home/ttorling/Projects/bitbake/bin:/usr/libexec/python3-sphinx:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ttorling/.local/bin:/home/ttorling/bin', 'ftp_proxy': 'http://proxy-us.intel.com:1080/', 'LC_ALL': 'en_US.UTF-8', 'LS_COLORS': 'no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.hpp=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.cl=32:*.sh=32:*.bash=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.go=32:*.sql=32:*.csv=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.PNG=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.m4a=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.opus=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.MOV=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.webm=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.odt=31:*.dot=31:*.dotx=31:*.ott=31:*.xls=31:*.xlsx=31:*.ods=31:*.ots=31:*.ppt=31:*.pptx=31:*.odp=31:*.otp=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:*.sqlite=34:', 'SSH_CONNECTION': '10.254.107.201 59657 10.54.74.39 22', 'LANG': 'en_US.UTF-8', 'HISTCONTROL': 'ignoredups', 'GUESTFISH_RESTORE': '\\e[0m', 'HOSTNAME': 'chiron.jf.intel.com', 'OLDPWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl/debian', 'GUESTFISH_INIT': '\\e[1;34m', 'XDG_SESSION_ID': '4715', 'GUESTFISH_PS1': '\\[\\e[1;32m\\]><fs>\\[\\e[0;31m\\] ', 'SELINUX_ROLE_REQUESTED': '', 'SSH_CLIENT': '10.254.107.201 59657 22', 'SELINUX_LEVEL_REQUESTED': '', 'XDG_DATA_DIRS': '/home/ttorling/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share', 'LOADEDMODULES': 'python-sphinx/python3-sphinx', 'BUILDDIR': '/var/build/build-timo-perl-5.28.0', 'SSH_TTY': '/dev/pts/5', 'MAIL': '/var/spool/mail/ttorling', 'SOCKS_PROXY': 'socks://proxy-us.intel.com:1080/', 'socks_proxy': 'socks://proxy-us.intel.com:1080/', 'SELINUX_USE_CURRENT_RANGE': '', 'SHLVL': '1', 'MODULEPATH': '/etc/scl/modulefiles:/usr/share/Modules/modulefiles:/etc/modulefiles:/usr/share/modulefiles', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', 'XDG_RUNTIME_DIR': '/run/user/1000', '_LMFILES_': '/usr/share/modulefiles/python-sphinx/python3-sphinx', 'GUESTFISH_OUTPUT': '\\e[0m', 'MODULESHOME': '/usr/share/Modules', 'HISTSIZE': '1000', 'LESSOPEN': '||/usr/bin/lesspipe.sh %s', 'BASH_FUNC_module%%': '() { eval `/usr/bin/modulecmd bash $*`\n}', 'BASH_FUNC_scl%%': '() { if [ "$1" = "load" -o "$1" = "unload" ]; then\n eval "module $@";\n else\n /usr/bin/scl "$@";\n fi\n}', '_': '/home/ttorling/Projects/bitbake/bin/bitbake'}, ['/home/ttorling/Projects/bitbake/bin/bitbake', 'perl-native', '-c', 'cleanall']]
+Running command ['getVariable', 'BBINCLUDELOGS']
+Running command ['getVariable', 'BBINCLUDELOGS_LINES']
+Running command ['getSetVariable', 'BB_CONSOLELOG']
+Running command ['getUIHandlerNum']
+Running command ['setEventMask', 1, 20, {}, ['bb.runqueue.runQueueExitWait', 'bb.event.LogExecTTY', 'logging.LogRecord', 'bb.build.TaskFailed', 'bb.build.TaskBase', 'bb.event.ParseStarted', 'bb.event.ParseProgress', 'bb.event.ParseCompleted', 'bb.event.CacheLoadStarted', 'bb.event.CacheLoadProgress', 'bb.event.CacheLoadCompleted', 'bb.command.CommandFailed', 'bb.command.CommandExit', 'bb.command.CommandCompleted', 'bb.cooker.CookerExit', 'bb.event.MultipleProviders', 'bb.event.NoProvider', 'bb.runqueue.sceneQueueTaskStarted', 'bb.runqueue.runQueueTaskStarted', 'bb.runqueue.runQueueTaskFailed', 'bb.runqueue.sceneQueueTaskFailed', 'bb.event.BuildBase', 'bb.build.TaskStarted', 'bb.build.TaskSucceeded', 'bb.build.TaskFailedSilent', 'bb.build.TaskProgress', 'bb.event.ProcessStarted', 'bb.event.ProcessProgress', 'bb.event.ProcessFinished']]
+Running command ['setConfig', 'cmd', 'cleanall']
+Running command ['buildTargets', ['perl-native'], 'cleanall']
+Connecting Client
+Disconnecting Client
+No timeout, exiting.
+Exiting
+--- Starting bitbake server pid 12671 at 2018-07-05 21:16:22.503888 ---
+Started bitbake server pid 12671
+DEBUG: Found bblayers.conf (/var/build/build-timo-perl-5.28.0/conf/bblayers.conf)
+DEBUG: Adding layer /home/ttorling/Projects/openembedded-core/meta
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:746: including conf/abi_version.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:747: including conf/site.conf
+DEBUG: CONF file 'conf/site.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:748: including conf/auto.conf
+DEBUG: CONF file 'conf/auto.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:749: including conf/local.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:750: including conf/multiconfig/default.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:751: including conf/machine/qemux86.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:10: including conf/machine/include/qemu.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:11: including conf/machine/include/tune-i586.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/include/tune-i586.inc:3: including conf/machine/include/x86/arch-x86.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:12: including conf/machine/include/qemuboot-x86.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:752: including conf/machine-sdk/x86_64.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:753: including conf/distro/nodistro.conf
+DEBUG: CONF file 'conf/distro/nodistro.conf' not found
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:754: including conf/distro/defaultsetup.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:1: including conf/distro/include/default-providers.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:2: including conf/distro/include/default-versions.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:3: including conf/distro/include/default-distrovars.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:4: including conf/distro/include/world-broken.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:7: including conf/distro/include/tcmode-default.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:10: including conf/distro/include/tclibc-glibc.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:12: including conf/distro/include/uninative-flags.inc
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:755: including conf/documentation.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:756: including conf/licenses.conf
+DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:757: including conf/sanity.conf
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:4)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/terminal.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass:11)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/staging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:5)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/mirrors.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:7)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utils.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:8)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utility-tasks.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:9)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/metadata_scm.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:10)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/logging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:11)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass:1)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/packagedata.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:41)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/chrpath.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:42)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/insane.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:45)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/buildstats.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/linuxloader.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass:5)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-prelink.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/debian.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/devshell.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sstate.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/license.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/remove-libtool.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/blacklist.bbclass (from configuration INHERITs:0)
+DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sanity.bbclass (from configuration INHERITs:0)
+DEBUG: Clearing SRCREV cache due to cache policy of: clear
+DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/local_file_checksum_cache.dat'
+DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/bb_codeparser.dat'
+Entering server connection loop
+Accepting [<socket.socket fd=7, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>]
+Connecting Client
+Running command ['setFeatures', [2]]
+Running command ['updateConfig', {'abort': True, 'force': False, 'invalidate_stamp': None, 'verbose': False, 'debug': 0, 'dry_run': False, 'dump_signatures': [], 'debug_domains': [], 'extra_assume_provided': [], 'profile': False, 'prefile': [], 'postfile': [], 'server_timeout': None}, {'HTTP_PROXY': 'http://proxy-us.intel.com:911/', 'USER': 'ttorling', 'FTP_PROXY': 'http://proxy.jf.intel.com:1080/', 'PWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl', 'HOME': '/home/ttorling', 'BBPATH': '/var/build/build-timo-perl-5.28.0', 'https_proxy': 'https://proxy-us.intel.com:912/', 'http_proxy': 'http://proxy-us.intel.com:911/', 'BB_ENV_EXTRAWHITE': 'ALL_PROXY BBPATH_EXTRA BB_NO_NETWORK BB_NUMBER_THREADS BB_SETSCENE_ENFORCE BB_SRCREV_POLICY DISTRO FTPS_PROXY FTP_PROXY GIT_PROXY_COMMAND HTTPS_PROXY HTTP_PROXY MACHINE NO_PROXY PARALLEL_MAKE SCREENDIR SDKMACHINE SOCKS5_PASSWD SOCKS5_USER SSH_AGENT_PID SSH_AUTH_SOCK STAMPS_DIR TCLIBC TCMODE all_proxy ftp_proxy ftps_proxy http_proxy https_proxy no_proxy ', 'ALL_PROXY': 'socks://proxy-us.intel.com:1080/', 'no_proxy': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'NO_PROXY': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'GIT_PROXY_COMMAND': '/usr/bin/oe-git-proxy', 'HTTPS_PROXY': 'https://proxy-us.intel.com:912/', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'all_proxy': 'socks://proxy-us.intel.com:1080/', 'LOGNAME': 'ttorling', 'PATH': '/home/ttorling/Projects/openembedded-core/scripts:/home/ttorling/Projects/bitbake/bin:/usr/libexec/python3-sphinx:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ttorling/.local/bin:/home/ttorling/bin', 'ftp_proxy': 'http://proxy-us.intel.com:1080/', 'LC_ALL': 'en_US.UTF-8', 'LS_COLORS': 'no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.hpp=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.cl=32:*.sh=32:*.bash=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.go=32:*.sql=32:*.csv=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.PNG=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.m4a=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.opus=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.MOV=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.webm=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.odt=31:*.dot=31:*.dotx=31:*.ott=31:*.xls=31:*.xlsx=31:*.ods=31:*.ots=31:*.ppt=31:*.pptx=31:*.odp=31:*.otp=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:*.sqlite=34:', 'SSH_CONNECTION': '10.254.107.201 59657 10.54.74.39 22', 'LANG': 'en_US.UTF-8', 'HISTCONTROL': 'ignoredups', 'GUESTFISH_RESTORE': '\\e[0m', 'HOSTNAME': 'chiron.jf.intel.com', 'OLDPWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl/debian', 'GUESTFISH_INIT': '\\e[1;34m', 'XDG_SESSION_ID': '4715', 'GUESTFISH_PS1': '\\[\\e[1;32m\\]><fs>\\[\\e[0;31m\\] ', 'SELINUX_ROLE_REQUESTED': '', 'SSH_CLIENT': '10.254.107.201 59657 22', 'SELINUX_LEVEL_REQUESTED': '', 'XDG_DATA_DIRS': '/home/ttorling/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share', 'LOADEDMODULES': 'python-sphinx/python3-sphinx', 'BUILDDIR': '/var/build/build-timo-perl-5.28.0', 'SSH_TTY': '/dev/pts/5', 'MAIL': '/var/spool/mail/ttorling', 'SOCKS_PROXY': 'socks://proxy-us.intel.com:1080/', 'socks_proxy': 'socks://proxy-us.intel.com:1080/', 'SELINUX_USE_CURRENT_RANGE': '', 'SHLVL': '1', 'MODULEPATH': '/etc/scl/modulefiles:/usr/share/Modules/modulefiles:/etc/modulefiles:/usr/share/modulefiles', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', 'XDG_RUNTIME_DIR': '/run/user/1000', '_LMFILES_': '/usr/share/modulefiles/python-sphinx/python3-sphinx', 'GUESTFISH_OUTPUT': '\\e[0m', 'MODULESHOME': '/usr/share/Modules', 'HISTSIZE': '1000', 'LESSOPEN': '||/usr/bin/lesspipe.sh %s', 'BASH_FUNC_module%%': '() { eval `/usr/bin/modulecmd bash $*`\n}', 'BASH_FUNC_scl%%': '() { if [ "$1" = "load" -o "$1" = "unload" ]; then\n eval "module $@";\n else\n /usr/bin/scl "$@";\n fi\n}', '_': '/home/ttorling/Projects/bitbake/bin/bitbake'}, ['/home/ttorling/Projects/bitbake/bin/bitbake', 'perl-native']]
+Running command ['getVariable', 'BBINCLUDELOGS']
+Running command ['getVariable', 'BBINCLUDELOGS_LINES']
+Running command ['getSetVariable', 'BB_CONSOLELOG']
+Running command ['getUIHandlerNum']
+Running command ['setEventMask', 1, 20, {}, ['bb.runqueue.runQueueExitWait', 'bb.event.LogExecTTY', 'logging.LogRecord', 'bb.build.TaskFailed', 'bb.build.TaskBase', 'bb.event.ParseStarted', 'bb.event.ParseProgress', 'bb.event.ParseCompleted', 'bb.event.CacheLoadStarted', 'bb.event.CacheLoadProgress', 'bb.event.CacheLoadCompleted', 'bb.command.CommandFailed', 'bb.command.CommandExit', 'bb.command.CommandCompleted', 'bb.cooker.CookerExit', 'bb.event.MultipleProviders', 'bb.event.NoProvider', 'bb.runqueue.sceneQueueTaskStarted', 'bb.runqueue.runQueueTaskStarted', 'bb.runqueue.runQueueTaskFailed', 'bb.runqueue.sceneQueueTaskFailed', 'bb.event.BuildBase', 'bb.build.TaskStarted', 'bb.build.TaskSucceeded', 'bb.build.TaskFailedSilent', 'bb.build.TaskProgress', 'bb.event.ProcessStarted', 'bb.event.ProcessProgress', 'bb.event.ProcessFinished']]
+Running command ['getVariable', 'BB_DEFAULT_TASK']
+Running command ['setConfig', 'cmd', 'build']
+Running command ['buildTargets', ['perl-native'], 'build']
+Connecting Client
+Disconnecting Client
+No timeout, exiting.
+Exiting
diff --git a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
index 33e222259f..0894214e45 100644
--- a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
+++ b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
@@ -1,10 +1,19 @@
+From 4ea95a0ffb3d602031f3a4df5beb6589591ca0e7 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Wed, 19 Oct 2011 14:53:17 -0700
+Subject: [PATCH] perl: upgrade from 5.12.3 to 5.14.2
+
Upstream-Status:Inappropriate [embedded specific]
-Index: perl-5.24.1/Makefile.SH
-===================================================================
---- perl-5.24.1.orig/Makefile.SH
-+++ perl-5.24.1/Makefile.SH
-@@ -710,7 +710,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_E
+---
+ Makefile.SH | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.SH b/Makefile.SH
+index c6aaf02..e7e3324 100755
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -729,7 +729,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_EXT)
$spitshell >>$Makefile <<'!NO!SUBS!'
generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
diff --git a/meta/recipes-devtools/perl/perl/debian/configure-regen.diff b/meta/recipes-devtools/perl/perl/debian/configure-regen.diff
new file mode 100644
index 0000000000..8c8332eb59
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/configure-regen.diff
@@ -0,0 +1,128 @@
+From c4aff15e74aa3e49190893bd18c8a07221806cd3 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 14 Oct 2017 17:47:09 +0300
+Subject: Regenerate Configure et al. after probe unit changes
+
+The config_h.SH reordering seems unavoidable but one time only, and also
+propagates to uconfig.h.
+
+Patch-Name: debian/configure-regen.diff
+Bug-Debian: https://bugs.debian.org/762638
+---
+ Configure | 14 ++++++++++----
+ config_h.SH | 14 +++++++-------
+ uconfig.h | 16 ++++++++--------
+ 3 files changed, 25 insertions(+), 19 deletions(-)
+
+diff --git a/Configure b/Configure
+index bdcfaf17ef..47e2d3d4ed 100755
+--- a/Configure
++++ b/Configure
+@@ -1497,8 +1497,7 @@ archname=''
+ usereentrant='undef'
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="cl pthread socket bind inet nsl 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 ! !'`
+@@ -11127,8 +11126,15 @@ $cat >attrib.c <<EOCP
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#$i_inttypes I_INTTYPES
++#ifdef I_INTTYPES
++#include <inttypes.h>
++#endif
++#ifndef INTPTR_MAX
++#define intptr_t int
++#endif
+ int null_printf (char* pat,...) __attribute__((__format__(__printf__,1,2)));
+-int null_printf (char* pat,...) { return (int)pat; }
++int null_printf (char* pat,...) { return (int)(intptr_t)pat; }
+ int main () { exit(null_printf(NULL)); }
+ EOCP
+ if $cc $ccflags -o attrib attrib.c >attrib.out 2>&1 ; then
+@@ -24254,7 +24260,7 @@ sunos*X4*)
+ ;;
+ *) case "$usedl" in
+ $define|true|[yY]*)
+- set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
++ set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'`
+ shift
+ perllibs="$*"
+ ;;
+diff --git a/config_h.SH b/config_h.SH
+index e9b144f02b..a294c29cb0 100755
+--- a/config_h.SH
++++ b/config_h.SH
+@@ -571,6 +571,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
+ */
+ #$d_strcoll HAS_STRCOLL /**/
+
++/* USE_STRUCT_COPY:
++ * This symbol, if defined, indicates that this C compiler knows how
++ * to copy structures. If undefined, you'll need to use a block copy
++ * routine of some sort instead.
++ */
++#$d_strctcpy USE_STRUCT_COPY /**/
++
+ /* HAS_STRTOD:
+ * This symbol, if defined, indicates that the strtod routine is
+ * available to provide better numeric string conversion than atof().
+@@ -2175,13 +2182,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
+ #$d_statblks USE_STAT_BLOCKS /**/
+ #endif
+
+-/* USE_STRUCT_COPY:
+- * This symbol, if defined, indicates that this C compiler knows how
+- * to copy structures. If undefined, you'll need to use a block copy
+- * routine of some sort instead.
+- */
+-#$d_strctcpy USE_STRUCT_COPY /**/
+-
+ /* HAS_STRERROR:
+ * This symbol, if defined, indicates that the strerror routine is
+ * available to translate error numbers to strings. See the writeup
+diff --git a/uconfig.h b/uconfig.h
+index 6832f6f73d..a5cd2dd44e 100644
+--- a/uconfig.h
++++ b/uconfig.h
+@@ -536,6 +536,13 @@
+ */
+ /*#define HAS_STRCOLL / **/
+
++/* USE_STRUCT_COPY:
++ * This symbol, if defined, indicates that this C compiler knows how
++ * to copy structures. If undefined, you'll need to use a block copy
++ * routine of some sort instead.
++ */
++/*#define USE_STRUCT_COPY / **/
++
+ /* HAS_STRTOD:
+ * This symbol, if defined, indicates that the strtod routine is
+ * available to provide better numeric string conversion than atof().
+@@ -2140,13 +2147,6 @@
+ /*#define USE_STAT_BLOCKS / **/
+ #endif
+
+-/* USE_STRUCT_COPY:
+- * This symbol, if defined, indicates that this C compiler knows how
+- * to copy structures. If undefined, you'll need to use a block copy
+- * routine of some sort instead.
+- */
+-/*#define USE_STRUCT_COPY / **/
+-
+ /* HAS_STRERROR:
+ * This symbol, if defined, indicates that the strerror routine is
+ * available to translate error numbers to strings. See the writeup
+@@ -5354,6 +5354,6 @@
+ #endif
+
+ /* Generated from:
+- * a0cea6273c16c1c5d8625665c84bda01926ce960c26873d4e5596b5b02a53e92 config_h.SH
++ * 28ca1428da5d95db9e1c446562e21f67c6f2d4094eed684418c6854460c8a926 config_h.SH
+ * b1c042726e6a17692921b6947c4e7c196c5c0cee011667ba719b15af7c31e669 uconfig.sh
+ * ex: set ro: */
diff --git a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
index c597701cad..e21e9b7d51 100644
--- a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
@@ -1,8 +1,8 @@
-From d33d46963035ef726144dc66be2ae9c00aec0333 Mon Sep 17 00:00:00 2001
+From f78d2c2b3f3db6bcdcaca696abd800759740812b 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
- is writable
+Subject: [PATCH] Fix CPAN::FirstTime defaults with nonexisting site dirs if a
+ parent is writable
The site directories do not exist on a typical Debian system. The build
systems will create them when necessary, so there's no need for a prompt
@@ -13,16 +13,16 @@ explicitly tell CPAN not to touch those with INSTALLDIRS=site.
Bug-Debian: http://bugs.debian.org/688842
Patch-Name: debian/cpan-missing-site-dirs.diff
-Upstream-Status: Pending
+
---
cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 33054cd..7b0becf 100644
+index 3ccaeec..05d8910 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -2057,11 +2057,34 @@ sub _print_urllist {
+@@ -2067,11 +2067,34 @@ sub _print_urllist {
};
}
diff --git a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
index 572f149514..2ceb6e762b 100644
--- a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
@@ -1,24 +1,24 @@
-From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001
+From bff3929ba9f07af375c9387c6ebb8d0a37f63cdb 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
- CPAN.
+Subject: [PATCH] Provide a sensible INSTALLDIRS default for modules installed
+ from CPAN.
Some modules which are included in core set INSTALLDIRS => 'perl'
explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC
ordering, but not ours.
Patch-Name: debian/cpan_definstalldirs.diff
-Upstream-Status: Pending
+
---
cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 918e009..33054cd 100644
+index 531c115..3ccaeec 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -1024,7 +1024,7 @@ sub init {
+@@ -1033,7 +1033,7 @@ sub init {
my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
@@ -27,7 +27,7 @@ index 918e009..33054cd 100644
my_dflt_prompt(make_arg => "", $matcher);
if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
$CPAN::Frontend->mywarn(
-@@ -1056,7 +1056,7 @@ sub init {
+@@ -1065,7 +1065,7 @@ sub init {
my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
$matcher);
diff --git a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
index 0861650eb6..d40af19898 100644
--- a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
+++ b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
@@ -1,14 +1,14 @@
-From 01421f8a80d5c623959695ba2b8167f30112d333 Mon Sep 17 00:00:00 2001
+From 2d2d34408d389fa9bf2047611dac19fa26b229ea 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.
+Subject: [PATCH] Remove overly restrictive DB_File version check.
Bug-Debian: http://bugs.debian.org/340047
Package dependencies ensure the correct library is linked at run-time.
Patch-Name: debian/db_file_ver.diff
-Upstream-Status: Pending
+
---
cpan/DB_File/version.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
index c2ac4a3bdf..8af38af4e3 100644
--- a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
+++ b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
@@ -1,7 +1,7 @@
-From def4aa3817f98aae625e601b791ef068276f05d5 Mon Sep 17 00:00:00 2001
+From 30e7d8d6deee25eaa998523b91b87ae769babd87 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
+Subject: [PATCH] Point users to Debian packages of deprecated core modules
Bug-Debian: http://bugs.debian.org/747628
@@ -15,7 +15,7 @@ warnings will still be useful, so modify them slightly to point to the
separate packages instead.
Patch-Name: debian/deprecate-with-apt.diff
-Upstream-Status: Pending
+
---
lib/deprecate.pm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/perl/perl/debian/doc_info.diff b/meta/recipes-devtools/perl/perl/debian/doc_info.diff
index 4662ecdaa7..1ae394e133 100644
--- a/meta/recipes-devtools/perl/perl/debian/doc_info.diff
+++ b/meta/recipes-devtools/perl/perl/debian/doc_info.diff
@@ -1,21 +1,22 @@
-From e18f81e69c55d698abd293e71063d6b6b275cc07 Mon Sep 17 00:00:00 2001
+From 4ae088472565a6a1a8792f923c6600705edde6e3 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.
+Subject: [PATCH] Replace generic man(1) instructions with Debian-specific
+ information.
Indicate that the user needs to install the perl-doc package.
Patch-Name: debian/doc_info.diff
-Upstream-Status: Pending
+
---
pod/perl.pod | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pod/perl.pod b/pod/perl.pod
-index 364e957..f97e103 100644
+index 4e4661e..d21cfe9 100644
--- a/pod/perl.pod
+++ b/pod/perl.pod
-@@ -291,8 +291,16 @@ aux c2ph h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp
+@@ -292,8 +292,16 @@ aux h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp
=for buildtoc __END__
diff --git a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
index b3bd58c1d1..0bbc47f7ca 100644
--- a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
@@ -1,7 +1,8 @@
-From 7fe59a3d0601c6d8634eae4f99dae3024cd02a92 Mon Sep 17 00:00:00 2001
+From 78240dfe28febc268010675de335d1bdafd9a303 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.
+Subject: [PATCH] Tweak enc2xs to follow symlinks and ignore missing @INC
+ directories.
Bug-Debian: http://bugs.debian.org/290336
@@ -11,17 +12,17 @@ Bug-Debian: http://bugs.debian.org/290336
issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
Patch-Name: debian/enc2xs_inc.diff
-Upstream-Status: Pending
+
---
cpan/Encode/bin/enc2xs | 8 ++++----
t/porting/customized.t | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index 19f2b2b..4d64e38 100644
+index bd39639..e467518 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
-@@ -944,11 +944,11 @@ use vars qw(
+@@ -1013,11 +1013,11 @@ use vars qw(
sub find_e2x{
eval { require File::Find; };
my (@inc, %e2x_dir);
@@ -35,7 +36,7 @@ index 19f2b2b..4d64e38 100644
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks)
= lstat($_) or return;
-@@ -958,7 +958,7 @@ sub find_e2x{
+@@ -1027,7 +1027,7 @@ sub find_e2x{
$e2x_dir{$File::Find::dir} ||= $mtime;
}
return;
@@ -44,7 +45,7 @@ index 19f2b2b..4d64e38 100644
warn join("\n", keys %e2x_dir), "\n";
for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
$_E2X = $d;
-@@ -1025,7 +1025,7 @@ sub make_configlocal_pm {
+@@ -1094,7 +1094,7 @@ sub make_configlocal_pm {
$LocalMod{$enc} ||= $mod;
}
};
diff --git a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
index a965fbeeec..1c7e9c194c 100644
--- a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
+++ b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
@@ -1,7 +1,7 @@
-From 8e1efba7560d8d55524c7a0f1b0539ddce419b86 Mon Sep 17 00:00:00 2001
+From e055c5df42111f672a66f314a86d0068a24c070c Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 16 Dec 2005 01:32:14 +1100
-Subject: [PATCH 6/8] Remove Errno version check due to upgrade problems with
+Subject: [PATCH] Remove Errno version check due to upgrade problems with
long-running processes.
Bug-Debian: http://bugs.debian.org/343351
@@ -11,27 +11,35 @@ processes embedding perl when upgrading to a newer version,
compatible, but built on a different machine.
Patch-Name: debian/errno_ver.diff
-Upstream-Status: Pending
+
---
- ext/Errno/Errno_pm.PL | 5 -----
- 1 file changed, 5 deletions(-)
+ ext/Errno/Errno_pm.PL | 16 ----------------
+ 1 file changed, 16 deletions(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 6251a3c..eeed445 100644
+index d345e98..4464706 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
-@@ -294,11 +294,6 @@ EDQ
- # they've already declared perl doesn't need to worry about this risk.
- if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) {
- print <<"CONFIG_CHECK_END";
+@@ -288,22 +288,6 @@ package Errno;
+ require Exporter;
+ use strict;
+
+-EDQ
+-
+- # Errno only needs Config to make sure it hasn't changed platforms.
+- # If someone set $ENV{PERL_BUILD_EXPAND_CONFIG_VARS} at build time,
+- # they've already declared perl doesn't need to worry about this risk.
+- if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) {
+- print <<"CONFIG_CHECK_END";
-use Config;
-"\$Config{'archname'}-\$Config{'osvers'}" eq
-"$archname-$Config{'osvers'}" or
- die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
-
- CONFIG_CHECK_END
- }
-
---
-2.1.4
-
+-CONFIG_CHECK_END
+-}
+-
+- print <<"EDQ";
+ our \$VERSION = "$VERSION";
+ \$VERSION = eval \$VERSION;
+ our \@ISA = 'Exporter';
diff --git a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
index e023038f04..607a2d8d06 100644
--- a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
@@ -1,23 +1,22 @@
-From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001
+From cef4125d1c553d7cb3ce9589f9c89f7171281b30 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
+Subject: [PATCH] EU:MM: set location of libperl.a under /usr/lib
The Debian packaging moves libperl.a a couple of levels up from the
CORE directory to match other static libraries.
Patch-Name: debian/extutils_set_libperl_path.diff
-Upstream-Status: Pending
+
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
- pp.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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 5f1b87f..570a631 100644
+index 66a24d7..3fe8dc2 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2505,7 +2505,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
+@@ -2613,7 +2613,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
}
unless ($libperl && -f $lperl) { # Ilya's code...
@@ -26,13 +25,3 @@ index 5f1b87f..570a631 100644
$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
$libperl ||= "libperl$self->{LIB_EXT}";
$libperl = "$dir/$libperl";
-diff --git a/pp.c b/pp.c
-index 42f156a..77c1279 100644
---- a/pp.c
-+++ b/pp.c
-@@ -1,4 +1,4 @@
--/* pp.c
-+ /* pp.c
- *
- * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others
diff --git a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
index bdf34d1859..d05baa28f9 100644
--- a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
+++ b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
@@ -1,7 +1,7 @@
-From 27ae7b18078d801a2c943aa6de2f7e9808177251 Mon Sep 17 00:00:00 2001
+From b451ca3a34e76b69e791e1d5cd1621edb0496e0d 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.
+Subject: [PATCH] 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.
@@ -11,16 +11,16 @@ 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
-Upstream-Status: Pending
+
---
Makefile.SH | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile.SH b/Makefile.SH
-index 034d812..04dd7d5 100755
+index 260d04e..c6aaf02 100755
--- a/Makefile.SH
+++ b/Makefile.SH
-@@ -39,10 +39,7 @@ case "$useshrplib" in
+@@ -48,10 +48,7 @@ case "$useshrplib" in
true)
# Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl.
@@ -32,7 +32,7 @@ index 034d812..04dd7d5 100755
pldlflags="$cccdlflags"
static_ldflags=''
-@@ -113,7 +110,7 @@ true)
+@@ -122,7 +119,7 @@ true)
;;
esac
case "$ldlibpthname" in
diff --git a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
index 082709140d..34ed6b4d18 100644
--- a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
+++ b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
@@ -1,7 +1,7 @@
-From c81dbdedff9e9b4fb75ac028aa718838c0292d2f Mon Sep 17 00:00:00 2001
+From 21186d6d1fa87b0e5c9513aaaf7536769965c50b 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
+Subject: [PATCH] Configure CPAN::Distribution with correct name of html2text
Bug-Debian: http://bugs.debian.org/640479
Patch-Name: debian/find_html2text.diff
@@ -16,16 +16,16 @@ Please see the attached patch for a quick fix of this issue.
[Maintainer's note: html2text in Debian is not the same implementation
as the html2text.pl which is expected, but should provide similar
functionality].
-Upstream-Status: Pending
+
---
cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
-index 092b781..5c2bae1 100644
+index 64976eb..aef3070 100644
--- a/cpan/CPAN/lib/CPAN/Distribution.pm
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
-@@ -4099,7 +4099,7 @@ sub _display_url {
+@@ -4098,7 +4098,7 @@ sub _display_url {
if $CPAN::DEBUG;
# should we define it in the config instead?
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
deleted file mode 100644
index afcf7fb012..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-Bug-Debian: http://bugs.debian.org/100195
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
-
-Patch-Name: fixes/net_smtp_docs.diff
-Upstream-Status: Pending
----
- cpan/libnet/lib/Net/SMTP.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-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
-
-+B<Port> - Select a port on the remote host to connect to (default is 25)
-
- Example:
-
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff b/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
deleted file mode 100644
index 9bdf41b47d..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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
deleted file mode 100644
index d23573f188..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
+++ /dev/null
@@ -1,171 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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
deleted file mode 100644
index 9de29b8654..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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
deleted file mode 100644
index d8858d8a69..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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
deleted file mode 100644
index b6ae409ac0..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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
deleted file mode 100644
index 3fb7c20dde..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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/debian/hppa_op_optimize_workaround.diff b/meta/recipes-devtools/perl/perl/debian/hppa_op_optimize_workaround.diff
new file mode 100644
index 0000000000..7da2f75f44
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/hppa_op_optimize_workaround.diff
@@ -0,0 +1,35 @@
+From 56ec0748c4aab7b4b704f226dfea508d404a6a27 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 25 Sep 2016 09:59:22 +0200
+Subject: [PATCH] Temporarily lower the optimization of op.c on hppa due to
+ gcc-6 problems
+
+This fixes a crash in ext/XS-APItest/t/customop.t
+
+It's currently unclear if the problem is with the code or the
+gcc-6 optimizer.
+
+Bug-Debian: https://bugs.debian.org/838613
+Patch-Name: debian/hppa_op_optimize_workaround.diff
+
+---
+ cflags.SH | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cflags.SH b/cflags.SH
+index 3af1e97..7a57d7e 100755
+--- a/cflags.SH
++++ b/cflags.SH
+@@ -493,6 +493,12 @@ for file do
+ # or customize here
+
+ case "$file" in
++ op) : work around http://bugs.debian.org/838613
++ case $archname in
++ hppa-*)
++ optimize="$optimize -O0";;
++ esac;;
++
+ regcomp) : work around http://bugs.debian.org/754054
+ case $archname in
+ mips-*|mipsel-*)
diff --git a/meta/recipes-devtools/perl/perl/debian/hppa_opmini_optimize_workaround.diff b/meta/recipes-devtools/perl/perl/debian/hppa_opmini_optimize_workaround.diff
new file mode 100644
index 0000000000..0e3406d95e
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/hppa_opmini_optimize_workaround.diff
@@ -0,0 +1,28 @@
+From 4504a9bbc3802a6aa32b1a3e89644ae2865cb82a Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 29 Jul 2017 23:30:20 +0300
+Subject: Lower the optimization level of opmini.c on hppa
+
+This further amends debian/hppa_op_optimize_workaround.diff to affect
+miniperl too.
+
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81538
+Bug-Debian: https://bugs.debian.org/869122
+Patch-Name: debian/hppa_opmini_optimize_workaround.diff
+---
+ cflags.SH | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cflags.SH b/cflags.SH
+index 7a57d7e0cd..ae3b1e88f0 100755
+--- a/cflags.SH
++++ b/cflags.SH
+@@ -493,7 +493,7 @@ for file do
+ # or customize here
+
+ case "$file" in
+- op) : work around http://bugs.debian.org/838613
++ op|opmini) : work around http://bugs.debian.org/838613 and 869122
+ case $archname in
+ hppa-*)
+ optimize="$optimize -O0";;
diff --git a/meta/recipes-devtools/perl/perl/debian/hurd-softupdates.diff b/meta/recipes-devtools/perl/perl/debian/hurd-softupdates.diff
new file mode 100644
index 0000000000..0f96064dae
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/hurd-softupdates.diff
@@ -0,0 +1,26 @@
+From 9d0eb16b542f93325ecd0d69a11d50d202c9823e Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Thu, 28 Apr 2016 16:31:39 +0300
+Subject: Fix t/op/stat.t failures on hurd
+
+We already do this on GNU/kFreeBSD, and GNU/Hurd seems to need same
+treatment.
+
+Bug-Debian: https://bugs.debian.org/822735
+Patch-Name: debian/hurd-softupdates.diff
+---
+ t/op/stat.t | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/t/op/stat.t b/t/op/stat.t
+index ce86a74510..71888ee292 100644
+--- a/t/op/stat.t
++++ b/t/op/stat.t
+@@ -98,6 +98,7 @@ print FOO "Now is the time for all good men to come to.\n";
+ close(FOO);
+
+ stat($tmpfile) if $^O =~ /^gnukfreebsd/; # Work around Debian Bug#796798
++stat($tmpfile) if $^O eq 'gnu'; # Work around Debian Bug#822735
+ sleep 2;
+
+ my $has_link = 1;
diff --git a/meta/recipes-devtools/perl/perl/debian/installman-utf8.diff b/meta/recipes-devtools/perl/perl/debian/installman-utf8.diff
new file mode 100644
index 0000000000..0e81101dbc
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/installman-utf8.diff
@@ -0,0 +1,29 @@
+From 5e0c34139bbd577b09522056cbdf4812275eb757 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 19 Nov 2016 21:30:46 +0200
+Subject: [PATCH] Generate man pages with UTF-8 characters
+
+This fixes totally incorrectly rendered manual pages like
+perlunicook and perltw.
+
+TODO: should probably be a Configure option for proper upstreaming.
+
+Bug-Debian: https://bugs.debian.org/840211
+Patch-Name: debian/installman-utf8.diff
+
+---
+ installman | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/installman b/installman
+index 53117ab..80d9bc4 100755
+--- a/installman
++++ b/installman
+@@ -153,6 +153,7 @@ sub pod2man {
+ $manpage = "${mandir}/${manpage}.${manext}";
+
+ my $parser = Pod::Man->new( section => $manext,
++ utf8 => 1,
+ official=> 1,
+ center => 'Perl Programmers Reference Guide'
+ );
diff --git a/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
index 7e1fd697ca..54da8ed3ad 100644
--- a/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
@@ -1,19 +1,20 @@
-From 26209b55201a1b2d25252ac3b425bc49081299de Mon Sep 17 00:00:00 2001
+From df3d9049911ae55da5685552ca9157225fbe2779 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.
+Subject: [PATCH] Debian policy doesn't install .packlist files for core or
+ vendor.
Patch-Name: debian/instmodsh_doc.diff
-Upstream-Status: Pending
+
---
cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-index 8b9aa95..e551434 100644
+index ab0f9d1..b3b109f 100644
--- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-@@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules
+@@ -19,9 +19,11 @@ instmodsh - A shell to examine installed modules
=head1 DESCRIPTION
diff --git a/meta/recipes-devtools/perl/perl/debian/kfreebsd-softupdates.diff b/meta/recipes-devtools/perl/perl/debian/kfreebsd-softupdates.diff
new file mode 100644
index 0000000000..a90e898551
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/kfreebsd-softupdates.diff
@@ -0,0 +1,30 @@
+From 26b9d3f89e9fc4eb22977d12bc9116588ea50769 Mon Sep 17 00:00:00 2001
+From: Steven Chamberlain <steven@pyro.eu.org>
+Date: Thu, 17 Dec 2015 02:15:58 +0000
+Subject: [PATCH] Work around Debian Bug#796798
+
+kFreeBSD 10 (possibly only with softupdates enabled) may defer
+calculating the mtime for more than 2 seconds. Work around this
+with a stat() call to calculate the mtime immediately.
+
+(Modified to only stat() on kfreebsd by Niko Tyni)
+
+Bug-Debian: https://bugs.debian.org/796798
+Patch-Name: debian/kfreebsd-softupdates.diff
+
+---
+ t/op/stat.t | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/t/op/stat.t b/t/op/stat.t
+index 323c498..ce86a74 100644
+--- a/t/op/stat.t
++++ b/t/op/stat.t
+@@ -97,6 +97,7 @@ sleep 3 if $funky_FAT_timestamps;
+ print FOO "Now is the time for all good men to come to.\n";
+ close(FOO);
+
++stat($tmpfile) if $^O =~ /^gnukfreebsd/; # Work around Debian Bug#796798
+ sleep 2;
+
+ my $has_link = 1;
diff --git a/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
index ff0b2871f6..9856ee2ea0 100644
--- a/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
@@ -1,19 +1,19 @@
-From 53ce69085918232a1b7e26e7762c1b2f70b1eb4a Mon Sep 17 00:00:00 2001
+From 3f992301ce68a43cb513aceb2cc3eb30b3d1c69d 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.
+Subject: [PATCH] Remove standard libs from LD_RUN_PATH as per Debian policy.
Patch-Name: debian/ld_run_path.diff
-Upstream-Status: Pending
+
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++
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 37bcfd4..bd66e65 100644
+index a7fae86..4491989 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 {
+@@ -57,6 +57,9 @@ sub _unix_os2_ext {
my ( $pwd ) = cwd(); # from Cwd.pm
my ( $found ) = 0;
diff --git a/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
index d5347422dc..44a17d0f03 100644
--- a/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
+++ b/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
@@ -1,20 +1,20 @@
-From a7f6d453e60256d329469a75b642cca854cebea1 Mon Sep 17 00:00:00 2001
+From a2a02002f9578f7ff2980f0573c5c3d1c73e3f06 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
- writable.
+Subject: [PATCH] Set location of libnet.cfg to /etc/perl/Net as /usr may not
+ be writable.
Patch-Name: debian/libnet_config_path.diff
-Upstream-Status: Pending
+
---
cpan/libnet/lib/Net/Config.pm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
-index 953a826..61ba12a 100644
+index a593538..d27ef54 100644
--- a/cpan/libnet/lib/Net/Config.pm
+++ b/cpan/libnet/lib/Net/Config.pm
-@@ -68,9 +68,8 @@ my %nc = (
+@@ -74,9 +74,8 @@ my %nc = (
TRY_INTERNET_CONFIG
}
@@ -25,7 +25,7 @@ index 953a826..61ba12a 100644
if (-f $file) {
$ref = eval { local $SIG{__DIE__}; do $file };
if (ref($ref) eq 'HASH') {
-@@ -142,8 +141,8 @@ Net::Config - Local configuration data for libnet
+@@ -148,8 +147,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/debian/libperl_embed_doc.diff b/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
index 0cdc0d3e39..baadaaf39b 100644
--- a/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
+++ b/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
@@ -1,18 +1,19 @@
-From fb8bdbb4bf56382de099e62c2564286b9dfda46d Mon Sep 17 00:00:00 2001
+From 8683b38412c01e4a28cfd145a0e386c0b68a022d 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
+Subject: [PATCH] Note that libperl-dev package is required for embedded
+ linking
Bug-Debian: http://bugs.debian.org/186778
Patch-Name: debian/libperl_embed_doc.diff
-Upstream-Status: Pending
+
---
lib/ExtUtils/Embed.pm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
-index 3f983c1..0ec8a67 100644
+index b26bf73..d4b662f 100644
--- a/lib/ExtUtils/Embed.pm
+++ b/lib/ExtUtils/Embed.pm
@@ -296,6 +296,9 @@ and extensions in your C/C++ applications.
diff --git a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff b/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
deleted file mode 100644
index 7cf1242c0a..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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-manext.diff b/meta/recipes-devtools/perl/perl/debian/makemaker-manext.diff
new file mode 100644
index 0000000000..cef6416486
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/makemaker-manext.diff
@@ -0,0 +1,32 @@
+From a4d2ea54a83a55999845b2f36d3f2664a4ef1f87 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Wed, 1 Jul 2015 22:23:53 +0300
+Subject: [PATCH] Make EU::MakeMaker honour MANnEXT settings in generated
+ manpage headers
+
+This was inherited from early changes by Brendan O'Dea, previously
+(accidentally) in debian/prefix_changes.diff and before that in
+debian/extutils_hacks.diff
+
+Patch-Name: debian/makemaker-manext.diff
+Bug-Debian: https://bugs.debian.org/247370
+
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+index 433a8dd..22e9e7b 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+@@ -1079,8 +1079,8 @@ END
+ my @man_cmds;
+ foreach my $section (qw(1 3)) {
+ my $pods = $self->{"MAN${section}PODS"};
+- my $p2m = sprintf <<'CMD', $section, $] > 5.008 ? " -u" : "";
+- $(NOECHO) $(POD2MAN) --section=%s --perm_rw=$(PERM_RW)%s
++ my $p2m = sprintf <<CMD, $] > 5.008 ? " -u" : "";
++ \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)%s
+ CMD
+ push @man_cmds, $self->split_command($p2m, map {($_,$pods->{$_})} sort keys %$pods);
+ }
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff b/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
index 5f07180893..c2b00be8da 100644
--- a/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
+++ b/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
@@ -1,7 +1,7 @@
-From 593dd52f535b1f439dfd0afe52211ae8960e980a Mon Sep 17 00:00:00 2001
+From 372c6c6e2708e53de27d24c8ca600405848a64d2 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
+Subject: [PATCH] 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
@@ -11,16 +11,16 @@ the PASTHRU list fixes this.
Bug-Debian: https://bugs.debian.org/758471
Patch-Name: debian/makemaker-pasthru.diff
-Upstream-Status: Pending
+
---
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
+index 3fe8dc2..8ea92e5 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 {
+@@ -2947,7 +2947,7 @@ sub pasthru {
my($sep) = $Is{VMS} ? ',' : '';
$sep .= "\\\n\t";
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff b/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
deleted file mode 100644
index d870b608cf..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
index 7e22484038..8a2b32482f 100644
--- a/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
+++ b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
@@ -1,7 +1,7 @@
-From 6c6cf14e204f3c031372bfd9604ad524d5691186 Mon Sep 17 00:00:00 2001
+From 9e4a1c99eb3972be704cff277e31a4775f53407d 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
+Subject: [PATCH] Tweak @INC ordering for Debian
Our order is:
@@ -16,17 +16,19 @@ The rationale being that an admin (via site), or module packager
(vendor) can chose to shadow core modules when there is a newer
version than is included in core.
+(later updates by Niko Tyni)
+
Patch-Name: debian/mod_paths.diff
-Upstream-Status: Pending
+
---
perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/perl.c b/perl.c
-index 086645b..e64f1f4 100644
+index 384b294..0fef608 100644
--- a/perl.c
+++ b/perl.c
-@@ -4373,6 +4373,11 @@ S_init_perllib(pTHX)
+@@ -4526,6 +4526,11 @@ S_init_perllib(pTHX)
INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
#endif
@@ -38,7 +40,7 @@ index 086645b..e64f1f4 100644
#ifdef SITEARCH_EXP
/* sitearch is always relative to sitelib on Windows for
* DLL-based path intuition to work correctly */
-@@ -4490,6 +4495,59 @@ S_init_perllib(pTHX)
+@@ -4643,6 +4648,59 @@ S_init_perllib(pTHX)
INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
#endif
@@ -77,16 +79,16 @@ index 086645b..e64f1f4 100644
+ subdirectory of sitelib */
+ for (p = vers; *p; p++)
+ {
-+ if (arch_vers)
++ if (arch_vers && !strchr(*p, '/')) /* skip arch-specific subdirs */
+ {
-+ strcpy(arch_vers, *p);
++ my_snprintf(arch_vers, 16, "%s", *p);
+ if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
+ S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0);
+ }
+
-+ if (lib_vers)
++ if (lib_vers && !strchr(*p, '/')) /* skip arch-specific subdirs */
+ {
-+ strcpy(lib_vers, *p);
++ my_snprintf(lib_vers, 16, "%s", *p);
+ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
+ S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0);
+ }
diff --git a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
index 7484bec413..4fa3416cdd 100644
--- a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
+++ b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
@@ -1,19 +1,18 @@
-From 240f2f4aeb3850bc0c5370b9fbc3909573bed9b3 Mon Sep 17 00:00:00 2001
+From 4962548d377555dbcf22c34037179d482482c908 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
-Upstream-Status: Pending
---
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
+index c3f5553961..5f9673e6f6 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
+@@ -2227,11 +2227,6 @@ pure_perl_install :: all
};
push @m,
@@ -25,7 +24,7 @@ index 570a631..391dc22 100644
q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
"$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
"$(INST_BIN)" "$(DESTINSTALLBIN)" \
-@@ -2158,10 +2153,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
+@@ -2263,10 +2258,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
pure_vendor_install :: all
$(NOECHO) umask 022; $(MOD_INSTALL) \
};
@@ -36,7 +35,7 @@ index 570a631..391dc22 100644
push @m,
q{ "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
-@@ -2187,37 +2178,19 @@ doc_vendor_install :: all
+@@ -2292,37 +2283,19 @@ doc_vendor_install :: all
push @m, q{
doc_perl_install :: all
@@ -44,7 +43,7 @@ index 570a631..391dc22 100644
- -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
- -$(NOECHO) umask 022; $(DOC_INSTALL) \
- "Module" "$(NAME)" \
-- "installed into" $(INSTALLPRIVLIB) \
+- "installed into" "$(INSTALLPRIVLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
@@ -57,7 +56,7 @@ index 570a631..391dc22 100644
+ -$(NOECHO) umask 02; $(MKPATH) "$(DESTINSTALLSITEARCH)"
-$(NOECHO) umask 02; $(DOC_INSTALL) \
"Module" "$(NAME)" \
- "installed into" $(INSTALLSITELIB) \
+ "installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
@@ -69,7 +68,7 @@ index 570a631..391dc22 100644
- -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
- -$(NOECHO) umask 022; $(DOC_INSTALL) \
- "Module" "$(NAME)" \
-- "installed into" $(INSTALLVENDORLIB) \
+- "installed into" "$(INSTALLVENDORLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
@@ -77,7 +76,7 @@ index 570a631..391dc22 100644
} unless $self->{NO_PERLLOCAL};
-@@ -2226,13 +2199,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+@@ -2331,13 +2304,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
$(NOECHO) $(NOOP)
uninstall_from_perldirs ::
diff --git a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
index 2d05ae5486..8ffc0abc87 100644
--- a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
+++ b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
@@ -1,7 +1,7 @@
-From b517c5e15d0871e36d0f1187661fe1dd28ddf820 Mon Sep 17 00:00:00 2001
+From 13799c0d68b541c3ad667fd5bbbb634e3d72dc1f 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
+Subject: [PATCH] List packaged patches in patchlevel.h
Origin: vendor
Bug-Debian: http://bugs.debian.org/567489
@@ -10,13 +10,13 @@ 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
-Upstream-Status: Pending
+
---
patchlevel.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/patchlevel.h b/patchlevel.h
-index a0ad78b..01367b7 100644
+index 0b6b7dc..707b107 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
diff --git a/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch b/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
index 6f1625bb1c..c4fa194847 100644
--- a/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
+++ b/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
@@ -1,7 +1,7 @@
-From c99c61e8f863a508a0793168011c98dc74abbd05 Mon Sep 17 00:00:00 2001
+From 4c078c2ef26437926bb046bb340b957e8292243d 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
+Subject: [PATCH] Invoke x-terminal-emulator rather than xterm in perl5db.pl
In Debian systems, xterm might not exist or might not be the preferred
terminal emulator. Use x-terminal-emulator instead
@@ -10,16 +10,16 @@ Bug-Debian: http://bugs.debian.org/668490
Forwarded: not-needed
Patch-Name: debian/perl5db-x-terminal-emulator.patch
-Upstream-Status: Pending
+
---
lib/perl5db.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/perl5db.pl b/lib/perl5db.pl
-index 7e7194e..c466bf3 100644
+index 265b444..a3d9b8d 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
-@@ -6960,7 +6960,7 @@ properly set up.
+@@ -6988,7 +6988,7 @@ properly set up.
sub xterm_get_fork_TTY {
( my $name = $0 ) =~ s,^.*[/\\],,s;
open XT,
diff --git a/meta/recipes-devtools/perl/perl/debian/perldoc-pager.diff b/meta/recipes-devtools/perl/perl/debian/perldoc-pager.diff
new file mode 100644
index 0000000000..70b19389ad
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/perldoc-pager.diff
@@ -0,0 +1,29 @@
+From f5eda24c66e1ad55e963c0df4f2e150a5f1a7df7 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 13 Oct 2017 11:59:34 +0300
+Subject: [PATCH] Fix perldoc terminal escapes when sensible-pager is less
+
+This is a temporary fix while upstream is reworking the
+pager handling.
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=120229
+Bug-Debian: https://bugs.debian.org/870340
+Patch-Name: debian/perldoc-pager.diff
+
+---
+ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
+index 9501d63..a5aedf6 100644
+--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
++++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
+@@ -32,7 +32,7 @@ sub pager_configuration {
+ # do not modify anything on Windows or DOS
+ return if ( $perldoc->is_mswin32 || $perldoc->is_dos );
+
+- if ( $pager =~ /less/ ) {
++ if ( $pager =~ /sensible-pager|less/ ) {
+ $self->_maybe_modify_environment('LESS');
+ }
+ elsif ( $pager =~ /more/ ) {
diff --git a/meta/recipes-devtools/perl/perl/debian/perlivp.diff b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
index 5c7413b965..e87ee9700f 100644
--- a/meta/recipes-devtools/perl/perl/debian/perlivp.diff
+++ b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
@@ -1,7 +1,7 @@
-From fbfbeb7a690d703a3cdc56f923e89eb7b7997d31 Mon Sep 17 00:00:00 2001
+From 6453abd00237a51476aaf82d8d0aff8c67696322 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
+Subject: [PATCH] Make perlivp skip include directories in /usr/local
Bug-Debian: http://bugs.debian.org/510895
@@ -21,16 +21,16 @@ On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
Signed-off-by: Niko Tyni <ntyni@debian.org>
Patch-Name: debian/perlivp.diff
-Upstream-Status: Pending
+
---
utils/perlivp.PL | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/perlivp.PL b/utils/perlivp.PL
-index c2f0a11..cc49f96 100644
+index 50d187a..bd8091c 100644
--- a/utils/perlivp.PL
+++ b/utils/perlivp.PL
-@@ -153,6 +153,7 @@ my $INC_total = 0;
+@@ -155,6 +155,7 @@ my $INC_total = 0;
my $INC_there = 0;
foreach (@INC) {
next if $_ eq '.'; # skip -d test here
diff --git a/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff b/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
deleted file mode 100644
index 47075625c6..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-Upstream-Status: Pending
----
- 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/debian/prefix_changes.diff b/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
deleted file mode 100644
index b681c3e892..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-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
-
-Fiddle with *PREFIX and variables written to the makefile so that
-install directories may be changed when make is run by passing
-PREFIX= to the "make install" command (used when packaging
-modules).
-
-Patch-Name: debian/prefix_changes.diff
-Upstream-Status: Pending
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 12 ++++++------
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 +--
- cpan/ExtUtils-MakeMaker/t/INST.t | 4 +---
- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | 10 +++++-----
- 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 4c00129..1ea2035 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-@@ -902,8 +902,6 @@ all POD files in MAN1PODS and MAN3PODS.
- sub manifypods_target {
- my($self) = shift;
-
-- my $man1pods = '';
-- my $man3pods = '';
- my $dependencies = '';
-
- # populate manXpods & dependencies:
-@@ -919,7 +917,7 @@ END
- foreach my $section (qw(1 3)) {
- my $pods = $self->{"MAN${section}PODS"};
- 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);
- }
-@@ -1875,9 +1873,11 @@ sub init_INSTALL_from_PREFIX {
- $self->{SITEPREFIX} ||= $sprefix;
- $self->{VENDORPREFIX} ||= $vprefix;
-
-- # Lots of MM extension authors like to use $(PREFIX) so we
-- # put something sensible in there no matter what.
-- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
-+ my $p = $self->{PREFIX} = $self->{PERLPREFIX};
-+ for my $t (qw/PERL SITE VENDOR/)
-+ {
-+ $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
-+ }
- }
-
- my $arch = $Config{archname};
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 391dc22..4a8e14c 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -3077,8 +3077,7 @@ sub prefixify {
- warn " prefixify $var => $path\n" if $Verbose >= 2;
- warn " from $sprefix to $rprefix\n" if $Verbose >= 2;
-
-- if( $self->{ARGS}{PREFIX} &&
-- $path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
-+ if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
- {
-
- warn " cannot prefix, using default.\n" if $Verbose >= 2;
-diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
-index 91058bb..e399ced 100644
---- a/cpan/ExtUtils-MakeMaker/t/INST.t
-+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
-@@ -65,9 +65,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
- is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
- is( $mm->{VERSION}, 0.01, 'VERSION' );
-
--my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
-- $Config{prefixexp} || $Config{prefix};
--is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' );
-+is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' );
-
- is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
-
-diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-index e8de7c6..3fb3f12 100644
---- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-@@ -10,7 +10,7 @@ BEGIN {
- }
-
- use strict;
--use Test::More tests => 52;
-+use Test::More tests => 47;
- use MakeMaker::Test::Utils;
- use MakeMaker::Test::Setup::BFD;
- use ExtUtils::MakeMaker;
-@@ -62,16 +62,16 @@ like( $stdout->read, qr{
- (?:Writing\ MYMETA.yml\ and\ MYMETA.json\n)?
- }x );
-
--is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
-+#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
-
- isa_ok( $mm, 'ExtUtils::MakeMaker' );
-
- is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
- is( $mm->{VERSION}, 0.01, 'VERSION' );
-
--foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
-- unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
--}
-+#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
-+# unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
-+#}
-
-
- my $PREFIX = File::Spec->catdir('foo', 'bar');
diff --git a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
index a2ed52ab2e..dd310a0624 100644
--- a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
@@ -1,27 +1,28 @@
-From c4538f966c49e356599358def7d1febf61bca21f Mon Sep 17 00:00:00 2001
+From 3d8158ea5a31e3e2636e9a61f9e7362c3bbbc10c Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
-Subject: [PATCH 15/49] Prune the list of libraries wanted to what we actually
- need.
+Subject: Prune the list of libraries wanted to what we actually need.
Bug-Debian: http://bugs.debian.org/128355
We want to keep the dependencies on perl-base as small as possible,
and some of the original list may be present on buildds (see Bug#128355).
+(Backported to metaconfig unit probes by Niko Tyni)
+
Patch-Name: debian/prune_libs.diff
-Upstream-Status: Pending
---
- Configure | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ regen-configure/U/modified/Myinit.U | 3 +--
+ regen-configure/U/perl/End.U | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
-diff --git a/Configure b/Configure
-index 5a353d6..a00df64 100755
---- a/Configure
-+++ b/Configure
-@@ -1479,8 +1479,7 @@ archname=''
- usereentrant='undef'
- : List of libraries we want.
+diff --git a/regen-configure/U/modified/Myinit.U b/regen-configure/U/modified/Myinit.U
+index 0e3155aecd..e1d58c2077 100644
+--- a/regen-configure/U/modified/Myinit.U
++++ b/regen-configure/U/modified/Myinit.U
+@@ -32,8 +32,7 @@
+ ?X: Put crypt here, even though I should really fix d_crypt.U to look
+ ?X: for it correctly, including possible shared library versions.
: If anyone needs extra -lxxx, put those in a hint file.
-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
-libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
@@ -29,7 +30,11 @@ index 5a353d6..a00df64 100755
: 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 ! !'`
-@@ -24007,7 +24006,7 @@ sunos*X4*)
+diff --git a/regen-configure/U/perl/End.U b/regen-configure/U/perl/End.U
+index 352071422f..9716623ae0 100644
+--- a/regen-configure/U/perl/End.U
++++ b/regen-configure/U/perl/End.U
+@@ -37,7 +37,7 @@ sunos*X4*)
;;
*) case "$usedl" in
$define|true|[yY]*)
@@ -38,6 +43,3 @@ index 5a353d6..a00df64 100755
shift
perllibs="$*"
;;
---
-2.1.4
-
diff --git a/meta/recipes-devtools/perl/perl/debian/regen-skip.diff b/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
deleted file mode 100644
index 5d9a7c4b46..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
-If the test is run in a git repository without lib/.gitignore,
-for instance because the repository only imported the Perl tarball,
-the regeneration check is broken because lib/.gitignore is missing.
-
-Patch-Name: debian/regen-skip.diff
-Upstream-Status: Pending
----
- regen/lib_cleanup.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl
-index c9d6e43..fece1ed 100644
---- a/regen/lib_cleanup.pl
-+++ b/regen/lib_cleanup.pl
-@@ -159,7 +159,7 @@ foreach ('win32/Makefile', 'win32/makefile.mk') {
- }
-
- # This must come last as it can exit early:
--if ($TAP && !-d '.git' && !-f 'lib/.gitignore') {
-+if ($TAP && !-d '.git' || !-f 'lib/.gitignore') {
- print "ok # skip not being run from a git checkout, hence no lib/.gitignore\n";
- exit 0;
- }
diff --git a/meta/recipes-devtools/perl/perl/debian/sh4_op_optimize_workaround.diff b/meta/recipes-devtools/perl/perl/debian/sh4_op_optimize_workaround.diff
new file mode 100644
index 0000000000..6ff0f8967c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/sh4_op_optimize_workaround.diff
@@ -0,0 +1,31 @@
+From 540afd0f01e5179cdb247daeaa9160939f8462a0 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 29 Jul 2017 23:32:51 +0300
+Subject: Also lower the optimization level of op.c and opmini.c on sh4
+
+This amends
+ debian/hppa_op_optimize_workaround.diff
+ debian/hppa_opmini_optimize_workaround.diff
+
+Bug-Debian: https://bugs.debian.org/869373
+Patch-Name: debian/sh4_op_optimize_workaround.diff
+---
+ cflags.SH | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cflags.SH b/cflags.SH
+index ae3b1e88f0..daa73a1659 100755
+--- a/cflags.SH
++++ b/cflags.SH
+@@ -493,9 +493,9 @@ for file do
+ # or customize here
+
+ case "$file" in
+- op|opmini) : work around http://bugs.debian.org/838613 and 869122
++ op|opmini) : work around http://bugs.debian.org/838613 869122 869373
+ case $archname in
+- hppa-*)
++ hppa-*|sh4-*)
+ optimize="$optimize -O0";;
+ esac;;
+
diff --git a/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff b/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
deleted file mode 100644
index 3b3745238d..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-
-Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=96272
-Bug-Debian: http://bugs.debian.org/628493
-
-The crash is not a regression in 5.14, it just gets triggered there by
-a new unrelated test case.
-
-Skip the test until the culprit is found.
-
-Patch-Name: debian/skip-kfreebsd-crash.diff
-Upstream-Status: Pending
----
- t/op/threads.t | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/t/op/threads.t b/t/op/threads.t
-index e76c956..bec210b 100644
---- a/t/op/threads.t
-+++ b/t/op/threads.t
-@@ -376,6 +376,9 @@ EOF
- }
-
-
-+SKIP: {
-+ skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1
-+ if $^O eq 'gnukfreebsd';
- # [perl #78494] Pipes shared between threads block when closed
- {
- my $perl = which_perl;
-@@ -384,6 +387,7 @@ EOF
- threads->create(sub { })->join;
- ok(1, "Pipes shared between threads do not block when closed");
- }
-+}
-
- # [perl #105208] Typeglob clones should not be cloned again during a join
- {
diff --git a/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
deleted file mode 100644
index 279f4ab76f..0000000000
--- a/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
-These tests fail if run from a different git repository than
-upstream. This complicates things needlessly for downstream packagers.
-
-Skip the tests altogether even if the .git directory exists.
-
-Patch-Name: debian/skip-upstream-git-tests.diff
-Upstream-Status: Pending
----
- t/test.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/test.pl b/t/test.pl
-index cda3840..af579a2 100644
---- a/t/test.pl
-+++ b/t/test.pl
-@@ -174,7 +174,7 @@ sub skip_all_without_unicode_tables { # (but only under miniperl)
-
- sub find_git_or_skip {
- my ($source_dir, $reason);
-- if (-d '.git') {
-+ if (-d '.git' && ! -d 'debian') {
- $source_dir = '.';
- } elsif (-l 'MANIFEST' && -l 'AUTHORS') {
- my $where = readlink 'MANIFEST';
diff --git a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
index 4964e480c7..cf212e36af 100644
--- a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
+++ b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
@@ -1,7 +1,7 @@
-From 487a6d6ada0b08e6a7276520ebc61cd851005e7c Mon Sep 17 00:00:00 2001
+From dd00a91a2b83a988d3986c0adc3e094c441d909b 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
+Subject: [PATCH] Squelch locale warnings in Debian package maintainer scripts
Bug-Debian: http://bugs.debian.org/508764
@@ -14,17 +14,17 @@ Any real locale problem will show up after the system upgrade too, and
the warning will be triggered normally again at that point.
Patch-Name: debian/squelch-locale-warnings.diff
-Upstream-Status: Pending
+
---
locale.c | 5 ++++-
pod/perllocale.pod | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/locale.c b/locale.c
-index 7a4a418..fdf911d 100644
+index 258542a..1aeba7b 100644
--- a/locale.c
+++ b/locale.c
-@@ -674,7 +674,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+@@ -942,7 +942,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
const bool locwarn = (printwarn > 1
|| (printwarn
@@ -37,10 +37,10 @@ index 7a4a418..fdf911d 100644
/* disallow with "" or "0" */
*bad_lang_use_once
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index 701b422..58cabaf 100644
+index 44da58f..011a506 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
-@@ -1217,6 +1217,14 @@ B<NOTE>: C<PERL_BADLANG> only gives you a way to hide the warning message.
+@@ -1236,6 +1236,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/debian/writable_site_dirs.diff b/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
index ab373b333c..95e9ed9b95 100644
--- a/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
@@ -1,4 +1,4 @@
-From 591c1f9b7d4755bfc59d9665bab1f2ca410de765 Mon Sep 17 00:00:00 2001
+From 7b78d04b2933a6bacac4c940908c35a896daeab1 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
@@ -6,16 +6,15 @@ Subject: Set umask approproately for site install directories
Policy requires group writable site directories
Patch-Name: debian/writable_site_dirs.diff
-Upstream-Status: Pending
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++---
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 197f102..5f1b87f 100644
+index 588c54b9bb..285bb8cbff 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2138,7 +2138,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
+@@ -2243,7 +2243,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
pure_site_install :: all
@@ -24,7 +23,7 @@ index 197f102..5f1b87f 100644
};
push @m,
q{ read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-@@ -2199,8 +2199,8 @@ doc_perl_install :: all
+@@ -2304,8 +2304,8 @@ doc_perl_install :: all
doc_site_install :: all
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -33,5 +32,5 @@ index 197f102..5f1b87f 100644
+ -$(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/dynaloaderhack.patch b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
index 719f07c9cc..d1cca3962f 100644
--- a/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
+++ b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
@@ -1,7 +1,7 @@
-From 2e0ce5d27e70defd66ace0661af7c24daae34f8b Mon Sep 17 00:00:00 2001
+From 28330ca32a8a26b034f410c380c637f476f74f51 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 19 Jan 2013 23:49:24 +0000
-Subject: [PATCH 7/8] perl: Add dyanloader build hack
+Subject: [PATCH] perl: Add dyanloader build hack
Hack the dynamic module loader so that we use native modules since we can't load
the target ones.
@@ -16,7 +16,7 @@ RP
1 file changed, 4 insertions(+)
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
-index e828f35..4021559 100644
+index bd95625..edfe86d 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -343,6 +343,10 @@ sub bootstrap {
@@ -30,6 +30,3 @@ index e828f35..4021559 100644
next unless -d $dir; # skip over uninteresting directories
---
-2.1.4
-
diff --git a/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch b/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
index 994ef7013c..746329fb66 100644
--- a/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
+++ b/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
@@ -1,4 +1,4 @@
-From ba4ed0b5b7baad5353c1e65b655f41d45e01c990 Mon Sep 17 00:00:00 2001
+From 5052f9386314655457523b322d9d0acef8d171bc Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 22 Jun 2015 20:00:11 -0700
Subject: [PATCH] ext/ODBM_File/hints/linux.pl: link libgdbm_compat
@@ -15,9 +15,10 @@ always have libgdbm_compat.
Upstream-Status:Inappropriate [embedded specific]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
- ext/ODBM_File/hints/linux.pl | 6 ------
- 1 file changed, 6 deletions(-)
+ ext/ODBM_File/hints/linux.pl | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ext/ODBM_File/hints/linux.pl b/ext/ODBM_File/hints/linux.pl
index 204bba0..9271b45 100644
diff --git a/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch b/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
index b85b50cea9..163ad01faf 100644
--- a/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
+++ b/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
@@ -1,7 +1,7 @@
-From b842e1de7798a1f7df770bb3f185ad3356e490e6 Mon Sep 17 00:00:00 2001
+From 1d5c1f0d6d63e7d7038f4ffd2d30845f657ff9dc Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 22 Jun 2015 20:06:56 -0700
-Subject: [PATCH] ext/ODBM_File/t/odbm.t: fix the path of dbmt_common.pl
+Subject: [PATCH] ext/ODBM_File/t/odbm.t: fix the path of dbmt_common.pl
It should be lib/dbmt_common.pl when run by run-ptest.
@@ -11,12 +11,13 @@ Can't locate ../../t/lib/dbmt_common.pl in @INC
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Upstream-Status: Pending
+
---
- ext/ODBM_File/t/odbm.t | 2 +-
+ ext/ODBM_File/t/odbm.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/ODBM_File/t/odbm.t b/ext/ODBM_File/t/odbm.t
-index 079b9f1..250b991 100644
+index 079b9f1..e996f99 100644
--- a/ext/ODBM_File/t/odbm.t
+++ b/ext/ODBM_File/t/odbm.t
@@ -2,7 +2,7 @@
@@ -28,6 +29,3 @@ index 079b9f1..250b991 100644
if ($^O eq 'hpux') {
print <<EOM;
---
-1.7.9.5
-
diff --git a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
index 49efcbeefc..456a23fb7d 100644
--- a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
+++ b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
@@ -1,3 +1,8 @@
+From fecf0890f5951d49b9c3da9afe5c9da778ef2175 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Fri, 1 Jul 2011 11:51:15 -0700
+Subject: [PATCH] perl: Fix package qa rpath warnings.
+
Upstream-Status:Inappropriate [embedded specific]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2011/07/01
@@ -6,15 +11,19 @@ Fix these Package QA warnings before they are converted into fetal errors:
WARNING: QA Issue: package perl-module-compress contains bad RPATH /build_disk/poky_build/build0/tmp/sysroots/qemux86/usr/lib in file /build_disk/poky_build/build0/tmp/work/i586-poky-linux/perl-5.12.3-r1/packages-split/perl-module-compress/usr/lib/perl/5.12.3/auto/Compress/Raw/Zlib/Zlib.so
-This fixes this warning for perl recipe as well as libxml-parser-perl recipe.
-It is a fix to MakeMaker within perl, so all such perl recipes will get
+This fixes this warning for perl recipe as well as libxml-parser-perl recipe.
+It is a fix to MakeMaker within perl, so all such perl recipes will get
fixed with this perl fix.
-Index: perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-===================================================================
---- perl-5.24.1.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-+++ perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-@@ -57,6 +57,7 @@ sub _unix_os2_ext {
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+index 4491989..114e401 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+@@ -58,6 +58,7 @@ sub _unix_os2_ext {
my ( $found ) = 0;
# Debian-specific: don't use LD_RUN_PATH for standard dirs
diff --git a/meta/recipes-devtools/perl/perl/fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff b/meta/recipes-devtools/perl/perl/fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff
new file mode 100644
index 0000000000..011d66ae03
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff
@@ -0,0 +1,44 @@
+From af80a2d91b13dff65a495663dd9bd68d7880b9fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 8 Jun 2018 11:45:40 +0100
+Subject: [PATCH] Remove existing files before overwriting them
+
+Archive should extract only the latest same-named entry.
+Extracted regular file should not be writtent into existing block
+device (or any other one).
+
+Signed-off-by: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
+Bug: https://rt.cpan.org/Ticket/Display.html?id=125523
+Bug-Debian: https://bugs.debian.org/900834
+Origin: upstream, https://github.com/jib/archive-tar-new/commit/ae65651eab053fc6dc4590dbb863a268215c1fc5
+Patch-Name: fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff
+
+---
+ cpan/Archive-Tar/lib/Archive/Tar.pm | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm
+index d63e586..4861ea7 100644
+--- a/cpan/Archive-Tar/lib/Archive/Tar.pm
++++ b/cpan/Archive-Tar/lib/Archive/Tar.pm
+@@ -845,6 +845,20 @@ sub _extract_file {
+ return;
+ }
+
++ ### If a file system already contains a block device with the same name as
++ ### the being extracted regular file, we would write the file's content
++ ### to the block device. So remove the existing file (block device) now.
++ ### If an archive contains multiple same-named entries, the last one
++ ### should replace the previous ones. So remove the old file now.
++ ### If the old entry is a symlink to a file outside of the CWD, the new
++ ### entry would create a file there. This is CVE-2018-12015
++ ### <https://rt.cpan.org/Ticket/Display.html?id=125523>.
++ if (-l $full || -e _) {
++ if (!unlink $full) {
++ $self->_error( qq[Could not remove old file '$full': $!] );
++ return;
++ }
++ }
+ if( length $entry->type && $entry->is_file ) {
+ my $fh = IO::File->new;
+ $fh->open( '>' . $full ) or (
diff --git a/meta/recipes-devtools/perl/perl/fixes/CVE-2018-6797-testcase.diff b/meta/recipes-devtools/perl/perl/fixes/CVE-2018-6797-testcase.diff
new file mode 100644
index 0000000000..5f662dfb57
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/CVE-2018-6797-testcase.diff
@@ -0,0 +1,33 @@
+From 0e201824c24919ad8f3570b15b0a3eab40166f8e Mon Sep 17 00:00:00 2001
+From: Karl Williamson <khw@cpan.org>
+Date: Fri, 2 Feb 2018 15:14:27 -0700
+Subject: [PATCH] (perl #132227) restart a node if we change to uni rules
+ within the node and encounter a sharp S
+
+This could lead to a buffer overflow.
+
+Test case backported from the corresponding blead fix by Niko Tyni.
+
+Origin: backport
+Bug: https://rt.perl.org/Public/Bug/Display.html?id=132227
+Patch-Name: fixes/CVE-2018-6797-testcase.diff
+
+---
+ t/re/pat_advanced.t | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
+index 5e5cc1f..27df550 100644
+--- a/t/re/pat_advanced.t
++++ b/t/re/pat_advanced.t
+@@ -2336,6 +2336,10 @@ EOF
+ unlike("s\N{U+DF}", qr/^\x{00DF}/i, "\"s\\N{U+DF}\", qr/^\\x{00DF}/i");
+ }
+
++ { # Bug #132227, caused failed assertion
++ ok(qr/0b\N{U+41}\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF\xDF/i, "No seqgfault [perl #132227]");
++ }
++
+ # User-defined Unicode properties to match above-Unicode code points
+ sub Is_32_Bit_Super { return "110000\tFFFFFFFF\n" }
+ sub Is_Portable_Super { return '!utf8::Any' } # Matches beyond 32 bits
diff --git a/meta/recipes-devtools/perl/perl/fixes/autodie-scope.diff b/meta/recipes-devtools/perl/perl/fixes/autodie-scope.diff
new file mode 100644
index 0000000000..2b03aa607c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/autodie-scope.diff
@@ -0,0 +1,100 @@
+From 5efa314e711b24e80ff36d5baa24f995ea07d359 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Mon, 21 Dec 2015 19:20:12 +0200
+Subject: [PATCH] Fix a scoping issue with "no autodie" and the "system" sub
+
+Don't queue nonexisting subs for reinstalling later when
+exiting the 'no autodie' scope.
+
+FIXME: if the original sub 'can be undef for "CORE::" subs', does this
+break for those? Is that the case when $symbol =~ /::/, as guarded for
+on L566?
+
+Bug: https://github.com/pjf/autodie/issues/69
+Bug-Debian: https://bugs.debian.org/798096
+Origin: upstream, https://github.com/pjf/autodie/commit/c1b4fc4a319f8139d1cd6770bfb7b72a59ae232d
+Patch-Name: fixes/autodie-scope.diff
+
+---
+ cpan/autodie/lib/Fatal.pm | 7 ++++++-
+ cpan/autodie/t/no-all.t | 22 ++++++++++++++++++++++
+ cpan/autodie/t/no-default.t | 23 +++++++++++++++++++++++
+ 3 files changed, 51 insertions(+), 1 deletion(-)
+ create mode 100755 cpan/autodie/t/no-all.t
+ create mode 100755 cpan/autodie/t/no-default.t
+
+diff --git a/cpan/autodie/lib/Fatal.pm b/cpan/autodie/lib/Fatal.pm
+index 16e1743..2058abd 100644
+--- a/cpan/autodie/lib/Fatal.pm
++++ b/cpan/autodie/lib/Fatal.pm
+@@ -580,7 +580,12 @@ sub unimport {
+ # Record the current sub to be reinstalled at end of scope
+ # and then restore the original (can be undef for "CORE::"
+ # subs)
+- $reinstall_subs{$symbol} = \&$sub;
++
++ {
++ no strict 'refs';
++ $reinstall_subs{$symbol} = \&$sub
++ if exists ${"${pkg}::"}{$symbol};
++ }
+ $uninstall_subs{$symbol} = $Original_user_sub{$sub};
+
+ }
+diff --git a/cpan/autodie/t/no-all.t b/cpan/autodie/t/no-all.t
+new file mode 100755
+index 0000000..1a503f6
+--- /dev/null
++++ b/cpan/autodie/t/no-all.t
+@@ -0,0 +1,22 @@
++#!/usr/bin/perl
++
++package foo;
++use warnings;
++use strict;
++use Test::More tests => 1;
++use autodie qw(:all);
++
++use_system();
++ok("system() works with a lexical 'no autodie' block (github issue #69");
++
++sub break_system {
++ no autodie;
++ open(my $fh, "<", 'NONEXISTENT');
++ ok("survived failing open");
++}
++
++sub use_system {
++ system($^X, '-e' , 1);
++}
++
++1;
+diff --git a/cpan/autodie/t/no-default.t b/cpan/autodie/t/no-default.t
+new file mode 100755
+index 0000000..44d2acf
+--- /dev/null
++++ b/cpan/autodie/t/no-default.t
+@@ -0,0 +1,23 @@
++#!/usr/bin/perl
++
++package foo;
++use warnings;
++use strict;
++use Test::More tests => 2;
++use autodie;
++
++
++use_system();
++ok("system() works with a lexical 'no autodie' block (github issue #69");
++break_system();
++
++sub break_system {
++ no autodie;
++ open(my $fh, "<", 'NONEXISTENT');
++ ok("survived failing open");
++}
++
++sub use_system {
++ system($^X, '-e' , 1);
++}
++1;
diff --git a/meta/recipes-devtools/perl/perl/fixes/cpan_web_link.diff b/meta/recipes-devtools/perl/perl/fixes/cpan_web_link.diff
new file mode 100644
index 0000000000..e5069e78ae
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/cpan_web_link.diff
@@ -0,0 +1,27 @@
+From 531f0bae1b89e63b3c77b39e8cdbb85485735212 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 30 Apr 2016 23:13:34 +0100
+Subject: [PATCH] CPAN: Add link to main CPAN web site
+
+Bug: https://github.com/andk/cpanpm/pull/96
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=367291
+Patch-Name: fixes/cpan_web_link.diff
+
+---
+ cpan/CPAN/lib/CPAN.pm | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
+index 4f02850..088cf61 100644
+--- a/cpan/CPAN/lib/CPAN.pm
++++ b/cpan/CPAN/lib/CPAN.pm
+@@ -3981,6 +3981,9 @@ your operating system) then typing C<cpan> in a console window will
+ work for you as well. Above that the utility provides several
+ commandline shortcuts.
+
++The main CPAN website, which includes general information about the
++service, is at L<http://www.cpan.org/>.
++
+ melezhik (Alexey) sent me a link where he published a chef recipe to
+ work with CPAN.pm: http://community.opscode.com/cookbooks/cpan.
+
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl/fixes/document_makemaker_ccflags.diff
index f3d92583e3..f1ed3b9fb8 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
+++ b/meta/recipes-devtools/perl/perl/fixes/document_makemaker_ccflags.diff
@@ -1,7 +1,7 @@
-From 9faf6dcc3a5c4154484d812eb3cc3dd78b35563b Mon Sep 17 00:00:00 2001
+From 14385d93ff7d29b73e74b3a5f3ccb95b54d00ba6 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}
+Subject: [PATCH] Document that CCFLAGS should include $Config{ccflags}
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613
Bug-Debian: http://bugs.debian.org/628522
@@ -10,16 +10,16 @@ Compiling XS extensions without $Config{ccflags} can break the
binary interface on some platforms.
Patch-Name: fixes/document_makemaker_ccflags.diff
-Upstream-Status: Pending
+
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-index fe95b27..90403e8 100644
+index d579256..0b154e2 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-@@ -1774,6 +1774,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
+@@ -1839,6 +1839,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/fixes/encode-alias-regexp.diff b/meta/recipes-devtools/perl/perl/fixes/encode-alias-regexp.diff
new file mode 100644
index 0000000000..be8d97877e
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/encode-alias-regexp.diff
@@ -0,0 +1,27 @@
+From cd21384376d32eaf01141cea24b09a35aadc13dc Mon Sep 17 00:00:00 2001
+From: Dan Kogai <dankogai+github@gmail.com>
+Date: Tue, 9 Jan 2018 14:39:26 +0900
+Subject: [PATCH] fix https://github.com/dankogai/p5-encode/issues/127
+
+Bug-Debian: https://bugs.debian.org/880085
+Bug: https://github.com/dankogai/p5-encode/issues/127
+Origin: backport, https://github.com/dankogai/p5-encode/commit/7609648146d4742b9e92861a0497892eff891f20
+Patch-Name: fixes/encode-alias-regexp.diff
+
+---
+ cpan/Encode/lib/Encode/Alias.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/Encode/lib/Encode/Alias.pm b/cpan/Encode/lib/Encode/Alias.pm
+index 0a25256..5b184e0 100644
+--- a/cpan/Encode/lib/Encode/Alias.pm
++++ b/cpan/Encode/lib/Encode/Alias.pm
+@@ -270,7 +270,7 @@ sub init_aliases {
+ define_alias( qr/\bUTF-8$/i => '"utf-8-strict"' );
+
+ # At last, Map white space and _ to '-'
+- define_alias( qr/^(\S+)[\s_]+(.*)$/i => '"$1-$2"' );
++ define_alias( qr/^([^\s_]+)[\s_]+([^\s_]*)$/i => '"$1-$2"' );
+ }
+
+ 1;
diff --git a/meta/recipes-devtools/perl/perl/fixes/extutils_file_path_compat.diff b/meta/recipes-devtools/perl/perl/fixes/extutils_file_path_compat.diff
new file mode 100644
index 0000000000..f1ef61de18
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/extutils_file_path_compat.diff
@@ -0,0 +1,53 @@
+From 4636b3bfd2ccdacc60da0e7a858c6c5a4e0cb659 Mon Sep 17 00:00:00 2001
+From: James E Keenan <jkeenan@cpan.org>
+Date: Thu, 11 May 2017 04:23:40 -0400
+Subject: [PATCH] Correct the order of tests of chmod(). (#294)
+
+Per code review by haarg, the order of tests was wrong in the first place.
+Hence, correctly re-ordering them is a better repair than changing one test's
+description.
+
+For: https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/294
+
+[Debian note: this is a prerequisite for the CVE-2017-6512 fix in
+File-Path]
+
+Bug: https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/294
+Patch-Name: fixes/extutils_file_path_compat.diff
+
+---
+ cpan/ExtUtils-MakeMaker/t/eu_command.t | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/t/eu_command.t b/cpan/ExtUtils-MakeMaker/t/eu_command.t
+index 269aa5c..32a6f59 100644
+--- a/cpan/ExtUtils-MakeMaker/t/eu_command.t
++++ b/cpan/ExtUtils-MakeMaker/t/eu_command.t
+@@ -151,20 +151,21 @@ BEGIN {
+ is( ((stat('testdir'))[2] & 07777) & 0700,
+ 0100, 'change a dir to execute-only' );
+
+- # change a dir to read-only
+- @ARGV = ( '0400', 'testdir' );
++ # change a dir to write-only
++ @ARGV = ( '0200', 'testdir' );
+ ExtUtils::Command::chmod();
+
+ is( ((stat('testdir'))[2] & 07777) & 0700,
+- 0400, 'change a dir to read-only' );
++ 0200, 'change a dir to write-only' );
+
+- # change a dir to write-only
+- @ARGV = ( '0200', 'testdir' );
++ # change a dir to read-only
++ @ARGV = ( '0400', 'testdir' );
+ ExtUtils::Command::chmod();
+
+ is( ((stat('testdir'))[2] & 07777) & 0700,
+- 0200, 'change a dir to write-only' );
++ 0400, 'change a dir to read-only' );
+
++ # remove the dir we've been playing with
+ @ARGV = ('testdir');
+ rm_rf;
+ ok( ! -e 'testdir', 'rm_rf can delete a read-only dir' );
diff --git a/meta/recipes-devtools/perl/perl/fixes/extutils_makemaker_reproducible.diff b/meta/recipes-devtools/perl/perl/fixes/extutils_makemaker_reproducible.diff
new file mode 100644
index 0000000000..9474a2ab55
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/extutils_makemaker_reproducible.diff
@@ -0,0 +1,41 @@
+From ee45bd25752f7034faf80d968ddf5adfb2694ed8 Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Sun, 28 Aug 2016 17:22:10 +0100
+Subject: [PATCH] Make perllocal.pod files reproducible
+
+Bug-Debian: https://bugs.debian.org/834190
+Bug-Debian: https://bugs.debian.org/835815
+Patch-Name: fixes/extutils_makemaker_reproducible.diff
+
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm | 3 ++-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+index 69779b2..bf53ad5 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+@@ -219,7 +219,8 @@ sub perllocal_install {
+ : @ARGV;
+
+ my $pod;
+- $pod = sprintf <<'POD', scalar(localtime), $type, $name, $name;
++ my $time = gmtime($ENV{SOURCE_DATE_EPOCH} || time);
++ $pod = sprintf <<'POD', $time, $type, $name, $name;
+ =head2 %s: C<%s> L<%s|%s>
+
+ =over 4
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 8ea92e5..0344194 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -3869,7 +3869,7 @@ Obsolete, deprecated method. Not used since Version 5.21.
+ sub writedoc {
+ # --- perllocal.pod section ---
+ my($self,$what,$name,@attribs)=@_;
+- my $time = localtime;
++ my $time = gmtime($ENV{SOURCE_DATE_EPOCH} || time);
+ print "=head2 $time: $what C<$name>\n\n=over 4\n\n=item *\n\n";
+ print join "\n\n=item *\n\n", map("C<$_>",@attribs);
+ print "\n\n=back\n\n";
diff --git a/meta/recipes-devtools/perl/perl/fixes/file_path_chmod_race.diff b/meta/recipes-devtools/perl/perl/fixes/file_path_chmod_race.diff
new file mode 100644
index 0000000000..9902e0f3e1
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/file_path_chmod_race.diff
@@ -0,0 +1,163 @@
+From b8507de17cceea6fe6ab7d67807600814d2eb971 Mon Sep 17 00:00:00 2001
+From: John Lightsey <john@nixnuts.net>
+Date: Tue, 2 May 2017 12:03:52 -0500
+Subject: [PATCH] Prevent directory chmod race attack.
+
+CVE-2017-6512 is a race condition attack where the chmod() of directories
+that cannot be entered is misused to change the permissions on other
+files or directories on the system. This has been corrected by limiting
+the directory-permission loosening logic to systems where fchmod() is
+supported.
+
+[Backported (whitespace adjustments) to File-Path 2.12 / perl 5.24 by
+Dominic Hargreaves for Debian.]
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=121951
+Bug-Debian: https://bugs.debian.org/863870
+Patch-Name: fixes/file_path_chmod_race.diff
+
+---
+ cpan/File-Path/lib/File/Path.pm | 39 +++++++++++++++++++++++++--------------
+ cpan/File-Path/t/Path.t | 40 ++++++++++++++++++++++++++--------------
+ 2 files changed, 51 insertions(+), 28 deletions(-)
+
+diff --git a/cpan/File-Path/lib/File/Path.pm b/cpan/File-Path/lib/File/Path.pm
+index 034da1e..a824cc8 100644
+--- a/cpan/File-Path/lib/File/Path.pm
++++ b/cpan/File-Path/lib/File/Path.pm
+@@ -354,21 +354,32 @@ sub _rmtree {
+
+ # see if we can escalate privileges to get in
+ # (e.g. funny protection mask such as -w- instead of rwx)
+- $perm &= oct '7777';
+- my $nperm = $perm | oct '700';
+- if (
+- !(
+- $arg->{safe}
+- or $nperm == $perm
+- or chmod( $nperm, $root )
+- )
+- )
+- {
+- _error( $arg,
+- "cannot make child directory read-write-exec", $canon );
+- next ROOT_DIR;
++ # This uses fchmod to avoid traversing outside of the proper
++ # location (CVE-2017-6512)
++ my $root_fh;
++ if (open($root_fh, '<', $root)) {
++ my ($fh_dev, $fh_inode) = (stat $root_fh )[0,1];
++ $perm &= oct '7777';
++ my $nperm = $perm | oct '700';
++ local $@;
++ if (
++ !(
++ $arg->{safe}
++ or $nperm == $perm
++ or !-d _
++ or $fh_dev ne $ldev
++ or $fh_inode ne $lino
++ or eval { chmod( $nperm, $root_fh ) }
++ )
++ )
++ {
++ _error( $arg,
++ "cannot make child directory read-write-exec", $canon );
++ next ROOT_DIR;
++ }
++ close $root_fh;
+ }
+- elsif ( !chdir($root) ) {
++ if ( !chdir($root) ) {
+ _error( $arg, "cannot chdir to child", $canon );
+ next ROOT_DIR;
+ }
+diff --git a/cpan/File-Path/t/Path.t b/cpan/File-Path/t/Path.t
+index 5644f57..fffc49c 100644
+--- a/cpan/File-Path/t/Path.t
++++ b/cpan/File-Path/t/Path.t
+@@ -3,7 +3,7 @@
+
+ use strict;
+
+-use Test::More tests => 127;
++use Test::More tests => 126;
+ use Config;
+ use Fcntl ':mode';
+ use lib 't/';
+@@ -17,6 +17,13 @@ BEGIN {
+
+ my $Is_VMS = $^O eq 'VMS';
+
++my $fchmod_supported = 0;
++if (open my $fh, curdir()) {
++ my ($perm) = (stat($fh))[2];
++ $perm &= 07777;
++ eval { $fchmod_supported = chmod( $perm, $fh); };
++}
++
+ # first check for stupid permissions second for full, so we clean up
+ # behind ourselves
+ for my $perm (0111,0777) {
+@@ -298,16 +305,19 @@ is($created[0], $dir, "created directory (old style 3 mode undef) cross-check");
+
+ is(rmtree($dir, 0, undef), 1, "removed directory 3 verbose undef");
+
+-$dir = catdir($tmp_base,'G');
+-$dir = VMS::Filespec::unixify($dir) if $Is_VMS;
++SKIP: {
++ skip "fchmod of directories not supported on this platform", 3 unless $fchmod_supported;
++ $dir = catdir($tmp_base,'G');
++ $dir = VMS::Filespec::unixify($dir) if $Is_VMS;
+
+-@created = mkpath($dir, undef, 0200);
++ @created = mkpath($dir, undef, 0400);
+
+-is(scalar(@created), 1, "created write-only dir");
++ is(scalar(@created), 1, "created read-only dir");
+
+-is($created[0], $dir, "created write-only directory cross-check");
++ is($created[0], $dir, "created read-only directory cross-check");
+
+-is(rmtree($dir), 1, "removed write-only dir");
++ is(rmtree($dir), 1, "removed read-only dir");
++}
+
+ # borderline new-style heuristics
+ if (chdir $tmp_base) {
+@@ -449,26 +459,28 @@ SKIP: {
+ }
+
+ SKIP : {
+- my $skip_count = 19;
++ my $skip_count = 18;
+ # this test will fail on Windows, as per:
+ # http://perldoc.perl.org/perlport.html#chmod
+
+ skip "Windows chmod test skipped", $skip_count
+ if $^O eq 'MSWin32';
++ skip "fchmod() on directories is not supported on this platform", $skip_count
++ unless $fchmod_supported;
+ my $mode;
+ my $octal_mode;
+ my @inputs = (
+- 0777, 0700, 0070, 0007,
+- 0333, 0300, 0030, 0003,
+- 0111, 0100, 0010, 0001,
+- 0731, 0713, 0317, 0371, 0173, 0137,
+- 00 );
++ 0777, 0700, 0470, 0407,
++ 0433, 0400, 0430, 0403,
++ 0111, 0100, 0110, 0101,
++ 0731, 0713, 0317, 0371,
++ 0173, 0137);
+ my $input;
+ my $octal_input;
+- $dir = catdir($tmp_base, 'chmod_test');
+
+ foreach (@inputs) {
+ $input = $_;
++ $dir = catdir($tmp_base, sprintf("chmod_test%04o", $input));
+ # We can skip from here because 0 is last in the list.
+ skip "Mode of 0 means assume user defaults on VMS", 1
+ if ($input == 0 && $Is_VMS);
diff --git a/meta/recipes-devtools/perl/perl/fixes/file_path_hurd_errno.diff b/meta/recipes-devtools/perl/perl/fixes/file_path_hurd_errno.diff
new file mode 100644
index 0000000000..ca5c51ab87
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/file_path_hurd_errno.diff
@@ -0,0 +1,32 @@
+From e504c7f1978469462558090a1c5cc5c7e9e15ae6 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@debian.org>
+Date: Thu, 8 Sep 2016 10:26:59 +0100
+Subject: [PATCH] File-Path: Fix test failure in Hurd due to hard-coded ENOENT
+
+Patch-Name: fixes/file_path_hurd_errno.diff
+
+---
+ cpan/File-Path/t/Path.t | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cpan/File-Path/t/Path.t b/cpan/File-Path/t/Path.t
+index fffc49c..956ca09 100644
+--- a/cpan/File-Path/t/Path.t
++++ b/cpan/File-Path/t/Path.t
+@@ -8,6 +8,7 @@ use Config;
+ use Fcntl ':mode';
+ use lib 't/';
+ use FilePathTest;
++use Errno qw(:POSIX);
+
+ BEGIN {
+ use_ok('Cwd');
+@@ -668,7 +669,7 @@ is(
+ {
+ my ($x, $message, $object, $expect, $rv, $arg, $error);
+ my ($k, $v, $second_error, $third_error);
+- local $! = 2;
++ local $! = ENOENT;
+ $x = $!;
+
+ $message = 'message in a bottle';
diff --git a/meta/recipes-devtools/perl/perl/fixes/getopt-long-2.diff b/meta/recipes-devtools/perl/perl/fixes/getopt-long-2.diff
new file mode 100644
index 0000000000..d4fa69cc93
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/getopt-long-2.diff
@@ -0,0 +1,58 @@
+From 04ab4420bf9e7690c612b555ae8ad396b2a3a855 Mon Sep 17 00:00:00 2001
+From: Johan Vromans <jvromans@squirrel.nl>
+Date: Wed, 22 Feb 2017 12:10:34 +0100
+Subject: [PATCH] Withdraw part of commit
+ 5d9947fb445327c7299d8beb009d609bc70066c0, which tries to implement more GNU
+ getopt_long campatibility. GNU getopt_long() does not accept the (optional)
+ argument to be passed to the option without = sign. However, we do, since not
+ doing so breaks existing scripts.
+
+Origin: backport, https://github.com/sciurius/perl-Getopt-Long/commit/258074ddb2f8960eb1c74a5b20d6ea7263c3bb13
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=120300
+Patch-Name: fixes/getopt-long-2.diff
+
+---
+ cpan/Getopt-Long/lib/Getopt/Long.pm | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/cpan/Getopt-Long/lib/Getopt/Long.pm b/cpan/Getopt-Long/lib/Getopt/Long.pm
+index 5e1834f..9d38673 100644
+--- a/cpan/Getopt-Long/lib/Getopt/Long.pm
++++ b/cpan/Getopt-Long/lib/Getopt/Long.pm
+@@ -1110,9 +1110,17 @@ sub FindOption ($$$$$) {
+
+ # Check if there is an option argument available.
+ if ( $gnu_compat ) {
+- my $optargtype = 0; # 0 = none, 1 = empty, 2 = nonempty
+- $optargtype = ( !defined($optarg) ? 0 : ( (length($optarg) == 0) ? 1 : 2 ) );
+- return (1, $opt, $ctl, defined($ctl->[CTL_DEFAULT]) ? $ctl->[CTL_DEFAULT] : undef)
++ my $optargtype = 0; # none, 1 = empty, 2 = nonempty, 3 = aux
++ if ( defined($optarg) ) {
++ $optargtype = (length($optarg) == 0) ? 1 : 2;
++ }
++ elsif ( defined $rest || @$argv > 0 ) {
++ # GNU getopt_long() does not accept the (optional)
++ # argument to be passed to the option without = sign.
++ # We do, since not doing so breaks existing scripts.
++ $optargtype = 3;
++ }
++ return (1, $opt, $ctl, $ctl->[CTL_DEFAULT])
+ if (($optargtype == 0) && !$mand);
+ return (1, $opt, $ctl, $type eq 's' ? '' : 0)
+ if $optargtype == 1; # --foo= -> return nothing
+@@ -2322,11 +2330,14 @@ do. Without C<gnu_compat>, C<--opt=> gives an error. With C<gnu_compat>,
+ C<--opt=> will give option C<opt> and empty value.
+ This is the way GNU getopt_long() does it.
+
++Note that C<--opt value> is still accepted, even though GNU
++getopt_long() doesn't.
++
+ =item gnu_getopt
+
+ This is a short way of setting C<gnu_compat> C<bundling> C<permute>
+ C<no_getopt_compat>. With C<gnu_getopt>, command line handling should be
+-fully compatible with GNU getopt_long().
++reasonably compatible with GNU getopt_long().
+
+ =item require_order
+
diff --git a/meta/recipes-devtools/perl/perl/fixes/getopt-long-3.diff b/meta/recipes-devtools/perl/perl/fixes/getopt-long-3.diff
new file mode 100644
index 0000000000..8d14362e88
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/getopt-long-3.diff
@@ -0,0 +1,41 @@
+From f2a5c8b66c83fe4719dee9c50edeb2d6f8925c19 Mon Sep 17 00:00:00 2001
+From: Andrew Gregory <andrew.gregory.8@gmail.com>
+Date: Sun, 21 May 2017 21:12:21 -0400
+Subject: [PATCH] provide a default value for optional arguments
+
+When using gnu_compat, FindOption would return undef as the value for
+the options with optional arguments if none was provided. Subsequent
+processing in GetOptionsFromArray is skipped entirely for undef values,
+causing the option to be silently discarded. The following code snippet
+demonstrates the issue:
+
+ use Getopt::Long qw(GetOptionsFromArray :config gnu_compat);
+ GetOptionsFromArray( ['--foo'], 'foo:s' => sub { print("success") } );
+
+Origin: backport, https://github.com/sciurius/perl-Getopt-Long/commit/2d16f355e25537aa742eb2833a7d52a63051429b
+Patch-Name: fixes/getopt-long-3.diff
+
+---
+ cpan/Getopt-Long/lib/Getopt/Long.pm | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/Getopt-Long/lib/Getopt/Long.pm b/cpan/Getopt-Long/lib/Getopt/Long.pm
+index 9d38673..e7e033b 100644
+--- a/cpan/Getopt-Long/lib/Getopt/Long.pm
++++ b/cpan/Getopt-Long/lib/Getopt/Long.pm
+@@ -1120,8 +1120,13 @@ sub FindOption ($$$$$) {
+ # We do, since not doing so breaks existing scripts.
+ $optargtype = 3;
+ }
+- return (1, $opt, $ctl, $ctl->[CTL_DEFAULT])
+- if (($optargtype == 0) && !$mand);
++ if(($optargtype == 0) && !$mand) {
++ my $val
++ = defined($ctl->[CTL_DEFAULT]) ? $ctl->[CTL_DEFAULT]
++ : $type eq 's' ? ''
++ : 0;
++ return (1, $opt, $ctl, $val);
++ }
+ return (1, $opt, $ctl, $type eq 's' ? '' : 0)
+ if $optargtype == 1; # --foo= -> return nothing
+ }
diff --git a/meta/recipes-devtools/perl/perl/fixes/getopt-long-4.diff b/meta/recipes-devtools/perl/perl/fixes/getopt-long-4.diff
new file mode 100644
index 0000000000..a09507c4c6
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/getopt-long-4.diff
@@ -0,0 +1,31 @@
+From d315170f16aaace8bebf44e652d83c594621519e Mon Sep 17 00:00:00 2001
+From: Johan Vromans <jvromans@squirrel.nl>
+Date: Tue, 13 Jun 2017 13:26:00 +0200
+Subject: [PATCH] Fix issue #122068.
+
+Origin: backport, https://github.com/sciurius/perl-Getopt-Long/commit/2d16f355e25537aa742eb2833a7d52a63051429b
+Bug: https://rt.cpan.org/Ticket/Display.html?id=122068
+Bug-Debian: https://bugs.debian.org/864544
+Patch-Name: fixes/getopt-long-4.diff
+
+---
+ cpan/Getopt-Long/lib/Getopt/Long.pm | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cpan/Getopt-Long/lib/Getopt/Long.pm b/cpan/Getopt-Long/lib/Getopt/Long.pm
+index e7e033b..4cdfe92 100644
+--- a/cpan/Getopt-Long/lib/Getopt/Long.pm
++++ b/cpan/Getopt-Long/lib/Getopt/Long.pm
+@@ -1121,6 +1121,12 @@ sub FindOption ($$$$$) {
+ $optargtype = 3;
+ }
+ if(($optargtype == 0) && !$mand) {
++ if ( $type eq 'I' ) {
++ # Fake incremental type.
++ my @c = @$ctl;
++ $c[CTL_TYPE] = '+';
++ return (1, $opt, \@c, 1);
++ }
+ my $val
+ = defined($ctl->[CTL_DEFAULT]) ? $ctl->[CTL_DEFAULT]
+ : $type eq 's' ? ''
diff --git a/meta/recipes-devtools/perl/perl/fixes/json-pp-example.diff b/meta/recipes-devtools/perl/perl/fixes/json-pp-example.diff
new file mode 100644
index 0000000000..e3f3b3b9f3
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/json-pp-example.diff
@@ -0,0 +1,27 @@
+From e309e7edaad1621e517967e67e81454a2035f034 Mon Sep 17 00:00:00 2001
+From: Kenichi Ishigaki <ishigaki@cpan.org>
+Date: Sat, 27 Aug 2016 22:59:58 +0900
+Subject: [PATCH] fix RT-92793: bug in SYNOPSIS
+
+Bug-Debian: https://bugs.debian.org/871837
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=92793
+Origin: backport, https://github.com/makamaka/JSON-PP/commit/e4da34595ae4cd36e58940f06640f0bf2c40976b
+Patch-Name: fixes/json-pp-example.diff
+
+---
+ cpan/JSON-PP/lib/JSON/PP.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm
+index 9337ce9..ff0e88a 100644
+--- a/cpan/JSON-PP/lib/JSON/PP.pm
++++ b/cpan/JSON-PP/lib/JSON/PP.pm
+@@ -1613,7 +1613,7 @@ JSON::PP - JSON::XS compatible pure-Perl module.
+
+ # OO-interface
+
+- $coder = JSON::PP->new->ascii->pretty->allow_nonref;
++ $json = JSON::PP->new->ascii->pretty->allow_nonref;
+
+ $json_text = $json->encode( $perl_scalar );
+ $perl_scalar = $json->decode( $json_text );
diff --git a/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_angle_units.diff b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_angle_units.diff
new file mode 100644
index 0000000000..d21b021a49
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_angle_units.diff
@@ -0,0 +1,29 @@
+From c81abec8af46d3afb3f91700c4733d18d80cff5d Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 30 Apr 2016 22:56:56 +0100
+Subject: [PATCH] Math::Trig: document angle units
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=114106
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731505
+Patch-Name: fixes/math_complex_doc_angle_units.diff
+
+---
+ cpan/Math-Complex/lib/Math/Trig.pm | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cpan/Math-Complex/lib/Math/Trig.pm b/cpan/Math-Complex/lib/Math/Trig.pm
+index 1d9612a..728da3e 100644
+--- a/cpan/Math-Complex/lib/Math/Trig.pm
++++ b/cpan/Math-Complex/lib/Math/Trig.pm
+@@ -263,6 +263,11 @@ core Perl which defines only the C<sin()> and C<cos()>. The constant
+ B<pi> is also defined as are a few convenience functions for angle
+ conversions, and I<great circle formulas> for spherical movement.
+
++=head1 ANGLES
++
++All angles are defined in radians, except where otherwise specified
++(for example in the deg/rad conversion functions).
++
+ =head1 TRIGONOMETRIC FUNCTIONS
+
+ The tangent
diff --git a/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_great_circle.diff b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_great_circle.diff
new file mode 100644
index 0000000000..d4b98d9c04
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_great_circle.diff
@@ -0,0 +1,26 @@
+From ffebd2c39731282d0194acf9882cc9f0b315860c Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 30 Apr 2016 22:50:52 +0100
+Subject: [PATCH] Math::Trig: clarify definition of great_circle_midpoint
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=114104
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697567
+Patch-Name: fixes/math_complex_doc_great_circle.diff
+
+---
+ cpan/Math-Complex/lib/Math/Trig.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/Math-Complex/lib/Math/Trig.pm b/cpan/Math-Complex/lib/Math/Trig.pm
+index 728da3e..89dcd09 100644
+--- a/cpan/Math-Complex/lib/Math/Trig.pm
++++ b/cpan/Math-Complex/lib/Math/Trig.pm
+@@ -613,7 +613,7 @@ or the midpoint if you know the end points:
+ ($thetam, $phim) =
+ great_circle_midpoint($theta0, $phi0, $theta1, $phi1);
+
+-The great_circle_midpoint() is just a special case of
++The great_circle_midpoint() is just a special case (with $way = 0.5) of
+
+ =head2 great_circle_waypoint
+
diff --git a/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_see_also.diff b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_see_also.diff
new file mode 100644
index 0000000000..01e58de149
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/math_complex_doc_see_also.diff
@@ -0,0 +1,26 @@
+From 93fe0546af1b77897ec127db729a71e983dd79a0 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 30 Apr 2016 22:53:44 +0100
+Subject: [PATCH] Math::Trig: add missing SEE ALSO
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=114105
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697568
+Patch-Name: fixes/math_complex_doc_see_also.diff
+
+---
+ cpan/Math-Complex/lib/Math/Trig.pm | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cpan/Math-Complex/lib/Math/Trig.pm b/cpan/Math-Complex/lib/Math/Trig.pm
+index 89dcd09..bc7ac78 100644
+--- a/cpan/Math-Complex/lib/Math/Trig.pm
++++ b/cpan/Math-Complex/lib/Math/Trig.pm
+@@ -748,6 +748,8 @@ an answer instead of giving a fatal runtime error.
+
+ Do not attempt navigation using these formulas.
+
++=head1 SEE ALSO
++
+ L<Math::Complex>
+
+ =head1 AUTHORS
diff --git a/meta/recipes-devtools/perl/perl/fixes/memoize-pod.diff b/meta/recipes-devtools/perl/perl/fixes/memoize-pod.diff
new file mode 100644
index 0000000000..7f0ffe6542
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/memoize-pod.diff
@@ -0,0 +1,35 @@
+From 638e0106772943bbb4faf89cb720fbefe746003a Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 6 Feb 2016 20:15:19 +0200
+Subject: [PATCH] Fix POD errors in Memoize
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=89441
+Author: Dominic Hargreaves <dom@cpan.org>
+Patch-Name: fixes/memoize-pod.diff
+
+---
+ cpan/Memoize/Memoize.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/Memoize/Memoize.pm b/cpan/Memoize/Memoize.pm
+index f4e6522..2f28b36 100644
+--- a/cpan/Memoize/Memoize.pm
++++ b/cpan/Memoize/Memoize.pm
+@@ -752,6 +752,8 @@ cache that was populated by the first call. C<complicated> ends up
+ being called only once, and both subsequent calls return C<3> from the
+ cache, regardless of the calling context.
+
++=back
++
+ =head3 List values in scalar context
+
+ Consider this function:
+@@ -801,8 +803,6 @@ This normalizer function will store scalar context return values in
+ the disk file under keys that begin with C<S:>, and list context
+ return values under keys that begin with C<L:>.
+
+-=back
+-
+ =head1 OTHER FACILITIES
+
+ =head2 C<unmemoize>
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff b/meta/recipes-devtools/perl/perl/fixes/memoize_storable_nstore.diff
index d9b36f6d23..61005343f6 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
+++ b/meta/recipes-devtools/perl/perl/fixes/memoize_storable_nstore.diff
@@ -1,4 +1,4 @@
-From 55d430eb02fc116581847304ca20321687978269 Mon Sep 17 00:00:00 2001
+From 1e0e57ed2add974f85fda05bf2ef2072e85e3fa5 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
@@ -47,14 +47,13 @@ Bug-Debian: http://bugs.debian.org/587650
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=77790
Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=77790
Patch-Name: fixes/memoize_storable_nstore.diff
-Upstream-Status: Pending
---
cpan/Memoize/Memoize/Storable.pm | 2 +-
cpan/Memoize/t/tie_storable.t | 24 ++++++++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/cpan/Memoize/Memoize/Storable.pm b/cpan/Memoize/Memoize/Storable.pm
-index 1314797..87876f2 100644
+index 1314797297..87876f227e 100644
--- a/cpan/Memoize/Memoize/Storable.pm
+++ b/cpan/Memoize/Memoize/Storable.pm
@@ -55,7 +55,7 @@ sub DESTROY {
@@ -67,7 +66,7 @@ index 1314797..87876f2 100644
} else {
Storable::store($self->{H}, $self->{FILENAME});
diff --git a/cpan/Memoize/t/tie_storable.t b/cpan/Memoize/t/tie_storable.t
-index de3b8dc..a624238 100644
+index de3b8dc26b..a62423850e 100644
--- a/cpan/Memoize/t/tie_storable.t
+++ b/cpan/Memoize/t/tie_storable.t
@@ -31,18 +31,34 @@ if ($@) {
diff --git a/meta/recipes-devtools/perl/perl/fixes/packaging_test_skips.diff b/meta/recipes-devtools/perl/perl/fixes/packaging_test_skips.diff
new file mode 100644
index 0000000000..cf03dcf989
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/packaging_test_skips.diff
@@ -0,0 +1,121 @@
+From 41946a7ff425786d1ba38cbe0337e35bafb33a54 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 14 Oct 2017 16:27:53 +0200
+Subject: Skip various tests if PERL_BUILD_PACKAGING is set
+
+These are tests which tend not to be useful for downstream packagers
+
+t/porting/customized.t change originally from Todd Rinaldo
+
+Patch-Name: fixes/packaging_test_skips.diff
+---
+ INSTALL | 3 ++-
+ MANIFEST | 1 +
+ PACKAGING | 30 ++++++++++++++++++++++++++++++
+ regen/lib_cleanup.pl | 5 +++++
+ t/porting/customized.t | 1 +
+ t/test.pl | 3 +++
+ 6 files changed, 42 insertions(+), 1 deletion(-)
+ create mode 100644 PACKAGING
+
+diff --git a/INSTALL b/INSTALL
+index 0544b420ca..6af71dcdad 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -2724,4 +2724,5 @@ This document is part of the Perl package and may be distributed under
+ the same terms as perl itself, with the following additional request:
+ If you are distributing a modified version of perl (perhaps as part of
+ a larger package) please B<do> modify these installation instructions
+-and the contact information to match your distribution.
++and the contact information to match your distribution. Additional
++information for packagers is in F<PACKAGING>.
+diff --git a/MANIFEST b/MANIFEST
+index e102bf9277..37f901f4d8 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -4864,6 +4864,7 @@ os2/perlrexx.c Support perl interpreter embedded in REXX
+ os2/perlrexx.cmd Test perl interpreter embedded in REXX
+ overload.h generated overload enum (public)
+ overload.inc generated overload name table (implementation)
++PACKAGING notes and best practice for packaging perl 5
+ packsizetables.inc The generated packprops array used in pp_pack.c
+ pad.c Scratchpad functions
+ pad.h Scratchpad headers
+diff --git a/PACKAGING b/PACKAGING
+new file mode 100644
+index 0000000000..6369f0b979
+--- /dev/null
++++ b/PACKAGING
+@@ -0,0 +1,30 @@
++If you read this file _as_is_, just ignore the funny characters you
++see. It is written in the POD format (see pod/perlpod.pod) which is
++specifically designed to be readable as is.
++
++=head1 NAME
++
++PACKAGING - notes and best practice for packaging perl 5
++
++=head1 SYNOPSIS
++
++This document is aimed at anyone who is producing their own version of
++perl for distribution to other users. It is intended as a collection
++of useful tips, advice and best practice, rather than being a complete
++packaging manual. The starting point for installing perl remains
++F<INSTALL>.
++
++=head1 Customizing test running
++
++A small number of porting tests (those in t/porting) tests are not well
++suited to typical distribution packaging scenarios. For example, they
++assume they are working in a git clone of the upstream Perl repository,
++or enforce rules which are not relevant to downstream packagers.
++These can be skipped by setting the environment variable
++PERL_BUILD_PACKAGING. A complete list of tests which this applied to
++can be found by searching the codebase for this string.
++
++An alternative strategy would be to skip all porting tests, but many of
++them are useful if additional patches might be applied.
++
++=cut
+diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl
+index 5e40b405a4..6caf74a563 100644
+--- a/regen/lib_cleanup.pl
++++ b/regen/lib_cleanup.pl
+@@ -164,6 +164,11 @@ if ($TAP && !-d '.git' && !-f 'lib/.gitignore') {
+ exit 0;
+ }
+
++if ($ENV{'PERL_BUILD_PACKAGING'}) {
++ print "ok # skip explicitly disabled git tests by PERL_BUILD_PACKAGING\n";
++ exit 0;
++}
++
+ $fh = open_new('lib/.gitignore', '>',
+ { by => $0,
+ from => 'MANIFEST and parsing files in cpan/ dist/ and ext/'});
+diff --git a/t/porting/customized.t b/t/porting/customized.t
+index 3bd6adb33a..fdaa3c4562 100644
+--- a/t/porting/customized.t
++++ b/t/porting/customized.t
+@@ -13,6 +13,7 @@ BEGIN {
+ @INC = qw(lib Porting t);
+ require 'test.pl';
+ skip_all("pre-computed SHA1 won't match under EBCDIC") if $::IS_EBCDIC;
++ skip_all("This distro may have modified some files in cpan/. Skipping validation.") if $ENV{'PERL_BUILD_PACKAGING'};
+ }
+
+ use strict;
+diff --git a/t/test.pl b/t/test.pl
+index d86f6332b3..55ec664565 100644
+--- a/t/test.pl
++++ b/t/test.pl
+@@ -212,6 +212,9 @@ sub find_git_or_skip {
+ } else {
+ $reason = 'not being run from a git checkout';
+ }
++ if ($ENV{'PERL_BUILD_PACKAGING'}) {
++ $reason = 'PERL_BUILD_PACKAGING is set';
++ }
+ skip_all($reason) if $_[0] && $_[0] eq 'all';
+ skip($reason, @_);
+ }
diff --git a/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase1.diff b/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase1.diff
new file mode 100644
index 0000000000..f6cfe32231
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase1.diff
@@ -0,0 +1,55 @@
+From 59b2f127b56999b3373f6e9855402120ae4b66ab Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Mon, 16 Oct 2017 01:56:02 +0300
+Subject: regen-configure: rename filexp.U to filexp_path.U, phase 1
+
+The renaming placates t/porting/checkcase.t and matches dist upstream.
+
+It is done in two phases because git-dpm cannot currently handle git
+renames properly (i.e. use the --no-renames git-format-patch option
+to make the patches compatible with dpkg source format 3.0 (quilt)).
+
+We therefore copy first and delete afterwards.
+
+Patch-Name: fixes/rename-filexp.U-phase1.diff
+---
+ regen-configure/dist/U/filexp_path.U | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+ create mode 100644 regen-configure/dist/U/filexp_path.U
+
+diff --git a/regen-configure/dist/U/filexp_path.U b/regen-configure/dist/U/filexp_path.U
+new file mode 100644
+index 0000000000..ea88a34c23
+--- /dev/null
++++ b/regen-configure/dist/U/filexp_path.U
+@@ -0,0 +1,30 @@
++?RCS: $Id: filexp.U 1 2006-08-24 12:32:52Z rmanfredi $
++?RCS:
++?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
++?RCS:
++?RCS: You may redistribute only under the terms of the Artistic Licence,
++?RCS: as specified in the README file that comes with the distribution.
++?RCS: You may reuse parts of this distribution only within the terms of
++?RCS: that same Artistic Licence; a copy of which may be found at the root
++?RCS: of the source tree for dist 4.0.
++?RCS:
++?RCS: $Log: filexp.U,v $
++?RCS: Revision 3.0 1993/08/18 12:08:08 ram
++?RCS: Baseline for dist 3.0 netwide release.
++?RCS:
++?MAKE:filexp: privlib
++?MAKE: -pick add $@ %<
++?S:filexp:
++?S: This symbol contains the full pathname of the filexp script, in case we
++?S: are saving the script for posterity.
++?S:.
++: must not allow self reference
++case "$privlib" in
++ /*)
++ filexp=$privlib/filexp
++ ;;
++ *)
++ filexp=`pwd`/filexp
++ ;;
++esac
++
diff --git a/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase2.diff b/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase2.diff
new file mode 100644
index 0000000000..158002d069
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/rename-filexp.U-phase2.diff
@@ -0,0 +1,55 @@
+From 109a8792ab5ec683bcdc7d392f08d788a72ac08e Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Mon, 16 Oct 2017 01:56:02 +0300
+Subject: regen-configure: rename filexp.U to filexp_path.U, phase 2
+
+The renaming placates t/porting/checkcase.t and matches dist upstream.
+
+It is done in two phases because git-dpm cannot currently handle git
+renames properly (i.e. use the --no-renames git-format-patch option
+to make the patches compatible with dpkg source format 3.0 (quilt)).
+
+We therefore copy first and delete afterwards.
+
+Patch-Name: fixes/rename-filexp.U-phase2.diff
+---
+ regen-configure/dist/U/filexp.U | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+ delete mode 100644 regen-configure/dist/U/filexp.U
+
+diff --git a/regen-configure/dist/U/filexp.U b/regen-configure/dist/U/filexp.U
+deleted file mode 100644
+index ea88a34c23..0000000000
+--- a/regen-configure/dist/U/filexp.U
++++ /dev/null
+@@ -1,30 +0,0 @@
+-?RCS: $Id: filexp.U 1 2006-08-24 12:32:52Z rmanfredi $
+-?RCS:
+-?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
+-?RCS:
+-?RCS: You may redistribute only under the terms of the Artistic Licence,
+-?RCS: as specified in the README file that comes with the distribution.
+-?RCS: You may reuse parts of this distribution only within the terms of
+-?RCS: that same Artistic Licence; a copy of which may be found at the root
+-?RCS: of the source tree for dist 4.0.
+-?RCS:
+-?RCS: $Log: filexp.U,v $
+-?RCS: Revision 3.0 1993/08/18 12:08:08 ram
+-?RCS: Baseline for dist 3.0 netwide release.
+-?RCS:
+-?MAKE:filexp: privlib
+-?MAKE: -pick add $@ %<
+-?S:filexp:
+-?S: This symbol contains the full pathname of the filexp script, in case we
+-?S: are saving the script for posterity.
+-?S:.
+-: must not allow self reference
+-case "$privlib" in
+- /*)
+- filexp=$privlib/filexp
+- ;;
+- *)
+- filexp=`pwd`/filexp
+- ;;
+-esac
+-
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl/fixes/respect_umask.diff
index c8663f5357..34f700ae5f 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
+++ b/meta/recipes-devtools/perl/perl/fixes/respect_umask.diff
@@ -1,4 +1,4 @@
-From d9d535ef97f57af6e9728075944c33f3b0b5372f Mon Sep 17 00:00:00 2001
+From 900e978c41cd85e62187d05a89414d034a1910f2 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
@@ -7,14 +7,13 @@ This is needed to satisfy Debian policy regarding group-writable
site directories.
Patch-Name: fixes/respect_umask.diff
-Upstream-Status: Pending
---
cpan/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++---------
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
-index 1e8ac4c..3e79121 100644
+index 1e8ac4cd12..3e79121f38 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 {
@@ -89,10 +88,10 @@ index 1e8ac4c..3e79121 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
+index 66a24d7838..588c54b9bb 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
+@@ -2223,7 +2223,7 @@ doc__install : doc_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
pure_perl_install :: all
@@ -101,7 +100,7 @@ index f63145c..197f102 100644
};
push @m,
-@@ -2138,7 +2138,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
+@@ -2243,7 +2243,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
pure_site_install :: all
@@ -110,7 +109,7 @@ index f63145c..197f102 100644
};
push @m,
q{ read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-@@ -2156,7 +2156,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
+@@ -2261,7 +2261,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
"}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{"
pure_vendor_install :: all
@@ -119,7 +118,7 @@ index f63145c..197f102 100644
};
push @m,
q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-@@ -2188,8 +2188,8 @@ doc_vendor_install :: all
+@@ -2293,8 +2293,8 @@ doc_vendor_install :: all
push @m, q{
doc_perl_install :: all
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -128,9 +127,9 @@ index f63145c..197f102 100644
+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
- "installed into" $(INSTALLPRIVLIB) \
+ "installed into" "$(INSTALLPRIVLIB)" \
LINKTYPE "$(LINKTYPE)" \
-@@ -2199,8 +2199,8 @@ doc_perl_install :: all
+@@ -2304,8 +2304,8 @@ doc_perl_install :: all
doc_site_install :: all
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -139,9 +138,9 @@ index f63145c..197f102 100644
+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
- "installed into" $(INSTALLSITELIB) \
+ "installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
-@@ -2210,8 +2210,8 @@ doc_site_install :: all
+@@ -2315,8 +2315,8 @@ doc_site_install :: all
doc_vendor_install :: all
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -150,5 +149,5 @@ index f63145c..197f102 100644
+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
- "installed into" $(INSTALLVENDORLIB) \
+ "installed into" "$(INSTALLVENDORLIB)" \
LINKTYPE "$(LINKTYPE)" \
diff --git a/meta/recipes-devtools/perl/perl/fixes/test-builder-reset.diff b/meta/recipes-devtools/perl/perl/fixes/test-builder-reset.diff
new file mode 100644
index 0000000000..9774d2cce2
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/test-builder-reset.diff
@@ -0,0 +1,70 @@
+From 940e2f641870a85d44b8c53e505c8ebccb39f2b1 Mon Sep 17 00:00:00 2001
+From: Chad Granum <exodist7@gmail.com>
+Date: Wed, 1 Feb 2017 19:33:57 -0800
+Subject: Reset inside subtest maintains parent
+
+When TB->reset is called from within a subtest it should maintain the
+link to the parent, this link is necessary for unwinding the TB-stack.
+
+Fixes #757
+
+[backported to Debian Perl 5.26 by Niko Tyni <ntyni@debian.org>]
+
+Origin: backport, https://github.com/Test-More/test-more/commit/68775db7eef1a7e30dc03abf8feabcf3e32301d4
+Bug: https://github.com/Test-More/test-more/issues/757
+Bug-Debian: https://bugs.debian.org/865894
+Patch-Name: fixes/test-builder-reset.diff
+---
+ cpan/Test-Simple/lib/Test/Builder.pm | 4 +++-
+ cpan/Test-Simple/t/regression/757-reset_in_subtest.t | 20 ++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletion(-)
+ create mode 100644 cpan/Test-Simple/t/regression/757-reset_in_subtest.t
+
+diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm
+index 052e2793b9..851a5f6669 100644
+--- a/cpan/Test-Simple/lib/Test/Builder.pm
++++ b/cpan/Test-Simple/lib/Test/Builder.pm
+@@ -143,7 +143,8 @@ sub parent {
+ my $chub = $self->{Hub} || $ctx->hub;
+ $ctx->release;
+
+- my $parent = $chub->meta(__PACKAGE__, {})->{parent};
++ my $meta = $chub->meta(__PACKAGE__, {});
++ my $parent = $meta->{parent};
+
+ return undef unless $parent;
+
+@@ -388,6 +389,7 @@ sub reset { ## no critic (Subroutines::ProhibitBuiltinHomonyms)
+ Done_Testing => undef,
+ Skip_All => 0,
+ Test_Results => [],
++ parent => $meta->{parent},
+ );
+
+ $self->{Exported_To} = undef;
+diff --git a/cpan/Test-Simple/t/regression/757-reset_in_subtest.t b/cpan/Test-Simple/t/regression/757-reset_in_subtest.t
+new file mode 100644
+index 0000000000..846a34d835
+--- /dev/null
++++ b/cpan/Test-Simple/t/regression/757-reset_in_subtest.t
+@@ -0,0 +1,20 @@
++use strict;
++use warnings;
++
++use Test::More;
++
++subtest 'subtest' => sub {
++ Test::Builder->new->reset;
++ ok 1;
++};
++
++subtest 'subtest' => sub {
++ Test::Builder->new->reset;
++ subtest 'subtest' => sub {
++ Test::Builder->new->reset;
++ ok 1;
++ };
++ ok 1;
++};
++
++done_testing;
diff --git a/meta/recipes-devtools/perl/perl/fixes/test-printf-null.diff b/meta/recipes-devtools/perl/perl/fixes/test-printf-null.diff
new file mode 100644
index 0000000000..94547217da
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/test-printf-null.diff
@@ -0,0 +1,67 @@
+From 6ed5aa97af1ad9123ccd836fb5d12c94d8b14128 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 24 Mar 2018 16:49:06 +0200
+Subject: Fix pointer to integer cast in null_printf check
+
+Quoting James Cowgill in https://bugs.debian.org/893601
+
+> I recently noticed a build failure in the "mrs" package which embeds the
+> perl interpreter. The strange part was that the error looked completely
+> generic but only failed on 32-bit for some reason. I traced this to the
+> value of the PRINTF_FORMAT_NULL_OK config,h option in perl which is
+> defined on 32-bit, but not defined on 64-bit architectures. This is a
+> bug because this check detects the behavior of the compiler and should
+> be the same on all architectures with the same GCC version.
+>
+> The underlying bug is that the check for this warning causes GCC to emit
+> an unrelated warning on 64-bit arches which tricks the check into not
+> defining PRINTF_FORMAT_NULL_OK.
+>
+> The line which causes the warning is:
+> int null_printf (char* pat,...) { return (int)pat; }
+>
+> GCC complains about the pointer to integer cast of the wrong size but
+> only on 64-bits. I've attached a patch to fix this by casting through
+> intptr_t first.
+
+(Also includes a dependency fix from upstream commit 3bddea5a1c1a7721899d5e24f49e9ef21bec9eed)
+
+Bug: https://github.com/perl5-metaconfig/metaconfig/pull/53
+Bug-Debian: https://bugs.debian.org/893601
+Origin: upstream, https://github.com/perl5-metaconfig/metaconfig/commit/16e38bb83cd44f36aea3c39f90903f640fac3572
+Patch-Name: fixes/test-printf-null.diff
+---
+ regen-configure/U/modified/d_attribut.U | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/regen-configure/U/modified/d_attribut.U b/regen-configure/U/modified/d_attribut.U
+index 8f71d4b08d..86fe17319f 100644
+--- a/regen-configure/U/modified/d_attribut.U
++++ b/regen-configure/U/modified/d_attribut.U
+@@ -24,7 +24,8 @@
+ d_attribute_nonnull d_attribute_noreturn d_attribute_pure \
+ d_attribute_unused d_attribute_warn_unused_result \
+ d_printf_format_null: \
+- Myread Oldconfig cat cc ccflags rm Setvar contains i_stdlib run
++ Myread Oldconfig cat cc ccflags rm Setvar contains i_stdlib run \
++ i_inttypes
+ ?MAKE: -pick add $@ %<
+ ?S:d_attribute_format:
+ ?S: This variable conditionally defines HASATTRIBUTE_FORMAT, which
+@@ -159,8 +160,15 @@ $cat >attrib.c <<EOCP
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#$i_inttypes I_INTTYPES
++#ifdef I_INTTYPES
++#include <inttypes.h>
++#endif
++#ifndef INTPTR_MAX
++#define intptr_t int
++#endif
+ int null_printf (char* pat,...) __attribute__((__format__(__printf__,1,2)));
+-int null_printf (char* pat,...) { return (int)pat; }
++int null_printf (char* pat,...) { return (int)(intptr_t)pat; }
+ int main () { exit(null_printf(NULL)); }
+ EOCP
+ if $cc $ccflags -o attrib attrib.c >attrib.out 2>&1 ; then
diff --git a/meta/recipes-devtools/perl/perl/fixes/time_piece_doc.diff b/meta/recipes-devtools/perl/perl/fixes/time_piece_doc.diff
new file mode 100644
index 0000000000..3793e4848a
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/fixes/time_piece_doc.diff
@@ -0,0 +1,30 @@
+From 2f34b8acecfa25758eb31a541f019a6b2f1a24e0 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 30 Apr 2016 23:20:45 +0100
+Subject: Time::Piece: Improve documentation for add_months and add_years
+
+These methods don't act on the time of the object they are called from,
+so the previous documentation was open to misinterpretation.
+
+Bug: https://github.com/rjbs/Time-Piece/pull/22
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817925
+Patch-Name: fixes/time_piece_doc.diff
+---
+ cpan/Time-Piece/Piece.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/Time-Piece/Piece.pm b/cpan/Time-Piece/Piece.pm
+index 6dbf4d69c4..d3b62ce5fb 100644
+--- a/cpan/Time-Piece/Piece.pm
++++ b/cpan/Time-Piece/Piece.pm
+@@ -783,8 +783,8 @@ days, weeks and years in that delta, using the Time::Seconds API.
+ In addition to adding seconds, there are two APIs for adding months and
+ years:
+
+- $t->add_months(6);
+- $t->add_years(5);
++ $t = $t->add_months(6);
++ $t = $t->add_years(5);
+
+ The months and years can be negative for subtractions. Note that there
+ is some "strange" behaviour when adding and subtracting months at the
diff --git a/meta/recipes-devtools/perl/perl/generate-sh.patch b/meta/recipes-devtools/perl/perl/generate-sh.patch
index 27f6e691c0..3a6fe9e0c7 100644
--- a/meta/recipes-devtools/perl/perl/generate-sh.patch
+++ b/meta/recipes-devtools/perl/perl/generate-sh.patch
@@ -1,13 +1,22 @@
+From e249e726a74beaab77043e57e567da1f289b0c7f Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
Upstream-Status:Inappropriate [embedded specific]
Use the ld flags from the supplied configuration file. For sh we need the
flags that specify to build PIC code so that the shared libraries work.
-Index: perl-5.14.2/Cross/generate_config_sh
-===================================================================
---- perl-5.14.2.orig/Cross/generate_config_sh 2010-12-30 04:07:14.000000000 +0200
-+++ perl-5.14.2/Cross/generate_config_sh 2012-11-22 15:58:49.852852805 +0200
-@@ -19,10 +19,10 @@
+---
+ Cross/generate_config_sh | 26 ++++++++++++++++++++++----
+ 1 file changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/Cross/generate_config_sh b/Cross/generate_config_sh
+index 203885e..62dad29 100755
+--- a/Cross/generate_config_sh
++++ b/Cross/generate_config_sh
+@@ -19,10 +19,10 @@ my $callbacks = {};
$callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]];
$callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]];
$callbacks->{'cc'} = [\&simple_process, ["CC", "arm-linux-gcc"]];
@@ -22,7 +31,7 @@ Index: perl-5.14.2/Cross/generate_config_sh
$callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]];
$callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]];
$callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]];
-@@ -30,6 +30,7 @@
+@@ -30,6 +30,7 @@ $callbacks->{'cpprun'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-
$callbacks->{'cppstdin'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-E"]];
$callbacks->{'full_ar'} = [\&backtick, ["AR", "which $ENV{AR}", "/usr/local/arm/2.95.3/bin/arm-linux-ar"]];
$callbacks->{'ld'} = [\&simple_process, ["LD", "arm-linux-ld"]];
@@ -30,7 +39,7 @@ Index: perl-5.14.2/Cross/generate_config_sh
$callbacks->{'ldflags'} = [\&simple_process, ["LDFLAGS", ""]];
$callbacks->{'ldflags_uselargefiles'} = [\&simple_process, ["LDFLAGS", ""]];
$callbacks->{'myarchname'} = [\&simple_process, ["SYS", "armv4l-linux"]];
-@@ -105,6 +106,23 @@
+@@ -105,6 +106,23 @@ sub simple_process_append {
}
diff --git a/meta/recipes-devtools/perl/perl/installperl.patch b/meta/recipes-devtools/perl/perl/installperl.patch
index 7fd1f50144..b247213b55 100644
--- a/meta/recipes-devtools/perl/perl/installperl.patch
+++ b/meta/recipes-devtools/perl/perl/installperl.patch
@@ -1,9 +1,18 @@
+From 181d3715247d6e1ca800147ddb5592fdfdd94de0 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Tue, 30 Oct 2007 08:21:24 +0000
+Subject: [PATCH] perl: Sync with OE, fix hardcoded staging references
+
Upstream-Status:Inappropriate [embedded specific]
-Index: perl-5.24.1/installperl
-===================================================================
---- perl-5.24.1.orig/installperl
-+++ perl-5.24.1/installperl
+---
+ installperl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/installperl b/installperl
+index af61203..f12441d 100755
+--- a/installperl
++++ b/installperl
@@ -2,8 +2,8 @@
BEGIN {
diff --git a/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch b/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
index 5161e4c8b6..982895a33f 100644
--- a/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
+++ b/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
@@ -1,3 +1,8 @@
+From a0dde0eec4676f13ce4653f14c5d3e7b818d9387 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
Upstream-Status:Inappropriate [embedded specific]
This removes all the logic that perl uses to locate an appropriate
@@ -10,12 +15,16 @@ external toolchain since perl will search in ${STAGING_INCDIR} for
errno.h (when using gcc) and that isn't where it's located - its
wherever the external toolchain keeps it's headers.
-Index: perl-5.12.3/ext/Errno/Errno_pm.PL
-===================================================================
---- perl-5.12.3.orig/ext/Errno/Errno_pm.PL
-+++ perl-5.12.3/ext/Errno/Errno_pm.PL
-@@ -17,8 +17,18 @@ unlink "Errno.tmp" if -f "Errno.tmp";
- open OUT, ">Errno.tmp" or die "Cannot open Errno.tmp: $!";
+---
+ ext/Errno/Errno_pm.PL | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 4464706..560d2ef 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -16,8 +16,18 @@ unlink "Errno.tmp" if -f "Errno.tmp";
+ open OUT, '>', 'Errno.tmp' or die "Cannot open Errno.tmp: $!";
select OUT;
my $file;
-my @files = get_files();
@@ -35,7 +44,7 @@ Index: perl-5.12.3/ext/Errno/Errno_pm.PL
# MinGW complains "warning: #pragma system_header ignored outside include
# file" if the header files are processed individually, so include them
# all in .c file and process that instead.
-@@ -53,7 +63,7 @@ sub process_file {
+@@ -52,7 +62,7 @@ sub process_file {
chomp($file = `cygpath -w "$file"`);
}
diff --git a/meta/recipes-devtools/perl/perl/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 b2c597974e..00b0530894 100644
--- a/meta/recipes-devtools/perl/perl/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
@@ -1,4 +1,7 @@
-make_ext.pl: fix regenerate makefile failed while $cc changed
+From aaa19ebf42f6bc9f82f34985f956afe447e72c8c Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Thu, 24 Jul 2014 09:57:17 +0800
+Subject: [PATCH] make_ext.pl: fix regenerate makefile failed while $cc changed
While $cc changed, the existance of 'xdefine' caused makefile
regeneration failed.
@@ -6,15 +9,16 @@ regeneration failed.
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
make_ext.pl | 4 ++++
1 file changed, 4 insertions(+)
-Index: perl-5.24.1/make_ext.pl
-===================================================================
---- perl-5.24.1.orig/make_ext.pl
-+++ perl-5.24.1/make_ext.pl
-@@ -335,6 +335,10 @@ sub build_extension {
+diff --git a/make_ext.pl b/make_ext.pl
+index 80d8f68..823efe0 100644
+--- a/make_ext.pl
++++ b/make_ext.pl
+@@ -336,6 +336,10 @@ sub build_extension {
print "Deleting non-Cross makefile\n";
close $mfh or die "close $makefile: $!";
_unlink($makefile);
diff --git a/meta/recipes-devtools/perl/perl/native-perlinc.patch b/meta/recipes-devtools/perl/perl/native-perlinc.patch
index f0bb1f6596..babb230633 100644
--- a/meta/recipes-devtools/perl/perl/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/perl/native-perlinc.patch
@@ -1,10 +1,19 @@
+From 82e12df79fcb63ebc28e8141fefb60440b6c3c77 Mon Sep 17 00:00:00 2001
+From: Marcin Juszkiewicz <hrw@openedhand.com>
+Date: Wed, 30 May 2007 09:33:32 +0000
+Subject: [PATCH] perl: sync with OE
+
Upstream-Status:Inappropriate [embedded specific]
-Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
-===================================================================
---- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
-+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
-@@ -1597,6 +1597,19 @@
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 0344194..e9d475d 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -1768,6 +1768,19 @@ from the perl source tree.
$self->{PERL_LIB} ||= $Config{privlibexp};
$self->{PERL_ARCHLIB} ||= $Config{archlibexp};
$self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
diff --git a/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
index ff3d6dc099..d1ec6083a1 100644
--- a/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
+++ b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
@@ -1,17 +1,25 @@
+From be16bcb15fa523ec7a0bb5ed5aabd99420c60c6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=E0=B8=A3=E0=B8=96rn=20Esser?=
+ <besser82@fedoraproject.org>
+Date: Sat, 20 Jan 2018 20:22:53 +0100
+Subject: [PATCH] perl: add patch to solve libcrypt incompatibility
+
commit 13e70b397dcb0d1bf4a869b670f041c1d7b730d0
-Author: Bjรถrn Esser <besser82@fedoraproject.org>
-Date: Sat Jan 20 20:22:53 2018 +0100
pp: Guard fix for really old bug in glibc libcrypt
Upstream-Status: Pending
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ pp.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
diff --git a/pp.c b/pp.c
-index d50ad7ddbf..6510c7b15c 100644
+index fbba3bd..1e0a5eb 100644
--- a/pp.c
+++ b/pp.c
-@@ -3650,8 +3650,12 @@ PP(pp_crypt)
+@@ -3737,8 +3737,12 @@ PP(pp_crypt)
#if defined(__GLIBC__) || defined(__EMX__)
if (PL_reentrant_buffer->_crypt_struct_buffer) {
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
@@ -25,4 +33,3 @@ index d50ad7ddbf..6510c7b15c 100644
}
#endif
}
-
diff --git a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
index 37bf523357..311bd43338 100644
--- a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
+++ b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
@@ -1,9 +1,13 @@
-perl: add archlib_exp variable used to generate ARCHLIB_EXP in config.h
-
+From 65f6394798170eb1d328ab34e3cb5b2403d05d1f Mon Sep 17 00:00:00 2001
+From: Tom Zanussi <tom.zanussi@intel.com>
+Date: Tue, 9 Oct 2012 19:48:24 -0500
+Subject: [PATCH] perl: add archlib_exp variable used to generate ARCHLIB_EXP
+ in config.h
+
perl.c uses an ARCHLIB_EXP define to generate compile-time code that
adds the archlibexp path to @INC during run-time initialization of a
new perl interpreter.
-
+
Because we've changed this value in a temporary way to make it
possible to use ExtUtils::Embed in the target build (the temporary
value in config.sh gets re-stripped out during packaging), the
@@ -14,22 +18,26 @@ the others in config.sh).
This creates an unmodified version called archlib_exp that gets used
by a modified config_h.SH to get the correct value into config.h
-
+
This patch uses an unmodified version of archlibexp called
archlib_exp, introduced to config.sh, which is used to generate the
correct value of ARCHLIB_EXP into config.h
-
+
See YOCTO #3099 for more info.
Upstream-Status:Inappropriate [embedded specific]
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-Index: perl-5.24.1/config_h.SH
-===================================================================
---- perl-5.24.1.orig/config_h.SH
-+++ perl-5.24.1/config_h.SH
-@@ -1434,7 +1434,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+---
+ config_h.SH | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config_h.SH b/config_h.SH
+index e9b144f..594e7e5 100755
+--- a/config_h.SH
++++ b/config_h.SH
+@@ -1434,7 +1434,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
#$d_archlib ARCHLIB "$archlib" /**/
diff --git a/meta/recipes-devtools/perl/perl/perl-dynloader.patch b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
index 2572067a6e..f0a8065b96 100644
--- a/meta/recipes-devtools/perl/perl/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
@@ -1,3 +1,8 @@
+From c79212508d84537a6294a038299c1a3d081d690f Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
Upstream-Status:Inappropriate [embedded specific]
Allow the location that .so files are searched for for dynamic
@@ -7,10 +12,14 @@ system.
Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
-Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
-===================================================================
---- perl-5.24.1.orig/dist/XSLoader/XSLoader_pm.PL
-+++ perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
+---
+ dist/XSLoader/XSLoader_pm.PL | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
+index 8012e35..db4f987 100644
+--- a/dist/XSLoader/XSLoader_pm.PL
++++ b/dist/XSLoader/XSLoader_pm.PL
@@ -52,6 +52,20 @@ sub load {
my ($caller, $modlibname) = caller();
my $module = $caller;
diff --git a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch b/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
index 7379d8b814..8f5a59cc7b 100644
--- a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
+++ b/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
@@ -1,3 +1,8 @@
+From 1fc92ffc9e8aa08d6edc27766c2dd398cba633c3 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Fri, 23 Oct 2015 10:18:07 -0700
+Subject: [PATCH] Perl: Use CC version not $Config(gccversion)
+
Upstream-Status:Inappropriate [embedded specific]
The upstream code assumes that the compiler version used to compiler miniperl/perl-native
@@ -9,15 +14,16 @@ Jeremy Puhlman <jpuhlman@mvista.com>
Fix spaces in brackets while running $CC --version
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
ext/Errno/Errno_pm.PL | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 1fd29d0..7976ea2 100644
+index 560d2ef..d894a44 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
-@@ -224,9 +224,13 @@ sub write_errno_pm {
+@@ -231,9 +231,13 @@ sub write_errno_pm {
{ # BeOS (support now removed) did not enter this block
# invoke CPP and read the output
@@ -32,6 +38,3 @@ index 1fd29d0..7976ea2 100644
# GCC 5.0 interleaves expanded macros with line numbers breaking
# each line into multiple lines. RT#123784
$inhibit_linemarkers = ' -P';
---
-1.9.1
-
diff --git a/meta/recipes-devtools/perl/perl/perl-moreconfig.patch b/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
index 59ce85a7a3..4660c8179c 100644
--- a/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
+++ b/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
@@ -1,3 +1,8 @@
+From 3b24de5c5ff7060e9ef33ddd809fd8082690291e Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
Upstream-Status:Inappropriate [embedded specific]
We need ld in the fake config library, but it's not included by default. So
@@ -5,9 +10,15 @@ expand the number of items included. While this works it indicates that the
rest of the config items are not being picked up and/or are being picked up
from the host. More investigation needed.
---- perl-5.8.8/configpm 2007/04/20 09:48:05 1.1
-+++ perl-5.8.8/configpm 2007/04/20 09:57:12
-@@ -2,7 +2,7 @@
+---
+ configpm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configpm b/configpm
+index 877bff1..156ea58 100755
+--- a/configpm
++++ b/configpm
+@@ -37,7 +37,7 @@ EOF
use strict;
use vars qw(%Config $Config_SH_expanded);
diff --git a/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch b/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
index 03fdf4ab98..06a638f685 100644
--- a/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
+++ b/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
@@ -1,4 +1,4 @@
-From 1561549ea36e37cc25706f094a195de4928f4211 Mon Sep 17 00:00:00 2001
+From 7ebd6df5237609cb34870d280cda183f12c699d1 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 19 Jun 2015 01:23:46 -0700
Subject: [PATCH] t/run/switches.t: perl5 -> perl
@@ -8,15 +8,16 @@ We call it perl rather than perl5 in oe.
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
- t/run/switches.t | 2 +-
+ t/run/switches.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/run/switches.t b/t/run/switches.t
-index 78915e0..e9e4b45 100644
+index b61be56..d622f08 100644
--- a/t/run/switches.t
+++ b/t/run/switches.t
-@@ -269,7 +269,7 @@ is runperl(stderr => 1, prog => '#!perl -M'),
+@@ -267,7 +267,7 @@ is runperl(stderr => 1, prog => '#!perl -M'),
'-V generates 20+ lines' );
like( runperl( switches => ['-V'] ),
@@ -25,6 +26,3 @@ index 78915e0..e9e4b45 100644
'-V looks okay' );
# lookup a known config var
---
-1.7.9.5
-
diff --git a/meta/recipes-devtools/perl/perl/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 c8293c3d6a..9a3ae46899 100644
--- a/meta/recipes-devtools/perl/perl/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
@@ -1,14 +1,19 @@
-dist/threads/t/join.t: adjust ps option
+From 797f99b30288732a3453c8c9dda80baa6f361f8a Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 1 Jul 2014 15:51:53 +0800
+Subject: [PATCH] dist/threads/t/join.t: adjust ps option
The ps's option '-f' is not supported by busybox in oe.
Upstream-Status: Inappropriate
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
dist/threads/t/join.t | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dist/threads/t/join.t b/dist/threads/t/join.t
+index 2272e07..1d4b0e1 100644
--- a/dist/threads/t/join.t
+++ b/dist/threads/t/join.t
@@ -118,7 +118,7 @@ if ($^O eq 'linux') {
@@ -33,6 +38,3 @@ diff --git a/dist/threads/t/join.t b/dist/threads/t/join.t
}
} else {
skip("\$0 check: only on Linux");
---
-1.8.1.2
-
diff --git a/meta/recipes-devtools/perl/perl/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 ce577fe5f8..57a1dbeeac 100644
--- a/meta/recipes-devtools/perl/perl/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
@@ -1,18 +1,23 @@
-ext/DynaLoader/t/DynaLoader.t: fix calling dl_findfile() failed
+From 2e3dd40e215967b2cad53dcad22f75a759fea273 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 1 Jul 2014 15:51:53 +0800
+Subject: [PATCH] ext/DynaLoader/t/DynaLoader.t: fix calling dl_findfile()
+ failed
Use '$Config{libc}' as the libc file name
Upstream-Status: Inappropriate
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
ext/DynaLoader/t/DynaLoader.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/DynaLoader/t/DynaLoader.t b/ext/DynaLoader/t/DynaLoader.t
-index ade1f8e..3567afe 100644
+index 7fe30b3..3da2ada 100644
--- a/ext/DynaLoader/t/DynaLoader.t
+++ b/ext/DynaLoader/t/DynaLoader.t
-@@ -106,7 +106,7 @@ ok( defined $dlerr, "dl_error() returning an error message: '$dlerr'" );
+@@ -111,7 +111,7 @@ ok( defined $dlerr, "dl_error() returning an error message: '$dlerr'" );
# ... dl_findfile()
SKIP: {
my @files = ();
@@ -21,6 +26,3 @@ index ade1f8e..3567afe 100644
is( $@, '', "calling dl_findfile()" );
# Some platforms are known to not have a "libc"
# (not at least by that name) that the dl_findfile()
---
-1.8.1.2
-
diff --git a/meta/recipes-devtools/perl/perl_5.24.4.bb b/meta/recipes-devtools/perl/perl_5.26.2.bb
index 28f1c249dc..8569d609f0 100644
--- a/meta/recipes-devtools/perl/perl_5.24.4.bb
+++ b/meta/recipes-devtools/perl/perl_5.26.2.bb
@@ -4,40 +4,67 @@ require perl.inc
DEPENDS = "db grep-native gdbm zlib virtual/crypt"
# Pick up patches from debian
-# http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.22.0-1.debian.tar.xz
+# http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.26.2-6.debian.tar.xz
+#file://debian/hppa_opmini_optimize_workaround.diff
+#file://debian/hurd-softupdates.diff
+#file://debian/no_packlist_perllocal.diff
+#file://debian/prune_libs.diff
+#file://debian/sh4_op_optimize_workaround.diff
+#file://debian/writable_site_dirs.diff
SRC_URI += " \
- file://debian/cpan_definstalldirs.diff \
- file://debian/db_file_ver.diff \
- file://debian/doc_info.diff \
- file://debian/enc2xs_inc.diff \
- file://debian/errno_ver.diff \
- file://debian/libperl_embed_doc.diff \
- file://debian/fixes/respect_umask.diff \
- file://debian/writable_site_dirs.diff \
- file://debian/extutils_set_libperl_path.diff \
- file://debian/no_packlist_perllocal.diff \
- file://debian/prefix_changes.diff \
- file://debian/instmodsh_doc.diff \
- file://debian/ld_run_path.diff \
- file://debian/libnet_config_path.diff \
- file://debian/mod_paths.diff \
- file://debian/prune_libs.diff \
- file://debian/fixes/net_smtp_docs.diff \
- file://debian/perlivp.diff \
- file://debian/squelch-locale-warnings.diff \
- file://debian/skip-upstream-git-tests.diff \
- file://debian/skip-kfreebsd-crash.diff \
- file://debian/fixes/document_makemaker_ccflags.diff \
- file://debian/find_html2text.diff \
- file://debian/perl5db-x-terminal-emulator.patch \
- file://debian/cpan-missing-site-dirs.diff \
- file://debian/fixes/memoize_storable_nstore.diff \
- file://debian/regen-skip.diff \
-"
-
+ file://debian/cpan_definstalldirs.diff \
+ file://debian/cpan-missing-site-dirs.diff \
+ file://debian/db_file_ver.diff \
+ file://debian/deprecate-with-apt.diff \
+ file://debian/doc_info.diff \
+ file://debian/enc2xs_inc.diff \
+ file://debian/errno_ver.diff \
+ file://debian/extutils_set_libperl_path.diff \
+ file://debian/fakeroot.diff \
+ file://debian/find_html2text.diff \
+ file://debian/hppa_op_optimize_workaround.diff \
+ file://debian/installman-utf8.diff \
+ file://debian/instmodsh_doc.diff \
+ file://debian/kfreebsd-softupdates.diff \
+ file://debian/ld_run_path.diff \
+ file://debian/libnet_config_path.diff \
+ file://debian/libperl_embed_doc.diff \
+ file://debian/makemaker-manext.diff \
+ file://debian/makemaker-pasthru.diff \
+ file://debian/mod_paths.diff \
+ file://debian/patchlevel.diff \
+ file://debian/perl5db-x-terminal-emulator.patch \
+ file://debian/perldoc-pager.diff \
+ file://debian/perlivp.diff \
+ file://debian/squelch-locale-warnings.diff \
+ file://fixes/autodie-scope.diff \
+ file://fixes/cpan_web_link.diff \
+ file://fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff \
+ file://fixes/CVE-2018-6797-testcase.diff \
+ file://fixes/document_makemaker_ccflags.diff \
+ file://fixes/encode-alias-regexp.diff \
+ file://fixes/extutils_file_path_compat.diff \
+ file://fixes/extutils_makemaker_reproducible.diff \
+ file://fixes/file_path_chmod_race.diff \
+ file://fixes/file_path_hurd_errno.diff \
+ file://fixes/getopt-long-2.diff \
+ file://fixes/getopt-long-3.diff \
+ file://fixes/getopt-long-4.diff \
+ file://fixes/json-pp-example.diff \
+ file://fixes/math_complex_doc_angle_units.diff \
+ file://fixes/math_complex_doc_great_circle.diff \
+ file://fixes/math_complex_doc_see_also.diff \
+ file://fixes/memoize-pod.diff \
+ "
+
+#file://Makefile.SH.patch
+#file://perl-PathTools-don-t-filter-out-blib-from-INC.patch
+#file://perl-fix-conflict-between-skip_all-and-END.patch
+#file://perl-test-customized.patch
+#file://CVE-2017-12883.patch
+#file://CVE-2017-12837.patch
SRC_URI += " \
file://Makefile.patch \
- file://Makefile.SH.patch \
file://installperl.patch \
file://perl-archlib-exp.patch \
file://perl-dynloader.patch \
@@ -59,12 +86,8 @@ SRC_URI += " \
file://t-run-switches.t-perl5-perl.patch \
file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \
- file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
file://perl-errno-generation-gcc5.patch \
- file://perl-fix-conflict-between-skip_all-and-END.patch \
- file://perl-test-customized.patch \
file://perl-5.26.1-guard_old_libcrypt_fix.patch \
- file://CVE-2018-12015.patch \
"
# Fix test case issues
@@ -73,8 +96,8 @@ SRC_URI_append_class-target = " \
file://test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch \
"
-SRC_URI[md5sum] = "04622bc4d3941dc7eb571c52b7c02993"
-SRC_URI[sha256sum] = "7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84"
+SRC_URI[md5sum] = "1fa1b53eeff76aa37b17bfc9b2771671"
+SRC_URI[sha256sum] = "0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c"
inherit perlnative siteinfo
@@ -340,7 +363,7 @@ python split_perl_packages () {
}
PACKAGES_DYNAMIC += "^perl-module-.*(?<!\-native)$"
-PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-perl-module-.*"
+PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*"
RPROVIDES_perl-lib = "perl-lib"