diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian')
39 files changed, 0 insertions, 2387 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/arm_thread_stress_timeout.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/arm_thread_stress_timeout.diff deleted file mode 100644 index 6e70c66f52..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/arm_thread_stress_timeout.diff +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From f624a9f1206cdd44fde99c40d82e2f326db485dd Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Sat, 1 Nov 2008 15:10:16 +0200 -Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate - slower build hosts - -Bug-Debian: http://bugs.debian.org/501970 - -Patch-Name: debian/arm_thread_stress_timeout.diff ---- - dist/threads-shared/t/stress.t | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t -index adfd1ed..652a3e6 100644 ---- a/dist/threads-shared/t/stress.t -+++ b/dist/threads-shared/t/stress.t -@@ -34,7 +34,7 @@ use threads::shared; - { - my $cnt = 50; - -- my $TIMEOUT = 60; -+ my $TIMEOUT = 150; - - my $mutex = 1; - share($mutex); diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff deleted file mode 100644 index 57e7636be3..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be 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. - -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 ---- - cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm -index 667bdca..c38c890 100644 ---- a/cpan/CPAN/lib/CPAN/FirstTime.pm -+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm -@@ -990,7 +990,7 @@ sub init { - my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); - - if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { -- my_dflt_prompt(makepl_arg => "", $matcher); -+ my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); - my_dflt_prompt(make_arg => "", $matcher); - if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { - $CPAN::Frontend->mywarn( -@@ -1022,7 +1022,7 @@ sub init { - my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", - $matcher); - -- my_dflt_prompt(mbuildpl_arg => "", $matcher); -+ my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); - my_dflt_prompt(mbuild_arg => "", $matcher); - - if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff deleted file mode 100644 index f33221c3d1..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Mon, 6 Jul 2009 22:17:53 +0300 -Subject: Save local versions of CPANPLUS::Config::System into /etc/perl. - -This is a configuration file and needs to go in /etc by policy. -Besides, /usr may not even be writable. - -This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path. - -See #533707. - -Patch-Name: debian/cpanplus_config_path.diff ---- - cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 + - cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm -index ba1ca07..25cbe5f 100644 ---- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm -+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm -@@ -280,6 +280,7 @@ Saves the configuration to the package name you provided. - If this package is not C<CPANPLUS::Config::System>, it will - be saved in your C<.cpanplus> directory, otherwise it will - be attempted to be saved in the system wide directory. -+(On Debian systems, this system wide directory is /etc/perl.) - - If no argument is provided, it will default to your personal - config. -diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm -index 443d5a4..f7085a8 100644 ---- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm -+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm -@@ -209,6 +209,9 @@ use constant CONFIG_USER_FILE => sub { - ) . '.pm'; - }; - use constant CONFIG_SYSTEM_FILE => sub { -+ # Debian-specific shortcut -+ return '/etc/perl/CPANPLUS/Config/System.pm'; -+ - require CPANPLUS::Internals; - require File::Basename; - my $dir = File::Basename::dirname( diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_definstalldirs.diff deleted file mode 100644 index 7df28606b7..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_definstalldirs.diff +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 66517b14790aa6410fd37e411dd62521e1e02b7f Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Mon, 6 Jul 2009 21:58:41 +0300 -Subject: Configure CPANPLUS to use the site directories by default. - -Bug-Debian: http://bugs.debian.org/533707 - -The core modules usually default to INSTALLDIRS=perl (ExtUtils::MakeMaker) -or installdirs=core (Module::Build), so we need to explicitly ask for -the site destination to get upgraded versions into /usr/local. - -See also the sister patch, debian/cpan_definstalldirs . - -Patch-Name: debian/cpanplus_definstalldirs.diff ---- - cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm | 30 +++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - create mode 100644 cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm - -diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm -new file mode 100644 -index 0000000..5e6e11e ---- /dev/null -+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm -@@ -0,0 +1,30 @@ -+### minimal pod, so you can find it with perldoc -l, etc -+=pod -+ -+=head1 NAME -+ -+CPANPLUS::Config::System -+ -+=head1 DESCRIPTION -+ -+This is a CPANPLUS configuration file that sets appropriate default -+settings on Debian systems. -+ -+The only preconfigured settings are C<makemakerflags> (set to -+C<INSTALLDIRS=site>) and C<buildflags> (set to C<--installdirs site>). -+ -+These settings will not have any effect if -+C</etc/perl/CPANPLUS/Config/System.pm> is present. -+ -+=cut -+ -+ -+package CPANPLUS::Config::System; -+ -+sub setup { -+ my $conf = shift; -+ $conf->set_conf( makemakerflags => 'INSTALLDIRS=site' ); -+ $conf->set_conf( buildflags => '--installdirs site' ); -+} -+ -+1; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/db_file_ver.diff deleted file mode 100644 index 8726056eaa..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/db_file_ver.diff +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b 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. - -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 ---- - cpan/DB_File/version.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c -index e01f6f6..544e6ee 100644 ---- a/cpan/DB_File/version.c -+++ b/cpan/DB_File/version.c -@@ -48,6 +48,7 @@ __getBerkeleyDBInfo() - - (void)db_version(&Major, &Minor, &Patch) ; - -+#ifndef DEBIAN - /* Check that the versions of db.h and libdb.a are the same */ - if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR ) - /* || Patch != DB_VERSION_PATCH) */ -@@ -55,6 +56,7 @@ __getBerkeleyDBInfo() - croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n", - DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, - Major, Minor, Patch) ; -+#endif /* DEBIAN */ - - /* check that libdb is recent enough -- we need 2.3.4 or greater */ - if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4))) diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/deprecate-with-apt.diff deleted file mode 100644 index 3a145a1671..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/deprecate-with-apt.diff +++ /dev/null @@ -1,407 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001 -From: Dominic Hargreaves <dom@earth.li> -Date: Mon, 17 May 2010 13:23:07 +0300 -Subject: Point users to Debian packages of deprecated core modules - -Bug-Debian: http://bugs.debian.org/580034 - -Class::ISA, Switch, Pod::Plainer, and (partially) Shell were -deprecated from the Perl core in 5.12.0. - -Class::ISA, Switch, Pod::Plainer were removed from the Perl core in -5.14.0. - -Shell and Devel::DProf, and Perl 4 libraries, were deprecated from the -Perl core in 5.14.0. - -To get a clean transition, perl/perl-modules is going to recommend the -separate Debian packages of these for one release cycle so that they will be -pulled in by default on upgrades. - -However, on systems configured to ignore recommendations the deprecation -warnings will still be useful, so modify them slightly to point to the -separate packages instead. - -Patch-Name: debian/deprecate-with-apt.diff ---- - lib/abbrev.pl | 2 +- - lib/assert.pl | 2 +- - lib/bigfloat.pl | 2 +- - lib/bigint.pl | 2 +- - lib/bigrat.pl | 2 +- - lib/cacheout.pl | 2 +- - lib/complete.pl | 2 +- - lib/ctime.pl | 2 +- - lib/deprecate.pm | 16 +++++++++++++++- - lib/dotsh.pl | 2 +- - lib/exceptions.pl | 2 +- - lib/fastcwd.pl | 2 +- - lib/find.pl | 2 +- - lib/finddepth.pl | 2 +- - lib/flush.pl | 2 +- - lib/getcwd.pl | 2 +- - lib/getopt.pl | 2 +- - lib/getopts.pl | 2 +- - lib/hostname.pl | 2 +- - lib/importenv.pl | 2 +- - lib/look.pl | 2 +- - lib/newgetopt.pl | 2 +- - lib/open2.pl | 2 +- - lib/open3.pl | 2 +- - lib/pwd.pl | 2 +- - lib/shellwords.pl | 2 +- - lib/stat.pl | 2 +- - lib/syslog.pl | 2 +- - lib/tainted.pl | 2 +- - lib/termcap.pl | 2 +- - lib/timelocal.pl | 2 +- - lib/validate.pl | 2 +- - 32 files changed, 46 insertions(+), 32 deletions(-) - -diff --git a/lib/abbrev.pl b/lib/abbrev.pl -index d46321f..0168631 100644 ---- a/lib/abbrev.pl -+++ b/lib/abbrev.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# Usage: - ;# %foo = (); -diff --git a/lib/assert.pl b/lib/assert.pl -index d47e006..80593c5 100644 ---- a/lib/assert.pl -+++ b/lib/assert.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # - # This library is no longer being maintained, and is included for backward -diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl -index 82d0f5c..c21bac6 100644 ---- a/lib/bigfloat.pl -+++ b/lib/bigfloat.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - package bigfloat; - require "bigint.pl"; -diff --git a/lib/bigint.pl b/lib/bigint.pl -index 6de1c53..031e8ad 100644 ---- a/lib/bigint.pl -+++ b/lib/bigint.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - package bigint; - # -diff --git a/lib/bigrat.pl b/lib/bigrat.pl -index aaf1713..146a8f4 100644 ---- a/lib/bigrat.pl -+++ b/lib/bigrat.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - package bigrat; - require "bigint.pl"; -diff --git a/lib/cacheout.pl b/lib/cacheout.pl -index a5da453..937405d 100644 ---- a/lib/cacheout.pl -+++ b/lib/cacheout.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # - # This library is no longer being maintained, and is included for backward -diff --git a/lib/complete.pl b/lib/complete.pl -index 9ed041c..2ab0c6a 100644 ---- a/lib/complete.pl -+++ b/lib/complete.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# - # -diff --git a/lib/ctime.pl b/lib/ctime.pl -index aa00d00..ac24e71 100644 ---- a/lib/ctime.pl -+++ b/lib/ctime.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function. - # -diff --git a/lib/deprecate.pm b/lib/deprecate.pm -index 7562c69..fc548b0 100644 ---- a/lib/deprecate.pm -+++ b/lib/deprecate.pm -@@ -7,6 +7,14 @@ our $VERSION = 0.02; - our %Config; - unless (%Config) { require Config; *Config = \%Config::Config; } - -+# Debian-specific change: recommend the separate Debian packages of -+# deprecated modules where available -+ -+my %DEBIAN_PACKAGES = ( -+ "Shell" => "libshell-perl", -+ "Devel::DProf" => "libdevel-dprof-perl" -+); -+ - # This isn't a public API. It's internal to code maintained by the perl-porters - # If you would like it to be a public API, please send a patch with - # documentation and tests. Until then, it may change without warning. -@@ -58,9 +66,15 @@ EOM - if (defined $callers_bitmask - && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1) - || vec($callers_bitmask, $warnings::Offsets{all}, 1))) { -- warn <<"EOM"; -+ if (my $deb = $DEBIAN_PACKAGES{$package}) { -+ warn <<"EOM"; -+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line. -+EOM -+ } else { -+ warn <<"EOM"; - $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line. - EOM -+ } - } - } - } -diff --git a/lib/dotsh.pl b/lib/dotsh.pl -index 92f1f4c..4085122 100644 ---- a/lib/dotsh.pl -+++ b/lib/dotsh.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # - # @(#)dotsh.pl 03/19/94 -diff --git a/lib/exceptions.pl b/lib/exceptions.pl -index 8af64c8..b5b1427 100644 ---- a/lib/exceptions.pl -+++ b/lib/exceptions.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # exceptions.pl - # tchrist@convex.com -diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl -index 70007a1..2c7c42e 100644 ---- a/lib/fastcwd.pl -+++ b/lib/fastcwd.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # By John Bazik - # -diff --git a/lib/find.pl b/lib/find.pl -index 8e1b42c..7fb2fbf 100644 ---- a/lib/find.pl -+++ b/lib/find.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This library is deprecated and unmaintained. It is included for - # compatibility with Perl 4 scripts which may use it, but it will be -diff --git a/lib/finddepth.pl b/lib/finddepth.pl -index 479905f..c07cea5 100644 ---- a/lib/finddepth.pl -+++ b/lib/finddepth.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This library is deprecated and unmaintained. It is included for - # compatibility with Perl 4 scripts which may use it, but it will be -diff --git a/lib/flush.pl b/lib/flush.pl -index c427976..e5ed0ae 100644 ---- a/lib/flush.pl -+++ b/lib/flush.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # - # This library is no longer being maintained, and is included for backward -diff --git a/lib/getcwd.pl b/lib/getcwd.pl -index 77b2442..3810a99 100644 ---- a/lib/getcwd.pl -+++ b/lib/getcwd.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # By Brandon S. Allbery - # -diff --git a/lib/getopt.pl b/lib/getopt.pl -index 1d4008a..019a165 100644 ---- a/lib/getopt.pl -+++ b/lib/getopt.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $ - # -diff --git a/lib/getopts.pl b/lib/getopts.pl -index 37ecb4a..3d27418 100644 ---- a/lib/getopts.pl -+++ b/lib/getopts.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# getopts.pl - a better getopt.pl - # -diff --git a/lib/hostname.pl b/lib/hostname.pl -index f57375e..b055d30 100644 ---- a/lib/hostname.pl -+++ b/lib/hostname.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # From: asherman@fmrco.com (Aaron Sherman) - # -diff --git a/lib/importenv.pl b/lib/importenv.pl -index 625edf6..52ee722 100644 ---- a/lib/importenv.pl -+++ b/lib/importenv.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This library is no longer being maintained, and is included for backward - # compatibility with Perl 4 programs which may require it. -diff --git a/lib/look.pl b/lib/look.pl -index 7be55b2..12dcace 100644 ---- a/lib/look.pl -+++ b/lib/look.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# Usage: &look(*FILEHANDLE,$key,$dict,$fold) - # -diff --git a/lib/newgetopt.pl b/lib/newgetopt.pl -index 4ac9470..08df6cb 100644 ---- a/lib/newgetopt.pl -+++ b/lib/newgetopt.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This library is no longer being maintained, and is included for backward - # compatibility with Perl 4 programs which may require it. -diff --git a/lib/open2.pl b/lib/open2.pl -index ceb5653..a05f2ab 100644 ---- a/lib/open2.pl -+++ b/lib/open2.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This legacy library is deprecated and will be removed in a future - # release of perl. -diff --git a/lib/open3.pl b/lib/open3.pl -index 9f4d5a4..27f7ab4 100644 ---- a/lib/open3.pl -+++ b/lib/open3.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This legacy library is deprecated and will be removed in a future - # release of perl. -diff --git a/lib/pwd.pl b/lib/pwd.pl -index bd8123b..bdace6e 100644 ---- a/lib/pwd.pl -+++ b/lib/pwd.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# pwd.pl - keeps track of current working directory in PWD environment var - ;# -diff --git a/lib/shellwords.pl b/lib/shellwords.pl -index b562f5f..7f16375 100644 ---- a/lib/shellwords.pl -+++ b/lib/shellwords.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# This legacy library is deprecated and will be removed in a future - ;# release of perl. -diff --git a/lib/stat.pl b/lib/stat.pl -index feda273..910ce1c 100644 ---- a/lib/stat.pl -+++ b/lib/stat.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# This legacy library is deprecated and will be removed in a future - ;# release of perl. -diff --git a/lib/syslog.pl b/lib/syslog.pl -index 7504a5d..4c2b95f 100644 ---- a/lib/syslog.pl -+++ b/lib/syslog.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # - # syslog.pl -diff --git a/lib/tainted.pl b/lib/tainted.pl -index e88bca1..d58c765 100644 ---- a/lib/tainted.pl -+++ b/lib/tainted.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - # This legacy library is deprecated and will be removed in a future - # release of perl. -diff --git a/lib/termcap.pl b/lib/termcap.pl -index a84cba3..e641f4d 100644 ---- a/lib/termcap.pl -+++ b/lib/termcap.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $ - # -diff --git a/lib/timelocal.pl b/lib/timelocal.pl -index fefb9da..2297888 100644 ---- a/lib/timelocal.pl -+++ b/lib/timelocal.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# timelocal.pl - ;# -diff --git a/lib/validate.pl b/lib/validate.pl -index fc2d16a..1a8aef4 100644 ---- a/lib/validate.pl -+++ b/lib/validate.pl -@@ -1,4 +1,4 @@ --warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; -+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n"; - - ;# The validate routine takes a single multiline string consisting of - ;# lines containing a filename plus a file test to try on it. (The diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/disable-zlib-bundling.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/disable-zlib-bundling.diff deleted file mode 100644 index 03ef76f7c7..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/disable-zlib-bundling.diff +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 90c7967530102c66bbff25d89273d3f0bf189a83 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Fri, 10 Apr 2009 01:17:43 +0300 -Subject: Disable zlib bundling in Compress::Raw::Zlib - -Compress::Raw::Zlib statically links its bundled version of zlib -by default, but we use the system library instead. - -Patch-Name: debian/disable-zlib-bundling.diff ---- - cpan/Compress-Raw-Zlib/config.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cpan/Compress-Raw-Zlib/config.in b/cpan/Compress-Raw-Zlib/config.in -index c56cc03..2c6659b 100644 ---- a/cpan/Compress-Raw-Zlib/config.in -+++ b/cpan/Compress-Raw-Zlib/config.in -@@ -16,9 +16,9 @@ - # Setting the Gzip OS Code - # - --BUILD_ZLIB = True --INCLUDE = ./zlib-src --LIB = ./zlib-src -+BUILD_ZLIB = False -+INCLUDE = /usr/include -+LIB = /usr/lib - - OLD_ZLIB = False - GZIP_OS_CODE = AUTO_DETECT diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/doc_info.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/doc_info.diff deleted file mode 100644 index 889024a358..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/doc_info.diff +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 16ebe1f5232621d8894aa6c6210fdf2fc9b54a84 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. - -Indicate that the user needs to install the perl-doc package. - -Patch-Name: debian/doc_info.diff ---- - pod/perl.pod | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/pod/perl.pod b/pod/perl.pod -index 29cabf1..529ad6f 100644 ---- a/pod/perl.pod -+++ b/pod/perl.pod -@@ -261,8 +261,16 @@ For ease of access, the Perl manual has been split up into several sections. - perlwin32 Perl notes for Windows - - --On a Unix-like system, these documentation files will usually also be --available as manpages for use with the F<man> program. -+On Debian systems, you need to install the B<perl-doc> package which -+contains the majority of the standard Perl documentation and the -+F<perldoc> program. -+ -+Extensive additional documentation for Perl modules is available, both -+those distributed with Perl and third-party modules which are packaged -+or locally installed. -+ -+You should be able to view Perl's documentation with your man(1) -+program or perldoc(1). - - In general, if something strange has gone wrong with your program and you're - not sure where you should look for help, try the B<-w> switch first. It will diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff deleted file mode 100644 index 9440348355..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 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. - -Bug-Debian: http://bugs.debian.org/290336 - -- ignore missing directories, -- follow symlinks (/usr/share/perl/5.8 -> 5.8.4). -- filter "." out when running "enc2xs -C", it's unnecessary and causes - issues with follow => 1 (see #603686 and [rt.cpan.org #64585]) - -Patch-Name: debian/enc2xs_inc.diff ---- - cpan/Encode/bin/enc2xs | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs -index 773c0a0..bc1ae1b 100644 ---- a/cpan/Encode/bin/enc2xs -+++ b/cpan/Encode/bin/enc2xs -@@ -924,11 +924,11 @@ use vars qw( - sub find_e2x{ - eval { require File::Find; }; - my (@inc, %e2x_dir); -- for my $inc (@INC){ -+ for my $inc (grep -d, @INC){ - push @inc, $inc unless $inc eq '.'; #skip current dir - } - File::Find::find( -- sub { -+ { wanted => sub { - my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, - $atime,$mtime,$ctime,$blksize,$blocks) - = lstat($_) or return; -@@ -938,7 +938,7 @@ sub find_e2x{ - $e2x_dir{$File::Find::dir} ||= $mtime; - } - return; -- }, @inc); -+ }, follow => 1}, @inc); - warn join("\n", keys %e2x_dir), "\n"; - for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){ - $_E2X = $d; -@@ -1005,7 +1005,7 @@ sub make_configlocal_pm { - $LocalMod{$enc} ||= $mod; - } - }; -- File::Find::find({wanted => $wanted}, @INC); -+ File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC); - $_ModLines = ""; - for my $enc ( sort keys %LocalMod ) { - $_ModLines .= diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/errno_ver.diff deleted file mode 100644 index c7b0531fb8..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/errno_ver.diff +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 973bed42db538804179f39d66dab37c82c6ade24 Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Fri, 16 Dec 2005 01:32:14 +1100 -Subject: Remove Errno version check due to upgrade problems with long-running - processes. - -Bug-Debian: http://bugs.debian.org/343351 - -Remove version check which can cause problems for long running -processes embedding perl when upgrading to a newer version, -compatible, but built on a different machine. - -Patch-Name: debian/errno_ver.diff ---- - ext/Errno/Errno_pm.PL | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index 56bc815..01f510a 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -332,13 +332,8 @@ EOF - - package Errno; - require Exporter; --use Config; - use strict; - --"\$Config{'archname'}-\$Config{'osvers'}" eq --"$Config{'archname'}-$Config{'osvers'}" or -- die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})"; -- - our \$VERSION = "$VERSION"; - \$VERSION = eval \$VERSION; - our \@ISA = 'Exporter'; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/extutils_set_libperl_path.diff deleted file mode 100644 index d704c00c60..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/extutils_set_libperl_path.diff +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 334ac01a8306485ed901f4fb45d79f39a944fe77 Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: EU:MM: Set location of libperl.a to /usr/lib - -Patch-Name: debian/extutils_set_libperl_path.diff ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index 4ee6b3f..42bbb83 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2409,7 +2409,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib} - ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/; - } - unless ($libperl && -f $lperl) { # Ilya's code... -- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE"; -+ my $dir = $self->{PERL_SRC} || "/usr/lib"; - $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL}; - $libperl ||= "libperl$self->{LIB_EXT}"; - $libperl = "$dir/$libperl"; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff deleted file mode 100644 index 79e7fcffa7..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Fri, 18 Mar 2005 22:22:25 +1100 -Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets. - -Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the -time the rule is evaluated rather than when the Makefile is created. - -This is required when building packages with dpkg-buildpackage and fakeroot, -since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build" -rule where the Makefile is created, but is for the clean/binary* targets. - -Patch-Name: debian/fakeroot.diff ---- - Makefile.SH | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/Makefile.SH b/Makefile.SH -index eb6326a..1dac585 100755 ---- a/Makefile.SH -+++ b/Makefile.SH -@@ -36,12 +36,7 @@ case "$useshrplib" in - true) - # Prefix all runs of 'miniperl' and 'perl' with - # $ldlibpth so that ./perl finds *this* shared libperl. -- case "$LD_LIBRARY_PATH" in -- '') -- ldlibpth="LD_LIBRARY_PATH=`pwd`";; -- *) -- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; -- esac -+ ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH' - - pldlflags="$cccdlflags" - static_ldflags='' -@@ -112,7 +107,7 @@ true) - ;; - esac - case "$ldlibpthname" in -- '') ;; -+ ''|LD_LIBRARY_PATH) ;; - *) - case "$osname" in - os2) diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/find_html2text.diff deleted file mode 100644 index 29dc576c1c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/find_html2text.diff +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From ca66b95be369b47a6d372c3653be57cd737f7f21 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 - -Bug-Debian: http://bugs.debian.org/640479 -Patch-Name: debian/find_html2text.diff - -If you use cpan from Debian you usually wind up trying to read online -documentation through it. Unfortunately cpan can't find the -html2text.pl script even though it is installed using the Debian -package 'html2text'. - -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]. ---- - cpan/CPAN/lib/CPAN/Distribution.pm | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm -index 637ab27..a8193d9 100644 ---- a/cpan/CPAN/lib/CPAN/Distribution.pm -+++ b/cpan/CPAN/lib/CPAN/Distribution.pm -@@ -3715,7 +3715,7 @@ sub _display_url { - if $CPAN::DEBUG; - - # should we define it in the config instead? -- my $html_converter = "html2text.pl"; -+ my $html_converter = "html2text"; - - my $web_browser = $CPAN::Config->{'lynx'} || undef; - my $web_browser_out = $web_browser diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff deleted file mode 100644 index 3f2c3dc646..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From f0e3a51bd7286788e410510af86a6c07edac4445 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 ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -index be9624e..c56ca8f 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -@@ -1524,6 +1524,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-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff deleted file mode 100644 index f9a3c6bdf1..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff +++ /dev/null @@ -1,87 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 28 Apr 2011 09:18:54 +0300 -Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in - EU::CBuilder - -Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478 -Bug-Debian: http://bugs.debian.org/624460 -Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d - -Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), -CFLAGS and LDFLAGS from the environment have overridden the Config.pm -ccflags and ldflags settings. This can cause binary incompatibilities -between the core Perl and extensions built with EU::CBuilder. - -Append to the Config.pm values rather than overriding them. - -Patch-Name: fixes/extutils-cbuilder-cflags.diff ---- - .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- - dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -index b572312..2255c51 100644 ---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -@@ -40,11 +40,13 @@ sub new { - $self->{config}{$k} = $v unless exists $self->{config}{$k}; - } - $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; -- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; -+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) -+ if defined $ENV{CFLAGS}; - $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; - $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; - $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; -- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; -+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) -+ if defined $ENV{LDFLAGS}; - - unless ( exists $self->{config}{cxx} ) { - my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); -diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t -index db0ef98..49819a1 100644 ---- a/dist/ExtUtils-CBuilder/t/04-base.t -+++ b/dist/ExtUtils-CBuilder/t/04-base.t -@@ -1,7 +1,7 @@ - #! perl -w - - use strict; --use Test::More tests => 50; -+use Test::More tests => 64; - use Config; - use Cwd; - use File::Path qw( mkpath ); -@@ -328,6 +328,29 @@ is_deeply( $mksymlists_args, - "_prepare_mksymlists_args(): got expected arguments for Mksymlists", - ); - -+my %testvars = ( -+ CFLAGS => 'ccflags', -+ LDFLAGS => 'ldflags', -+); -+ -+while (my ($VAR, $var) = each %testvars) { -+ local $ENV{$VAR}; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "honours $var from Config.pm"); -+ -+ $ENV{$VAR} = "-foo -bar"; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, -+ "honours $VAR from the environment"); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "doesn't override $var from Config.pm with $VAR from the environment"); -+} -+ - ##### - - for ($source_file, $object_file, $lib_file) { diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff deleted file mode 100644 index 3b6b4a078c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff +++ /dev/null @@ -1,70 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Wed, 18 May 2011 21:44:06 -0700 -Subject: Make h2ph correctly search gcc include directories - -Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122 -Bug-Debian: http://bugs.debian.org/625808 -Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77 - -System header conversion with "h2ph -a" is currently broken on Ubuntu -Natty and Oneiric (unless the gcc-multilib package is installed for -backward compatibility), resulting in things like - - # perl -e 'require "syscall.ph"' - Can't locate asm/unistd.ph in @INC [...] - -This happens because Ubuntu has switched to a 'multiarch' setup, see -<https://wiki.ubuntu.com/MultiarchSpec> for details. - -The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm -is now /usr/include/x86_64-linux-gnu/asm. (The third component of the -new path varies with the actual architecture.) - -gcc --print-search-dirs doesn't really tell anything about where gcc -looks for the include directories, it was just used to find the gcc -internal directory prefix. - -Parse the output of "gcc -v -E" instead, and append $Config{usrinc} -for safety. Duplicates shouldn't matter. - -The h2ph "-a" switch isn't currently tested automatically, and that -seems nontrivial to do portably. Manual testing was done with - - # mkdir ttt - # ./perl -Ilib ./utils/h2ph -a -d $(pwd)/ttt syscall.h - -The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3. - -http://bugs.debian.org/625808 -https://bugs.launchpad.net/bugs/777903 - -Patch-Name: fixes/h2ph-multiarch.diff ---- - utils/h2ph.PL | 12 ++---------- - 1 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/utils/h2ph.PL b/utils/h2ph.PL -index 87f3c7d..4545d6d 100644 ---- a/utils/h2ph.PL -+++ b/utils/h2ph.PL -@@ -761,16 +761,8 @@ sub queue_includes_from - # non-GCC?) C compilers, but gcc uses additional include directories. - sub inc_dirs - { -- my $from_gcc = `LC_ALL=C $Config{cc} -v 2>&1`; -- if( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) ) -- { # gcc-4+ : -- $from_gcc = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`; -- if ( !($from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s) ) -- { -- $from_gcc = ''; -- }; -- }; -- length($from_gcc) ? ($from_gcc, $from_gcc . "-fixed", $Config{usrinc}) : ($Config{usrinc}); -+ my $from_gcc = `LC_ALL=C $Config{cc} -v -E - < /dev/null 2>&1 | awk '/^#include/, /^End of search list/' | grep '^ '`; -+ length($from_gcc) ? (split(' ', $from_gcc), $Config{usrinc}) : ($Config{usrinc}); - } - - diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff deleted file mode 100644 index ee00ca3cdf..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff +++ /dev/null @@ -1,74 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001 -From: David Mitchell <davem@iabyn.com> -Date: Tue, 28 Jun 2011 17:04:40 +0100 -Subject: RT 64804: tainting with index() of a constant - -Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804 -Bug-Debian: http://bugs.debian.org/291450 -Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1 - -At compile time, ck_index with a tainted constant set PL_tainted, -which remained on during the rest of compilation, tainting all other -constants. - -Fix this by saving and restoring PL_tainted across the call to -fbm_compile, which is what sets PL_tainted. - -Patch-Name: fixes/index-tainting.diff ---- - op.c | 5 ++++- - t/op/taint.t | 16 +++++++++++++++- - 2 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/op.c b/op.c -index e21b9a4..973df13 100644 ---- a/op.c -+++ b/op.c -@@ -7780,8 +7780,11 @@ Perl_ck_index(pTHX_ OP *o) - OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ - if (kid) - kid = kid->op_sibling; /* get past "big" */ -- if (kid && kid->op_type == OP_CONST) -+ if (kid && kid->op_type == OP_CONST) { -+ const bool save_taint = PL_tainted; - fbm_compile(((SVOP*)kid)->op_sv, 0); -+ PL_tainted = save_taint; -+ } - } - return ck_fun(o); - } -diff --git a/t/op/taint.t b/t/op/taint.t -index 9df6fee..a300b9b 100644 ---- a/t/op/taint.t -+++ b/t/op/taint.t -@@ -17,7 +17,7 @@ BEGIN { - use strict; - use Config; - --plan tests => 774; -+plan tests => 778; - - $| = 1; - -@@ -2144,6 +2144,20 @@ end - is_tainted $dest, "ucfirst(tainted) taints its return value"; - } - -+ -+# tainted constants and index() -+# RT 64804; http://bugs.debian.org/291450 -+{ -+ ok(tainted $old_env_path, "initial taintedness"); -+ BEGIN { no strict 'refs'; my $v = $old_env_path; *{"::C"} = sub () { $v }; } -+ ok(tainted C, "constant is tainted properly"); -+ ok(!tainted "", "tainting not broken yet"); -+ index(undef, C); -+ ok(!tainted "", "tainting still works after index() of the constant"); -+} -+ -+ -+ - # This may bomb out with the alarm signal so keep it last - SKIP: { - skip "No alarm()" unless $Config{d_alarm}; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff deleted file mode 100644 index 998a6a3d81..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001 -From: Dominic Hargreaves <dom@earth.li> -Date: Mon, 2 May 2011 10:35:04 +0100 -Subject: Fix failing tilde test when run under a UID without a passwd entry - -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893 -Bug-Debian: http://bugs.debian.org/624850 - -Patch-Name: fixes/module-build-home-directory.diff ---- - cpan/Module-Build/t/tilde.t | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t -index fac821b..04f0210 100644 ---- a/cpan/Module-Build/t/tilde.t -+++ b/cpan/Module-Build/t/tilde.t -@@ -46,7 +46,8 @@ SKIP: { - - unless (defined $home) { - my @info = eval { getpwuid $> }; -- skip "No home directory for tilde-expansion tests", 15 if $@; -+ skip "No home directory for tilde-expansion tests", 15 if $@ -+ or !defined $info[7]; - $home = $info[7]; - } - -@@ -95,7 +96,8 @@ SKIP: { - # Again, with named users - SKIP: { - my @info = eval { getpwuid $> }; -- skip "No home directory for tilde-expansion tests", 1 if $@; -+ skip "No home directory for tilde-expansion tests", 1 if $@ -+ or !defined $info[7] or !defined $info[0]; - my ($me, $home) = @info[0,7]; - - my $expected = "$home/fooxzy"; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff deleted file mode 100644 index f68c352985..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 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 ---- - cpan/libnet/Net/SMTP.pm | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm -index a28496d..07b2498 100644 ---- a/cpan/libnet/Net/SMTP.pm -+++ b/cpan/libnet/Net/SMTP.pm -@@ -625,6 +625,7 @@ Net::SMTP will attempt to extract the address from the value passed. - - B<Debug> - Enable debugging information - -+B<Port> - Select a port on the remote host to connect to (default is 25) - - Example: - diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff deleted file mode 100644 index 58e770bc76..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff +++ /dev/null @@ -1,146 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001 -From: Keith Thompson <kst@mib.org> -Date: Fri, 29 Jul 2011 17:17:00 -0700 -Subject: Fix typos in several pod/perl*.pod files - -Bug-Debian: http://bugs.debian.org/637816 -Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d -Patch-Name: fixes/pod_fixes.diff ---- - pod/perlfunc.pod | 8 ++++---- - pod/perlglossary.pod | 10 +++++----- - pod/perlmod.pod | 4 ++-- - pod/perlretut.pod | 6 +++--- - 4 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod -index 2ee3637..719a740 100644 ---- a/pod/perlfunc.pod -+++ b/pod/perlfunc.pod -@@ -3918,7 +3918,7 @@ count. A numeric repeat count may optionally be enclosed in brackets, as - in C<pack("C[80]", @arr)>. The repeat count gobbles that many values from - the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>, - C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means --something else, dscribed below. Supplying a C<*> for the repeat count -+something else, described below. Supplying a C<*> for the repeat count - instead of a number means to use however many items are left, except for: - - =over -@@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not - well-defined. - - Because C<< <=> >> returns C<undef> when either operand is C<NaN> --(not-a-number), and laso because C<sort> raises an exception unless the -+(not-a-number), and also because C<sort> raises an exception unless the - result of a comparison is defined, be careful when sorting with a - comparison function like C<< $a <=> $b >> any lists that might contain a - C<NaN>. The following example takes advantage that C<NaN != NaN> to -@@ -5958,7 +5958,7 @@ specified. - - A pattern matching the empty string (not to be confused with - an empty pattern C<//>, which is just one member of the set of patterns --matching the epmty string), splits EXPR into individual -+matching the empty string), splits EXPR into individual - characters. For example: - - print join(':', split(/ */, 'hi there')), "\n"; -@@ -6222,7 +6222,7 @@ For example: - printf '<%.1e>', 10; # prints "<1.0e+01>" - - For "g" and "G", this specifies the maximum number of digits to show, --including thoe prior to the decimal point and those after it; for -+including those prior to the decimal point and those after it; for - example: - - # These examples are subject to system-specific variation. -diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod -index 639ce33..191371c 100644 ---- a/pod/perlglossary.pod -+++ b/pod/perlglossary.pod -@@ -507,7 +507,7 @@ the class (its L<objects|/object>). See also L</inheritance>. - - =item class method - --A L</method> whose L</invocand> is a L</package> name, not an -+A L</method> whose L</invocant> is a L</package> name, not an - L</object> reference. A method associated with the class as a whole. - - =item client -@@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb - indirect-object object" where L</STDOUT> is the recipient of the - L<print|perlfunc/print> action, and C<"$foo"> is the object being - printed. Similarly, when invoking a L</method>, you might place the --invocand between the method and its arguments: -+invocant between the method and its arguments: - - $gollum = new Pathetic::Creature "Smeagol"; - give $gollum "Fisssssh!"; -@@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable - form (L<syntax trees|/syntax tree>) within the I<perl> process itself, - which the Perl L</run time> system then interprets. - --=item invocand -+=item invocant - - The agent on whose behalf a L</method> is invoked. In a L</class> --method, the invocand is a package name. In an L</instance> method, --the invocand is an object reference. -+method, the invocant is a package name. In an L</instance> method, -+the invocant is an object reference. - - =item invocation - -diff --git a/pod/perlmod.pod b/pod/perlmod.pod -index 5266f19..17de73e 100644 ---- a/pod/perlmod.pod -+++ b/pod/perlmod.pod -@@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary. - C<CLONE> will be called once as a class method for every package that has it - defined (or inherits it). It will be called in the context of the new thread, - so all modifications are made in the new area. Currently CLONE is called with --no parameters other than the invocand package name, but code should not assume -+no parameters other than the invocant package name, but code should not assume - that this will remain unchanged, as it is likely that in future extra parameters - will be passed in to give more information about the state of cloning. - -@@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is - needed. - - Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other --than the invocand package name, although that may change. Similarly, to -+than the invocant package name, although that may change. Similarly, to - allow for future expansion, the return value should be a single C<0> or - C<1> value. - -diff --git a/pod/perlretut.pod b/pod/perlretut.pod -index ea80594..1c65f5b 100644 ---- a/pod/perlretut.pod -+++ b/pod/perlretut.pod -@@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results. - =head2 Relative backreferences - - Counting the opening parentheses to get the correct number for a --backreference is errorprone as soon as there is more than one -+backreference is error-prone as soon as there is more than one - capturing group. A more convenient technique became available - with Perl 5.10: relative backreferences. To refer to the immediately - preceding capture group one now may write C<\g{-1}>, the next but -@@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead. So we have - - =head3 Global matching - --The final two modifiers we will disccuss here, -+The final two modifiers we will discuss here, - C<//g> and C<//c>, concern multiple matches. - The modifier C<//g> stands for global matching and allows the - matching operator to match within a string as many times as possible. -@@ -1870,7 +1870,7 @@ substituted. - - C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of - double-quotish syntax, and not part of regexp syntax proper. They will --work if they appear in a regular expression embeddded directly in a -+work if they appear in a regular expression embedded directly in a - program, but not when contained in a string that is interpolated in a - pattern. - diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff deleted file mode 100644 index aa9307fc8a..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff +++ /dev/null @@ -1,154 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 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 ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++--------- - dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++--------- - 2 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index 6964eea..865d36d 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2053,7 +2053,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) \ - read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ - write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLPRIVLIB) \ -@@ -2067,7 +2067,7 @@ pure_perl_install :: all - - - pure_site_install :: all -- $(NOECHO) $(MOD_INSTALL) \ -+ $(NOECHO) umask 022; $(MOD_INSTALL) \ - read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ - write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLSITELIB) \ -@@ -2080,7 +2080,7 @@ pure_site_install :: all - }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{ - - pure_vendor_install :: all -- $(NOECHO) $(MOD_INSTALL) \ -+ $(NOECHO) umask 022; $(MOD_INSTALL) \ - read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ - write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLVENDORLIB) \ -@@ -2092,8 +2092,8 @@ pure_vendor_install :: all - - 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)" \ -@@ -2103,8 +2103,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)" \ -@@ -2114,8 +2114,8 @@ doc_site_install :: all - - doc_vendor_install :: all - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) -- -$(NOECHO) $(DOC_INSTALL) \ -+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) -+ -$(NOECHO) umask 022; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" "$(INSTALLVENDORLIB)" \ - LINKTYPE "$(LINKTYPE)" \ -diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm -index 3b030a5..cb0e9e0 100644 ---- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm -+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm -@@ -468,7 +468,7 @@ sub _can_write_dir { - - =pod - --=item _mkpath($dir,$show,$mode,$verbose,$dry_run) -+=item _mkpath($dir,$show,$verbose,$dry_run) - - Wrapper around File::Path::mkpath() to handle errors. - -@@ -485,13 +485,13 @@ writable. - =cut - - sub _mkpath { -- my ($dir,$show,$mode,$verbose,$dry_run)=@_; -+ my ($dir,$show,$verbose,$dry_run)=@_; - if ( $verbose && $verbose > 1 && ! -d $dir) { - $show= 1; -- printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode; -+ printf "mkpath(%s,%d)\n", $dir, $show; - } - if (!$dry_run) { -- if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) { -+ if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) { - _choke("Can't create '$dir'","$@"); - } - -@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC - _chdir($cwd); - } - foreach my $targetdir (sort keys %check_dirs) { -- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $targetdir, 0, $verbose, $dry_run ); - } - foreach my $found (@found_files) { - my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime, -@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC - $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' ) - unless $dry_run; - } elsif ( ! -d $targetdir ) { -- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $targetdir, 0, $verbose, $dry_run ); - } - print "Installing $targetfile\n"; - -@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC - - if ($pack{'write'}) { - $dir = install_rooted_dir(dirname($pack{'write'})); -- _mkpath( $dir, 0, 0755, $verbose, $dry_run ); -+ _mkpath( $dir, 0, $verbose, $dry_run ); - print "Writing $pack{'write'}\n" if $verbose; - $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run; - } -@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory). - sub pm_to_blib { - my($fromto,$autodir,$pm_filter) = @_; - -- _mkpath($autodir,0,0755); -+ _mkpath($autodir,0); - while(my($from, $to) = each %$fromto) { - if( -f $to && -s $from == -s $to && -M $to < -M $from ) { - print "Skip $to (unchanged)\n"; -@@ -1213,7 +1213,7 @@ sub pm_to_blib { - # we wont try hard here. its too likely to mess things up. - forceunlink($to); - } else { -- _mkpath(dirname($to),0,0755); -+ _mkpath(dirname($to),0); - } - if ($need_filtering) { - run_filter($pm_filter, $from, $to); diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch deleted file mode 100644 index 632d426baa..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Wed, 3 Aug 2011 22:36:24 +0300 -Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable - messages - -Bug: http://rt.cpan.org/Ticket/Display.html?id=69997 -Bug-Debian: http://bugs.debian.org/627821 - -Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel -even when there's no listener, causing test failures. - -It seems probable that all FreeBSD-based systems suffer from the -same issue, but that's for upstream to decide. - -Patch-Name: fixes/sys-syslog-socket-timeout-kfreebsd.patch ---- - cpan/Sys-Syslog/Syslog.pm | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm -index 002e6e4..b445c66 100644 ---- a/cpan/Sys-Syslog/Syslog.pm -+++ b/cpan/Sys-Syslog/Syslog.pm -@@ -138,7 +138,10 @@ my @fallbackMethods = (); - # happy, the timeout is now zero by default on all systems - # except on OSX where it is set to 250 msec, and can be set - # with the infamous setlogsock() function. --$sock_timeout = 0.25 if $^O =~ /darwin/; -+# -+# Debian change: include Debian GNU/kFreeBSD, lower to 1ms -+# see [rt.cpan.org #69997] -+$sock_timeout = 0.001 if $^O =~ /darwin|gnukfreebsd/; - - # coderef for a nicer handling of errors - my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/instmodsh_doc.diff deleted file mode 100644 index ae13178151..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/instmodsh_doc.diff +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From ab89a31d1f46388a61953349c3546e4082cd38de 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. - -Patch-Name: debian/instmodsh_doc.diff ---- - cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh -index 5874aa6..6a2f03e 100644 ---- a/cpan/ExtUtils-MakeMaker/bin/instmodsh -+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh -@@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules - - =head1 DESCRIPTION - --A little interface to ExtUtils::Installed to examine installed modules, -+A little interface to ExtUtils::Installed to examine locally* installed modules, - validate your packlists and even create a tarball from an installed module. - -+*On Debian system, B<core> and B<vendor> modules are managed by C<dpkg>. -+ - =head1 SEE ALSO - - ExtUtils::Installed diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/ld_run_path.diff deleted file mode 100644 index 929328b0ca..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/ld_run_path.diff +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 704f6017119ce0301a9105944512120a38a43a02 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. - -Patch-Name: debian/ld_run_path.diff ---- - .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm -index cf4826f..eb212b5 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm -@@ -54,6 +54,9 @@ sub _unix_os2_ext { - my($pwd) = cwd(); # from Cwd.pm - my($found) = 0; - -+ # Debian-specific: don't use LD_RUN_PATH for standard dirs -+ $ld_run_path_seen{$_}++ for @libpath; -+ - foreach my $thislib (split ' ', $potential_libs) { - - # Handle possible linker path arguments. diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/libnet_config_path.diff deleted file mode 100644 index 454cb9e31a..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/libnet_config_path.diff +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 7465b6d008187580eabe655b9c8e75351d3d24b4 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. - -Patch-Name: debian/libnet_config_path.diff ---- - cpan/libnet/Net/Config.pm | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm -index db51c1f..8404593 100644 ---- a/cpan/libnet/Net/Config.pm -+++ b/cpan/libnet/Net/Config.pm -@@ -57,9 +57,8 @@ my %nc = ( - } - TRY_INTERNET_CONFIG - --my $file = __FILE__; -+my $file = '/etc/perl/Net/libnet.cfg'; - my $ref; --$file =~ s/Config.pm/libnet.cfg/; - if (-f $file) { - $ref = eval { local $SIG{__DIE__}; do $file }; - if (ref($ref) eq 'HASH') { -@@ -132,8 +131,8 @@ Net::Config - Local configuration data for libnet - C<Net::Config> holds configuration data for the modules in the libnet - distribution. During installation you will be asked for these values. - --The configuration data is held globally in a file in the perl installation --tree, but a user may override any of these values by providing their own. This -+The configuration data is held globally in C</etc/perl/Net/libnet.cfg>, -+but a user may override any of these values by providing their own. This - can be done by having a C<.libnetrc> file in their home directory. This file - should return a reference to a HASH containing the keys described below. - For example diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/libperl_embed_doc.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/libperl_embed_doc.diff deleted file mode 100644 index d1bf8bda7b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/libperl_embed_doc.diff +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From d70e88badfcc6edd05e884597f19fbbdcf2cf6a7 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 - -Bug-Debian: http://bugs.debian.org/186778 - -Patch-Name: debian/libperl_embed_doc.diff ---- - lib/ExtUtils/Embed.pm | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm -index 9710630..86f13b5 100644 ---- a/lib/ExtUtils/Embed.pm -+++ b/lib/ExtUtils/Embed.pm -@@ -305,6 +305,9 @@ and extensions in your C/C++ applications. - Typically, an application B<Makefile> will invoke ExtUtils::Embed - functions while building your application. - -+Note that on Debian systems the B<libperl-dev> package is required for -+compiling applications which embed an interpreter. -+ - =head1 @EXPORT - - ExtUtils::Embed exports the following functions: diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/m68k_thread_stress.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/m68k_thread_stress.diff deleted file mode 100644 index 1c3b6b55f1..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/m68k_thread_stress.diff +++ /dev/null @@ -1,47 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 55a718425dc4612ac01850ef786f75f072b20b9e Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Mon, 8 Sep 2008 20:48:14 +0300 -Subject: Disable some threads tests on m68k for now due to missing TLS. - -Bug-Debian: http://bugs.debian.org/495826 -Bug-Debian: http://bugs.debian.org/517938 - -Patch-Name: debian/m68k_thread_stress.diff ---- - dist/threads-shared/t/stress.t | 4 ++++ - dist/threads-shared/t/waithires.t | 6 ++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t -index 652a3e6..2f1b576 100644 ---- a/dist/threads-shared/t/stress.t -+++ b/dist/threads-shared/t/stress.t -@@ -11,6 +11,10 @@ BEGIN { - print("1..0 # SKIP Broken under HP-UX 10.20\n"); - exit(0); - } -+ if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) { -+ print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n"); -+ exit(0); -+ } - } - - use ExtUtils::testlib; -diff --git a/dist/threads-shared/t/waithires.t b/dist/threads-shared/t/waithires.t -index 3c3e852..349c5b4 100644 ---- a/dist/threads-shared/t/waithires.t -+++ b/dist/threads-shared/t/waithires.t -@@ -16,6 +16,12 @@ BEGIN { - if (! eval 'use Time::HiRes "time"; 1') { - Test::skip_all('Time::HiRes not available'); - } -+ -+ if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) { -+ print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n"); -+ exit(0); -+ } -+ - } - - use ExtUtils::testlib; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/mod_paths.diff deleted file mode 100644 index ceac541fd4..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/mod_paths.diff +++ /dev/null @@ -1,100 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 11633e598640b02e19329f323623af254fbac451 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 - -Our order is: - - etc (for config files) - site (5.8.1) - vendor (all) - core (5.8.1) - site (version-indep) - site (pre-5.8.1) - -The rationale being that an admin (via site), or module packager -(vendor) can chose to shadow core modules when there is a newer -version than is included in core. - -Patch-Name: debian/mod_paths.diff ---- - perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) - -diff --git a/perl.c b/perl.c -index f756e02..d26dcb0 100644 ---- a/perl.c -+++ b/perl.c -@@ -4219,6 +4219,11 @@ S_init_perllib(pTHX) - INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); - #endif - -+#ifdef DEBIAN -+ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ -+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/etc/perl"), 0x0); -+#endif -+ - #ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -@@ -4336,6 +4341,59 @@ S_init_perllib(pTHX) - INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); - #endif - -+#ifdef DEBIAN -+ /* Non-versioned site directory for local modules and for -+ compatability with the previous packages' site dirs */ -+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/usr/local/lib/site_perl"), -+ INCPUSH_ADD_SUB_DIRS); -+ -+#ifdef PERL_INC_VERSION_LIST -+ { -+ struct stat s; -+ -+ /* add small buffer in case old versions are longer than the -+ current version */ -+ char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP; -+ char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP; -+ char const *vers[] = { PERL_INC_VERSION_LIST }; -+ char const **p; -+ -+ char *arch_vers = strrchr(sitearch, '/'); -+ char *lib_vers = strrchr(sitelib, '/'); -+ -+ if (arch_vers && isdigit(*++arch_vers)) -+ *arch_vers = 0; -+ else -+ arch_vers = 0; -+ -+ if (lib_vers && isdigit(*++lib_vers)) -+ *lib_vers = 0; -+ else -+ lib_vers = 0; -+ -+ /* there is some duplication here as incpush does something -+ similar internally, but required as sitearch is not a -+ subdirectory of sitelib */ -+ for (p = vers; *p; p++) -+ { -+ if (arch_vers) -+ { -+ strcpy(arch_vers, *p); -+ if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode)) -+ S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0); -+ } -+ -+ if (lib_vers) -+ { -+ strcpy(lib_vers, *p); -+ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) -+ S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0); -+ } -+ } -+ } -+#endif -+#endif -+ - #ifdef PERL_OTHERLIBDIRS - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), - INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/module_build_man_extensions.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/module_build_man_extensions.diff deleted file mode 100644 index 64401d9123..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/module_build_man_extensions.diff +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From fbb5f07872d45bac76b5c3c83b50a19aa5da10b0 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 8 May 2008 14:32:33 +0300 -Subject: Adjust Module::Build manual page extensions for the Debian Perl - policy - -Bug-Debian: http://bugs.debian.org/479460 - -Patch-Name: debian/module_build_man_extensions.diff ---- - cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm -index fba916a..82df4cc 100644 ---- a/cpan/Module-Build/lib/Module/Build/Base.pm -+++ b/cpan/Module-Build/lib/Module/Build/Base.pm -@@ -3246,7 +3246,7 @@ sub manify_bin_pods { - foreach my $file (keys %$files) { - # Pod::Simple based parsers only support one document per instance. - # This is expected to change in a future version (Pod::Simple > 3.03). -- my $parser = Pod::Man->new( section => 1 ); # binaries go in section 1 -+ my $parser = Pod::Man->new( section => '1p' ); # binaries go in section 1p - my $manpage = $self->man1page_name( $file ) . '.' . - $self->config( 'man1ext' ); - my $outfile = File::Spec->catfile($mandir, $manpage); -@@ -3271,7 +3271,7 @@ sub manify_lib_pods { - while (my ($file, $relfile) = each %$files) { - # Pod::Simple based parsers only support one document per instance. - # This is expected to change in a future version (Pod::Simple > 3.03). -- my $parser = Pod::Man->new( section => 3 ); # libraries go in section 3 -+ my $parser = Pod::Man->new( section => '3pm' ); # libraries go in section 3pm - my $manpage = $self->man3page_name( $relfile ) . '.' . - $self->config( 'man3ext' ); - my $outfile = File::Spec->catfile( $mandir, $manpage); diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/no_packlist_perllocal.diff deleted file mode 100644 index 00633e3cb2..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/no_packlist_perllocal.diff +++ /dev/null @@ -1,89 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 44c7521619dd0e637920393184affcb26a27d5b7 Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: Don't install .packlist or perllocal.pod for perl or vendor - -Patch-Name: debian/no_packlist_perllocal.diff ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 31 +++-------------------- - 1 files changed, 4 insertions(+), 27 deletions(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index 42bbb83..a16e2d0 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2054,8 +2054,6 @@ doc__install : doc_site_install - - pure_perl_install :: all - $(NOECHO) umask 022; $(MOD_INSTALL) \ -- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ -- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLPRIVLIB) \ - $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ - $(INST_BIN) $(DESTINSTALLBIN) \ -@@ -2081,8 +2079,6 @@ pure_site_install :: all - - pure_vendor_install :: all - $(NOECHO) umask 022; $(MOD_INSTALL) \ -- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ -- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLVENDORLIB) \ - $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ - $(INST_BIN) $(DESTINSTALLVENDORBIN) \ -@@ -2091,37 +2087,19 @@ pure_vendor_install :: all - $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) - - doc_perl_install :: all -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) -- -$(NOECHO) umask 022; $(DOC_INSTALL) \ -- "Module" "$(NAME)" \ -- "installed into" "$(INSTALLPRIVLIB)" \ -- LINKTYPE "$(LINKTYPE)" \ -- VERSION "$(VERSION)" \ -- EXE_FILES "$(EXE_FILES)" \ -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ - - doc_site_install :: all -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -- -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB) -+ $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod -+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH) - -$(NOECHO) umask 02; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" "$(INSTALLSITELIB)" \ - LINKTYPE "$(LINKTYPE)" \ - VERSION "$(VERSION)" \ - EXE_FILES "$(EXE_FILES)" \ -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ -+ >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{ - - doc_vendor_install :: all -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) -- -$(NOECHO) umask 022; $(DOC_INSTALL) \ -- "Module" "$(NAME)" \ -- "installed into" "$(INSTALLVENDORLIB)" \ -- LINKTYPE "$(LINKTYPE)" \ -- VERSION "$(VERSION)" \ -- EXE_FILES "$(EXE_FILES)" \ -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ - - }; - -@@ -2130,13 +2108,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs - $(NOECHO) $(NOOP) - - uninstall_from_perldirs :: -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ - - uninstall_from_sitedirs :: - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ - - uninstall_from_vendordirs :: -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ -+ - }; - - join("",@m); diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/patchlevel.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/patchlevel.diff deleted file mode 100644 index 9c25eb710d..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/patchlevel.diff +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From cf928101697efa4a46ada500c2f449caeb854fd4 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Sun, 15 May 2011 19:35:58 +0300 -Subject: List packaged patches in patchlevel.h - -Origin: vendor -Bug-Debian: http://bugs.debian.org/567489 - -The list of packaged patches is in patchlevel-debian.h, which is generated -from the debian/patches/ directory when building the package. - -Patch-Name: debian/patchlevel.diff ---- - patchlevel.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/patchlevel.h b/patchlevel.h -index 5dc2a53..1356595 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -137,6 +137,9 @@ static const char * const local_patches[] = { - ,"uncommitted-changes" - #endif - PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ -+#ifdef DEBIAN -+#include "patchlevel-debian.h" -+#endif - ,NULL - }; - diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff deleted file mode 100644 index 21711e88ed..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 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 - -Bug-Debian: http://bugs.debian.org/510895 - -On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote: -> On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote: - -> > We could create the directories in a postinst script, but I'm not sure -> > I see the point. They will be created automatically when installing -> > CPAN modules. -> -> The directories are intentionally not created, as this way they are -> excluded from the search path at start-up, saving a bunch of wasted -> stats at use/require time in the common case that the user has not -> installed any local packages. As Niko points out, they will be -> created as required. - -Signed-off-by: Niko Tyni <ntyni@debian.org> - -Patch-Name: debian/perlivp.diff ---- - utils/perlivp.PL | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/utils/perlivp.PL b/utils/perlivp.PL -index 6fcb670..1401cac 100644 ---- a/utils/perlivp.PL -+++ b/utils/perlivp.PL -@@ -142,6 +142,7 @@ my $INC_total = 0; - my $INC_there = 0; - foreach (@INC) { - next if $_ eq '.'; # skip -d test here -+ next if m|/usr/local|; # not shipped on Debian - if (-d $_) { - print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'}; - $INC_there++; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/prefix_changes.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/prefix_changes.diff deleted file mode 100644 index 5a1ad99e0b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/prefix_changes.diff +++ /dev/null @@ -1,119 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 148e2717682ce8c65475ffdeea84b3cdd1ab1649 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 ---- - 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 a38f274..93d3fe9 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm -@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS. - sub manifypods_target { - my($self) = shift; - -- my $man1pods = ''; -- my $man3pods = ''; - my $dependencies = ''; - - # populate manXpods & dependencies: -@@ -718,7 +716,7 @@ END - foreach my $section (qw(1 3)) { - my $pods = $self->{"MAN${section}PODS"}; - push @man_cmds, $self->split_command(<<CMD, %$pods); -- \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW) -+ \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW) - CMD - } - -@@ -1521,9 +1519,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 a16e2d0..c308c49 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2981,8 +2981,7 @@ sub prefixify { - print STDERR " prefixify $var => $path\n" if $Verbose >= 2; - print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2; - -- if( $self->{ARGS}{PREFIX} && -- $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) -+ if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} ) - { - - print STDERR " cannot prefix, using default.\n" if $Verbose >= 2; -diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t -index 6aac294..28294f2 100644 ---- a/cpan/ExtUtils-MakeMaker/t/INST.t -+++ b/cpan/ExtUtils-MakeMaker/t/INST.t -@@ -61,9 +61,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 fbb18a3..8987569 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; -@@ -58,16 +58,16 @@ like( $stdout->read, qr{ - Writing\ MYMETA.yml\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-5.14.3/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/prune_libs.diff deleted file mode 100644 index e3c320ebe1..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/prune_libs.diff +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 063566907896ff32bea27897fa73cebbbd7bacce Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea <bod@debian.org> -Date: Fri, 18 Mar 2005 22:22:25 +1100 -Subject: Prune the list of libraries wanted to what we actually need. - -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). - -Patch-Name: debian/prune_libs.diff ---- - Configure | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Configure b/Configure -index d9911f9..f59f75c 100755 ---- a/Configure -+++ b/Configure -@@ -1367,8 +1367,7 @@ libswanted_uselargefiles='' - : set usesocks on the Configure command line to enable socks. - : List of libraries we want. - : If anyone needs extra -lxxx, put those in a hint file. --libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" --libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" -+libswanted='gdbm gdbm_compat db dl m c crypt' - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. - glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` -@@ -22308,7 +22307,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/meta/recipes-devtools/perl/perl-5.14.3/debian/series b/meta/recipes-devtools/perl/perl-5.14.3/debian/series deleted file mode 100644 index 08adca5626..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/series +++ /dev/null @@ -1,40 +0,0 @@ -debian/arm_thread_stress_timeout.diff -debian/cpan_definstalldirs.diff -debian/db_file_ver.diff -debian/doc_info.diff -debian/enc2xs_inc.diff -debian/errno_ver.diff -debian/libperl_embed_doc.diff -fixes/respect_umask.diff -debian/writable_site_dirs.diff -debian/extutils_set_libperl_path.diff -debian/no_packlist_perllocal.diff -debian/prefix_changes.diff -debian/fakeroot.diff -debian/instmodsh_doc.diff -debian/ld_run_path.diff -debian/libnet_config_path.diff -debian/m68k_thread_stress.diff -debian/mod_paths.diff -debian/module_build_man_extensions.diff -debian/prune_libs.diff -fixes/net_smtp_docs.diff -debian/perlivp.diff -debian/disable-zlib-bundling.diff -debian/cpanplus_definstalldirs.diff -debian/cpanplus_config_path.diff -debian/deprecate-with-apt.diff -fixes/hurd-ccflags.diff -debian/squelch-locale-warnings.diff -debian/skip-upstream-git-tests.diff -fixes/extutils-cbuilder-cflags.diff -fixes/module-build-home-directory.diff -debian/patchlevel.diff -fixes/h2ph-multiarch.diff -fixes/index-tainting.diff -debian/skip-kfreebsd-crash.diff -fixes/document_makemaker_ccflags.diff -fixes/sys-syslog-socket-timeout-kfreebsd.patch -fixes/hurd-hints.diff -fixes/pod_fixes.diff -debian/find_html2text.diff diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-kfreebsd-crash.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-kfreebsd-crash.diff deleted file mode 100644 index cdade88664..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-kfreebsd-crash.diff +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From ff2815399ad94915da2e63cb3c4bbd2d02dac4b2 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 ---- - t/op/threads.t | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/t/op/threads.t b/t/op/threads.t -index 24e84e4..6a91366 100644 ---- a/t/op/threads.t -+++ b/t/op/threads.t -@@ -342,6 +342,9 @@ threads->create( - - EOI - -+SKIP: { -+ skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1 -+ if $^O eq 'gnukfreebsd'; - # [perl #78494] Pipes shared between threads block when closed - watchdog 10; - { -@@ -351,5 +354,6 @@ watchdog 10; - threads->create(sub { })->join; - ok(1, "Pipes shared between threads do not block when closed"); - } -+} - - # EOF diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff deleted file mode 100644 index 2c30536120..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 2be2eed9148c38d3e982d3371f379ce77021aeb5 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 ---- - t/porting/authors.t | 3 ++- - t/porting/cmp_version.t | 3 ++- - t/porting/manifest.t | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/t/porting/authors.t b/t/porting/authors.t -index 28ca1ca..3c7f069 100644 ---- a/t/porting/authors.t -+++ b/t/porting/authors.t -@@ -9,7 +9,8 @@ BEGIN { - use strict; - use warnings; - --if (! -d '.git' ) { -+# Debian change: skip as we're probably in a different git repository -+if (1 || ! -d '.git' ) { - print "1..0 # SKIP: not being run from a git checkout\n"; - exit 0; - } -diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t -index b3c677c..f89f2a7 100644 ---- a/t/porting/cmp_version.t -+++ b/t/porting/cmp_version.t -@@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir); - use Getopt::Std; - use Maintainers; - --if (! -d '.git' ) { -+# Debian change: skip as we're probably in a different git repository -+if (1 || ! -d '.git' ) { - print "1..0 # SKIP: not being run from a git checkout\n"; - exit 0; - } -diff --git a/t/porting/manifest.t b/t/porting/manifest.t -index 48dd3ac..b08126b 100644 ---- a/t/porting/manifest.t -+++ b/t/porting/manifest.t -@@ -59,7 +59,8 @@ SKIP: { - - SKIP: { - chdir ".."; -- skip("not under git control", 3) unless -d '.git'; -+ # Debian change: skip as we're probably in a different git repository -+ skip("not under git control", 3) unless 0 && -d '.git'; - chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`); - skip("git ls-files didnt work",3) - if !@repo; diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/squelch-locale-warnings.diff deleted file mode 100644 index f0a6924499..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/squelch-locale-warnings.diff +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 718e9cbd59f0739fc9104af111e42fff66f927a7 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 - -Bug-Debian: http://bugs.debian.org/508764 - -The system locales are rather frequently out of sync with the C library -during package upgrades, causing a huge amount of useless Perl locale -warnings. Squelch them when running package maintainer scripts, detected -by the DPKG_RUNNING_VERSION environment variable. - -Any real locale problem will show up after the system upgrade too, and -the warning will be triggered normally again at that point. - -Patch-Name: debian/squelch-locale-warnings.diff ---- - locale.c | 4 ++++ - pod/perllocale.pod | 8 ++++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -diff --git a/locale.c b/locale.c -index 4631b86..94a0962 100644 ---- a/locale.c -+++ b/locale.c -@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) - char *p; - const bool locwarn = (printwarn > 1 || - (printwarn && -+ -+ /* Debian specific change - see http://bugs.debian.org/508764 */ -+ (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) && -+ - (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p)))); - - if (locwarn) { -diff --git a/pod/perllocale.pod b/pod/perllocale.pod -index 8926d8b..6c55889 100644 ---- a/pod/perllocale.pod -+++ b/pod/perllocale.pod -@@ -861,6 +861,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message. - The message tells about some problem in your system's locale support, - and you should investigate what the problem is. - -+=item DPKG_RUNNING_VERSION -+ -+On Debian systems, if the DPKG_RUNNING_VERSION environment variable is -+set (to any value), the locale failure warnings will be suppressed just -+like with a zero PERL_BADLANG setting. This is done to avoid floods -+of spurious warnings during system upgrades. -+See L<http://bugs.debian.org/508764>. -+ - =back - - The following environment variables are not specific to Perl: They are diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/writable_site_dirs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/writable_site_dirs.diff deleted file mode 100644 index a4a9adf52e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/writable_site_dirs.diff +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status:Inappropriate [debian patches] -From 492e0d6b4e3e0d786fb88b9058d581f6466c4a3e 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 - -Policy requires group writable site directories - -Patch-Name: debian/writable_site_dirs.diff ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++--- - 1 files 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 865d36d..4ee6b3f 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2067,7 +2067,7 @@ pure_perl_install :: all - - - pure_site_install :: all -- $(NOECHO) umask 022; $(MOD_INSTALL) \ -+ $(NOECHO) umask 02; $(MOD_INSTALL) \ - read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ - write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \ - $(INST_LIB) $(DESTINSTALLSITELIB) \ -@@ -2103,8 +2103,8 @@ doc_perl_install :: all - - doc_site_install :: all - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) -- -$(NOECHO) umask 022; $(DOC_INSTALL) \ -+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB) -+ -$(NOECHO) umask 02; $(DOC_INSTALL) \ - "Module" "$(NAME)" \ - "installed into" "$(INSTALLSITELIB)" \ - LINKTYPE "$(LINKTYPE)" \ |