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