diff options
author | Kang Kai <kai.kang@windriver.com> | 2013-01-21 16:57:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-25 12:42:48 +0000 |
commit | 526498282688c6e110727c9184efd1b69997c9db (patch) | |
tree | 96f2869b1983b070fc4bbd72eeb31aa1f9d5149c /meta/recipes-devtools/perl/perl-5.14.3/debian/fixes | |
parent | e80f02a93b1c717e6bc7001a05c773290ca68992 (diff) | |
download | poky-526498282688c6e110727c9184efd1b69997c9db.tar.gz |
perl: update to 5.14.3
There is a securty issue:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5195
Update perl to 5.14.3 to resolve this problem.
Patches hurd-ccflags.diff, h2ph-multiarch.diff, index-tainting.diff and
hurd-hints.diff have been merged, so remove them from SRC_URI.
Update patches config.sh and Makefile.SH.patch with new PV.
[Yocto 3701]
(From OE-Core rev: b1fd25e05308cabb56afe1d4276470bf7380ea59)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/fixes')
9 files changed, 664 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff new file mode 100644 index 0000000000..3f2c3dc646 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/document_makemaker_ccflags.diff | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Mon, 30 May 2011 22:54:24 +0300 | ||
5 | Subject: Document that CCFLAGS should include $Config{ccflags} | ||
6 | |||
7 | Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613 | ||
8 | Bug-Debian: http://bugs.debian.org/628522 | ||
9 | |||
10 | Compiling XS extensions without $Config{ccflags} can break the | ||
11 | binary interface on some platforms. | ||
12 | |||
13 | Patch-Name: fixes/document_makemaker_ccflags.diff | ||
14 | --- | ||
15 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++ | ||
16 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
17 | |||
18 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
19 | index be9624e..c56ca8f 100644 | ||
20 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
21 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
22 | @@ -1524,6 +1524,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs. | ||
23 | String that will be included in the compiler call command line between | ||
24 | the arguments INC and OPTIMIZE. | ||
25 | |||
26 | +The default value is taken from $Config{ccflags}. When overriding | ||
27 | +CCFLAGS, make sure to include the $Config{ccflags} settings to avoid | ||
28 | +binary incompatibilities. | ||
29 | + | ||
30 | =item CONFIG | ||
31 | |||
32 | Arrayref. E.g. [qw(archname manext)] defines ARCHNAME & MANEXT from | ||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff new file mode 100644 index 0000000000..f9a3c6bdf1 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/extutils-cbuilder-cflags.diff | |||
@@ -0,0 +1,87 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Thu, 28 Apr 2011 09:18:54 +0300 | ||
5 | Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in | ||
6 | EU::CBuilder | ||
7 | |||
8 | Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478 | ||
9 | Bug-Debian: http://bugs.debian.org/624460 | ||
10 | Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d | ||
11 | |||
12 | Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), | ||
13 | CFLAGS and LDFLAGS from the environment have overridden the Config.pm | ||
14 | ccflags and ldflags settings. This can cause binary incompatibilities | ||
15 | between the core Perl and extensions built with EU::CBuilder. | ||
16 | |||
17 | Append to the Config.pm values rather than overriding them. | ||
18 | |||
19 | Patch-Name: fixes/extutils-cbuilder-cflags.diff | ||
20 | --- | ||
21 | .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- | ||
22 | dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- | ||
23 | 2 files changed, 28 insertions(+), 3 deletions(-) | ||
24 | |||
25 | diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm | ||
26 | index b572312..2255c51 100644 | ||
27 | --- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm | ||
28 | +++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm | ||
29 | @@ -40,11 +40,13 @@ sub new { | ||
30 | $self->{config}{$k} = $v unless exists $self->{config}{$k}; | ||
31 | } | ||
32 | $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; | ||
33 | - $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; | ||
34 | + $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) | ||
35 | + if defined $ENV{CFLAGS}; | ||
36 | $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; | ||
37 | $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; | ||
38 | $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; | ||
39 | - $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; | ||
40 | + $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) | ||
41 | + if defined $ENV{LDFLAGS}; | ||
42 | |||
43 | unless ( exists $self->{config}{cxx} ) { | ||
44 | my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); | ||
45 | diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t | ||
46 | index db0ef98..49819a1 100644 | ||
47 | --- a/dist/ExtUtils-CBuilder/t/04-base.t | ||
48 | +++ b/dist/ExtUtils-CBuilder/t/04-base.t | ||
49 | @@ -1,7 +1,7 @@ | ||
50 | #! perl -w | ||
51 | |||
52 | use strict; | ||
53 | -use Test::More tests => 50; | ||
54 | +use Test::More tests => 64; | ||
55 | use Config; | ||
56 | use Cwd; | ||
57 | use File::Path qw( mkpath ); | ||
58 | @@ -328,6 +328,29 @@ is_deeply( $mksymlists_args, | ||
59 | "_prepare_mksymlists_args(): got expected arguments for Mksymlists", | ||
60 | ); | ||
61 | |||
62 | +my %testvars = ( | ||
63 | + CFLAGS => 'ccflags', | ||
64 | + LDFLAGS => 'ldflags', | ||
65 | +); | ||
66 | + | ||
67 | +while (my ($VAR, $var) = each %testvars) { | ||
68 | + local $ENV{$VAR}; | ||
69 | + $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); | ||
70 | + ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); | ||
71 | + isa_ok( $base, 'ExtUtils::CBuilder::Base' ); | ||
72 | + like($base->{config}{$var}, qr/\Q$Config{$var}/, | ||
73 | + "honours $var from Config.pm"); | ||
74 | + | ||
75 | + $ENV{$VAR} = "-foo -bar"; | ||
76 | + $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); | ||
77 | + ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); | ||
78 | + isa_ok( $base, 'ExtUtils::CBuilder::Base' ); | ||
79 | + like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, | ||
80 | + "honours $VAR from the environment"); | ||
81 | + like($base->{config}{$var}, qr/\Q$Config{$var}/, | ||
82 | + "doesn't override $var from Config.pm with $VAR from the environment"); | ||
83 | +} | ||
84 | + | ||
85 | ##### | ||
86 | |||
87 | for ($source_file, $object_file, $lib_file) { | ||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff new file mode 100644 index 0000000000..3b6b4a078c --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/h2ph-multiarch.diff | |||
@@ -0,0 +1,70 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Wed, 18 May 2011 21:44:06 -0700 | ||
5 | Subject: Make h2ph correctly search gcc include directories | ||
6 | |||
7 | Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122 | ||
8 | Bug-Debian: http://bugs.debian.org/625808 | ||
9 | Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77 | ||
10 | |||
11 | System header conversion with "h2ph -a" is currently broken on Ubuntu | ||
12 | Natty and Oneiric (unless the gcc-multilib package is installed for | ||
13 | backward compatibility), resulting in things like | ||
14 | |||
15 | # perl -e 'require "syscall.ph"' | ||
16 | Can't locate asm/unistd.ph in @INC [...] | ||
17 | |||
18 | This happens because Ubuntu has switched to a 'multiarch' setup, see | ||
19 | <https://wiki.ubuntu.com/MultiarchSpec> for details. | ||
20 | |||
21 | The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm | ||
22 | is now /usr/include/x86_64-linux-gnu/asm. (The third component of the | ||
23 | new path varies with the actual architecture.) | ||
24 | |||
25 | gcc --print-search-dirs doesn't really tell anything about where gcc | ||
26 | looks for the include directories, it was just used to find the gcc | ||
27 | internal directory prefix. | ||
28 | |||
29 | Parse the output of "gcc -v -E" instead, and append $Config{usrinc} | ||
30 | for safety. Duplicates shouldn't matter. | ||
31 | |||
32 | The h2ph "-a" switch isn't currently tested automatically, and that | ||
33 | seems nontrivial to do portably. Manual testing was done with | ||
34 | |||
35 | # mkdir ttt | ||
36 | # ./perl -Ilib ./utils/h2ph -a -d $(pwd)/ttt syscall.h | ||
37 | |||
38 | The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3. | ||
39 | |||
40 | http://bugs.debian.org/625808 | ||
41 | https://bugs.launchpad.net/bugs/777903 | ||
42 | |||
43 | Patch-Name: fixes/h2ph-multiarch.diff | ||
44 | --- | ||
45 | utils/h2ph.PL | 12 ++---------- | ||
46 | 1 files changed, 2 insertions(+), 10 deletions(-) | ||
47 | |||
48 | diff --git a/utils/h2ph.PL b/utils/h2ph.PL | ||
49 | index 87f3c7d..4545d6d 100644 | ||
50 | --- a/utils/h2ph.PL | ||
51 | +++ b/utils/h2ph.PL | ||
52 | @@ -761,16 +761,8 @@ sub queue_includes_from | ||
53 | # non-GCC?) C compilers, but gcc uses additional include directories. | ||
54 | sub inc_dirs | ||
55 | { | ||
56 | - my $from_gcc = `LC_ALL=C $Config{cc} -v 2>&1`; | ||
57 | - if( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) ) | ||
58 | - { # gcc-4+ : | ||
59 | - $from_gcc = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`; | ||
60 | - if ( !($from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s) ) | ||
61 | - { | ||
62 | - $from_gcc = ''; | ||
63 | - }; | ||
64 | - }; | ||
65 | - length($from_gcc) ? ($from_gcc, $from_gcc . "-fixed", $Config{usrinc}) : ($Config{usrinc}); | ||
66 | + my $from_gcc = `LC_ALL=C $Config{cc} -v -E - < /dev/null 2>&1 | awk '/^#include/, /^End of search list/' | grep '^ '`; | ||
67 | + length($from_gcc) ? (split(' ', $from_gcc), $Config{usrinc}) : ($Config{usrinc}); | ||
68 | } | ||
69 | |||
70 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff new file mode 100644 index 0000000000..ee00ca3cdf --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/index-tainting.diff | |||
@@ -0,0 +1,74 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001 | ||
3 | From: David Mitchell <davem@iabyn.com> | ||
4 | Date: Tue, 28 Jun 2011 17:04:40 +0100 | ||
5 | Subject: RT 64804: tainting with index() of a constant | ||
6 | |||
7 | Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804 | ||
8 | Bug-Debian: http://bugs.debian.org/291450 | ||
9 | Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1 | ||
10 | |||
11 | At compile time, ck_index with a tainted constant set PL_tainted, | ||
12 | which remained on during the rest of compilation, tainting all other | ||
13 | constants. | ||
14 | |||
15 | Fix this by saving and restoring PL_tainted across the call to | ||
16 | fbm_compile, which is what sets PL_tainted. | ||
17 | |||
18 | Patch-Name: fixes/index-tainting.diff | ||
19 | --- | ||
20 | op.c | 5 ++++- | ||
21 | t/op/taint.t | 16 +++++++++++++++- | ||
22 | 2 files changed, 19 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/op.c b/op.c | ||
25 | index e21b9a4..973df13 100644 | ||
26 | --- a/op.c | ||
27 | +++ b/op.c | ||
28 | @@ -7780,8 +7780,11 @@ Perl_ck_index(pTHX_ OP *o) | ||
29 | OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ | ||
30 | if (kid) | ||
31 | kid = kid->op_sibling; /* get past "big" */ | ||
32 | - if (kid && kid->op_type == OP_CONST) | ||
33 | + if (kid && kid->op_type == OP_CONST) { | ||
34 | + const bool save_taint = PL_tainted; | ||
35 | fbm_compile(((SVOP*)kid)->op_sv, 0); | ||
36 | + PL_tainted = save_taint; | ||
37 | + } | ||
38 | } | ||
39 | return ck_fun(o); | ||
40 | } | ||
41 | diff --git a/t/op/taint.t b/t/op/taint.t | ||
42 | index 9df6fee..a300b9b 100644 | ||
43 | --- a/t/op/taint.t | ||
44 | +++ b/t/op/taint.t | ||
45 | @@ -17,7 +17,7 @@ BEGIN { | ||
46 | use strict; | ||
47 | use Config; | ||
48 | |||
49 | -plan tests => 774; | ||
50 | +plan tests => 778; | ||
51 | |||
52 | $| = 1; | ||
53 | |||
54 | @@ -2144,6 +2144,20 @@ end | ||
55 | is_tainted $dest, "ucfirst(tainted) taints its return value"; | ||
56 | } | ||
57 | |||
58 | + | ||
59 | +# tainted constants and index() | ||
60 | +# RT 64804; http://bugs.debian.org/291450 | ||
61 | +{ | ||
62 | + ok(tainted $old_env_path, "initial taintedness"); | ||
63 | + BEGIN { no strict 'refs'; my $v = $old_env_path; *{"::C"} = sub () { $v }; } | ||
64 | + ok(tainted C, "constant is tainted properly"); | ||
65 | + ok(!tainted "", "tainting not broken yet"); | ||
66 | + index(undef, C); | ||
67 | + ok(!tainted "", "tainting still works after index() of the constant"); | ||
68 | +} | ||
69 | + | ||
70 | + | ||
71 | + | ||
72 | # This may bomb out with the alarm signal so keep it last | ||
73 | SKIP: { | ||
74 | skip "No alarm()" unless $Config{d_alarm}; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff new file mode 100644 index 0000000000..998a6a3d81 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/module-build-home-directory.diff | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001 | ||
3 | From: Dominic Hargreaves <dom@earth.li> | ||
4 | Date: Mon, 2 May 2011 10:35:04 +0100 | ||
5 | Subject: Fix failing tilde test when run under a UID without a passwd entry | ||
6 | |||
7 | Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893 | ||
8 | Bug-Debian: http://bugs.debian.org/624850 | ||
9 | |||
10 | Patch-Name: fixes/module-build-home-directory.diff | ||
11 | --- | ||
12 | cpan/Module-Build/t/tilde.t | 6 ++++-- | ||
13 | 1 files changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t | ||
16 | index fac821b..04f0210 100644 | ||
17 | --- a/cpan/Module-Build/t/tilde.t | ||
18 | +++ b/cpan/Module-Build/t/tilde.t | ||
19 | @@ -46,7 +46,8 @@ SKIP: { | ||
20 | |||
21 | unless (defined $home) { | ||
22 | my @info = eval { getpwuid $> }; | ||
23 | - skip "No home directory for tilde-expansion tests", 15 if $@; | ||
24 | + skip "No home directory for tilde-expansion tests", 15 if $@ | ||
25 | + or !defined $info[7]; | ||
26 | $home = $info[7]; | ||
27 | } | ||
28 | |||
29 | @@ -95,7 +96,8 @@ SKIP: { | ||
30 | # Again, with named users | ||
31 | SKIP: { | ||
32 | my @info = eval { getpwuid $> }; | ||
33 | - skip "No home directory for tilde-expansion tests", 1 if $@; | ||
34 | + skip "No home directory for tilde-expansion tests", 1 if $@ | ||
35 | + or !defined $info[7] or !defined $info[0]; | ||
36 | my ($me, $home) = @info[0,7]; | ||
37 | |||
38 | my $expected = "$home/fooxzy"; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff new file mode 100644 index 0000000000..f68c352985 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/net_smtp_docs.diff | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001 | ||
3 | From: Brendan O'Dea <bod@debian.org> | ||
4 | Date: Thu, 20 Sep 2007 19:47:14 +1000 | ||
5 | Subject: Document the Net::SMTP 'Port' option | ||
6 | |||
7 | Bug-Debian: http://bugs.debian.org/100195 | ||
8 | Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038 | ||
9 | |||
10 | Patch-Name: fixes/net_smtp_docs.diff | ||
11 | --- | ||
12 | cpan/libnet/Net/SMTP.pm | 1 + | ||
13 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
14 | |||
15 | diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm | ||
16 | index a28496d..07b2498 100644 | ||
17 | --- a/cpan/libnet/Net/SMTP.pm | ||
18 | +++ b/cpan/libnet/Net/SMTP.pm | ||
19 | @@ -625,6 +625,7 @@ Net::SMTP will attempt to extract the address from the value passed. | ||
20 | |||
21 | B<Debug> - Enable debugging information | ||
22 | |||
23 | +B<Port> - Select a port on the remote host to connect to (default is 25) | ||
24 | |||
25 | Example: | ||
26 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff new file mode 100644 index 0000000000..58e770bc76 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/pod_fixes.diff | |||
@@ -0,0 +1,146 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001 | ||
3 | From: Keith Thompson <kst@mib.org> | ||
4 | Date: Fri, 29 Jul 2011 17:17:00 -0700 | ||
5 | Subject: Fix typos in several pod/perl*.pod files | ||
6 | |||
7 | Bug-Debian: http://bugs.debian.org/637816 | ||
8 | Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d | ||
9 | Patch-Name: fixes/pod_fixes.diff | ||
10 | --- | ||
11 | pod/perlfunc.pod | 8 ++++---- | ||
12 | pod/perlglossary.pod | 10 +++++----- | ||
13 | pod/perlmod.pod | 4 ++-- | ||
14 | pod/perlretut.pod | 6 +++--- | ||
15 | 4 files changed, 14 insertions(+), 14 deletions(-) | ||
16 | |||
17 | diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod | ||
18 | index 2ee3637..719a740 100644 | ||
19 | --- a/pod/perlfunc.pod | ||
20 | +++ b/pod/perlfunc.pod | ||
21 | @@ -3918,7 +3918,7 @@ count. A numeric repeat count may optionally be enclosed in brackets, as | ||
22 | in C<pack("C[80]", @arr)>. The repeat count gobbles that many values from | ||
23 | the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>, | ||
24 | C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means | ||
25 | -something else, dscribed below. Supplying a C<*> for the repeat count | ||
26 | +something else, described below. Supplying a C<*> for the repeat count | ||
27 | instead of a number means to use however many items are left, except for: | ||
28 | |||
29 | =over | ||
30 | @@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not | ||
31 | well-defined. | ||
32 | |||
33 | Because C<< <=> >> returns C<undef> when either operand is C<NaN> | ||
34 | -(not-a-number), and laso because C<sort> raises an exception unless the | ||
35 | +(not-a-number), and also because C<sort> raises an exception unless the | ||
36 | result of a comparison is defined, be careful when sorting with a | ||
37 | comparison function like C<< $a <=> $b >> any lists that might contain a | ||
38 | C<NaN>. The following example takes advantage that C<NaN != NaN> to | ||
39 | @@ -5958,7 +5958,7 @@ specified. | ||
40 | |||
41 | A pattern matching the empty string (not to be confused with | ||
42 | an empty pattern C<//>, which is just one member of the set of patterns | ||
43 | -matching the epmty string), splits EXPR into individual | ||
44 | +matching the empty string), splits EXPR into individual | ||
45 | characters. For example: | ||
46 | |||
47 | print join(':', split(/ */, 'hi there')), "\n"; | ||
48 | @@ -6222,7 +6222,7 @@ For example: | ||
49 | printf '<%.1e>', 10; # prints "<1.0e+01>" | ||
50 | |||
51 | For "g" and "G", this specifies the maximum number of digits to show, | ||
52 | -including thoe prior to the decimal point and those after it; for | ||
53 | +including those prior to the decimal point and those after it; for | ||
54 | example: | ||
55 | |||
56 | # These examples are subject to system-specific variation. | ||
57 | diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod | ||
58 | index 639ce33..191371c 100644 | ||
59 | --- a/pod/perlglossary.pod | ||
60 | +++ b/pod/perlglossary.pod | ||
61 | @@ -507,7 +507,7 @@ the class (its L<objects|/object>). See also L</inheritance>. | ||
62 | |||
63 | =item class method | ||
64 | |||
65 | -A L</method> whose L</invocand> is a L</package> name, not an | ||
66 | +A L</method> whose L</invocant> is a L</package> name, not an | ||
67 | L</object> reference. A method associated with the class as a whole. | ||
68 | |||
69 | =item client | ||
70 | @@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb | ||
71 | indirect-object object" where L</STDOUT> is the recipient of the | ||
72 | L<print|perlfunc/print> action, and C<"$foo"> is the object being | ||
73 | printed. Similarly, when invoking a L</method>, you might place the | ||
74 | -invocand between the method and its arguments: | ||
75 | +invocant between the method and its arguments: | ||
76 | |||
77 | $gollum = new Pathetic::Creature "Smeagol"; | ||
78 | give $gollum "Fisssssh!"; | ||
79 | @@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable | ||
80 | form (L<syntax trees|/syntax tree>) within the I<perl> process itself, | ||
81 | which the Perl L</run time> system then interprets. | ||
82 | |||
83 | -=item invocand | ||
84 | +=item invocant | ||
85 | |||
86 | The agent on whose behalf a L</method> is invoked. In a L</class> | ||
87 | -method, the invocand is a package name. In an L</instance> method, | ||
88 | -the invocand is an object reference. | ||
89 | +method, the invocant is a package name. In an L</instance> method, | ||
90 | +the invocant is an object reference. | ||
91 | |||
92 | =item invocation | ||
93 | |||
94 | diff --git a/pod/perlmod.pod b/pod/perlmod.pod | ||
95 | index 5266f19..17de73e 100644 | ||
96 | --- a/pod/perlmod.pod | ||
97 | +++ b/pod/perlmod.pod | ||
98 | @@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary. | ||
99 | C<CLONE> will be called once as a class method for every package that has it | ||
100 | defined (or inherits it). It will be called in the context of the new thread, | ||
101 | so all modifications are made in the new area. Currently CLONE is called with | ||
102 | -no parameters other than the invocand package name, but code should not assume | ||
103 | +no parameters other than the invocant package name, but code should not assume | ||
104 | that this will remain unchanged, as it is likely that in future extra parameters | ||
105 | will be passed in to give more information about the state of cloning. | ||
106 | |||
107 | @@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is | ||
108 | needed. | ||
109 | |||
110 | Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other | ||
111 | -than the invocand package name, although that may change. Similarly, to | ||
112 | +than the invocant package name, although that may change. Similarly, to | ||
113 | allow for future expansion, the return value should be a single C<0> or | ||
114 | C<1> value. | ||
115 | |||
116 | diff --git a/pod/perlretut.pod b/pod/perlretut.pod | ||
117 | index ea80594..1c65f5b 100644 | ||
118 | --- a/pod/perlretut.pod | ||
119 | +++ b/pod/perlretut.pod | ||
120 | @@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results. | ||
121 | =head2 Relative backreferences | ||
122 | |||
123 | Counting the opening parentheses to get the correct number for a | ||
124 | -backreference is errorprone as soon as there is more than one | ||
125 | +backreference is error-prone as soon as there is more than one | ||
126 | capturing group. A more convenient technique became available | ||
127 | with Perl 5.10: relative backreferences. To refer to the immediately | ||
128 | preceding capture group one now may write C<\g{-1}>, the next but | ||
129 | @@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead. So we have | ||
130 | |||
131 | =head3 Global matching | ||
132 | |||
133 | -The final two modifiers we will disccuss here, | ||
134 | +The final two modifiers we will discuss here, | ||
135 | C<//g> and C<//c>, concern multiple matches. | ||
136 | The modifier C<//g> stands for global matching and allows the | ||
137 | matching operator to match within a string as many times as possible. | ||
138 | @@ -1870,7 +1870,7 @@ substituted. | ||
139 | |||
140 | C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of | ||
141 | double-quotish syntax, and not part of regexp syntax proper. They will | ||
142 | -work if they appear in a regular expression embeddded directly in a | ||
143 | +work if they appear in a regular expression embedded directly in a | ||
144 | program, but not when contained in a string that is interpolated in a | ||
145 | pattern. | ||
146 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff new file mode 100644 index 0000000000..aa9307fc8a --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff | |||
@@ -0,0 +1,154 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001 | ||
3 | From: Brendan O'Dea <bod@debian.org> | ||
4 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
5 | Subject: Respect umask during installation | ||
6 | |||
7 | This is needed to satisfy Debian policy regarding group-writable | ||
8 | site directories. | ||
9 | |||
10 | Patch-Name: fixes/respect_umask.diff | ||
11 | --- | ||
12 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++--------- | ||
13 | dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++--------- | ||
14 | 2 files changed, 18 insertions(+), 18 deletions(-) | ||
15 | |||
16 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
17 | index 6964eea..865d36d 100644 | ||
18 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
19 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
20 | @@ -2053,7 +2053,7 @@ doc__install : doc_site_install | ||
21 | $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site | ||
22 | |||
23 | pure_perl_install :: all | ||
24 | - $(NOECHO) $(MOD_INSTALL) \ | ||
25 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
26 | read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
27 | write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
28 | $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
29 | @@ -2067,7 +2067,7 @@ pure_perl_install :: all | ||
30 | |||
31 | |||
32 | pure_site_install :: all | ||
33 | - $(NOECHO) $(MOD_INSTALL) \ | ||
34 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
35 | read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
36 | write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
37 | $(INST_LIB) $(DESTINSTALLSITELIB) \ | ||
38 | @@ -2080,7 +2080,7 @@ pure_site_install :: all | ||
39 | }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{ | ||
40 | |||
41 | pure_vendor_install :: all | ||
42 | - $(NOECHO) $(MOD_INSTALL) \ | ||
43 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
44 | read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
45 | write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
46 | $(INST_LIB) $(DESTINSTALLVENDORLIB) \ | ||
47 | @@ -2092,8 +2092,8 @@ pure_vendor_install :: all | ||
48 | |||
49 | doc_perl_install :: all | ||
50 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
51 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
52 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
53 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
54 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
55 | "Module" "$(NAME)" \ | ||
56 | "installed into" "$(INSTALLPRIVLIB)" \ | ||
57 | LINKTYPE "$(LINKTYPE)" \ | ||
58 | @@ -2103,8 +2103,8 @@ doc_perl_install :: all | ||
59 | |||
60 | doc_site_install :: all | ||
61 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
62 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
63 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
64 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
65 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
66 | "Module" "$(NAME)" \ | ||
67 | "installed into" "$(INSTALLSITELIB)" \ | ||
68 | LINKTYPE "$(LINKTYPE)" \ | ||
69 | @@ -2114,8 +2114,8 @@ doc_site_install :: all | ||
70 | |||
71 | doc_vendor_install :: all | ||
72 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
73 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
74 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
75 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
76 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
77 | "Module" "$(NAME)" \ | ||
78 | "installed into" "$(INSTALLVENDORLIB)" \ | ||
79 | LINKTYPE "$(LINKTYPE)" \ | ||
80 | diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
81 | index 3b030a5..cb0e9e0 100644 | ||
82 | --- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
83 | +++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
84 | @@ -468,7 +468,7 @@ sub _can_write_dir { | ||
85 | |||
86 | =pod | ||
87 | |||
88 | -=item _mkpath($dir,$show,$mode,$verbose,$dry_run) | ||
89 | +=item _mkpath($dir,$show,$verbose,$dry_run) | ||
90 | |||
91 | Wrapper around File::Path::mkpath() to handle errors. | ||
92 | |||
93 | @@ -485,13 +485,13 @@ writable. | ||
94 | =cut | ||
95 | |||
96 | sub _mkpath { | ||
97 | - my ($dir,$show,$mode,$verbose,$dry_run)=@_; | ||
98 | + my ($dir,$show,$verbose,$dry_run)=@_; | ||
99 | if ( $verbose && $verbose > 1 && ! -d $dir) { | ||
100 | $show= 1; | ||
101 | - printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode; | ||
102 | + printf "mkpath(%s,%d)\n", $dir, $show; | ||
103 | } | ||
104 | if (!$dry_run) { | ||
105 | - if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) { | ||
106 | + if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) { | ||
107 | _choke("Can't create '$dir'","$@"); | ||
108 | } | ||
109 | |||
110 | @@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC | ||
111 | _chdir($cwd); | ||
112 | } | ||
113 | foreach my $targetdir (sort keys %check_dirs) { | ||
114 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
115 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
116 | } | ||
117 | foreach my $found (@found_files) { | ||
118 | my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime, | ||
119 | @@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC | ||
120 | $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' ) | ||
121 | unless $dry_run; | ||
122 | } elsif ( ! -d $targetdir ) { | ||
123 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
124 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
125 | } | ||
126 | print "Installing $targetfile\n"; | ||
127 | |||
128 | @@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC | ||
129 | |||
130 | if ($pack{'write'}) { | ||
131 | $dir = install_rooted_dir(dirname($pack{'write'})); | ||
132 | - _mkpath( $dir, 0, 0755, $verbose, $dry_run ); | ||
133 | + _mkpath( $dir, 0, $verbose, $dry_run ); | ||
134 | print "Writing $pack{'write'}\n" if $verbose; | ||
135 | $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run; | ||
136 | } | ||
137 | @@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory). | ||
138 | sub pm_to_blib { | ||
139 | my($fromto,$autodir,$pm_filter) = @_; | ||
140 | |||
141 | - _mkpath($autodir,0,0755); | ||
142 | + _mkpath($autodir,0); | ||
143 | while(my($from, $to) = each %$fromto) { | ||
144 | if( -f $to && -s $from == -s $to && -M $to < -M $from ) { | ||
145 | print "Skip $to (unchanged)\n"; | ||
146 | @@ -1213,7 +1213,7 @@ sub pm_to_blib { | ||
147 | # we wont try hard here. its too likely to mess things up. | ||
148 | forceunlink($to); | ||
149 | } else { | ||
150 | - _mkpath(dirname($to),0,0755); | ||
151 | + _mkpath(dirname($to),0); | ||
152 | } | ||
153 | if ($need_filtering) { | ||
154 | run_filter($pm_filter, $from, $to); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch new file mode 100644 index 0000000000..632d426baa --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Wed, 3 Aug 2011 22:36:24 +0300 | ||
5 | Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable | ||
6 | messages | ||
7 | |||
8 | Bug: http://rt.cpan.org/Ticket/Display.html?id=69997 | ||
9 | Bug-Debian: http://bugs.debian.org/627821 | ||
10 | |||
11 | Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel | ||
12 | even when there's no listener, causing test failures. | ||
13 | |||
14 | It seems probable that all FreeBSD-based systems suffer from the | ||
15 | same issue, but that's for upstream to decide. | ||
16 | |||
17 | Patch-Name: fixes/sys-syslog-socket-timeout-kfreebsd.patch | ||
18 | --- | ||
19 | cpan/Sys-Syslog/Syslog.pm | 5 ++++- | ||
20 | 1 files changed, 4 insertions(+), 1 deletions(-) | ||
21 | |||
22 | diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm | ||
23 | index 002e6e4..b445c66 100644 | ||
24 | --- a/cpan/Sys-Syslog/Syslog.pm | ||
25 | +++ b/cpan/Sys-Syslog/Syslog.pm | ||
26 | @@ -138,7 +138,10 @@ my @fallbackMethods = (); | ||
27 | # happy, the timeout is now zero by default on all systems | ||
28 | # except on OSX where it is set to 250 msec, and can be set | ||
29 | # with the infamous setlogsock() function. | ||
30 | -$sock_timeout = 0.25 if $^O =~ /darwin/; | ||
31 | +# | ||
32 | +# Debian change: include Debian GNU/kFreeBSD, lower to 1ms | ||
33 | +# see [rt.cpan.org #69997] | ||
34 | +$sock_timeout = 0.001 if $^O =~ /darwin|gnukfreebsd/; | ||
35 | |||
36 | # coderef for a nicer handling of errors | ||
37 | my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak; | ||