diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian')
49 files changed, 536 insertions, 1353 deletions
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/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff deleted file mode 100644 index f3d92583e3..0000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff +++ /dev/null @@ -1,32 +0,0 @@ -From 9faf6dcc3a5c4154484d812eb3cc3dd78b35563b Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Mon, 30 May 2011 22:54:24 +0300 -Subject: Document that CCFLAGS should include $Config{ccflags} - -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613 -Bug-Debian: http://bugs.debian.org/628522 - -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 ---- 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. - String that will be included in the compiler call command line between - the arguments INC and OPTIMIZE. - -+The default value is taken from $Config{ccflags}. When overriding -+CCFLAGS, make sure to include the $Config{ccflags} settings to avoid -+binary incompatibilities. -+ - =item CONFIG - - Arrayref. E.g. [qw(archname manext)] defines ARCHNAME & MANEXT from diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff b/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff deleted file mode 100644 index d9b36f6d23..0000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff +++ /dev/null @@ -1,111 +0,0 @@ -From 55d430eb02fc116581847304ca20321687978269 Mon Sep 17 00:00:00 2001 -From: Jonathan Nieder <jrnieder@gmail.com> -Date: Fri, 27 Jul 2012 10:35:07 -0500 -Subject: Memoize::Storable: respect 'nstore' option not respected -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Memoize(3perl) says: - - tie my %cache => 'Memoize::Storable', $filename, 'nstore'; - memoize 'function', SCALAR_CACHE => [HASH => \%cache]; - - Include the ‘nstore’ option to have the "Storable" database - written in ‘network order’. (See Storable for more details - about this.) - -In fact the "nstore" option does no such thing. Option parsing looks -like this: - - @options{@_} = (); - -$self->{OPTIONS}{'nstore'} is accordingly set to undef. Later -Memoize::Storable checks if the option is true, and since undef is -not true, the "else" branch is always taken. - - if ($self->{OPTIONS}{'nstore'}) { - Storable::nstore($self->{H}, $self->{FILENAME}); - } else { - Storable::store($self->{H}, $self->{FILENAME}); - } - -Correcting the condition to (exists $self->{OPTIONS}{'nstore'}) fixes -it. - -Noticed because git-svn, which uses the 'nstore' option for its -on-disk caches, was producing - - Byte order is not compatible at ../../lib/Storable.pm - -when run using a perl with a different integer size (and hence -byteorder). - -Reported by Tim Retout (RT#77790) - -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 ---- a/cpan/Memoize/Memoize/Storable.pm -+++ b/cpan/Memoize/Memoize/Storable.pm -@@ -55,7 +55,7 @@ sub DESTROY { - require Carp if $Verbose; - my $self= shift; - print STDERR "Memoize::Storable::DESTROY(@_)\n" if $Verbose; -- if ($self->{OPTIONS}{'nstore'}) { -+ if (exists $self->{OPTIONS}{'nstore'}) { - Storable::nstore($self->{H}, $self->{FILENAME}); - } 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 ---- a/cpan/Memoize/t/tie_storable.t -+++ b/cpan/Memoize/t/tie_storable.t -@@ -31,18 +31,34 @@ if ($@) { - exit 0; - } - --print "1..4\n"; -+print "1..9\n"; - - $file = "storable$$"; - 1 while unlink $file; - tryout('Memoize::Storable', $file, 1); # Test 1..4 - 1 while unlink $file; -+tryout('Memoize::Storable', $file, 5, 'nstore'); # Test 5..8 -+assert_netorder($file, 9); # Test 9 -+1 while unlink $file; -+ -+ -+sub assert_netorder { -+ my ($file, $testno) = @_; -+ -+ my $netorder = Storable::file_magic($file)->{'netorder'}; -+ print ($netorder ? "ok $testno\n" : "not ok $testno\n"); -+} - - sub tryout { -- my ($tiepack, $file, $testno) = @_; -+ my ($tiepack, $file, $testno, $option) = @_; - -- tie my %cache => $tiepack, $file -- or die $!; -+ if (defined $option) { -+ tie my %cache => $tiepack, $file, $option -+ or die $!; -+ } else { -+ tie my %cache => $tiepack, $file -+ or die $!; -+ } - - memoize 'c5', - SCALAR_CACHE => [HASH => \%cache], 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/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff deleted file mode 100644 index c8663f5357..0000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff +++ /dev/null @@ -1,154 +0,0 @@ -From d9d535ef97f57af6e9728075944c33f3b0b5372f Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: Respect umask during installation - -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 ---- a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm -+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm -@@ -451,7 +451,7 @@ sub _can_write_dir { - - =pod - --=item _mkpath($dir,$show,$mode,$verbose,$dry_run) -+=item _mkpath($dir,$show,$verbose,$dry_run) - - Wrapper around File::Path::mkpath() to handle errors. - -@@ -468,13 +468,13 @@ writable. - =cut - - sub _mkpath { -- my ($dir,$show,$mode,$verbose,$dry_run)=@_; -+ my ($dir,$show,$verbose,$dry_run)=@_; - if ( $verbose && $verbose > 1 && ! -d $dir) { - $show= 1; -- printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode; -+ printf "mkpath(%s,%d)\n", $dir, $show; - } - if (!$dry_run) { -- if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) { -+ if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) { - _choke("Can't create '$dir'","$@"); - } - -@@ -783,7 +783,7 @@ sub install { #XXX OS-SPECIFIC - _chdir($cwd); - } - foreach my $targetdir (sort keys %check_dirs) { -- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $targetdir, 0, $verbose, $dry_run ); - } - foreach my $found (@found_files) { - my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime, -@@ -797,7 +797,7 @@ sub install { #XXX OS-SPECIFIC - $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' ) - unless $dry_run; - } elsif ( ! -d $targetdir ) { -- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $targetdir, 0, $verbose, $dry_run ); - } - print "Installing $targetfile\n"; - -@@ -837,7 +837,7 @@ sub install { #XXX OS-SPECIFIC - - if ($pack{'write'}) { - $dir = install_rooted_dir(dirname($pack{'write'})); -- _mkpath( $dir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $dir, 0, $verbose, $dry_run ); - print "Writing $pack{'write'}\n" if $verbose; - $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run; - } -@@ -1180,7 +1180,7 @@ environment variable will silence this output. - sub pm_to_blib { - my($fromto,$autodir,$pm_filter) = @_; - -- _mkpath($autodir,0,0755); -+ _mkpath($autodir,0); - while(my($from, $to) = each %$fromto) { - if( -f $to && -s $from == -s $to && -M $to < -M $from ) { - print "Skip $to (unchanged)\n" unless $INSTALL_QUIET; -@@ -1203,7 +1203,7 @@ sub pm_to_blib { - # we wont try hard here. its too likely to mess things up. - forceunlink($to); - } else { -- _mkpath(dirname($to),0,0755); -+ _mkpath(dirname($to),0); - } - if ($need_filtering) { - run_filter($pm_filter, $from, $to); -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index f63145c..197f102 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2118,7 +2118,7 @@ doc__install : doc_site_install - $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site - - pure_perl_install :: all -- $(NOECHO) $(MOD_INSTALL) \ -+ $(NOECHO) umask 022; $(MOD_INSTALL) \ - }; - - push @m, -@@ -2138,7 +2138,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \ - - - pure_site_install :: all -- $(NOECHO) $(MOD_INSTALL) \ -+ $(NOECHO) umask 022; $(MOD_INSTALL) \ - }; - push @m, - q{ read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \ -@@ -2156,7 +2156,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \ - "}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{" - - pure_vendor_install :: all -- $(NOECHO) $(MOD_INSTALL) \ -+ $(NOECHO) umask 022; $(MOD_INSTALL) \ - }; - push @m, - q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \ -@@ -2188,8 +2188,8 @@ doc_vendor_install :: all - push @m, q{ - doc_perl_install :: all - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" -- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" -- -$(NOECHO) $(DOC_INSTALL) \ -+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)" -+ -$(NOECHO) umask 022; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" $(INSTALLPRIVLIB) \ - LINKTYPE "$(LINKTYPE)" \ -@@ -2199,8 +2199,8 @@ doc_perl_install :: all - - doc_site_install :: all - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" -- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" -- -$(NOECHO) $(DOC_INSTALL) \ -+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)" -+ -$(NOECHO) umask 022; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" $(INSTALLSITELIB) \ - LINKTYPE "$(LINKTYPE)" \ -@@ -2210,8 +2210,8 @@ doc_site_install :: all - - doc_vendor_install :: all - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" -- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" -- -$(NOECHO) $(DOC_INSTALL) \ -+ -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)" -+ -$(NOECHO) umask 022; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" $(INSTALLVENDORLIB) \ - LINKTYPE "$(LINKTYPE)" \ diff --git a/meta/recipes-devtools/perl/perl/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)" \ |