summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/debian
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-01 15:51:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commite73deac6dc7861c64ced49d2a35f781d655db79a (patch)
treedf7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.14.3/debian
parent93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff)
downloadpoky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz
perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/arm_thread_stress_timeout.diff27
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff38
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_config_path.diff45
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/cpanplus_definstalldirs.diff56
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/db_file_ver.diff35
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/deprecate-with-apt.diff407
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/disable-zlib-bundling.diff31
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/doc_info.diff37
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff54
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/errno_ver.diff36
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/extutils_set_libperl_path.diff24
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff45
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/find_html2text.diff36
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff32
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff87
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff70
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff74
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff38
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff26
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff146
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff154
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch37
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/instmodsh_doc.diff28
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/ld_run_path.diff25
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/libnet_config_path.diff38
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/libperl_embed_doc.diff27
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/m68k_thread_stress.diff47
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/mod_paths.diff100
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/module_build_man_extensions.diff36
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/no_packlist_perllocal.diff89
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/patchlevel.diff31
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff40
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/prefix_changes.diff119
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/prune_libs.diff39
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/series40
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/skip-kfreebsd-crash.diff40
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff60
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/squelch-locale-warnings.diff56
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/writable_site_dirs.diff37
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 @@
1Upstream-Status:Inappropriate [debian patches]
2From f624a9f1206cdd44fde99c40d82e2f326db485dd Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Sat, 1 Nov 2008 15:10:16 +0200
5Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate
6 slower build hosts
7
8Bug-Debian: http://bugs.debian.org/501970
9
10Patch-Name: debian/arm_thread_stress_timeout.diff
11---
12 dist/threads-shared/t/stress.t | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-)
14
15diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
16index adfd1ed..652a3e6 100644
17--- a/dist/threads-shared/t/stress.t
18+++ b/dist/threads-shared/t/stress.t
19@@ -34,7 +34,7 @@ use threads::shared;
20 {
21 my $cnt = 50;
22
23- my $TIMEOUT = 60;
24+ my $TIMEOUT = 150;
25
26 my $mutex = 1;
27 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Provide a sensible INSTALLDIRS default for modules installed from
6 CPAN.
7
8Some modules which are included in core set INSTALLDIRS => 'perl'
9explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC
10ordering, but not ours.
11
12Patch-Name: debian/cpan_definstalldirs.diff
13---
14 cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
15 1 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
18index 667bdca..c38c890 100644
19--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
20+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
21@@ -990,7 +990,7 @@ sub init {
22 my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
23
24 if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
25- my_dflt_prompt(makepl_arg => "", $matcher);
26+ my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
27 my_dflt_prompt(make_arg => "", $matcher);
28 if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
29 $CPAN::Frontend->mywarn(
30@@ -1022,7 +1022,7 @@ sub init {
31 my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
32 $matcher);
33
34- my_dflt_prompt(mbuildpl_arg => "", $matcher);
35+ my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher);
36 my_dflt_prompt(mbuild_arg => "", $matcher);
37
38 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Mon, 6 Jul 2009 22:17:53 +0300
5Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
6
7This is a configuration file and needs to go in /etc by policy.
8Besides, /usr may not even be writable.
9
10This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
11
12See #533707.
13
14Patch-Name: debian/cpanplus_config_path.diff
15---
16 cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 +
17 cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++
18 2 files changed, 4 insertions(+), 0 deletions(-)
19
20diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
21index ba1ca07..25cbe5f 100644
22--- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
23+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
24@@ -280,6 +280,7 @@ Saves the configuration to the package name you provided.
25 If this package is not C<CPANPLUS::Config::System>, it will
26 be saved in your C<.cpanplus> directory, otherwise it will
27 be attempted to be saved in the system wide directory.
28+(On Debian systems, this system wide directory is /etc/perl.)
29
30 If no argument is provided, it will default to your personal
31 config.
32diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
33index 443d5a4..f7085a8 100644
34--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
35+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
36@@ -209,6 +209,9 @@ use constant CONFIG_USER_FILE => sub {
37 ) . '.pm';
38 };
39 use constant CONFIG_SYSTEM_FILE => sub {
40+ # Debian-specific shortcut
41+ return '/etc/perl/CPANPLUS/Config/System.pm';
42+
43 require CPANPLUS::Internals;
44 require File::Basename;
45 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 66517b14790aa6410fd37e411dd62521e1e02b7f Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Mon, 6 Jul 2009 21:58:41 +0300
5Subject: Configure CPANPLUS to use the site directories by default.
6
7Bug-Debian: http://bugs.debian.org/533707
8
9The core modules usually default to INSTALLDIRS=perl (ExtUtils::MakeMaker)
10or installdirs=core (Module::Build), so we need to explicitly ask for
11the site destination to get upgraded versions into /usr/local.
12
13See also the sister patch, debian/cpan_definstalldirs .
14
15Patch-Name: debian/cpanplus_definstalldirs.diff
16---
17 cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm | 30 +++++++++++++++++++++++++++
18 1 files changed, 30 insertions(+), 0 deletions(-)
19 create mode 100644 cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
20
21diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
22new file mode 100644
23index 0000000..5e6e11e
24--- /dev/null
25+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
26@@ -0,0 +1,30 @@
27+### minimal pod, so you can find it with perldoc -l, etc
28+=pod
29+
30+=head1 NAME
31+
32+CPANPLUS::Config::System
33+
34+=head1 DESCRIPTION
35+
36+This is a CPANPLUS configuration file that sets appropriate default
37+settings on Debian systems.
38+
39+The only preconfigured settings are C<makemakerflags> (set to
40+C<INSTALLDIRS=site>) and C<buildflags> (set to C<--installdirs site>).
41+
42+These settings will not have any effect if
43+C</etc/perl/CPANPLUS/Config/System.pm> is present.
44+
45+=cut
46+
47+
48+package CPANPLUS::Config::System;
49+
50+sub setup {
51+ my $conf = shift;
52+ $conf->set_conf( makemakerflags => 'INSTALLDIRS=site' );
53+ $conf->set_conf( buildflags => '--installdirs site' );
54+}
55+
56+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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 16 Dec 2005 01:32:14 +1100
5Subject: Remove overly restrictive DB_File version check.
6
7Bug-Debian: http://bugs.debian.org/340047
8
9Package dependencies ensure the correct library is linked at run-time.
10
11Patch-Name: debian/db_file_ver.diff
12---
13 cpan/DB_File/version.c | 2 ++
14 1 files changed, 2 insertions(+), 0 deletions(-)
15
16diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
17index e01f6f6..544e6ee 100644
18--- a/cpan/DB_File/version.c
19+++ b/cpan/DB_File/version.c
20@@ -48,6 +48,7 @@ __getBerkeleyDBInfo()
21
22 (void)db_version(&Major, &Minor, &Patch) ;
23
24+#ifndef DEBIAN
25 /* Check that the versions of db.h and libdb.a are the same */
26 if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR )
27 /* || Patch != DB_VERSION_PATCH) */
28@@ -55,6 +56,7 @@ __getBerkeleyDBInfo()
29 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",
30 DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
31 Major, Minor, Patch) ;
32+#endif /* DEBIAN */
33
34 /* check that libdb is recent enough -- we need 2.3.4 or greater */
35 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001
3From: Dominic Hargreaves <dom@earth.li>
4Date: Mon, 17 May 2010 13:23:07 +0300
5Subject: Point users to Debian packages of deprecated core modules
6
7Bug-Debian: http://bugs.debian.org/580034
8
9Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
10deprecated from the Perl core in 5.12.0.
11
12Class::ISA, Switch, Pod::Plainer were removed from the Perl core in
135.14.0.
14
15Shell and Devel::DProf, and Perl 4 libraries, were deprecated from the
16Perl core in 5.14.0.
17
18To get a clean transition, perl/perl-modules is going to recommend the
19separate Debian packages of these for one release cycle so that they will be
20pulled in by default on upgrades.
21
22However, on systems configured to ignore recommendations the deprecation
23warnings will still be useful, so modify them slightly to point to the
24separate packages instead.
25
26Patch-Name: debian/deprecate-with-apt.diff
27---
28 lib/abbrev.pl | 2 +-
29 lib/assert.pl | 2 +-
30 lib/bigfloat.pl | 2 +-
31 lib/bigint.pl | 2 +-
32 lib/bigrat.pl | 2 +-
33 lib/cacheout.pl | 2 +-
34 lib/complete.pl | 2 +-
35 lib/ctime.pl | 2 +-
36 lib/deprecate.pm | 16 +++++++++++++++-
37 lib/dotsh.pl | 2 +-
38 lib/exceptions.pl | 2 +-
39 lib/fastcwd.pl | 2 +-
40 lib/find.pl | 2 +-
41 lib/finddepth.pl | 2 +-
42 lib/flush.pl | 2 +-
43 lib/getcwd.pl | 2 +-
44 lib/getopt.pl | 2 +-
45 lib/getopts.pl | 2 +-
46 lib/hostname.pl | 2 +-
47 lib/importenv.pl | 2 +-
48 lib/look.pl | 2 +-
49 lib/newgetopt.pl | 2 +-
50 lib/open2.pl | 2 +-
51 lib/open3.pl | 2 +-
52 lib/pwd.pl | 2 +-
53 lib/shellwords.pl | 2 +-
54 lib/stat.pl | 2 +-
55 lib/syslog.pl | 2 +-
56 lib/tainted.pl | 2 +-
57 lib/termcap.pl | 2 +-
58 lib/timelocal.pl | 2 +-
59 lib/validate.pl | 2 +-
60 32 files changed, 46 insertions(+), 32 deletions(-)
61
62diff --git a/lib/abbrev.pl b/lib/abbrev.pl
63index d46321f..0168631 100644
64--- a/lib/abbrev.pl
65+++ b/lib/abbrev.pl
66@@ -1,4 +1,4 @@
67-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";
68+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";
69
70 ;# Usage:
71 ;# %foo = ();
72diff --git a/lib/assert.pl b/lib/assert.pl
73index d47e006..80593c5 100644
74--- a/lib/assert.pl
75+++ b/lib/assert.pl
76@@ -1,4 +1,4 @@
77-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";
78+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";
79
80 #
81 # This library is no longer being maintained, and is included for backward
82diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl
83index 82d0f5c..c21bac6 100644
84--- a/lib/bigfloat.pl
85+++ b/lib/bigfloat.pl
86@@ -1,4 +1,4 @@
87-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";
88+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";
89
90 package bigfloat;
91 require "bigint.pl";
92diff --git a/lib/bigint.pl b/lib/bigint.pl
93index 6de1c53..031e8ad 100644
94--- a/lib/bigint.pl
95+++ b/lib/bigint.pl
96@@ -1,4 +1,4 @@
97-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";
98+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";
99
100 package bigint;
101 #
102diff --git a/lib/bigrat.pl b/lib/bigrat.pl
103index aaf1713..146a8f4 100644
104--- a/lib/bigrat.pl
105+++ b/lib/bigrat.pl
106@@ -1,4 +1,4 @@
107-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";
108+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";
109
110 package bigrat;
111 require "bigint.pl";
112diff --git a/lib/cacheout.pl b/lib/cacheout.pl
113index a5da453..937405d 100644
114--- a/lib/cacheout.pl
115+++ b/lib/cacheout.pl
116@@ -1,4 +1,4 @@
117-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";
118+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";
119
120 #
121 # This library is no longer being maintained, and is included for backward
122diff --git a/lib/complete.pl b/lib/complete.pl
123index 9ed041c..2ab0c6a 100644
124--- a/lib/complete.pl
125+++ b/lib/complete.pl
126@@ -1,4 +1,4 @@
127-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";
128+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";
129
130 ;#
131 #
132diff --git a/lib/ctime.pl b/lib/ctime.pl
133index aa00d00..ac24e71 100644
134--- a/lib/ctime.pl
135+++ b/lib/ctime.pl
136@@ -1,4 +1,4 @@
137-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";
138+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";
139
140 ;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function.
141 #
142diff --git a/lib/deprecate.pm b/lib/deprecate.pm
143index 7562c69..fc548b0 100644
144--- a/lib/deprecate.pm
145+++ b/lib/deprecate.pm
146@@ -7,6 +7,14 @@ our $VERSION = 0.02;
147 our %Config;
148 unless (%Config) { require Config; *Config = \%Config::Config; }
149
150+# Debian-specific change: recommend the separate Debian packages of
151+# deprecated modules where available
152+
153+my %DEBIAN_PACKAGES = (
154+ "Shell" => "libshell-perl",
155+ "Devel::DProf" => "libdevel-dprof-perl"
156+);
157+
158 # This isn't a public API. It's internal to code maintained by the perl-porters
159 # If you would like it to be a public API, please send a patch with
160 # documentation and tests. Until then, it may change without warning.
161@@ -58,9 +66,15 @@ EOM
162 if (defined $callers_bitmask
163 && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
164 || vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
165- warn <<"EOM";
166+ if (my $deb = $DEBIAN_PACKAGES{$package}) {
167+ warn <<"EOM";
168+$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.
169+EOM
170+ } else {
171+ warn <<"EOM";
172 $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.
173 EOM
174+ }
175 }
176 }
177 }
178diff --git a/lib/dotsh.pl b/lib/dotsh.pl
179index 92f1f4c..4085122 100644
180--- a/lib/dotsh.pl
181+++ b/lib/dotsh.pl
182@@ -1,4 +1,4 @@
183-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";
184+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";
185
186 #
187 # @(#)dotsh.pl 03/19/94
188diff --git a/lib/exceptions.pl b/lib/exceptions.pl
189index 8af64c8..b5b1427 100644
190--- a/lib/exceptions.pl
191+++ b/lib/exceptions.pl
192@@ -1,4 +1,4 @@
193-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";
194+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";
195
196 # exceptions.pl
197 # tchrist@convex.com
198diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl
199index 70007a1..2c7c42e 100644
200--- a/lib/fastcwd.pl
201+++ b/lib/fastcwd.pl
202@@ -1,4 +1,4 @@
203-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";
204+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";
205
206 # By John Bazik
207 #
208diff --git a/lib/find.pl b/lib/find.pl
209index 8e1b42c..7fb2fbf 100644
210--- a/lib/find.pl
211+++ b/lib/find.pl
212@@ -1,4 +1,4 @@
213-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";
214+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";
215
216 # This library is deprecated and unmaintained. It is included for
217 # compatibility with Perl 4 scripts which may use it, but it will be
218diff --git a/lib/finddepth.pl b/lib/finddepth.pl
219index 479905f..c07cea5 100644
220--- a/lib/finddepth.pl
221+++ b/lib/finddepth.pl
222@@ -1,4 +1,4 @@
223-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";
224+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";
225
226 # This library is deprecated and unmaintained. It is included for
227 # compatibility with Perl 4 scripts which may use it, but it will be
228diff --git a/lib/flush.pl b/lib/flush.pl
229index c427976..e5ed0ae 100644
230--- a/lib/flush.pl
231+++ b/lib/flush.pl
232@@ -1,4 +1,4 @@
233-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";
234+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";
235
236 #
237 # This library is no longer being maintained, and is included for backward
238diff --git a/lib/getcwd.pl b/lib/getcwd.pl
239index 77b2442..3810a99 100644
240--- a/lib/getcwd.pl
241+++ b/lib/getcwd.pl
242@@ -1,4 +1,4 @@
243-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";
244+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";
245
246 # By Brandon S. Allbery
247 #
248diff --git a/lib/getopt.pl b/lib/getopt.pl
249index 1d4008a..019a165 100644
250--- a/lib/getopt.pl
251+++ b/lib/getopt.pl
252@@ -1,4 +1,4 @@
253-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";
254+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";
255
256 ;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
257 #
258diff --git a/lib/getopts.pl b/lib/getopts.pl
259index 37ecb4a..3d27418 100644
260--- a/lib/getopts.pl
261+++ b/lib/getopts.pl
262@@ -1,4 +1,4 @@
263-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";
264+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";
265
266 ;# getopts.pl - a better getopt.pl
267 #
268diff --git a/lib/hostname.pl b/lib/hostname.pl
269index f57375e..b055d30 100644
270--- a/lib/hostname.pl
271+++ b/lib/hostname.pl
272@@ -1,4 +1,4 @@
273-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";
274+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";
275
276 # From: asherman@fmrco.com (Aaron Sherman)
277 #
278diff --git a/lib/importenv.pl b/lib/importenv.pl
279index 625edf6..52ee722 100644
280--- a/lib/importenv.pl
281+++ b/lib/importenv.pl
282@@ -1,4 +1,4 @@
283-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";
284+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";
285
286 # This library is no longer being maintained, and is included for backward
287 # compatibility with Perl 4 programs which may require it.
288diff --git a/lib/look.pl b/lib/look.pl
289index 7be55b2..12dcace 100644
290--- a/lib/look.pl
291+++ b/lib/look.pl
292@@ -1,4 +1,4 @@
293-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";
294+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";
295
296 ;# Usage: &look(*FILEHANDLE,$key,$dict,$fold)
297 #
298diff --git a/lib/newgetopt.pl b/lib/newgetopt.pl
299index 4ac9470..08df6cb 100644
300--- a/lib/newgetopt.pl
301+++ b/lib/newgetopt.pl
302@@ -1,4 +1,4 @@
303-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";
304+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";
305
306 # This library is no longer being maintained, and is included for backward
307 # compatibility with Perl 4 programs which may require it.
308diff --git a/lib/open2.pl b/lib/open2.pl
309index ceb5653..a05f2ab 100644
310--- a/lib/open2.pl
311+++ b/lib/open2.pl
312@@ -1,4 +1,4 @@
313-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";
314+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";
315
316 # This legacy library is deprecated and will be removed in a future
317 # release of perl.
318diff --git a/lib/open3.pl b/lib/open3.pl
319index 9f4d5a4..27f7ab4 100644
320--- a/lib/open3.pl
321+++ b/lib/open3.pl
322@@ -1,4 +1,4 @@
323-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";
324+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";
325
326 # This legacy library is deprecated and will be removed in a future
327 # release of perl.
328diff --git a/lib/pwd.pl b/lib/pwd.pl
329index bd8123b..bdace6e 100644
330--- a/lib/pwd.pl
331+++ b/lib/pwd.pl
332@@ -1,4 +1,4 @@
333-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";
334+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";
335
336 ;# pwd.pl - keeps track of current working directory in PWD environment var
337 ;#
338diff --git a/lib/shellwords.pl b/lib/shellwords.pl
339index b562f5f..7f16375 100644
340--- a/lib/shellwords.pl
341+++ b/lib/shellwords.pl
342@@ -1,4 +1,4 @@
343-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";
344+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";
345
346 ;# This legacy library is deprecated and will be removed in a future
347 ;# release of perl.
348diff --git a/lib/stat.pl b/lib/stat.pl
349index feda273..910ce1c 100644
350--- a/lib/stat.pl
351+++ b/lib/stat.pl
352@@ -1,4 +1,4 @@
353-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";
354+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";
355
356 ;# This legacy library is deprecated and will be removed in a future
357 ;# release of perl.
358diff --git a/lib/syslog.pl b/lib/syslog.pl
359index 7504a5d..4c2b95f 100644
360--- a/lib/syslog.pl
361+++ b/lib/syslog.pl
362@@ -1,4 +1,4 @@
363-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";
364+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";
365
366 #
367 # syslog.pl
368diff --git a/lib/tainted.pl b/lib/tainted.pl
369index e88bca1..d58c765 100644
370--- a/lib/tainted.pl
371+++ b/lib/tainted.pl
372@@ -1,4 +1,4 @@
373-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";
374+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";
375
376 # This legacy library is deprecated and will be removed in a future
377 # release of perl.
378diff --git a/lib/termcap.pl b/lib/termcap.pl
379index a84cba3..e641f4d 100644
380--- a/lib/termcap.pl
381+++ b/lib/termcap.pl
382@@ -1,4 +1,4 @@
383-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";
384+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";
385
386 ;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $
387 #
388diff --git a/lib/timelocal.pl b/lib/timelocal.pl
389index fefb9da..2297888 100644
390--- a/lib/timelocal.pl
391+++ b/lib/timelocal.pl
392@@ -1,4 +1,4 @@
393-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";
394+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";
395
396 ;# timelocal.pl
397 ;#
398diff --git a/lib/validate.pl b/lib/validate.pl
399index fc2d16a..1a8aef4 100644
400--- a/lib/validate.pl
401+++ b/lib/validate.pl
402@@ -1,4 +1,4 @@
403-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";
404+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";
405
406 ;# The validate routine takes a single multiline string consisting of
407 ;# 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 90c7967530102c66bbff25d89273d3f0bf189a83 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Fri, 10 Apr 2009 01:17:43 +0300
5Subject: Disable zlib bundling in Compress::Raw::Zlib
6
7Compress::Raw::Zlib statically links its bundled version of zlib
8by default, but we use the system library instead.
9
10Patch-Name: debian/disable-zlib-bundling.diff
11---
12 cpan/Compress-Raw-Zlib/config.in | 6 +++---
13 1 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/cpan/Compress-Raw-Zlib/config.in b/cpan/Compress-Raw-Zlib/config.in
16index c56cc03..2c6659b 100644
17--- a/cpan/Compress-Raw-Zlib/config.in
18+++ b/cpan/Compress-Raw-Zlib/config.in
19@@ -16,9 +16,9 @@
20 # Setting the Gzip OS Code
21 #
22
23-BUILD_ZLIB = True
24-INCLUDE = ./zlib-src
25-LIB = ./zlib-src
26+BUILD_ZLIB = False
27+INCLUDE = /usr/include
28+LIB = /usr/lib
29
30 OLD_ZLIB = False
31 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 16ebe1f5232621d8894aa6c6210fdf2fc9b54a84 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Replace generic man(1) instructions with Debian-specific
6 information.
7
8Indicate that the user needs to install the perl-doc package.
9
10Patch-Name: debian/doc_info.diff
11---
12 pod/perl.pod | 12 ++++++++++--
13 1 files changed, 10 insertions(+), 2 deletions(-)
14
15diff --git a/pod/perl.pod b/pod/perl.pod
16index 29cabf1..529ad6f 100644
17--- a/pod/perl.pod
18+++ b/pod/perl.pod
19@@ -261,8 +261,16 @@ For ease of access, the Perl manual has been split up into several sections.
20 perlwin32 Perl notes for Windows
21
22
23-On a Unix-like system, these documentation files will usually also be
24-available as manpages for use with the F<man> program.
25+On Debian systems, you need to install the B<perl-doc> package which
26+contains the majority of the standard Perl documentation and the
27+F<perldoc> program.
28+
29+Extensive additional documentation for Perl modules is available, both
30+those distributed with Perl and third-party modules which are packaged
31+or locally installed.
32+
33+You should be able to view Perl's documentation with your man(1)
34+program or perldoc(1).
35
36 In general, if something strange has gone wrong with your program and you're
37 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
6
7Bug-Debian: http://bugs.debian.org/290336
8
9- ignore missing directories,
10- follow symlinks (/usr/share/perl/5.8 -> 5.8.4).
11- filter "." out when running "enc2xs -C", it's unnecessary and causes
12 issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
13
14Patch-Name: debian/enc2xs_inc.diff
15---
16 cpan/Encode/bin/enc2xs | 8 ++++----
17 1 files changed, 4 insertions(+), 4 deletions(-)
18
19diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
20index 773c0a0..bc1ae1b 100644
21--- a/cpan/Encode/bin/enc2xs
22+++ b/cpan/Encode/bin/enc2xs
23@@ -924,11 +924,11 @@ use vars qw(
24 sub find_e2x{
25 eval { require File::Find; };
26 my (@inc, %e2x_dir);
27- for my $inc (@INC){
28+ for my $inc (grep -d, @INC){
29 push @inc, $inc unless $inc eq '.'; #skip current dir
30 }
31 File::Find::find(
32- sub {
33+ { wanted => sub {
34 my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
35 $atime,$mtime,$ctime,$blksize,$blocks)
36 = lstat($_) or return;
37@@ -938,7 +938,7 @@ sub find_e2x{
38 $e2x_dir{$File::Find::dir} ||= $mtime;
39 }
40 return;
41- }, @inc);
42+ }, follow => 1}, @inc);
43 warn join("\n", keys %e2x_dir), "\n";
44 for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
45 $_E2X = $d;
46@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
47 $LocalMod{$enc} ||= $mod;
48 }
49 };
50- File::Find::find({wanted => $wanted}, @INC);
51+ File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC);
52 $_ModLines = "";
53 for my $enc ( sort keys %LocalMod ) {
54 $_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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 973bed42db538804179f39d66dab37c82c6ade24 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 16 Dec 2005 01:32:14 +1100
5Subject: Remove Errno version check due to upgrade problems with long-running
6 processes.
7
8Bug-Debian: http://bugs.debian.org/343351
9
10Remove version check which can cause problems for long running
11processes embedding perl when upgrading to a newer version,
12compatible, but built on a different machine.
13
14Patch-Name: debian/errno_ver.diff
15---
16 ext/Errno/Errno_pm.PL | 5 -----
17 1 files changed, 0 insertions(+), 5 deletions(-)
18
19diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
20index 56bc815..01f510a 100644
21--- a/ext/Errno/Errno_pm.PL
22+++ b/ext/Errno/Errno_pm.PL
23@@ -332,13 +332,8 @@ EOF
24
25 package Errno;
26 require Exporter;
27-use Config;
28 use strict;
29
30-"\$Config{'archname'}-\$Config{'osvers'}" eq
31-"$Config{'archname'}-$Config{'osvers'}" or
32- die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
33-
34 our \$VERSION = "$VERSION";
35 \$VERSION = eval \$VERSION;
36 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 334ac01a8306485ed901f4fb45d79f39a944fe77 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: EU:MM: Set location of libperl.a to /usr/lib
6
7Patch-Name: debian/extutils_set_libperl_path.diff
8---
9 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
10 1 files changed, 1 insertions(+), 1 deletions(-)
11
12diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
13index 4ee6b3f..42bbb83 100644
14--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
15+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
16@@ -2409,7 +2409,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
17 ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
18 }
19 unless ($libperl && -f $lperl) { # Ilya's code...
20- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
21+ my $dir = $self->{PERL_SRC} || "/usr/lib";
22 $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
23 $libperl ||= "libperl$self->{LIB_EXT}";
24 $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 @@
1Upstream-Status:Inappropriate [debian patches]
2From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
6
7Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
8time the rule is evaluated rather than when the Makefile is created.
9
10This is required when building packages with dpkg-buildpackage and fakeroot,
11since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
12rule where the Makefile is created, but is for the clean/binary* targets.
13
14Patch-Name: debian/fakeroot.diff
15---
16 Makefile.SH | 9 ++-------
17 1 files changed, 2 insertions(+), 7 deletions(-)
18
19diff --git a/Makefile.SH b/Makefile.SH
20index eb6326a..1dac585 100755
21--- a/Makefile.SH
22+++ b/Makefile.SH
23@@ -36,12 +36,7 @@ case "$useshrplib" in
24 true)
25 # Prefix all runs of 'miniperl' and 'perl' with
26 # $ldlibpth so that ./perl finds *this* shared libperl.
27- case "$LD_LIBRARY_PATH" in
28- '')
29- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
30- *)
31- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
32- esac
33+ ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
34
35 pldlflags="$cccdlflags"
36 static_ldflags=''
37@@ -112,7 +107,7 @@ true)
38 ;;
39 esac
40 case "$ldlibpthname" in
41- '') ;;
42+ ''|LD_LIBRARY_PATH) ;;
43 *)
44 case "$osname" in
45 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From ca66b95be369b47a6d372c3653be57cd737f7f21 Mon Sep 17 00:00:00 2001
3From: Andreas Marschke <andreas.marschke@googlemail.com>
4Date: Sat, 17 Sep 2011 11:38:42 +0100
5Subject: Configure CPAN::Distribution with correct name of html2text
6
7Bug-Debian: http://bugs.debian.org/640479
8Patch-Name: debian/find_html2text.diff
9
10If you use cpan from Debian you usually wind up trying to read online
11documentation through it. Unfortunately cpan can't find the
12html2text.pl script even though it is installed using the Debian
13package 'html2text'.
14
15Please see the attached patch for a quick fix of this issue.
16
17[Maintainer's note: html2text in Debian is not the same implementation
18as the html2text.pl which is expected, but should provide similar
19functionality].
20---
21 cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
22 1 files changed, 1 insertions(+), 1 deletions(-)
23
24diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
25index 637ab27..a8193d9 100644
26--- a/cpan/CPAN/lib/CPAN/Distribution.pm
27+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
28@@ -3715,7 +3715,7 @@ sub _display_url {
29 if $CPAN::DEBUG;
30
31 # should we define it in the config instead?
32- my $html_converter = "html2text.pl";
33+ my $html_converter = "html2text";
34
35 my $web_browser = $CPAN::Config->{'lynx'} || undef;
36 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Mon, 30 May 2011 22:54:24 +0300
5Subject: Document that CCFLAGS should include $Config{ccflags}
6
7Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613
8Bug-Debian: http://bugs.debian.org/628522
9
10Compiling XS extensions without $Config{ccflags} can break the
11binary interface on some platforms.
12
13Patch-Name: fixes/document_makemaker_ccflags.diff
14---
15 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++
16 1 files changed, 4 insertions(+), 0 deletions(-)
17
18diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
19index be9624e..c56ca8f 100644
20--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
21+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
22@@ -1524,6 +1524,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
23 String that will be included in the compiler call command line between
24 the arguments INC and OPTIMIZE.
25
26+The default value is taken from $Config{ccflags}. When overriding
27+CCFLAGS, make sure to include the $Config{ccflags} settings to avoid
28+binary incompatibilities.
29+
30 =item CONFIG
31
32 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Thu, 28 Apr 2011 09:18:54 +0300
5Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in
6 EU::CBuilder
7
8Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
9Bug-Debian: http://bugs.debian.org/624460
10Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d
11
12Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
13CFLAGS and LDFLAGS from the environment have overridden the Config.pm
14ccflags and ldflags settings. This can cause binary incompatibilities
15between the core Perl and extensions built with EU::CBuilder.
16
17Append to the Config.pm values rather than overriding them.
18
19Patch-Name: fixes/extutils-cbuilder-cflags.diff
20---
21 .../lib/ExtUtils/CBuilder/Base.pm | 6 +++-
22 dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++-
23 2 files changed, 28 insertions(+), 3 deletions(-)
24
25diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
26index b572312..2255c51 100644
27--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
28+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
29@@ -40,11 +40,13 @@ sub new {
30 $self->{config}{$k} = $v unless exists $self->{config}{$k};
31 }
32 $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
33- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
34+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
35+ if defined $ENV{CFLAGS};
36 $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
37 $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
38 $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
39- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
40+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
41+ if defined $ENV{LDFLAGS};
42
43 unless ( exists $self->{config}{cxx} ) {
44 my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
45diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
46index db0ef98..49819a1 100644
47--- a/dist/ExtUtils-CBuilder/t/04-base.t
48+++ b/dist/ExtUtils-CBuilder/t/04-base.t
49@@ -1,7 +1,7 @@
50 #! perl -w
51
52 use strict;
53-use Test::More tests => 50;
54+use Test::More tests => 64;
55 use Config;
56 use Cwd;
57 use File::Path qw( mkpath );
58@@ -328,6 +328,29 @@ is_deeply( $mksymlists_args,
59 "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
60 );
61
62+my %testvars = (
63+ CFLAGS => 'ccflags',
64+ LDFLAGS => 'ldflags',
65+);
66+
67+while (my ($VAR, $var) = each %testvars) {
68+ local $ENV{$VAR};
69+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
70+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
71+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
72+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
73+ "honours $var from Config.pm");
74+
75+ $ENV{$VAR} = "-foo -bar";
76+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
77+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
78+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
79+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
80+ "honours $VAR from the environment");
81+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
82+ "doesn't override $var from Config.pm with $VAR from the environment");
83+}
84+
85 #####
86
87 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Wed, 18 May 2011 21:44:06 -0700
5Subject: Make h2ph correctly search gcc include directories
6
7Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122
8Bug-Debian: http://bugs.debian.org/625808
9Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77
10
11System header conversion with "h2ph -a" is currently broken on Ubuntu
12Natty and Oneiric (unless the gcc-multilib package is installed for
13backward compatibility), resulting in things like
14
15 # perl -e 'require "syscall.ph"'
16 Can't locate asm/unistd.ph in @INC [...]
17
18This happens because Ubuntu has switched to a 'multiarch' setup, see
19<https://wiki.ubuntu.com/MultiarchSpec> for details.
20
21The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm
22is now /usr/include/x86_64-linux-gnu/asm. (The third component of the
23new path varies with the actual architecture.)
24
25gcc --print-search-dirs doesn't really tell anything about where gcc
26looks for the include directories, it was just used to find the gcc
27internal directory prefix.
28
29Parse the output of "gcc -v -E" instead, and append $Config{usrinc}
30for safety. Duplicates shouldn't matter.
31
32The h2ph "-a" switch isn't currently tested automatically, and that
33seems nontrivial to do portably. Manual testing was done with
34
35 # mkdir ttt
36 # ./perl -Ilib ./utils/h2ph -a -d $(pwd)/ttt syscall.h
37
38The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3.
39
40http://bugs.debian.org/625808
41https://bugs.launchpad.net/bugs/777903
42
43Patch-Name: fixes/h2ph-multiarch.diff
44---
45 utils/h2ph.PL | 12 ++----------
46 1 files changed, 2 insertions(+), 10 deletions(-)
47
48diff --git a/utils/h2ph.PL b/utils/h2ph.PL
49index 87f3c7d..4545d6d 100644
50--- a/utils/h2ph.PL
51+++ b/utils/h2ph.PL
52@@ -761,16 +761,8 @@ sub queue_includes_from
53 # non-GCC?) C compilers, but gcc uses additional include directories.
54 sub inc_dirs
55 {
56- my $from_gcc = `LC_ALL=C $Config{cc} -v 2>&1`;
57- if( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) )
58- { # gcc-4+ :
59- $from_gcc = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`;
60- if ( !($from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s) )
61- {
62- $from_gcc = '';
63- };
64- };
65- length($from_gcc) ? ($from_gcc, $from_gcc . "-fixed", $Config{usrinc}) : ($Config{usrinc});
66+ my $from_gcc = `LC_ALL=C $Config{cc} -v -E - < /dev/null 2>&1 | awk '/^#include/, /^End of search list/' | grep '^ '`;
67+ length($from_gcc) ? (split(' ', $from_gcc), $Config{usrinc}) : ($Config{usrinc});
68 }
69
70
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 @@
1Upstream-Status:Inappropriate [debian patches]
2From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001
3From: David Mitchell <davem@iabyn.com>
4Date: Tue, 28 Jun 2011 17:04:40 +0100
5Subject: RT 64804: tainting with index() of a constant
6
7Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804
8Bug-Debian: http://bugs.debian.org/291450
9Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1
10
11At compile time, ck_index with a tainted constant set PL_tainted,
12which remained on during the rest of compilation, tainting all other
13constants.
14
15Fix this by saving and restoring PL_tainted across the call to
16fbm_compile, which is what sets PL_tainted.
17
18Patch-Name: fixes/index-tainting.diff
19---
20 op.c | 5 ++++-
21 t/op/taint.t | 16 +++++++++++++++-
22 2 files changed, 19 insertions(+), 2 deletions(-)
23
24diff --git a/op.c b/op.c
25index e21b9a4..973df13 100644
26--- a/op.c
27+++ b/op.c
28@@ -7780,8 +7780,11 @@ Perl_ck_index(pTHX_ OP *o)
29 OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */
30 if (kid)
31 kid = kid->op_sibling; /* get past "big" */
32- if (kid && kid->op_type == OP_CONST)
33+ if (kid && kid->op_type == OP_CONST) {
34+ const bool save_taint = PL_tainted;
35 fbm_compile(((SVOP*)kid)->op_sv, 0);
36+ PL_tainted = save_taint;
37+ }
38 }
39 return ck_fun(o);
40 }
41diff --git a/t/op/taint.t b/t/op/taint.t
42index 9df6fee..a300b9b 100644
43--- a/t/op/taint.t
44+++ b/t/op/taint.t
45@@ -17,7 +17,7 @@ BEGIN {
46 use strict;
47 use Config;
48
49-plan tests => 774;
50+plan tests => 778;
51
52 $| = 1;
53
54@@ -2144,6 +2144,20 @@ end
55 is_tainted $dest, "ucfirst(tainted) taints its return value";
56 }
57
58+
59+# tainted constants and index()
60+# RT 64804; http://bugs.debian.org/291450
61+{
62+ ok(tainted $old_env_path, "initial taintedness");
63+ BEGIN { no strict 'refs'; my $v = $old_env_path; *{"::C"} = sub () { $v }; }
64+ ok(tainted C, "constant is tainted properly");
65+ ok(!tainted "", "tainting not broken yet");
66+ index(undef, C);
67+ ok(!tainted "", "tainting still works after index() of the constant");
68+}
69+
70+
71+
72 # This may bomb out with the alarm signal so keep it last
73 SKIP: {
74 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001
3From: Dominic Hargreaves <dom@earth.li>
4Date: Mon, 2 May 2011 10:35:04 +0100
5Subject: Fix failing tilde test when run under a UID without a passwd entry
6
7Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893
8Bug-Debian: http://bugs.debian.org/624850
9
10Patch-Name: fixes/module-build-home-directory.diff
11---
12 cpan/Module-Build/t/tilde.t | 6 ++++--
13 1 files changed, 4 insertions(+), 2 deletions(-)
14
15diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t
16index fac821b..04f0210 100644
17--- a/cpan/Module-Build/t/tilde.t
18+++ b/cpan/Module-Build/t/tilde.t
19@@ -46,7 +46,8 @@ SKIP: {
20
21 unless (defined $home) {
22 my @info = eval { getpwuid $> };
23- skip "No home directory for tilde-expansion tests", 15 if $@;
24+ skip "No home directory for tilde-expansion tests", 15 if $@
25+ or !defined $info[7];
26 $home = $info[7];
27 }
28
29@@ -95,7 +96,8 @@ SKIP: {
30 # Again, with named users
31 SKIP: {
32 my @info = eval { getpwuid $> };
33- skip "No home directory for tilde-expansion tests", 1 if $@;
34+ skip "No home directory for tilde-expansion tests", 1 if $@
35+ or !defined $info[7] or !defined $info[0];
36 my ($me, $home) = @info[0,7];
37
38 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Thu, 20 Sep 2007 19:47:14 +1000
5Subject: Document the Net::SMTP 'Port' option
6
7Bug-Debian: http://bugs.debian.org/100195
8Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
9
10Patch-Name: fixes/net_smtp_docs.diff
11---
12 cpan/libnet/Net/SMTP.pm | 1 +
13 1 files changed, 1 insertions(+), 0 deletions(-)
14
15diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
16index a28496d..07b2498 100644
17--- a/cpan/libnet/Net/SMTP.pm
18+++ b/cpan/libnet/Net/SMTP.pm
19@@ -625,6 +625,7 @@ Net::SMTP will attempt to extract the address from the value passed.
20
21 B<Debug> - Enable debugging information
22
23+B<Port> - Select a port on the remote host to connect to (default is 25)
24
25 Example:
26
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 @@
1Upstream-Status:Inappropriate [debian patches]
2From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001
3From: Keith Thompson <kst@mib.org>
4Date: Fri, 29 Jul 2011 17:17:00 -0700
5Subject: Fix typos in several pod/perl*.pod files
6
7Bug-Debian: http://bugs.debian.org/637816
8Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d
9Patch-Name: fixes/pod_fixes.diff
10---
11 pod/perlfunc.pod | 8 ++++----
12 pod/perlglossary.pod | 10 +++++-----
13 pod/perlmod.pod | 4 ++--
14 pod/perlretut.pod | 6 +++---
15 4 files changed, 14 insertions(+), 14 deletions(-)
16
17diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
18index 2ee3637..719a740 100644
19--- a/pod/perlfunc.pod
20+++ b/pod/perlfunc.pod
21@@ -3918,7 +3918,7 @@ count. A numeric repeat count may optionally be enclosed in brackets, as
22 in C<pack("C[80]", @arr)>. The repeat count gobbles that many values from
23 the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>,
24 C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means
25-something else, dscribed below. Supplying a C<*> for the repeat count
26+something else, described below. Supplying a C<*> for the repeat count
27 instead of a number means to use however many items are left, except for:
28
29 =over
30@@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not
31 well-defined.
32
33 Because C<< <=> >> returns C<undef> when either operand is C<NaN>
34-(not-a-number), and laso because C<sort> raises an exception unless the
35+(not-a-number), and also because C<sort> raises an exception unless the
36 result of a comparison is defined, be careful when sorting with a
37 comparison function like C<< $a <=> $b >> any lists that might contain a
38 C<NaN>. The following example takes advantage that C<NaN != NaN> to
39@@ -5958,7 +5958,7 @@ specified.
40
41 A pattern matching the empty string (not to be confused with
42 an empty pattern C<//>, which is just one member of the set of patterns
43-matching the epmty string), splits EXPR into individual
44+matching the empty string), splits EXPR into individual
45 characters. For example:
46
47 print join(':', split(/ */, 'hi there')), "\n";
48@@ -6222,7 +6222,7 @@ For example:
49 printf '<%.1e>', 10; # prints "<1.0e+01>"
50
51 For "g" and "G", this specifies the maximum number of digits to show,
52-including thoe prior to the decimal point and those after it; for
53+including those prior to the decimal point and those after it; for
54 example:
55
56 # These examples are subject to system-specific variation.
57diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod
58index 639ce33..191371c 100644
59--- a/pod/perlglossary.pod
60+++ b/pod/perlglossary.pod
61@@ -507,7 +507,7 @@ the class (its L<objects|/object>). See also L</inheritance>.
62
63 =item class method
64
65-A L</method> whose L</invocand> is a L</package> name, not an
66+A L</method> whose L</invocant> is a L</package> name, not an
67 L</object> reference. A method associated with the class as a whole.
68
69 =item client
70@@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb
71 indirect-object object" where L</STDOUT> is the recipient of the
72 L<print|perlfunc/print> action, and C<"$foo"> is the object being
73 printed. Similarly, when invoking a L</method>, you might place the
74-invocand between the method and its arguments:
75+invocant between the method and its arguments:
76
77 $gollum = new Pathetic::Creature "Smeagol";
78 give $gollum "Fisssssh!";
79@@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable
80 form (L<syntax trees|/syntax tree>) within the I<perl> process itself,
81 which the Perl L</run time> system then interprets.
82
83-=item invocand
84+=item invocant
85
86 The agent on whose behalf a L</method> is invoked. In a L</class>
87-method, the invocand is a package name. In an L</instance> method,
88-the invocand is an object reference.
89+method, the invocant is a package name. In an L</instance> method,
90+the invocant is an object reference.
91
92 =item invocation
93
94diff --git a/pod/perlmod.pod b/pod/perlmod.pod
95index 5266f19..17de73e 100644
96--- a/pod/perlmod.pod
97+++ b/pod/perlmod.pod
98@@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary.
99 C<CLONE> will be called once as a class method for every package that has it
100 defined (or inherits it). It will be called in the context of the new thread,
101 so all modifications are made in the new area. Currently CLONE is called with
102-no parameters other than the invocand package name, but code should not assume
103+no parameters other than the invocant package name, but code should not assume
104 that this will remain unchanged, as it is likely that in future extra parameters
105 will be passed in to give more information about the state of cloning.
106
107@@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is
108 needed.
109
110 Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other
111-than the invocand package name, although that may change. Similarly, to
112+than the invocant package name, although that may change. Similarly, to
113 allow for future expansion, the return value should be a single C<0> or
114 C<1> value.
115
116diff --git a/pod/perlretut.pod b/pod/perlretut.pod
117index ea80594..1c65f5b 100644
118--- a/pod/perlretut.pod
119+++ b/pod/perlretut.pod
120@@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results.
121 =head2 Relative backreferences
122
123 Counting the opening parentheses to get the correct number for a
124-backreference is errorprone as soon as there is more than one
125+backreference is error-prone as soon as there is more than one
126 capturing group. A more convenient technique became available
127 with Perl 5.10: relative backreferences. To refer to the immediately
128 preceding capture group one now may write C<\g{-1}>, the next but
129@@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead. So we have
130
131 =head3 Global matching
132
133-The final two modifiers we will disccuss here,
134+The final two modifiers we will discuss here,
135 C<//g> and C<//c>, concern multiple matches.
136 The modifier C<//g> stands for global matching and allows the
137 matching operator to match within a string as many times as possible.
138@@ -1870,7 +1870,7 @@ substituted.
139
140 C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of
141 double-quotish syntax, and not part of regexp syntax proper. They will
142-work if they appear in a regular expression embeddded directly in a
143+work if they appear in a regular expression embedded directly in a
144 program, but not when contained in a string that is interpolated in a
145 pattern.
146
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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Respect umask during installation
6
7This is needed to satisfy Debian policy regarding group-writable
8site directories.
9
10Patch-Name: fixes/respect_umask.diff
11---
12 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++---------
13 dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++---------
14 2 files changed, 18 insertions(+), 18 deletions(-)
15
16diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
17index 6964eea..865d36d 100644
18--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
19+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
20@@ -2053,7 +2053,7 @@ doc__install : doc_site_install
21 $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
22
23 pure_perl_install :: all
24- $(NOECHO) $(MOD_INSTALL) \
25+ $(NOECHO) umask 022; $(MOD_INSTALL) \
26 read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
27 write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
28 $(INST_LIB) $(DESTINSTALLPRIVLIB) \
29@@ -2067,7 +2067,7 @@ pure_perl_install :: all
30
31
32 pure_site_install :: all
33- $(NOECHO) $(MOD_INSTALL) \
34+ $(NOECHO) umask 022; $(MOD_INSTALL) \
35 read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
36 write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
37 $(INST_LIB) $(DESTINSTALLSITELIB) \
38@@ -2080,7 +2080,7 @@ pure_site_install :: all
39 }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
40
41 pure_vendor_install :: all
42- $(NOECHO) $(MOD_INSTALL) \
43+ $(NOECHO) umask 022; $(MOD_INSTALL) \
44 read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
45 write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
46 $(INST_LIB) $(DESTINSTALLVENDORLIB) \
47@@ -2092,8 +2092,8 @@ pure_vendor_install :: all
48
49 doc_perl_install :: all
50 $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
51- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
52- -$(NOECHO) $(DOC_INSTALL) \
53+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
54+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
55 "Module" "$(NAME)" \
56 "installed into" "$(INSTALLPRIVLIB)" \
57 LINKTYPE "$(LINKTYPE)" \
58@@ -2103,8 +2103,8 @@ doc_perl_install :: all
59
60 doc_site_install :: all
61 $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
62- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
63- -$(NOECHO) $(DOC_INSTALL) \
64+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
65+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
66 "Module" "$(NAME)" \
67 "installed into" "$(INSTALLSITELIB)" \
68 LINKTYPE "$(LINKTYPE)" \
69@@ -2114,8 +2114,8 @@ doc_site_install :: all
70
71 doc_vendor_install :: all
72 $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
73- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
74- -$(NOECHO) $(DOC_INSTALL) \
75+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
76+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
77 "Module" "$(NAME)" \
78 "installed into" "$(INSTALLVENDORLIB)" \
79 LINKTYPE "$(LINKTYPE)" \
80diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
81index 3b030a5..cb0e9e0 100644
82--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
83+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
84@@ -468,7 +468,7 @@ sub _can_write_dir {
85
86 =pod
87
88-=item _mkpath($dir,$show,$mode,$verbose,$dry_run)
89+=item _mkpath($dir,$show,$verbose,$dry_run)
90
91 Wrapper around File::Path::mkpath() to handle errors.
92
93@@ -485,13 +485,13 @@ writable.
94 =cut
95
96 sub _mkpath {
97- my ($dir,$show,$mode,$verbose,$dry_run)=@_;
98+ my ($dir,$show,$verbose,$dry_run)=@_;
99 if ( $verbose && $verbose > 1 && ! -d $dir) {
100 $show= 1;
101- printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode;
102+ printf "mkpath(%s,%d)\n", $dir, $show;
103 }
104 if (!$dry_run) {
105- if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) {
106+ if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) {
107 _choke("Can't create '$dir'","$@");
108 }
109
110@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
111 _chdir($cwd);
112 }
113 foreach my $targetdir (sort keys %check_dirs) {
114- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
115+ _mkpath( $targetdir, 0, $verbose, $dry_run );
116 }
117 foreach my $found (@found_files) {
118 my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
119@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC
120 $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
121 unless $dry_run;
122 } elsif ( ! -d $targetdir ) {
123- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
124+ _mkpath( $targetdir, 0, $verbose, $dry_run );
125 }
126 print "Installing $targetfile\n";
127
128@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC
129
130 if ($pack{'write'}) {
131 $dir = install_rooted_dir(dirname($pack{'write'}));
132- _mkpath( $dir, 0, 0755, $verbose, $dry_run );
133+ _mkpath( $dir, 0, $verbose, $dry_run );
134 print "Writing $pack{'write'}\n" if $verbose;
135 $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
136 }
137@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory).
138 sub pm_to_blib {
139 my($fromto,$autodir,$pm_filter) = @_;
140
141- _mkpath($autodir,0,0755);
142+ _mkpath($autodir,0);
143 while(my($from, $to) = each %$fromto) {
144 if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
145 print "Skip $to (unchanged)\n";
146@@ -1213,7 +1213,7 @@ sub pm_to_blib {
147 # we wont try hard here. its too likely to mess things up.
148 forceunlink($to);
149 } else {
150- _mkpath(dirname($to),0,0755);
151+ _mkpath(dirname($to),0);
152 }
153 if ($need_filtering) {
154 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Wed, 3 Aug 2011 22:36:24 +0300
5Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable
6 messages
7
8Bug: http://rt.cpan.org/Ticket/Display.html?id=69997
9Bug-Debian: http://bugs.debian.org/627821
10
11Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel
12even when there's no listener, causing test failures.
13
14It seems probable that all FreeBSD-based systems suffer from the
15same issue, but that's for upstream to decide.
16
17Patch-Name: fixes/sys-syslog-socket-timeout-kfreebsd.patch
18---
19 cpan/Sys-Syslog/Syslog.pm | 5 ++++-
20 1 files changed, 4 insertions(+), 1 deletions(-)
21
22diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
23index 002e6e4..b445c66 100644
24--- a/cpan/Sys-Syslog/Syslog.pm
25+++ b/cpan/Sys-Syslog/Syslog.pm
26@@ -138,7 +138,10 @@ my @fallbackMethods = ();
27 # happy, the timeout is now zero by default on all systems
28 # except on OSX where it is set to 250 msec, and can be set
29 # with the infamous setlogsock() function.
30-$sock_timeout = 0.25 if $^O =~ /darwin/;
31+#
32+# Debian change: include Debian GNU/kFreeBSD, lower to 1ms
33+# see [rt.cpan.org #69997]
34+$sock_timeout = 0.001 if $^O =~ /darwin|gnukfreebsd/;
35
36 # coderef for a nicer handling of errors
37 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From ab89a31d1f46388a61953349c3546e4082cd38de Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Debian policy doesn't install .packlist files for core or vendor.
6
7Patch-Name: debian/instmodsh_doc.diff
8---
9 cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++-
10 1 files changed, 3 insertions(+), 1 deletions(-)
11
12diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
13index 5874aa6..6a2f03e 100644
14--- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
15+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
16@@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules
17
18 =head1 DESCRIPTION
19
20-A little interface to ExtUtils::Installed to examine installed modules,
21+A little interface to ExtUtils::Installed to examine locally* installed modules,
22 validate your packlists and even create a tarball from an installed module.
23
24+*On Debian system, B<core> and B<vendor> modules are managed by C<dpkg>.
25+
26 =head1 SEE ALSO
27
28 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 704f6017119ce0301a9105944512120a38a43a02 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.
6
7Patch-Name: debian/ld_run_path.diff
8---
9 .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++
10 1 files changed, 3 insertions(+), 0 deletions(-)
11
12diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
13index cf4826f..eb212b5 100644
14--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
15+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
16@@ -54,6 +54,9 @@ sub _unix_os2_ext {
17 my($pwd) = cwd(); # from Cwd.pm
18 my($found) = 0;
19
20+ # Debian-specific: don't use LD_RUN_PATH for standard dirs
21+ $ld_run_path_seen{$_}++ for @libpath;
22+
23 foreach my $thislib (split ' ', $potential_libs) {
24
25 # 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 7465b6d008187580eabe655b9c8e75351d3d24b4 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be
6 writable.
7
8Patch-Name: debian/libnet_config_path.diff
9---
10 cpan/libnet/Net/Config.pm | 7 +++----
11 1 files changed, 3 insertions(+), 4 deletions(-)
12
13diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm
14index db51c1f..8404593 100644
15--- a/cpan/libnet/Net/Config.pm
16+++ b/cpan/libnet/Net/Config.pm
17@@ -57,9 +57,8 @@ my %nc = (
18 }
19 TRY_INTERNET_CONFIG
20
21-my $file = __FILE__;
22+my $file = '/etc/perl/Net/libnet.cfg';
23 my $ref;
24-$file =~ s/Config.pm/libnet.cfg/;
25 if (-f $file) {
26 $ref = eval { local $SIG{__DIE__}; do $file };
27 if (ref($ref) eq 'HASH') {
28@@ -132,8 +131,8 @@ Net::Config - Local configuration data for libnet
29 C<Net::Config> holds configuration data for the modules in the libnet
30 distribution. During installation you will be asked for these values.
31
32-The configuration data is held globally in a file in the perl installation
33-tree, but a user may override any of these values by providing their own. This
34+The configuration data is held globally in C</etc/perl/Net/libnet.cfg>,
35+but a user may override any of these values by providing their own. This
36 can be done by having a C<.libnetrc> file in their home directory. This file
37 should return a reference to a HASH containing the keys described below.
38 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From d70e88badfcc6edd05e884597f19fbbdcf2cf6a7 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Note that libperl-dev package is required for embedded linking
6
7Bug-Debian: http://bugs.debian.org/186778
8
9Patch-Name: debian/libperl_embed_doc.diff
10---
11 lib/ExtUtils/Embed.pm | 3 +++
12 1 files changed, 3 insertions(+), 0 deletions(-)
13
14diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
15index 9710630..86f13b5 100644
16--- a/lib/ExtUtils/Embed.pm
17+++ b/lib/ExtUtils/Embed.pm
18@@ -305,6 +305,9 @@ and extensions in your C/C++ applications.
19 Typically, an application B<Makefile> will invoke ExtUtils::Embed
20 functions while building your application.
21
22+Note that on Debian systems the B<libperl-dev> package is required for
23+compiling applications which embed an interpreter.
24+
25 =head1 @EXPORT
26
27 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 55a718425dc4612ac01850ef786f75f072b20b9e Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Mon, 8 Sep 2008 20:48:14 +0300
5Subject: Disable some threads tests on m68k for now due to missing TLS.
6
7Bug-Debian: http://bugs.debian.org/495826
8Bug-Debian: http://bugs.debian.org/517938
9
10Patch-Name: debian/m68k_thread_stress.diff
11---
12 dist/threads-shared/t/stress.t | 4 ++++
13 dist/threads-shared/t/waithires.t | 6 ++++++
14 2 files changed, 10 insertions(+), 0 deletions(-)
15
16diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
17index 652a3e6..2f1b576 100644
18--- a/dist/threads-shared/t/stress.t
19+++ b/dist/threads-shared/t/stress.t
20@@ -11,6 +11,10 @@ BEGIN {
21 print("1..0 # SKIP Broken under HP-UX 10.20\n");
22 exit(0);
23 }
24+ if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
25+ print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
26+ exit(0);
27+ }
28 }
29
30 use ExtUtils::testlib;
31diff --git a/dist/threads-shared/t/waithires.t b/dist/threads-shared/t/waithires.t
32index 3c3e852..349c5b4 100644
33--- a/dist/threads-shared/t/waithires.t
34+++ b/dist/threads-shared/t/waithires.t
35@@ -16,6 +16,12 @@ BEGIN {
36 if (! eval 'use Time::HiRes "time"; 1') {
37 Test::skip_all('Time::HiRes not available');
38 }
39+
40+ if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
41+ print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
42+ exit(0);
43+ }
44+
45 }
46
47 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 11633e598640b02e19329f323623af254fbac451 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Tweak @INC ordering for Debian
6
7Our order is:
8
9 etc (for config files)
10 site (5.8.1)
11 vendor (all)
12 core (5.8.1)
13 site (version-indep)
14 site (pre-5.8.1)
15
16The rationale being that an admin (via site), or module packager
17(vendor) can chose to shadow core modules when there is a newer
18version than is included in core.
19
20Patch-Name: debian/mod_paths.diff
21---
22 perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
23 1 files changed, 58 insertions(+), 0 deletions(-)
24
25diff --git a/perl.c b/perl.c
26index f756e02..d26dcb0 100644
27--- a/perl.c
28+++ b/perl.c
29@@ -4219,6 +4219,11 @@ S_init_perllib(pTHX)
30 INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
31 #endif
32
33+#ifdef DEBIAN
34+ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
35+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/etc/perl"), 0x0);
36+#endif
37+
38 #ifdef SITEARCH_EXP
39 /* sitearch is always relative to sitelib on Windows for
40 * DLL-based path intuition to work correctly */
41@@ -4336,6 +4341,59 @@ S_init_perllib(pTHX)
42 INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
43 #endif
44
45+#ifdef DEBIAN
46+ /* Non-versioned site directory for local modules and for
47+ compatability with the previous packages' site dirs */
48+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/usr/local/lib/site_perl"),
49+ INCPUSH_ADD_SUB_DIRS);
50+
51+#ifdef PERL_INC_VERSION_LIST
52+ {
53+ struct stat s;
54+
55+ /* add small buffer in case old versions are longer than the
56+ current version */
57+ char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
58+ char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
59+ char const *vers[] = { PERL_INC_VERSION_LIST };
60+ char const **p;
61+
62+ char *arch_vers = strrchr(sitearch, '/');
63+ char *lib_vers = strrchr(sitelib, '/');
64+
65+ if (arch_vers && isdigit(*++arch_vers))
66+ *arch_vers = 0;
67+ else
68+ arch_vers = 0;
69+
70+ if (lib_vers && isdigit(*++lib_vers))
71+ *lib_vers = 0;
72+ else
73+ lib_vers = 0;
74+
75+ /* there is some duplication here as incpush does something
76+ similar internally, but required as sitearch is not a
77+ subdirectory of sitelib */
78+ for (p = vers; *p; p++)
79+ {
80+ if (arch_vers)
81+ {
82+ strcpy(arch_vers, *p);
83+ if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
84+ S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0);
85+ }
86+
87+ if (lib_vers)
88+ {
89+ strcpy(lib_vers, *p);
90+ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
91+ S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0);
92+ }
93+ }
94+ }
95+#endif
96+#endif
97+
98 #ifdef PERL_OTHERLIBDIRS
99 S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
100 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From fbb5f07872d45bac76b5c3c83b50a19aa5da10b0 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Thu, 8 May 2008 14:32:33 +0300
5Subject: Adjust Module::Build manual page extensions for the Debian Perl
6 policy
7
8Bug-Debian: http://bugs.debian.org/479460
9
10Patch-Name: debian/module_build_man_extensions.diff
11---
12 cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++--
13 1 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
16index fba916a..82df4cc 100644
17--- a/cpan/Module-Build/lib/Module/Build/Base.pm
18+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
19@@ -3246,7 +3246,7 @@ sub manify_bin_pods {
20 foreach my $file (keys %$files) {
21 # Pod::Simple based parsers only support one document per instance.
22 # This is expected to change in a future version (Pod::Simple > 3.03).
23- my $parser = Pod::Man->new( section => 1 ); # binaries go in section 1
24+ my $parser = Pod::Man->new( section => '1p' ); # binaries go in section 1p
25 my $manpage = $self->man1page_name( $file ) . '.' .
26 $self->config( 'man1ext' );
27 my $outfile = File::Spec->catfile($mandir, $manpage);
28@@ -3271,7 +3271,7 @@ sub manify_lib_pods {
29 while (my ($file, $relfile) = each %$files) {
30 # Pod::Simple based parsers only support one document per instance.
31 # This is expected to change in a future version (Pod::Simple > 3.03).
32- my $parser = Pod::Man->new( section => 3 ); # libraries go in section 3
33+ my $parser = Pod::Man->new( section => '3pm' ); # libraries go in section 3pm
34 my $manpage = $self->man3page_name( $relfile ) . '.' .
35 $self->config( 'man3ext' );
36 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 44c7521619dd0e637920393184affcb26a27d5b7 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Don't install .packlist or perllocal.pod for perl or vendor
6
7Patch-Name: debian/no_packlist_perllocal.diff
8---
9 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 31 +++--------------------
10 1 files changed, 4 insertions(+), 27 deletions(-)
11
12diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
13index 42bbb83..a16e2d0 100644
14--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
15+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
16@@ -2054,8 +2054,6 @@ doc__install : doc_site_install
17
18 pure_perl_install :: all
19 $(NOECHO) umask 022; $(MOD_INSTALL) \
20- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
21- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
22 $(INST_LIB) $(DESTINSTALLPRIVLIB) \
23 $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
24 $(INST_BIN) $(DESTINSTALLBIN) \
25@@ -2081,8 +2079,6 @@ pure_site_install :: all
26
27 pure_vendor_install :: all
28 $(NOECHO) umask 022; $(MOD_INSTALL) \
29- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
30- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
31 $(INST_LIB) $(DESTINSTALLVENDORLIB) \
32 $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
33 $(INST_BIN) $(DESTINSTALLVENDORBIN) \
34@@ -2091,37 +2087,19 @@ pure_vendor_install :: all
35 $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
36
37 doc_perl_install :: all
38- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
39- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
40- -$(NOECHO) umask 022; $(DOC_INSTALL) \
41- "Module" "$(NAME)" \
42- "installed into" "$(INSTALLPRIVLIB)" \
43- LINKTYPE "$(LINKTYPE)" \
44- VERSION "$(VERSION)" \
45- EXE_FILES "$(EXE_FILES)" \
46- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
47
48 doc_site_install :: all
49- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
50- -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
51+ $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
52+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH)
53 -$(NOECHO) umask 02; $(DOC_INSTALL) \
54 "Module" "$(NAME)" \
55 "installed into" "$(INSTALLSITELIB)" \
56 LINKTYPE "$(LINKTYPE)" \
57 VERSION "$(VERSION)" \
58 EXE_FILES "$(EXE_FILES)" \
59- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
60+ >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
61
62 doc_vendor_install :: all
63- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
64- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
65- -$(NOECHO) umask 022; $(DOC_INSTALL) \
66- "Module" "$(NAME)" \
67- "installed into" "$(INSTALLVENDORLIB)" \
68- LINKTYPE "$(LINKTYPE)" \
69- VERSION "$(VERSION)" \
70- EXE_FILES "$(EXE_FILES)" \
71- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
72
73 };
74
75@@ -2130,13 +2108,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
76 $(NOECHO) $(NOOP)
77
78 uninstall_from_perldirs ::
79- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
80
81 uninstall_from_sitedirs ::
82 $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
83
84 uninstall_from_vendordirs ::
85- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
86+
87 };
88
89 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From cf928101697efa4a46ada500c2f449caeb854fd4 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Sun, 15 May 2011 19:35:58 +0300
5Subject: List packaged patches in patchlevel.h
6
7Origin: vendor
8Bug-Debian: http://bugs.debian.org/567489
9
10The list of packaged patches is in patchlevel-debian.h, which is generated
11from the debian/patches/ directory when building the package.
12
13Patch-Name: debian/patchlevel.diff
14---
15 patchlevel.h | 3 +++
16 1 files changed, 3 insertions(+), 0 deletions(-)
17
18diff --git a/patchlevel.h b/patchlevel.h
19index 5dc2a53..1356595 100644
20--- a/patchlevel.h
21+++ b/patchlevel.h
22@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
23 ,"uncommitted-changes"
24 #endif
25 PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
26+#ifdef DEBIAN
27+#include "patchlevel-debian.h"
28+#endif
29 ,NULL
30 };
31
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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Fri, 9 Jan 2009 18:54:47 +0200
5Subject: Make perlivp skip include directories in /usr/local
6
7Bug-Debian: http://bugs.debian.org/510895
8
9On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
10> On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote:
11
12> > We could create the directories in a postinst script, but I'm not sure
13> > I see the point. They will be created automatically when installing
14> > CPAN modules.
15>
16> The directories are intentionally not created, as this way they are
17> excluded from the search path at start-up, saving a bunch of wasted
18> stats at use/require time in the common case that the user has not
19> installed any local packages. As Niko points out, they will be
20> created as required.
21
22Signed-off-by: Niko Tyni <ntyni@debian.org>
23
24Patch-Name: debian/perlivp.diff
25---
26 utils/perlivp.PL | 1 +
27 1 files changed, 1 insertions(+), 0 deletions(-)
28
29diff --git a/utils/perlivp.PL b/utils/perlivp.PL
30index 6fcb670..1401cac 100644
31--- a/utils/perlivp.PL
32+++ b/utils/perlivp.PL
33@@ -142,6 +142,7 @@ my $INC_total = 0;
34 my $INC_there = 0;
35 foreach (@INC) {
36 next if $_ eq '.'; # skip -d test here
37+ next if m|/usr/local|; # not shipped on Debian
38 if (-d $_) {
39 print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'};
40 $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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 148e2717682ce8c65475ffdeea84b3cdd1ab1649 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Fiddle with *PREFIX and variables written to the makefile
6
7Fiddle with *PREFIX and variables written to the makefile so that
8install directories may be changed when make is run by passing
9PREFIX= to the "make install" command (used when packaging
10modules).
11
12Patch-Name: debian/prefix_changes.diff
13---
14 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 12 ++++++------
15 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 +--
16 cpan/ExtUtils-MakeMaker/t/INST.t | 4 +---
17 cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | 10 +++++-----
18 4 files changed, 13 insertions(+), 16 deletions(-)
19
20diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
21index a38f274..93d3fe9 100644
22--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
23+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
24@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS.
25 sub manifypods_target {
26 my($self) = shift;
27
28- my $man1pods = '';
29- my $man3pods = '';
30 my $dependencies = '';
31
32 # populate manXpods & dependencies:
33@@ -718,7 +716,7 @@ END
34 foreach my $section (qw(1 3)) {
35 my $pods = $self->{"MAN${section}PODS"};
36 push @man_cmds, $self->split_command(<<CMD, %$pods);
37- \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
38+ \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
39 CMD
40 }
41
42@@ -1521,9 +1519,11 @@ sub init_INSTALL_from_PREFIX {
43 $self->{SITEPREFIX} ||= $sprefix;
44 $self->{VENDORPREFIX} ||= $vprefix;
45
46- # Lots of MM extension authors like to use $(PREFIX) so we
47- # put something sensible in there no matter what.
48- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
49+ my $p = $self->{PREFIX} = $self->{PERLPREFIX};
50+ for my $t (qw/PERL SITE VENDOR/)
51+ {
52+ $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
53+ }
54 }
55
56 my $arch = $Config{archname};
57diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
58index a16e2d0..c308c49 100644
59--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
60+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
61@@ -2981,8 +2981,7 @@ sub prefixify {
62 print STDERR " prefixify $var => $path\n" if $Verbose >= 2;
63 print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2;
64
65- if( $self->{ARGS}{PREFIX} &&
66- $path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
67+ if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
68 {
69
70 print STDERR " cannot prefix, using default.\n" if $Verbose >= 2;
71diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
72index 6aac294..28294f2 100644
73--- a/cpan/ExtUtils-MakeMaker/t/INST.t
74+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
75@@ -61,9 +61,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
76 is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
77 is( $mm->{VERSION}, 0.01, 'VERSION' );
78
79-my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
80- $Config{prefixexp} || $Config{prefix};
81-is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' );
82+is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' );
83
84 is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
85
86diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
87index fbb18a3..8987569 100644
88--- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
89+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
90@@ -10,7 +10,7 @@ BEGIN {
91 }
92
93 use strict;
94-use Test::More tests => 52;
95+use Test::More tests => 47;
96 use MakeMaker::Test::Utils;
97 use MakeMaker::Test::Setup::BFD;
98 use ExtUtils::MakeMaker;
99@@ -58,16 +58,16 @@ like( $stdout->read, qr{
100 Writing\ MYMETA.yml\n
101 }x );
102
103-is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
104+#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
105
106 isa_ok( $mm, 'ExtUtils::MakeMaker' );
107
108 is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
109 is( $mm->{VERSION}, 0.01, 'VERSION' );
110
111-foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
112- unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
113-}
114+#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
115+# unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
116+#}
117
118
119 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 063566907896ff32bea27897fa73cebbbd7bacce Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Prune the list of libraries wanted to what we actually need.
6
7Bug-Debian: http://bugs.debian.org/128355
8
9We want to keep the dependencies on perl-base as small as possible,
10and some of the original list may be present on buildds (see Bug#128355).
11
12Patch-Name: debian/prune_libs.diff
13---
14 Configure | 5 ++---
15 1 files changed, 2 insertions(+), 3 deletions(-)
16
17diff --git a/Configure b/Configure
18index d9911f9..f59f75c 100755
19--- a/Configure
20+++ b/Configure
21@@ -1367,8 +1367,7 @@ libswanted_uselargefiles=''
22 : set usesocks on the Configure command line to enable socks.
23 : List of libraries we want.
24 : If anyone needs extra -lxxx, put those in a hint file.
25-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
26-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
27+libswanted='gdbm gdbm_compat db dl m c crypt'
28 : We probably want to search /usr/shlib before most other libraries.
29 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
30 glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
31@@ -22308,7 +22307,7 @@ sunos*X4*)
32 ;;
33 *) case "$usedl" in
34 $define|true|[yY]*)
35- set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
36+ set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'`
37 shift
38 perllibs="$*"
39 ;;
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 @@
1debian/arm_thread_stress_timeout.diff
2debian/cpan_definstalldirs.diff
3debian/db_file_ver.diff
4debian/doc_info.diff
5debian/enc2xs_inc.diff
6debian/errno_ver.diff
7debian/libperl_embed_doc.diff
8fixes/respect_umask.diff
9debian/writable_site_dirs.diff
10debian/extutils_set_libperl_path.diff
11debian/no_packlist_perllocal.diff
12debian/prefix_changes.diff
13debian/fakeroot.diff
14debian/instmodsh_doc.diff
15debian/ld_run_path.diff
16debian/libnet_config_path.diff
17debian/m68k_thread_stress.diff
18debian/mod_paths.diff
19debian/module_build_man_extensions.diff
20debian/prune_libs.diff
21fixes/net_smtp_docs.diff
22debian/perlivp.diff
23debian/disable-zlib-bundling.diff
24debian/cpanplus_definstalldirs.diff
25debian/cpanplus_config_path.diff
26debian/deprecate-with-apt.diff
27fixes/hurd-ccflags.diff
28debian/squelch-locale-warnings.diff
29debian/skip-upstream-git-tests.diff
30fixes/extutils-cbuilder-cflags.diff
31fixes/module-build-home-directory.diff
32debian/patchlevel.diff
33fixes/h2ph-multiarch.diff
34fixes/index-tainting.diff
35debian/skip-kfreebsd-crash.diff
36fixes/document_makemaker_ccflags.diff
37fixes/sys-syslog-socket-timeout-kfreebsd.patch
38fixes/hurd-hints.diff
39fixes/pod_fixes.diff
40debian/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 @@
1Upstream-Status:Inappropriate [debian patches]
2From ff2815399ad94915da2e63cb3c4bbd2d02dac4b2 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Fri, 5 Aug 2011 10:50:18 +0300
5Subject: Skip a crashing test case in t/op/threads.t on GNU/kFreeBSD
6
7Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=96272
8Bug-Debian: http://bugs.debian.org/628493
9
10The crash is not a regression in 5.14, it just gets triggered there by
11a new unrelated test case.
12
13Skip the test until the culprit is found.
14
15Patch-Name: debian/skip-kfreebsd-crash.diff
16---
17 t/op/threads.t | 4 ++++
18 1 files changed, 4 insertions(+), 0 deletions(-)
19
20diff --git a/t/op/threads.t b/t/op/threads.t
21index 24e84e4..6a91366 100644
22--- a/t/op/threads.t
23+++ b/t/op/threads.t
24@@ -342,6 +342,9 @@ threads->create(
25
26 EOI
27
28+SKIP: {
29+ skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1
30+ if $^O eq 'gnukfreebsd';
31 # [perl #78494] Pipes shared between threads block when closed
32 watchdog 10;
33 {
34@@ -351,5 +354,6 @@ watchdog 10;
35 threads->create(sub { })->join;
36 ok(1, "Pipes shared between threads do not block when closed");
37 }
38+}
39
40 # 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Fri, 22 Apr 2011 11:15:32 +0300
5Subject: Skip tests specific to the upstream Git repository
6
7These tests fail if run from a different git repository than
8upstream. This complicates things needlessly for downstream packagers.
9
10Skip the tests altogether even if the .git directory exists.
11
12Patch-Name: debian/skip-upstream-git-tests.diff
13---
14 t/porting/authors.t | 3 ++-
15 t/porting/cmp_version.t | 3 ++-
16 t/porting/manifest.t | 3 ++-
17 3 files changed, 6 insertions(+), 3 deletions(-)
18
19diff --git a/t/porting/authors.t b/t/porting/authors.t
20index 28ca1ca..3c7f069 100644
21--- a/t/porting/authors.t
22+++ b/t/porting/authors.t
23@@ -9,7 +9,8 @@ BEGIN {
24 use strict;
25 use warnings;
26
27-if (! -d '.git' ) {
28+# Debian change: skip as we're probably in a different git repository
29+if (1 || ! -d '.git' ) {
30 print "1..0 # SKIP: not being run from a git checkout\n";
31 exit 0;
32 }
33diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t
34index b3c677c..f89f2a7 100644
35--- a/t/porting/cmp_version.t
36+++ b/t/porting/cmp_version.t
37@@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir);
38 use Getopt::Std;
39 use Maintainers;
40
41-if (! -d '.git' ) {
42+# Debian change: skip as we're probably in a different git repository
43+if (1 || ! -d '.git' ) {
44 print "1..0 # SKIP: not being run from a git checkout\n";
45 exit 0;
46 }
47diff --git a/t/porting/manifest.t b/t/porting/manifest.t
48index 48dd3ac..b08126b 100644
49--- a/t/porting/manifest.t
50+++ b/t/porting/manifest.t
51@@ -59,7 +59,8 @@ SKIP: {
52
53 SKIP: {
54 chdir "..";
55- skip("not under git control", 3) unless -d '.git';
56+ # Debian change: skip as we're probably in a different git repository
57+ skip("not under git control", 3) unless 0 && -d '.git';
58 chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`);
59 skip("git ls-files didnt work",3)
60 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 718e9cbd59f0739fc9104af111e42fff66f927a7 Mon Sep 17 00:00:00 2001
3From: Niko Tyni <ntyni@debian.org>
4Date: Sun, 3 Oct 2010 21:36:17 +0300
5Subject: Squelch locale warnings in Debian package maintainer scripts
6
7Bug-Debian: http://bugs.debian.org/508764
8
9The system locales are rather frequently out of sync with the C library
10during package upgrades, causing a huge amount of useless Perl locale
11warnings. Squelch them when running package maintainer scripts, detected
12by the DPKG_RUNNING_VERSION environment variable.
13
14Any real locale problem will show up after the system upgrade too, and
15the warning will be triggered normally again at that point.
16
17Patch-Name: debian/squelch-locale-warnings.diff
18---
19 locale.c | 4 ++++
20 pod/perllocale.pod | 8 ++++++++
21 2 files changed, 12 insertions(+), 0 deletions(-)
22
23diff --git a/locale.c b/locale.c
24index 4631b86..94a0962 100644
25--- a/locale.c
26+++ b/locale.c
27@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
28 char *p;
29 const bool locwarn = (printwarn > 1 ||
30 (printwarn &&
31+
32+ /* Debian specific change - see http://bugs.debian.org/508764 */
33+ (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
34+
35 (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
36
37 if (locwarn) {
38diff --git a/pod/perllocale.pod b/pod/perllocale.pod
39index 8926d8b..6c55889 100644
40--- a/pod/perllocale.pod
41+++ b/pod/perllocale.pod
42@@ -861,6 +861,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
43 The message tells about some problem in your system's locale support,
44 and you should investigate what the problem is.
45
46+=item DPKG_RUNNING_VERSION
47+
48+On Debian systems, if the DPKG_RUNNING_VERSION environment variable is
49+set (to any value), the locale failure warnings will be suppressed just
50+like with a zero PERL_BADLANG setting. This is done to avoid floods
51+of spurious warnings during system upgrades.
52+See L<http://bugs.debian.org/508764>.
53+
54 =back
55
56 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 @@
1Upstream-Status:Inappropriate [debian patches]
2From 492e0d6b4e3e0d786fb88b9058d581f6466c4a3e Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Set umask approproately for site install directories
6
7Policy requires group writable site directories
8
9Patch-Name: debian/writable_site_dirs.diff
10---
11 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++---
12 1 files changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
15index 865d36d..4ee6b3f 100644
16--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
17+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
18@@ -2067,7 +2067,7 @@ pure_perl_install :: all
19
20
21 pure_site_install :: all
22- $(NOECHO) umask 022; $(MOD_INSTALL) \
23+ $(NOECHO) umask 02; $(MOD_INSTALL) \
24 read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
25 write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
26 $(INST_LIB) $(DESTINSTALLSITELIB) \
27@@ -2103,8 +2103,8 @@ doc_perl_install :: all
28
29 doc_site_install :: all
30 $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
31- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
32- -$(NOECHO) umask 022; $(DOC_INSTALL) \
33+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
34+ -$(NOECHO) umask 02; $(DOC_INSTALL) \
35 "Module" "$(NAME)" \
36 "installed into" "$(INSTALLSITELIB)" \
37 LINKTYPE "$(LINKTYPE)" \