summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.2/debian/fixes
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-10-19 14:53:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-24 17:27:14 +0100
commit5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f (patch)
tree5b7867dec533d001ce29d8bf7b4869299cea254f /meta/recipes-devtools/perl/perl-5.14.2/debian/fixes
parent53f7342562a66d1b14ecee234aa76be07951dedc (diff)
downloadpoky-5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f.tar.gz
perl: upgrade from 5.12.3 to 5.14.2
parallel build fix patches are not needed as they are upstream now. Got a new set of debian patch set for 5.14.2 perl-rpdepends: fix the autogenerated rdepends mistakes take out some mdoules which are not going to be built. [Saul Wold: Remove debug] (From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.2/debian/fixes')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/document_makemaker_ccflags.diff31
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/extutils-cbuilder-cflags.diff86
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/h2ph-multiarch.diff69
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/hurd-ccflags.diff30
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/hurd-hints.diff48
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/index-tainting.diff73
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/module-build-home-directory.diff37
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/net_smtp_docs.diff25
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/pod_fixes.diff145
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/respect_umask.diff153
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch36
11 files changed, 733 insertions, 0 deletions
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 @@
1From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Mon, 30 May 2011 22:54:24 +0300
4Subject: Document that CCFLAGS should include $Config{ccflags}
5
6Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613
7Bug-Debian: http://bugs.debian.org/628522
8
9Compiling XS extensions without $Config{ccflags} can break the
10binary interface on some platforms.
11
12Patch-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
17diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
18index 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 @@
1From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Thu, 28 Apr 2011 09:18:54 +0300
4Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in
5 EU::CBuilder
6
7Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
8Bug-Debian: http://bugs.debian.org/624460
9Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d
10
11Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
12CFLAGS and LDFLAGS from the environment have overridden the Config.pm
13ccflags and ldflags settings. This can cause binary incompatibilities
14between the core Perl and extensions built with EU::CBuilder.
15
16Append to the Config.pm values rather than overriding them.
17
18Patch-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
24diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
25index 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/\.[^.]*/);
44diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
45index 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 @@
1From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Wed, 18 May 2011 21:44:06 -0700
4Subject: Make h2ph correctly search gcc include directories
5
6Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122
7Bug-Debian: http://bugs.debian.org/625808
8Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77
9
10System header conversion with "h2ph -a" is currently broken on Ubuntu
11Natty and Oneiric (unless the gcc-multilib package is installed for
12backward compatibility), resulting in things like
13
14 # perl -e 'require "syscall.ph"'
15 Can't locate asm/unistd.ph in @INC [...]
16
17This happens because Ubuntu has switched to a 'multiarch' setup, see
18<https://wiki.ubuntu.com/MultiarchSpec> for details.
19
20The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm
21is now /usr/include/x86_64-linux-gnu/asm. (The third component of the
22new path varies with the actual architecture.)
23
24gcc --print-search-dirs doesn't really tell anything about where gcc
25looks for the include directories, it was just used to find the gcc
26internal directory prefix.
27
28Parse the output of "gcc -v -E" instead, and append $Config{usrinc}
29for safety. Duplicates shouldn't matter.
30
31The h2ph "-a" switch isn't currently tested automatically, and that
32seems 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
37The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3.
38
39http://bugs.debian.org/625808
40https://bugs.launchpad.net/bugs/777903
41
42Patch-Name: fixes/h2ph-multiarch.diff
43---
44 utils/h2ph.PL | 12 ++----------
45 1 files changed, 2 insertions(+), 10 deletions(-)
46
47diff --git a/utils/h2ph.PL b/utils/h2ph.PL
48index 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 @@
1From f66e8575cb0ca11171f43efe0f9e3c6e790b75bc Mon Sep 17 00:00:00 2001
2From: Samuel Thibault <sthibault@debian.org>
3Date: Wed, 4 Aug 2010 13:34:05 +0300
4Subject: Make hints/gnu.sh append to $ccflags rather than overriding them
5
6Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=92244
7Bug-Debian: http://bugs.debian.org/587901
8Origin: upstream, http://perl5.git.perl.org/perl.git/commit/a190e648879
9
10Don't override possible extra $ccflags values given to Configure
11on GNU/Hurd.
12
13Patch-Name: fixes/hurd-ccflags.diff
14---
15 hints/gnu.sh | 2 +-
16 1 files changed, 1 insertions(+), 1 deletions(-)
17
18diff --git a/hints/gnu.sh b/hints/gnu.sh
19index 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 @@
1From d6fd7595fcd04b332e7449f59ea298639f10a183 Mon Sep 17 00:00:00 2001
2From: Pino Toscano <pino@debian.org>
3Date: Wed, 10 Aug 2011 08:11:33 +0300
4Subject: Improve general GNU hints, needed for GNU/Hurd.
5
6Bug-Debian: http://bugs.debian.org/636609
7
8Patch-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
15diff --git a/ext/ODBM_File/hints/gnu.pl b/ext/ODBM_File/hints/gnu.pl
16new file mode 100644
17index 0000000..db63567
18--- /dev/null
19+++ b/ext/ODBM_File/hints/gnu.pl
20@@ -0,0 +1 @@
21+do './hints/linux.pl' or die $@;
22diff --git a/hints/gnu.sh b/hints/gnu.sh
23index 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 @@
1From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001
2From: David Mitchell <davem@iabyn.com>
3Date: Tue, 28 Jun 2011 17:04:40 +0100
4Subject: RT 64804: tainting with index() of a constant
5
6Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804
7Bug-Debian: http://bugs.debian.org/291450
8Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1
9
10At compile time, ck_index with a tainted constant set PL_tainted,
11which remained on during the rest of compilation, tainting all other
12constants.
13
14Fix this by saving and restoring PL_tainted across the call to
15fbm_compile, which is what sets PL_tainted.
16
17Patch-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
23diff --git a/op.c b/op.c
24index 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 }
40diff --git a/t/op/taint.t b/t/op/taint.t
41index 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 @@
1From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001
2From: Dominic Hargreaves <dom@earth.li>
3Date: Mon, 2 May 2011 10:35:04 +0100
4Subject: Fix failing tilde test when run under a UID without a passwd entry
5
6Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893
7Bug-Debian: http://bugs.debian.org/624850
8
9Patch-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
14diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t
15index 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 @@
1From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001
2From: Brendan O'Dea <bod@debian.org>
3Date: Thu, 20 Sep 2007 19:47:14 +1000
4Subject: Document the Net::SMTP 'Port' option
5
6Bug-Debian: http://bugs.debian.org/100195
7Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
8
9Patch-Name: fixes/net_smtp_docs.diff
10---
11 cpan/libnet/Net/SMTP.pm | 1 +
12 1 files changed, 1 insertions(+), 0 deletions(-)
13
14diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
15index 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 @@
1From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001
2From: Keith Thompson <kst@mib.org>
3Date: Fri, 29 Jul 2011 17:17:00 -0700
4Subject: Fix typos in several pod/perl*.pod files
5
6Bug-Debian: http://bugs.debian.org/637816
7Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d
8Patch-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
16diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
17index 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.
56diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod
57index 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
93diff --git a/pod/perlmod.pod b/pod/perlmod.pod
94index 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
115diff --git a/pod/perlretut.pod b/pod/perlretut.pod
116index 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 @@
1From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001
2From: Brendan O'Dea <bod@debian.org>
3Date: Tue, 8 Mar 2005 19:30:38 +1100
4Subject: Respect umask during installation
5
6This is needed to satisfy Debian policy regarding group-writable
7site directories.
8
9Patch-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
15diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
16index 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)" \
79diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
80index 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 @@
1From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Wed, 3 Aug 2011 22:36:24 +0300
4Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable
5 messages
6
7Bug: http://rt.cpan.org/Ticket/Display.html?id=69997
8Bug-Debian: http://bugs.debian.org/627821
9
10Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel
11even when there's no listener, causing test failures.
12
13It seems probable that all FreeBSD-based systems suffer from the
14same issue, but that's for upstream to decide.
15
16Patch-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
21diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
22index 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;