perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0

Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2026-11-14 02:27:10 +00:00 · 2014-07-08 11:20:12 +01:00
1 parent 93d77b6ca8
commit e73deac6dc
@@ -1,86 +0,0 @@
-From 1735f6f53ca19f99c6e9e39496c486af323ba6a8 Mon Sep 17 00:00:00 2001
-From: Brian Carlson <brian.carlson@cpanel.net>
-Date: Wed, 28 Nov 2012 08:54:33 -0500
-Subject: [PATCH] Fix misparsing of maketext strings.
-
-Case 61251: This commit fixes a misparse of maketext strings that could
-lead to arbitrary code execution.  Basically, maketext was compiling
-bracket notation into functions, but neglected to escape backslashes
-inside the content or die on fully-qualified method names when
-generating the code.  This change escapes all such backslashes and dies
-when a method name with a colon or apostrophe is specified.
---
- AUTHORS                                     |  1 +
- dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++----------------
- 2 files changed, 9 insertions(+), 16 deletions(-)
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-
-diff --git a/AUTHORS b/AUTHORS
-index 70734b0..009dea0 100644
--- a/AUTHORS
-+++ b/AUTHORS
-@@ -154,6 +154,7 @@ Breno G. de Oliveira		<garu@cpan.org>
- Brent Dax			<brentdax@cpan.org>
- Brooks D Boyd
- Brian Callaghan			<callagh@itginc.com>
-+Brian Carlson			<brian.carlson@cpanel.net>
- Brian Clarke			<clarke@appliedmeta.com>
- brian d foy			<brian.d.foy@gmail.com>
- Brian Fraser			<fraserbn@gmail.com>
-diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm
-index 4822027..63e5fba 100644
--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm
-+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm
-@@ -625,21 +625,9 @@ sub _compile {
-                         # 0-length method name means to just interpolate:
-                         push @code, ' (';
-                     }
-                    elsif($m =~ /^\w+(?:\:\:\w+)*$/s
-                            and $m !~ m/(?:^|\:)\d/s
-                        # exclude starting a (sub)package or symbol with a digit
-+                    elsif($m =~ /^\w+$/s
-+                        # exclude anything fancy, especially fully-qualified module names
-                     ) {
-                        # Yes, it even supports the demented (and undocumented?)
-                        #  $obj->Foo::bar(...) syntax.
-                        $target->_die_pointing(
-                            $string_to_compile, q{Can't use "SUPER::" in a bracket-group method},
-                            2 + length($c[-1])
-                        )
-                        if $m =~ m/^SUPER::/s;
-                        # Because for SUPER:: to work, we'd have to compile this into
-                        #  the right package, and that seems just not worth the bother,
-                        #  unless someone convinces me otherwise.
-
-                         push @code, ' $_[0]->' . $m . '(';
-                     }
-                     else {
-@@ -693,7 +681,9 @@ sub _compile {
-             elsif(substr($1,0,1) ne '~') {
-                 # it's stuff not containing "~" or "[" or "]"
-                 # i.e., a literal blob
-                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
- 
-             }
-             elsif($1 eq '~~') { # "~~"
-@@ -731,7 +721,9 @@ sub _compile {
-             else {
-                 # It's a "~X" where X is not a special character.
-                 # Consider it a literal ~ and X.
-                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
-             }
-         }
-     }
-- 
-1.8.3.1
-
@@ -1,178 +0,0 @@
-From d59e31fc729d8a39a774f03bc6bc457029a7aef2 Mon Sep 17 00:00:00 2001
-From: Yves Orton <demerphq@gmail.com>
-Date: Tue, 12 Feb 2013 10:53:05 +0100
-Subject: [PATCH] Prevent premature hsplit() calls, and only trigger REHASH
- after hsplit()
-
-Triggering a hsplit due to long chain length allows an attacker
-to create a carefully chosen set of keys which can cause the hash
-to use 2 * (2**32) * sizeof(void *) bytes ram. AKA a DOS via memory
-exhaustion. Doing so also takes non trivial time.
-
-Eliminating this check, and only inspecting chain length after a
-normal hsplit() (triggered when keys>buckets) prevents the attack
-entirely, and makes such attacks relatively benign.
-
-(cherry picked from commit f1220d61455253b170e81427c9d0357831ca0fac)
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-
---
- ext/Hash-Util-FieldHash/t/10_hash.t | 18 ++++++++++++++++--
- hv.c                                | 35 ++++++++---------------------------
- t/op/hash.t                         | 20 +++++++++++++++++---
- 3 files changed, 41 insertions(+), 32 deletions(-)
-
-diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
-index 2cfb4e8..d58f053 100644
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
-+++ b/ext/Hash-Util-FieldHash/t/10_hash.t
-@@ -38,15 +38,29 @@ use constant START     => "a";
- 
- # some initial hash data
- fieldhash my %h2;
-%h2 = map {$_ => 1} 'a'..'cc';
-+my $counter= "a";
-+$h2{$counter++}++ while $counter ne 'cd';
- 
- ok (!Internals::HvREHASH(%h2), 
-     "starting with pre-populated non-pathological hash (rehash flag if off)");
- 
- my @keys = get_keys(\%h2);
-+my $buckets= buckets(\%h2);
- $h2{$_}++ for @keys;
-+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
- ok (Internals::HvREHASH(%h2), 
-    scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
-+    scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
-+
-+# returns the number of buckets in a hash
-+sub buckets {
-+    my $hr = shift;
-+    my $keys_buckets= scalar(%$hr);
-+    if ($keys_buckets=~m!/([0-9]+)\z!) {
-+        return 0+$1;
-+    } else {
-+        return 8;
-+    }
-+}
- 
- sub get_keys {
-     my $hr = shift;
-diff --git a/hv.c b/hv.c
-index 2be1feb..abb9d76 100644
--- a/hv.c
-+++ b/hv.c
-@@ -35,7 +35,8 @@ holds the key and hash value.
- #define PERL_HASH_INTERNAL_ACCESS
- #include "perl.h"
- 
-#define HV_MAX_LENGTH_BEFORE_SPLIT 14
-+#define HV_MAX_LENGTH_BEFORE_REHASH 14
-+#define SHOULD_DO_HSPLIT(xhv) ((xhv)->xhv_keys > (xhv)->xhv_max) /* HvTOTALKEYS(hv) > HvMAX(hv) */
- 
- static const char S_strtab_error[]
-     = "Cannot modify shared string table in hv_%s";
-@@ -794,29 +795,9 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
-     if (masked_flags & HVhek_ENABLEHVKFLAGS)
- 	HvHASKFLAGS_on(hv);
- 
-    {
-	const HE *counter = HeNEXT(entry);
-
-	xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
-	if (!counter) {				/* initial entry? */
-	} else if (xhv->xhv_keys > xhv->xhv_max) {
-		/* Use only the old HvKEYS(hv) > HvMAX(hv) condition to limit
-		   bucket splits on a rehashed hash, as we're not going to
-		   split it again, and if someone is lucky (evil) enough to
-		   get all the keys in one list they could exhaust our memory
-		   as we repeatedly double the number of buckets on every
-		   entry. Linear search feels a less worse thing to do.  */
-	    hsplit(hv);
-	} else if(!HvREHASH(hv)) {
-	    U32 n_links = 1;
-
-	    while ((counter = HeNEXT(counter)))
-		n_links++;
-
-	    if (n_links > HV_MAX_LENGTH_BEFORE_SPLIT) {
-		hsplit(hv);
-	    }
-	}
-+    xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
-+    if ( SHOULD_DO_HSPLIT(xhv) ) {
-+        hsplit(hv);
-     }
- 
-     if (return_svp) {
-@@ -1192,7 +1173,7 @@ S_hsplit(pTHX_ HV *hv)
- 
- 
-     /* Pick your policy for "hashing isn't working" here:  */
-    if (longest_chain <= HV_MAX_LENGTH_BEFORE_SPLIT /* split worked?  */
-+    if (longest_chain <= HV_MAX_LENGTH_BEFORE_REHASH /* split worked?  */
- 	|| HvREHASH(hv)) {
- 	return;
-     }
-@@ -2831,8 +2812,8 @@ S_share_hek_flags(pTHX_ const char *str, I32 len, register U32 hash, int flags)
- 
- 	xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
- 	if (!next) {			/* initial entry? */
-	} else if (xhv->xhv_keys > xhv->xhv_max /* HvKEYS(hv) > HvMAX(hv) */) {
-		hsplit(PL_strtab);
-+	} else if ( SHOULD_DO_HSPLIT(xhv) ) {
-+            hsplit(PL_strtab);
- 	}
-     }
- 
-diff --git a/t/op/hash.t b/t/op/hash.t
-index 278bea7..201260a 100644
--- a/t/op/hash.t
-+++ b/t/op/hash.t
-@@ -39,22 +39,36 @@ use constant THRESHOLD => 14;
- use constant START     => "a";
- 
- # some initial hash data
-my %h2 = map {$_ => 1} 'a'..'cc';
-+my %h2;
-+my $counter= "a";
-+$h2{$counter++}++ while $counter ne 'cd';
- 
- ok (!Internals::HvREHASH(%h2), 
-     "starting with pre-populated non-pathological hash (rehash flag if off)");
- 
- my @keys = get_keys(\%h2);
-+my $buckets= buckets(\%h2);
- $h2{$_}++ for @keys;
-+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
- ok (Internals::HvREHASH(%h2), 
-    scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
-+    scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
-+
-+# returns the number of buckets in a hash
-+sub buckets {
-+    my $hr = shift;
-+    my $keys_buckets= scalar(%$hr);
-+    if ($keys_buckets=~m!/([0-9]+)\z!) {
-+        return 0+$1;
-+    } else {
-+        return 8;
-+    }
-+}
- 
- sub get_keys {
-     my $hr = shift;
- 
-     # the minimum of bits required to mount the attack on a hash
-     my $min_bits = log(THRESHOLD)/log(2);
-
-     # if the hash has already been populated with a significant amount
-     # of entries the number of mask bits can be higher
-     my $keys = scalar keys %$hr;
-- 
-1.8.3.1
-
@@ -1,21 +0,0 @@
-Upstream-Status:Inappropriate [embedded specific]
-
-Correctly identify arch-specific modules in ext/ where the .pm files
-are under lib.
-
-Ensure that POSIX/SigAction is kept with the rest of the POSIX module
-under archlib.
-
-Index: perl-5.12.3/installperl
-===================================================================
--- perl-5.12.3.orig/installperl
-+++ perl-5.12.3/installperl
-@@ -750,7 +750,7 @@ sub installlib {
-     }
- 
-     if (-f $_) {
-	if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
-+	if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) {
- 	    $installlib = $installprivlib;
- 	    #We're installing *.al and *.ix files into $installprivlib,
- 	    #but we have to delete old *.al and *.ix files from the 5.000
@@ -1,298 +0,0 @@
-Upstream-Status:Inappropriate [embedded specific]
-
-Index: perl-5.14.2/Makefile.SH
-===================================================================
--- perl-5.14.2.orig/Makefile.SH
-+++ perl-5.14.2/Makefile.SH
-@@ -36,7 +36,7 @@ case "$useshrplib" in
- true)
- 	# Prefix all runs of 'miniperl' and 'perl' with
- 	# $ldlibpth so that ./perl finds *this* shared libperl.
-	ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
-+	#ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
- 
- 	pldlflags="$cccdlflags"
- 	static_ldflags=''
-@@ -114,7 +114,8 @@ true)
- 	        ldlibpth=''
- 	        ;;
- 	    *)
-		eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
-+# We compile in the library path in OE from cross-compile, so lets not do this
-+#		eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
- 		;;
- 	    esac
- 	    # Strip off any trailing :'s
-@@ -135,18 +136,7 @@ true)
- 	    # INSTALL file, under "Building a shared perl library".
- 	    # If there is no pre-existing $libperl, we don't need
- 	    # to do anything further.
-	    if test -f $archlib/CORE/$libperl; then
-		rm -f preload
-		cat <<'EOT' > preload
-#! /bin/sh
-lib=$1
-shift
-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
-exec "$@"
-EOT
-		chmod 755 preload
-		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
-	    fi
-+	    echo linux libraries overwritten by cross-compile patches
- 	    ;;
- 	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
- 		;;
-@@ -529,9 +519,19 @@ splintfiles = $(c1)
- .c.s:
- 	$(CCCMDSRC) -S $*.c
- 
-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
-	@echo " ";
-	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
-+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
-+#	@echo " ";
-+#	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
-+
-+all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles)
-+
-+more: $(generated_pods) $(private) $(public)
-+
-+more2: $(dynamic_ext)
-+
-+more3: $(nonxs_ext)
-+
-+more4: extras.make
- 
- .PHONY: all translators utilities
- 
-@@ -539,7 +539,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(
- # by make_patchnum.pl.
- git_version.h: lib/Config_git.pl
- 
-lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl
-+lib/Config_git.pl: make_patchnum.pl
- 	$(MINIPERL) make_patchnum.pl
- 
- # make sure that we recompile perl.c if the git version changes
-@@ -552,8 +552,8 @@ perl$(OBJ_EXT): git_version.h
- # loading, we need to build perl first.
- case "$usedl" in
- define)
-    util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
-     x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
-+    util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
-+     x2p_deps='$(CONFIGPM) $(dynamic_ext) FORCE'
-     ;;
- *)  util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
-      x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
-@@ -627,7 +627,7 @@ generate_uudmap$(HOST_EXE_EXT): generate
- miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
- 	$(CCCMD) $(PLDLFLAGS) $*.c
- 
-perlmain.c: $(MINIPERL_EXE) lib/ExtUtils/Miniperl.pm
-+perlmain.c: lib/ExtUtils/Miniperl.pm
- 	$(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(@ARGV)' DynaLoader $(static_ext) > perlmain.c
- 
- perlmain$(OBJ_EXT): perlmain.c
-@@ -691,7 +691,7 @@ PERLEXPORT		= perl.exp
- 	;;
- 	esac
- 	$spitshell >>$Makefile <<'!NO!SUBS!'
-perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH)
-+perl.exp: makedef.pl config.sh $(SYM) $(SYMH)
- 	./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp
- 
- !NO!SUBS!
-@@ -700,7 +700,7 @@ os2)
- 	$spitshell >>$Makefile <<'!NO!SUBS!'
- MINIPERLEXP		= miniperl
- 
-perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
-+perl5.def:  makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
- 	./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
- 
- !NO!SUBS!
-@@ -757,7 +757,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI
- 	true)
- 		$spitshell >>$Makefile <<'!NO!SUBS!'
- 	rm -f $@
-	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
-+	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
- !NO!SUBS!
- 		case "$osname" in
- 		aix)
-@@ -798,7 +798,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
- 	$(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) \
- 	    $(mini_obj) \
- 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
-	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-+	mv -f miniperl miniperl-target
-+	ln -s hostperl miniperl
-+#	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
- !NO!SUBS!
- 		;;
- 	next4*)
-@@ -806,7 +808,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
- $(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) perlmini$(OBJ_EXT) opmini$(OBJ_EXT)
- 	$(CC) -o $(MINIPERL_EXE) $(mini_obj) \
- 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
-	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-+	mv -f miniperl miniperl-target
-+	ln -s hostperl miniperl
-+#	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
- !NO!SUBS!
- 		;;
- 	darwin*)
-@@ -828,7 +832,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
- 	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
- 	    $(mini_obj) \
- 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
-	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-+	mv -f miniperl miniperl-target
-+	ln -s hostperl miniperl
-+#	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
- !NO!SUBS!
- 		;;
- 	*)
-@@ -838,7 +844,10 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
- 	$(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
- 	    $(mini_obj) \
- 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
-	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-+
-+	mv -f miniperl miniperl-target
-+	ln -s hostperl miniperl
-+#	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
- !NO!SUBS!
- 		;;
- 	esac
-@@ -960,7 +969,7 @@ case "${osname}" in
- catamount)
- $spitshell >>$Makefile <<!GROK!THIS!
- .PHONY: makeppport
-makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
-+makeppport: \$(CONFIGPM)
- 	-@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
- 	(cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
- 	done
-@@ -970,7 +979,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
- *)
- $spitshell >>$Makefile <<'!NO!SUBS!'
- .PHONY: makeppport
-makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext)
-+makeppport: $(CONFIGPM) $(nonxs_ext)
- 	$(MINIPERL) $(Icwd) mkppport
- 
- !NO!SUBS!
-@@ -980,22 +989,22 @@ esac
- $spitshell >>$Makefile <<'!NO!SUBS!'
- 
- .PHONY: preplibrary
-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
-+preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
- 
- $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
- 
-$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl
-+$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl
- 	$(MINIPERL) configpm
- 
-lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM)
-+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
- 	$(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
- 
-lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
-+lib/buildcustomize.pl: write_buildcustomize.pl
- 	$(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
- 
- unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
- 
-uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
-+uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
- 	$(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
- #	Commented out so always runs, mktables looks at far more files than we
- #	can in this makefile to decide if needs to run or not
-@@ -1004,21 +1013,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
- # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re
- # But also this ensures that all extensions are built before we try to scan
- # them, which picks up Devel::PPPort's documentation.
-pod/perltoc.pod: $(perltoc_pod_prereqs)  $(PERL_EXE) $(ext) pod/buildtoc
-	$(RUN_PERL) -f -Ilib pod/buildtoc --build-toc -q
-+pod/perltoc.pod: $(perltoc_pod_prereqs)  $(ext) pod/buildtoc
-+	$(MINIPERL) -f -Ilib pod/buildtoc --build-toc -q
- 
- pod/perlapi.pod: pod/perlintern.pod
- 
-pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
-+pod/perlintern.pod: autodoc.pl embed.fnc
- 	$(MINIPERL) autodoc.pl
- 
-pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
-+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
- 	$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
- 
- pod/perl5143delta.pod: pod/perldelta.pod
- 	$(LNS) perldelta.pod pod/perl5143delta.pod
- 
-extra.pods: $(MINIPERL_EXE)
-+extra.pods: 
- 	-@test ! -f extra.pods || rm -f `cat extra.pods`
- 	-@rm -f extra.pods
- 	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -1058,11 +1067,7 @@ no-install:
- INSTALL_DEPENDENCE = all
- 
- install.perl:	$(INSTALL_DEPENDENCE) installperl
-	$(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
-	-@test ! -s extras.lst || $(MAKE) extras.install
-
-install.man:	all installman
-	$(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
-+	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
- 
- # XXX Experimental. Hardwired values, but useful for testing.
- # Eventually Configure could ask for some of these values.
-@@ -1161,16 +1166,16 @@ manicheck:	FORCE
- #
- # DynaLoader may be needed for extensions that use Makefile.PL.
- 
-$(DYNALOADER):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
-+$(DYNALOADER):	lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
- 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
- 
-d_dummy $(dynamic_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
-+d_dummy $(dynamic_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
- 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
- 
-s_dummy $(static_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
-+s_dummy $(static_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
- 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
- 
-n_dummy $(nonxs_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
-+n_dummy $(nonxs_ext):	lib/buildcustomize.pl preplibrary FORCE
- 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
- !NO!SUBS!
- 
-@@ -1365,10 +1370,10 @@ _test:
- 
- test_prep_pre: preplibrary utilities $(nonxs_ext)
- 
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
-+test_prep: test_prep_pre $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
- 	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
- 
-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
-+test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
- 	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
- 	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
- 
-@@ -1459,7 +1464,7 @@ minitest.prep:
- 
- # Can't depend on lib/Config.pm because that might be where miniperl
- # is crashing.
-minitest: $(MINIPERL_EXE) minitest.prep
-+minitest: minitest.prep
- 	- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
- 		&& $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
- 
@@ -1,27 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From f624a9f1206cdd44fde99c40d82e2f326db485dd Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sat, 1 Nov 2008 15:10:16 +0200
-Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate
- slower build hosts
-
-Bug-Debian: http://bugs.debian.org/501970
-
-Patch-Name: debian/arm_thread_stress_timeout.diff
---
- dist/threads-shared/t/stress.t |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
-index adfd1ed..652a3e6 100644
--- a/dist/threads-shared/t/stress.t
-+++ b/dist/threads-shared/t/stress.t
-@@ -34,7 +34,7 @@ use threads::shared;
- {
-     my $cnt = 50;
- 
-    my $TIMEOUT = 60;
-+    my $TIMEOUT = 150;
- 
-     my $mutex = 1;
-     share($mutex);
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Mon, 6 Jul 2009 22:17:53 +0300
-Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
-
-This is a configuration file and needs to go in /etc by policy.
-Besides, /usr may not even be writable.
-
-This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
-
-See #533707.
-
-Patch-Name: debian/cpanplus_config_path.diff
---
- cpan/CPANPLUS/lib/CPANPLUS/Configure.pm           |    1 +
- cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm |    3 +++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-index ba1ca07..25cbe5f 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
-@@ -280,6 +280,7 @@ Saves the configuration to the package name you provided.
- If this package is not C<CPANPLUS::Config::System>, it will
- be saved in your C<.cpanplus> directory, otherwise it will
- be attempted to be saved in the system wide directory.
-+(On Debian systems, this system wide directory is /etc/perl.)
- 
- If no argument is provided, it will default to your personal
- config.
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-index 443d5a4..f7085a8 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
-@@ -209,6 +209,9 @@ use constant CONFIG_USER_FILE    => sub {
-                                     ) . '.pm';
-                                 };
- use constant CONFIG_SYSTEM_FILE  => sub {
-+                                    # Debian-specific shortcut
-+                                    return '/etc/perl/CPANPLUS/Config/System.pm';
-+                                    
-                                     require CPANPLUS::Internals;
-                                     require File::Basename;
-                                     my $dir = File::Basename::dirname(
@@ -1,56 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 66517b14790aa6410fd37e411dd62521e1e02b7f Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Mon, 6 Jul 2009 21:58:41 +0300
-Subject: Configure CPANPLUS to use the site directories by default.
-
-Bug-Debian: http://bugs.debian.org/533707
-
-The core modules usually default to INSTALLDIRS=perl (ExtUtils::MakeMaker)
-or installdirs=core (Module::Build), so we need to explicitly ask for
-the site destination to get upgraded versions into /usr/local.
-
-See also the sister patch, debian/cpan_definstalldirs .
-
-Patch-Name: debian/cpanplus_definstalldirs.diff
---
- cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm |   30 +++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+), 0 deletions(-)
- create mode 100644 cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
-
-diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
-new file mode 100644
-index 0000000..5e6e11e
--- /dev/null
-+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
-@@ -0,0 +1,30 @@
-+### minimal pod, so you can find it with perldoc -l, etc
-+=pod
-+
-+=head1 NAME
-+
-+CPANPLUS::Config::System
-+
-+=head1 DESCRIPTION
-+
-+This is a CPANPLUS configuration file that sets appropriate default
-+settings on Debian systems.
-+
-+The only preconfigured settings are C<makemakerflags> (set to
-+C<INSTALLDIRS=site>) and C<buildflags> (set to C<--installdirs site>).
-+
-+These settings will not have any effect if
-+C</etc/perl/CPANPLUS/Config/System.pm> is present.
-+
-+=cut
-+
-+
-+package CPANPLUS::Config::System;
-+
-+sub setup {
-+    my $conf = shift;
-+    $conf->set_conf( makemakerflags => 'INSTALLDIRS=site' );    
-+    $conf->set_conf( buildflags => '--installdirs site' );    
-+}
-+
-+1;
@@ -1,407 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <dom@earth.li>
-Date: Mon, 17 May 2010 13:23:07 +0300
-Subject: Point users to Debian packages of deprecated core modules
-
-Bug-Debian: http://bugs.debian.org/580034
-
-Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
-deprecated from the Perl core in 5.12.0.
-
-Class::ISA, Switch, Pod::Plainer were removed from the Perl core in
-5.14.0.
-
-Shell and Devel::DProf, and Perl 4 libraries, were deprecated from the
-Perl core in 5.14.0.
-
-To get a clean transition, perl/perl-modules is going to recommend the
-separate Debian packages of these for one release cycle so that they will be
-pulled in by default on upgrades.
-
-However, on systems configured to ignore recommendations the deprecation
-warnings will still be useful, so modify them slightly to point to the
-separate packages instead.
-
-Patch-Name: debian/deprecate-with-apt.diff
---
- lib/abbrev.pl     |    2 +-
- lib/assert.pl     |    2 +-
- lib/bigfloat.pl   |    2 +-
- lib/bigint.pl     |    2 +-
- lib/bigrat.pl     |    2 +-
- lib/cacheout.pl   |    2 +-
- lib/complete.pl   |    2 +-
- lib/ctime.pl      |    2 +-
- lib/deprecate.pm  |   16 +++++++++++++++-
- lib/dotsh.pl      |    2 +-
- lib/exceptions.pl |    2 +-
- lib/fastcwd.pl    |    2 +-
- lib/find.pl       |    2 +-
- lib/finddepth.pl  |    2 +-
- lib/flush.pl      |    2 +-
- lib/getcwd.pl     |    2 +-
- lib/getopt.pl     |    2 +-
- lib/getopts.pl    |    2 +-
- lib/hostname.pl   |    2 +-
- lib/importenv.pl  |    2 +-
- lib/look.pl       |    2 +-
- lib/newgetopt.pl  |    2 +-
- lib/open2.pl      |    2 +-
- lib/open3.pl      |    2 +-
- lib/pwd.pl        |    2 +-
- lib/shellwords.pl |    2 +-
- lib/stat.pl       |    2 +-
- lib/syslog.pl     |    2 +-
- lib/tainted.pl    |    2 +-
- lib/termcap.pl    |    2 +-
- lib/timelocal.pl  |    2 +-
- lib/validate.pl   |    2 +-
- 32 files changed, 46 insertions(+), 32 deletions(-)
-
-diff --git a/lib/abbrev.pl b/lib/abbrev.pl
-index d46321f..0168631 100644
--- a/lib/abbrev.pl
-+++ b/lib/abbrev.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# Usage:
- ;#	%foo = ();
-diff --git a/lib/assert.pl b/lib/assert.pl
-index d47e006..80593c5 100644
--- a/lib/assert.pl
-+++ b/lib/assert.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- #
- # This library is no longer being maintained, and is included for backward
-diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl
-index 82d0f5c..c21bac6 100644
--- a/lib/bigfloat.pl
-+++ b/lib/bigfloat.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- package bigfloat;
- require "bigint.pl";
-diff --git a/lib/bigint.pl b/lib/bigint.pl
-index 6de1c53..031e8ad 100644
--- a/lib/bigint.pl
-+++ b/lib/bigint.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- package bigint;
- #
-diff --git a/lib/bigrat.pl b/lib/bigrat.pl
-index aaf1713..146a8f4 100644
--- a/lib/bigrat.pl
-+++ b/lib/bigrat.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- package bigrat;
- require "bigint.pl";
-diff --git a/lib/cacheout.pl b/lib/cacheout.pl
-index a5da453..937405d 100644
--- a/lib/cacheout.pl
-+++ b/lib/cacheout.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- #
- # This library is no longer being maintained, and is included for backward
-diff --git a/lib/complete.pl b/lib/complete.pl
-index 9ed041c..2ab0c6a 100644
--- a/lib/complete.pl
-+++ b/lib/complete.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;#
- #
-diff --git a/lib/ctime.pl b/lib/ctime.pl
-index aa00d00..ac24e71 100644
--- a/lib/ctime.pl
-+++ b/lib/ctime.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function.
- #
-diff --git a/lib/deprecate.pm b/lib/deprecate.pm
-index 7562c69..fc548b0 100644
--- a/lib/deprecate.pm
-+++ b/lib/deprecate.pm
-@@ -7,6 +7,14 @@ our $VERSION = 0.02;
- our %Config;
- unless (%Config) { require Config; *Config = \%Config::Config; }
- 
-+# Debian-specific change: recommend the separate Debian packages of
-+# deprecated modules where available
-+
-+my %DEBIAN_PACKAGES = (
-+    "Shell"		=> "libshell-perl",
-+    "Devel::DProf"	=> "libdevel-dprof-perl"
-+);
-+
- # This isn't a public API. It's internal to code maintained by the perl-porters
- # If you would like it to be a public API, please send a patch with
- # documentation and tests. Until then, it may change without warning.
-@@ -58,9 +66,15 @@ EOM
- 	if (defined $callers_bitmask
- 	    && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
- 		|| vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
-	    warn <<"EOM";
-+		if (my $deb = $DEBIAN_PACKAGES{$package}) {
-+		    warn <<"EOM";
-+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line.
-+EOM
-+		} else {
-+		    warn <<"EOM";
- $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line.
- EOM
-+		}
- 	}
-     }
- }
-diff --git a/lib/dotsh.pl b/lib/dotsh.pl
-index 92f1f4c..4085122 100644
--- a/lib/dotsh.pl
-+++ b/lib/dotsh.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- #
- #   @(#)dotsh.pl                                               03/19/94
-diff --git a/lib/exceptions.pl b/lib/exceptions.pl
-index 8af64c8..b5b1427 100644
--- a/lib/exceptions.pl
-+++ b/lib/exceptions.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # exceptions.pl
- # tchrist@convex.com
-diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl
-index 70007a1..2c7c42e 100644
--- a/lib/fastcwd.pl
-+++ b/lib/fastcwd.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # By John Bazik
- #
-diff --git a/lib/find.pl b/lib/find.pl
-index 8e1b42c..7fb2fbf 100644
--- a/lib/find.pl
-+++ b/lib/find.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This library is deprecated and unmaintained. It is included for
- # compatibility with Perl 4 scripts which may use it, but it will be
-diff --git a/lib/finddepth.pl b/lib/finddepth.pl
-index 479905f..c07cea5 100644
--- a/lib/finddepth.pl
-+++ b/lib/finddepth.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This library is deprecated and unmaintained. It is included for
- # compatibility with Perl 4 scripts which may use it, but it will be
-diff --git a/lib/flush.pl b/lib/flush.pl
-index c427976..e5ed0ae 100644
--- a/lib/flush.pl
-+++ b/lib/flush.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- #
- # This library is no longer being maintained, and is included for backward
-diff --git a/lib/getcwd.pl b/lib/getcwd.pl
-index 77b2442..3810a99 100644
--- a/lib/getcwd.pl
-+++ b/lib/getcwd.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # By Brandon S. Allbery
- #
-diff --git a/lib/getopt.pl b/lib/getopt.pl
-index 1d4008a..019a165 100644
--- a/lib/getopt.pl
-+++ b/lib/getopt.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
- #
-diff --git a/lib/getopts.pl b/lib/getopts.pl
-index 37ecb4a..3d27418 100644
--- a/lib/getopts.pl
-+++ b/lib/getopts.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# getopts.pl - a better getopt.pl
- #
-diff --git a/lib/hostname.pl b/lib/hostname.pl
-index f57375e..b055d30 100644
--- a/lib/hostname.pl
-+++ b/lib/hostname.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # From: asherman@fmrco.com (Aaron Sherman)
- #
-diff --git a/lib/importenv.pl b/lib/importenv.pl
-index 625edf6..52ee722 100644
--- a/lib/importenv.pl
-+++ b/lib/importenv.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This library is no longer being maintained, and is included for backward
- # compatibility with Perl 4 programs which may require it.
-diff --git a/lib/look.pl b/lib/look.pl
-index 7be55b2..12dcace 100644
--- a/lib/look.pl
-+++ b/lib/look.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# Usage: &look(*FILEHANDLE,$key,$dict,$fold)
- #
-diff --git a/lib/newgetopt.pl b/lib/newgetopt.pl
-index 4ac9470..08df6cb 100644
--- a/lib/newgetopt.pl
-+++ b/lib/newgetopt.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This library is no longer being maintained, and is included for backward
- # compatibility with Perl 4 programs which may require it.
-diff --git a/lib/open2.pl b/lib/open2.pl
-index ceb5653..a05f2ab 100644
--- a/lib/open2.pl
-+++ b/lib/open2.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This legacy library is deprecated and will be removed in a future
- # release of perl.
-diff --git a/lib/open3.pl b/lib/open3.pl
-index 9f4d5a4..27f7ab4 100644
--- a/lib/open3.pl
-+++ b/lib/open3.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This legacy library is deprecated and will be removed in a future
- # release of perl.
-diff --git a/lib/pwd.pl b/lib/pwd.pl
-index bd8123b..bdace6e 100644
--- a/lib/pwd.pl
-+++ b/lib/pwd.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# pwd.pl - keeps track of current working directory in PWD environment var
- ;#
-diff --git a/lib/shellwords.pl b/lib/shellwords.pl
-index b562f5f..7f16375 100644
--- a/lib/shellwords.pl
-+++ b/lib/shellwords.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# This legacy library is deprecated and will be removed in a future
- ;# release of perl.
-diff --git a/lib/stat.pl b/lib/stat.pl
-index feda273..910ce1c 100644
--- a/lib/stat.pl
-+++ b/lib/stat.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# This legacy library is deprecated and will be removed in a future
- ;# release of perl.
-diff --git a/lib/syslog.pl b/lib/syslog.pl
-index 7504a5d..4c2b95f 100644
--- a/lib/syslog.pl
-+++ b/lib/syslog.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- #
- # syslog.pl
-diff --git a/lib/tainted.pl b/lib/tainted.pl
-index e88bca1..d58c765 100644
--- a/lib/tainted.pl
-+++ b/lib/tainted.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- # This legacy library is deprecated and will be removed in a future
- # release of perl.
-diff --git a/lib/termcap.pl b/lib/termcap.pl
-index a84cba3..e641f4d 100644
--- a/lib/termcap.pl
-+++ b/lib/termcap.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $
- #
-diff --git a/lib/timelocal.pl b/lib/timelocal.pl
-index fefb9da..2297888 100644
--- a/lib/timelocal.pl
-+++ b/lib/timelocal.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# timelocal.pl
- ;#
-diff --git a/lib/validate.pl b/lib/validate.pl
-index fc2d16a..1a8aef4 100644
--- a/lib/validate.pl
-+++ b/lib/validate.pl
-@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
- 
- ;# The validate routine takes a single multiline string consisting of
- ;# lines containing a filename plus a file test to try on it.  (The
@@ -1,31 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 90c7967530102c66bbff25d89273d3f0bf189a83 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Fri, 10 Apr 2009 01:17:43 +0300
-Subject: Disable zlib bundling in Compress::Raw::Zlib
-
-Compress::Raw::Zlib statically links its bundled version of zlib
-by default, but we use the system library instead.
-
-Patch-Name: debian/disable-zlib-bundling.diff
---
- cpan/Compress-Raw-Zlib/config.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cpan/Compress-Raw-Zlib/config.in b/cpan/Compress-Raw-Zlib/config.in
-index c56cc03..2c6659b 100644
--- a/cpan/Compress-Raw-Zlib/config.in
-+++ b/cpan/Compress-Raw-Zlib/config.in
-@@ -16,9 +16,9 @@
- #    Setting the Gzip OS Code
- #
- 
-BUILD_ZLIB      = True
-INCLUDE         = ./zlib-src
-LIB             = ./zlib-src
-+BUILD_ZLIB      = False
-+INCLUDE         = /usr/include
-+LIB             = /usr/lib
- 
- OLD_ZLIB        = False
- GZIP_OS_CODE    = AUTO_DETECT
@@ -1,24 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 334ac01a8306485ed901f4fb45d79f39a944fe77 Mon Sep 17 00:00:00 2001
-From: Brendan O'Dea <bod@debian.org>
-Date: Tue, 8 Mar 2005 19:30:38 +1100
-Subject: EU:MM: Set location of libperl.a to /usr/lib
-
-Patch-Name: debian/extutils_set_libperl_path.diff
---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 4ee6b3f..42bbb83 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2409,7 +2409,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
- 	($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
-     }
-     unless ($libperl && -f $lperl) { # Ilya's code...
-	my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
-+	my $dir = $self->{PERL_SRC} || "/usr/lib";
- 	$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
- 	$libperl ||= "libperl$self->{LIB_EXT}";
- 	$libperl   = "$dir/$libperl";
@@ -1,45 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001
-From: Brendan O'Dea <bod@debian.org>
-Date: Fri, 18 Mar 2005 22:22:25 +1100
-Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
-
-Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
-time the rule is evaluated rather than when the Makefile is created.
-
-This is required when building packages with dpkg-buildpackage and fakeroot,
-since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
-rule where the Makefile is created, but is for the clean/binary* targets.
-
-Patch-Name: debian/fakeroot.diff
---
- Makefile.SH |    9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.SH b/Makefile.SH
-index eb6326a..1dac585 100755
--- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -36,12 +36,7 @@ case "$useshrplib" in
- true)
- 	# Prefix all runs of 'miniperl' and 'perl' with
- 	# $ldlibpth so that ./perl finds *this* shared libperl.
-	case "$LD_LIBRARY_PATH" in
-	'')
-		ldlibpth="LD_LIBRARY_PATH=`pwd`";;
-	*)
-		ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
-	esac
-+	ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
- 
- 	pldlflags="$cccdlflags"
- 	static_ldflags=''
-@@ -112,7 +107,7 @@ true)
- 	    ;;
- 	esac
- 	case "$ldlibpthname" in
-	'') ;;
-+	''|LD_LIBRARY_PATH) ;;
- 	*)
- 	    case "$osname" in
- 	    os2)
@@ -1,87 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
-Bug-Debian: http://bugs.debian.org/624460
-Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
-
-Patch-Name: fixes/extutils-cbuilder-cflags.diff
---
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
-  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
-  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index db0ef98..49819a1 100644
--- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
-use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -328,6 +328,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
@@ -1,70 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Wed, 18 May 2011 21:44:06 -0700
-Subject: Make h2ph correctly search gcc include directories
-
-Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122
-Bug-Debian: http://bugs.debian.org/625808
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77
-
-System header conversion with "h2ph -a" is currently broken on Ubuntu
-Natty and Oneiric (unless the gcc-multilib package is installed for
-backward compatibility), resulting in things like
-
- # perl -e 'require "syscall.ph"'
- Can't locate asm/unistd.ph in @INC [...]
-
-This happens because Ubuntu has switched to a 'multiarch' setup, see
-<https://wiki.ubuntu.com/MultiarchSpec> for details.
-
-The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm
-is now /usr/include/x86_64-linux-gnu/asm. (The third component of the
-new path varies with the actual architecture.)
-
-gcc --print-search-dirs doesn't really tell anything about where gcc
-looks for the include directories, it was just used to find the gcc
-internal directory prefix.
-
-Parse the output of "gcc -v -E" instead, and append $Config{usrinc}
-for safety. Duplicates shouldn't matter.
-
-The h2ph "-a" switch isn't currently tested automatically, and that
-seems nontrivial to do portably. Manual testing was done with
-
- # mkdir ttt
- # ./perl -Ilib ./utils/h2ph -a -d $(pwd)/ttt syscall.h
-
-The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3.
-
-http://bugs.debian.org/625808
-https://bugs.launchpad.net/bugs/777903
-
-Patch-Name: fixes/h2ph-multiarch.diff
---
- utils/h2ph.PL |   12 ++----------
- 1 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 87f3c7d..4545d6d 100644
--- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -761,16 +761,8 @@ sub queue_includes_from
- # non-GCC?) C compilers, but gcc uses additional include directories.
- sub inc_dirs
- {
-    my $from_gcc    = `LC_ALL=C $Config{cc} -v 2>&1`;
-    if( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) )
-    { # gcc-4+ :
-       $from_gcc   = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`;
-       if ( !($from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s) )
-       {
-           $from_gcc = '';
-       };
-    };
-    length($from_gcc) ? ($from_gcc, $from_gcc . "-fixed", $Config{usrinc}) : ($Config{usrinc});
-+    my $from_gcc   = `LC_ALL=C $Config{cc} -v -E - < /dev/null 2>&1 | awk '/^#include/, /^End of search list/' | grep '^ '`;
-+    length($from_gcc) ? (split(' ', $from_gcc), $Config{usrinc}) : ($Config{usrinc});
- }
- 
- 
@@ -1,74 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001
-From: David Mitchell <davem@iabyn.com>
-Date: Tue, 28 Jun 2011 17:04:40 +0100
-Subject: RT 64804: tainting with index() of a constant
-
-Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804
-Bug-Debian: http://bugs.debian.org/291450
-Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1
-
-At compile time, ck_index with a tainted constant set PL_tainted,
-which remained on during the rest of compilation, tainting all other
-constants.
-
-Fix this by saving and restoring PL_tainted across the call to
-fbm_compile, which is what sets PL_tainted.
-
-Patch-Name: fixes/index-tainting.diff
---
- op.c         |    5 ++++-
- t/op/taint.t |   16 +++++++++++++++-
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/op.c b/op.c
-index e21b9a4..973df13 100644
--- a/op.c
-+++ b/op.c
-@@ -7780,8 +7780,11 @@ Perl_ck_index(pTHX_ OP *o)
- 	OP *kid = cLISTOPo->op_first->op_sibling;	/* get past pushmark */
- 	if (kid)
- 	    kid = kid->op_sibling;			/* get past "big" */
-	if (kid && kid->op_type == OP_CONST)
-+	if (kid && kid->op_type == OP_CONST) {
-+	    const bool save_taint = PL_tainted;
- 	    fbm_compile(((SVOP*)kid)->op_sv, 0);
-+	    PL_tainted = save_taint;
-+	}
-     }
-     return ck_fun(o);
- }
-diff --git a/t/op/taint.t b/t/op/taint.t
-index 9df6fee..a300b9b 100644
--- a/t/op/taint.t
-+++ b/t/op/taint.t
-@@ -17,7 +17,7 @@ BEGIN {
- use strict;
- use Config;
- 
-plan tests => 774;
-+plan tests => 778;
- 
- $| = 1;
- 
-@@ -2144,6 +2144,20 @@ end
-     is_tainted $dest, "ucfirst(tainted) taints its return value";
- }
- 
-+
-+# tainted constants and index()
-+#  RT 64804; http://bugs.debian.org/291450
-+{
-+    ok(tainted $old_env_path, "initial taintedness");
-+    BEGIN { no strict 'refs'; my $v = $old_env_path; *{"::C"} = sub () { $v }; }
-+    ok(tainted C, "constant is tainted properly");
-+    ok(!tainted "", "tainting not broken yet");
-+    index(undef, C);
-+    ok(!tainted "", "tainting still works after index() of the constant");
-+}
-+
-+
-+
- # This may bomb out with the alarm signal so keep it last
- SKIP: {
-     skip "No alarm()"  unless $Config{d_alarm};
@@ -1,38 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <dom@earth.li>
-Date: Mon, 2 May 2011 10:35:04 +0100
-Subject: Fix failing tilde test when run under a UID without a passwd entry
-
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893
-Bug-Debian: http://bugs.debian.org/624850
-
-Patch-Name: fixes/module-build-home-directory.diff
---
- cpan/Module-Build/t/tilde.t |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t
-index fac821b..04f0210 100644
--- a/cpan/Module-Build/t/tilde.t
-+++ b/cpan/Module-Build/t/tilde.t
-@@ -46,7 +46,8 @@ SKIP: {
- 
-     unless (defined $home) {
-       my @info = eval { getpwuid $> };
-      skip "No home directory for tilde-expansion tests", 15 if $@;
-+      skip "No home directory for tilde-expansion tests", 15 if $@
-+        or !defined $info[7];
-       $home = $info[7];
-     }
- 
-@@ -95,7 +96,8 @@ SKIP: {
- # Again, with named users
- SKIP: {
-     my @info = eval { getpwuid $> };
-    skip "No home directory for tilde-expansion tests", 1 if $@;
-+    skip "No home directory for tilde-expansion tests", 1 if $@
-+        or !defined $info[7] or !defined $info[0];
-     my ($me, $home) = @info[0,7];
- 
-     my $expected = "$home/fooxzy";
@@ -1,146 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001
-From: Keith Thompson <kst@mib.org>
-Date: Fri, 29 Jul 2011 17:17:00 -0700
-Subject: Fix typos in several pod/perl*.pod files
-
-Bug-Debian: http://bugs.debian.org/637816
-Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d
-Patch-Name: fixes/pod_fixes.diff
---
- pod/perlfunc.pod     |    8 ++++----
- pod/perlglossary.pod |   10 +++++-----
- pod/perlmod.pod      |    4 ++--
- pod/perlretut.pod    |    6 +++---
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
-index 2ee3637..719a740 100644
--- a/pod/perlfunc.pod
-+++ b/pod/perlfunc.pod
-@@ -3918,7 +3918,7 @@ count.  A numeric repeat count may optionally be enclosed in brackets, as
- in C<pack("C[80]", @arr)>.  The repeat count gobbles that many values from
- the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>,
- C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means
-something else, dscribed below.  Supplying a C<*> for the repeat count
-+something else, described below.  Supplying a C<*> for the repeat count
- instead of a number means to use however many items are left, except for:
- 
- =over 
-@@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not
- well-defined.
- 
- Because C<< <=> >> returns C<undef> when either operand is C<NaN>
-(not-a-number), and laso because C<sort> raises an exception unless the
-+(not-a-number), and also because C<sort> raises an exception unless the
- result of a comparison is defined, be careful when sorting with a
- comparison function like C<< $a <=> $b >> any lists that might contain a
- C<NaN>.  The following example takes advantage that C<NaN != NaN> to
-@@ -5958,7 +5958,7 @@ specified.
- 
- A pattern matching the empty string (not to be confused with
- an empty pattern C<//>, which is just one member of the set of patterns
-matching the epmty string), splits EXPR into individual
-+matching the empty string), splits EXPR into individual
- characters.  For example:
- 
-     print join(':', split(/ */, 'hi there')), "\n";
-@@ -6222,7 +6222,7 @@ For example:
-   printf '<%.1e>', 10; # prints "<1.0e+01>"
- 
- For "g" and "G", this specifies the maximum number of digits to show,
-including thoe prior to the decimal point and those after it; for 
-+including those prior to the decimal point and those after it; for 
- example:
- 
-   # These examples are subject to system-specific variation.
-diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod
-index 639ce33..191371c 100644
--- a/pod/perlglossary.pod
-+++ b/pod/perlglossary.pod
-@@ -507,7 +507,7 @@ the class (its L<objects|/object>).  See also L</inheritance>.
- 
- =item class method
- 
-A L</method> whose L</invocand> is a L</package> name, not an
-+A L</method> whose L</invocant> is a L</package> name, not an
- L</object> reference.  A method associated with the class as a whole.
- 
- =item client
-@@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb
- indirect-object object" where L</STDOUT> is the recipient of the
- L<print|perlfunc/print> action, and C<"$foo"> is the object being
- printed.  Similarly, when invoking a L</method>, you might place the
-invocand between the method and its arguments:
-+invocant between the method and its arguments:
- 
-   $gollum = new Pathetic::Creature "Smeagol";
-   give $gollum "Fisssssh!";
-@@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable
- form (L<syntax trees|/syntax tree>) within the I<perl> process itself,
- which the Perl L</run time> system then interprets.
- 
-=item invocand
-+=item invocant
- 
- The agent on whose behalf a L</method> is invoked.  In a L</class>
-method, the invocand is a package name.  In an L</instance> method,
-the invocand is an object reference.
-+method, the invocant is a package name.  In an L</instance> method,
-+the invocant is an object reference.
- 
- =item invocation
- 
-diff --git a/pod/perlmod.pod b/pod/perlmod.pod
-index 5266f19..17de73e 100644
--- a/pod/perlmod.pod
-+++ b/pod/perlmod.pod
-@@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary.
- C<CLONE> will be called once as a class method for every package that has it
- defined (or inherits it).  It will be called in the context of the new thread,
- so all modifications are made in the new area.  Currently CLONE is called with
-no parameters other than the invocand package name, but code should not assume
-+no parameters other than the invocant package name, but code should not assume
- that this will remain unchanged, as it is likely that in future extra parameters
- will be passed in to give more information about the state of cloning.
- 
-@@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is
- needed.
- 
- Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other
-than the invocand package name, although that may change. Similarly, to
-+than the invocant package name, although that may change. Similarly, to
- allow for future expansion, the return value should be a single C<0> or
- C<1> value.
- 
-diff --git a/pod/perlretut.pod b/pod/perlretut.pod
-index ea80594..1c65f5b 100644
--- a/pod/perlretut.pod
-+++ b/pod/perlretut.pod
-@@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results.
- =head2 Relative backreferences
- 
- Counting the opening parentheses to get the correct number for a
-backreference is errorprone as soon as there is more than one
-+backreference is error-prone as soon as there is more than one
- capturing group.  A more convenient technique became available
- with Perl 5.10: relative backreferences. To refer to the immediately
- preceding capture group one now may write C<\g{-1}>, the next but
-@@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead.  So we have
- 
- =head3 Global matching
- 
-The final two modifiers we will disccuss here,
-+The final two modifiers we will discuss here,
- C<//g> and C<//c>, concern multiple matches.
- The modifier C<//g> stands for global matching and allows the
- matching operator to match within a string as many times as possible.
-@@ -1870,7 +1870,7 @@ substituted.
- 
- C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of
- double-quotish syntax, and not part of regexp syntax proper.  They will
-work if they appear in a regular expression embeddded directly in a
-+work if they appear in a regular expression embedded directly in a
- program, but not when contained in a string that is interpolated in a
- pattern.
- 
@@ -1,37 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Wed, 3 Aug 2011 22:36:24 +0300
-Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable
- messages
-
-Bug: http://rt.cpan.org/Ticket/Display.html?id=69997
-Bug-Debian: http://bugs.debian.org/627821
-
-Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel
-even when there's no listener, causing test failures.
-
-It seems probable that all FreeBSD-based systems suffer from the
-same issue, but that's for upstream to decide.
-
-Patch-Name: fixes/sys-syslog-socket-timeout-kfreebsd.patch
---
- cpan/Sys-Syslog/Syslog.pm |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
-index 002e6e4..b445c66 100644
--- a/cpan/Sys-Syslog/Syslog.pm
-+++ b/cpan/Sys-Syslog/Syslog.pm
-@@ -138,7 +138,10 @@ my @fallbackMethods = ();
- # happy, the timeout is now zero by default on all systems 
- # except on OSX where it is set to 250 msec, and can be set 
- # with the infamous setlogsock() function.
-$sock_timeout = 0.25 if $^O =~ /darwin/;
-+#
-+# Debian change: include Debian GNU/kFreeBSD, lower to 1ms
-+# see [rt.cpan.org #69997]
-+$sock_timeout = 0.001 if $^O =~ /darwin|gnukfreebsd/;
- 
- # coderef for a nicer handling of errors
- my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;
@@ -1,47 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 55a718425dc4612ac01850ef786f75f072b20b9e Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Mon, 8 Sep 2008 20:48:14 +0300
-Subject: Disable some threads tests on m68k for now due to missing TLS.
-
-Bug-Debian: http://bugs.debian.org/495826
-Bug-Debian: http://bugs.debian.org/517938
-
-Patch-Name: debian/m68k_thread_stress.diff
---
- dist/threads-shared/t/stress.t    |    4 ++++
- dist/threads-shared/t/waithires.t |    6 ++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
-index 652a3e6..2f1b576 100644
--- a/dist/threads-shared/t/stress.t
-+++ b/dist/threads-shared/t/stress.t
-@@ -11,6 +11,10 @@ BEGIN {
-         print("1..0 # SKIP Broken under HP-UX 10.20\n");
-         exit(0);
-     }
-+    if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
-+        print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
-+        exit(0);
-+    }
- }
- 
- use ExtUtils::testlib;
-diff --git a/dist/threads-shared/t/waithires.t b/dist/threads-shared/t/waithires.t
-index 3c3e852..349c5b4 100644
--- a/dist/threads-shared/t/waithires.t
-+++ b/dist/threads-shared/t/waithires.t
-@@ -16,6 +16,12 @@ BEGIN {
-     if (! eval 'use Time::HiRes "time"; 1') {
-         Test::skip_all('Time::HiRes not available');
-     }
-+
-+    if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
-+        print("1..0 # Skip: no TLS on m68k yet <http://bugs.debian.org/495826>\n");
-+        exit(0);
-+    }
-+
- }
- 
- use ExtUtils::testlib;
@@ -1,31 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From cf928101697efa4a46ada500c2f449caeb854fd4 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sun, 15 May 2011 19:35:58 +0300
-Subject: List packaged patches in patchlevel.h
-
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/567489
-
-The list of packaged patches is in patchlevel-debian.h, which is generated
-from the debian/patches/ directory when building the package.
-
-Patch-Name: debian/patchlevel.diff
---
- patchlevel.h |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/patchlevel.h b/patchlevel.h
-index 5dc2a53..1356595 100644
--- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
- 	,"uncommitted-changes"
- #endif
- 	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+#ifdef DEBIAN
-+#include "patchlevel-debian.h"
-+#endif
- 	,NULL
- };
- 
@@ -1,40 +0,0 @@
-debian/arm_thread_stress_timeout.diff
-debian/cpan_definstalldirs.diff
-debian/db_file_ver.diff
-debian/doc_info.diff
-debian/enc2xs_inc.diff
-debian/errno_ver.diff
-debian/libperl_embed_doc.diff
-fixes/respect_umask.diff
-debian/writable_site_dirs.diff
-debian/extutils_set_libperl_path.diff
-debian/no_packlist_perllocal.diff
-debian/prefix_changes.diff
-debian/fakeroot.diff
-debian/instmodsh_doc.diff
-debian/ld_run_path.diff
-debian/libnet_config_path.diff
-debian/m68k_thread_stress.diff
-debian/mod_paths.diff
-debian/module_build_man_extensions.diff
-debian/prune_libs.diff
-fixes/net_smtp_docs.diff
-debian/perlivp.diff
-debian/disable-zlib-bundling.diff
-debian/cpanplus_definstalldirs.diff
-debian/cpanplus_config_path.diff
-debian/deprecate-with-apt.diff
-fixes/hurd-ccflags.diff
-debian/squelch-locale-warnings.diff
-debian/skip-upstream-git-tests.diff
-fixes/extutils-cbuilder-cflags.diff
-fixes/module-build-home-directory.diff
-debian/patchlevel.diff
-fixes/h2ph-multiarch.diff
-fixes/index-tainting.diff
-debian/skip-kfreebsd-crash.diff
-fixes/document_makemaker_ccflags.diff
-fixes/sys-syslog-socket-timeout-kfreebsd.patch
-fixes/hurd-hints.diff
-fixes/pod_fixes.diff
-debian/find_html2text.diff
@@ -1,60 +0,0 @@
-Upstream-Status:Inappropriate [debian patches]
-From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Fri, 22 Apr 2011 11:15:32 +0300
-Subject: Skip tests specific to the upstream Git repository
-
-These tests fail if run from a different git repository than
-upstream. This complicates things needlessly for downstream packagers.
-
-Skip the tests altogether even if the .git directory exists.
-
-Patch-Name: debian/skip-upstream-git-tests.diff
---
- t/porting/authors.t     |    3 ++-
- t/porting/cmp_version.t |    3 ++-
- t/porting/manifest.t    |    3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/t/porting/authors.t b/t/porting/authors.t
-index 28ca1ca..3c7f069 100644
--- a/t/porting/authors.t
-+++ b/t/porting/authors.t
-@@ -9,7 +9,8 @@ BEGIN {
- use strict;
- use warnings;
- 
-if (! -d '.git' ) {
-+# Debian change: skip as we're probably in a different git repository
-+if (1 || ! -d '.git' ) {
-     print "1..0 # SKIP: not being run from a git checkout\n";
-     exit 0;
- }
-diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t
-index b3c677c..f89f2a7 100644
--- a/t/porting/cmp_version.t
-+++ b/t/porting/cmp_version.t
-@@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir);
- use Getopt::Std;
- use Maintainers;
- 
-if (! -d '.git' ) {
-+# Debian change: skip as we're probably in a different git repository
-+if (1 || ! -d '.git' ) {
-     print "1..0 # SKIP: not being run from a git checkout\n";
-     exit 0;
- }
-diff --git a/t/porting/manifest.t b/t/porting/manifest.t
-index 48dd3ac..b08126b 100644
--- a/t/porting/manifest.t
-+++ b/t/porting/manifest.t
-@@ -59,7 +59,8 @@ SKIP: {
- 
- SKIP: {
-     chdir "..";
-    skip("not under git control", 3) unless -d '.git';
-+    # Debian change: skip as we're probably in a different git repository
-+    skip("not under git control", 3) unless 0 && -d '.git';
-     chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`);
-     skip("git ls-files didnt work",3)
-         if !@repo;
@@ -1,42 +0,0 @@
-Upstream-Status:Pending
-
-Perl cannot cross build in a path containing a directory that has the
-name of "t".  As an example, you can make the perl build fail with
-"mkdir -p /tmp/build/t", go to the directory, unpack the sources,
-configure and cross build.
-
-You get an error like the following:
-    pod/buildtoc: no pods at pod/buildtoc line 305.
-    make[1]: *** [pod/perltoc.pod] Error 255
-
-The fix is to strip off the top directory that you are building in and
-then execute all the same logic as before against the path relative to
-the build directory.
-
-Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
- pod/buildtoc |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
--- a/pod/buildtoc
-+++ b/pod/buildtoc
-@@ -274,8 +274,10 @@ if ($Build{toc}) {
-   find \&getpods => abs_from_top('lib/');
- 
-   sub getpods {
-+    my $Top = $FindBin::Bin;
-     if (/\.p(od|m)$/) {
-       my $file = $File::Find::name;
-+      $file =~ s!^$Top!!;
-       return if $file =~ qr!/lib/Pod/Functions.pm\z!; # Used only by pod itself
-       return if $file =~ m!(?:^|/)t/!;
-       return if $file =~ m!lib/Attribute/Handlers/demo/!;
-@@ -283,7 +285,7 @@ if ($Build{toc}) {
-       return if $file =~ m!lib/Math/BigInt/t/!;
-       return if $file =~ m!/Devel/PPPort/[Hh]arness|lib/Devel/Harness!i;
-       return if $file =~ m!XS/(?:APItest|Typemap)!;
-      my $pod = $file;
-+      my $pod = $file = $File::Find::name;
-       return if $pod =~ s/pm$/pod/ && -e $pod;
-       unless (open my $f, '<', $_) {
- 	warn "$0: bogus <$file>: $!";
@@ -0,0 +1,47 @@
+From 2ed4b0c66fe7c7282922798eb3271b8f101359d1 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Thu, 19 Jun 2014 19:34:56 +0800
+Subject: [PATCH] Makefile.SH: fix do_install failed
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.SH | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/Makefile.SH b/Makefile.SH
+index f5d2d0f..e468c1b 100755
+--- a/Makefile.SH
+++ b/Makefile.SH
+@@ -1074,8 +1074,7 @@ EOT
+         $spitshell >>$Makefile <<EOT
+ 
+ install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
+-	\$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
+-	\$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags
+	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags  \$(INSTALLFLAGS) \$(STRIPFLAGS)
+ EOT
+     fi
+ 
+@@ -1104,19 +1103,6 @@ else
+ 	$spitshell >>$Makefile <<'!NO!SUBS!'
+ install.perl:	$(INSTALL_DEPENDENCE) installperl
+ 	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+-
+-# XXX Experimental. Hardwired values, but useful for testing.
+-# Eventually Configure could ask for some of these values.
+-install.html: all installhtml
+-	-@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
+-	$(RUN_PERL) installhtml   \
+-      --podroot=. --podpath=. --recurse  \
+-      --htmldir=$(privlib)/html   \
+-      --htmlroot=$(privlib)/html  \
+-      --splithead=pod/perlipc     \
+-      --splititem=pod/perlfunc    \
+-      --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
+-      --verbose
+ !NO!SUBS!
+ fi
+ 
+-- 
+1.8.1.2
+
@@ -0,0 +1,356 @@
+Upstream-Status:Inappropriate [embedded specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.SH | 130 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 66 insertions(+), 64 deletions(-)
+
+diff --git a/Makefile.SH b/Makefile.SH
+--- a/Makefile.SH
+++ b/Makefile.SH
+@@ -39,10 +39,10 @@ case "$useshrplib" in
+ true)
+ 	# Prefix all runs of 'miniperl' and 'perl' with
+ 	# $ldlibpth so that ./perl finds *this* shared libperl.
+-	case "$LD_LIBRARY_PATH" in
+-	'')  ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
+-	*)   ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
+-	esac
+	#case "$LD_LIBRARY_PATH" in
+	#'')  ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
+	#*)   ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
+	#esac
+ 
+ 	pldlflags="$cccdlflags"
+ 	static_ldflags=''
+@@ -122,10 +122,11 @@ true)
+ 	    *)
+ 		eval "ldlibpthval=\"\$$ldlibpthname\""
+ 
+-		case "$ldlibpthval" in
+-		'')  ldlibpth="$ldlibpthname=` quote "$pwd" `" ;;
+-		*)   ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;;
+-		esac
+# We compile in the library path in OE from cross-compile, so lets not do this
+#		case "$ldlibpthval" in
+#		'')  ldlibpth="$ldlibpthname=` quote "$pwd" `" ;;
+#		*)   ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;;
+#		esac
+ 
+ 		;;
+ 	    esac
+@@ -141,18 +142,7 @@ true)
+ 	    # INSTALL file, under "Building a shared perl library".
+ 	    # If there is no pre-existing $libperl, we don't need
+ 	    # to do anything further.
+-	    if test -f $archlib/CORE/$libperl; then
+-		rm -f preload
+-		cat <<'EOT' > preload
+-#! /bin/sh
+-lib=$1
+-shift
+-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+-exec "$@"
+-EOT
+-		chmod 755 preload
+-		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
+-	    fi
+	    echo linux libraries overwritten by cross-compile patches
+ 	    ;;
+ 	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
+ 		;;
+@@ -565,9 +555,19 @@ splintfiles = $(c1)
+ 	@echo `$(CCCMDSRC)` -S $*.c
+ 	@`$(CCCMDSRC)` -S $*.c
+ 
+-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+-	@echo " ";
+-	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+#	@echo " ";
+#	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
+
+all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles)
+
+more: $(generated_pods) $(private) $(public)
+
+more2: $(dynamic_ext)
+
+more3: $(nonxs_ext)
+
+more4: extras.make
+ 
+ .PHONY: all translators utilities
+ 
+@@ -575,7 +575,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile
+ # by make_patchnum.pl.
+ git_version.h: lib/Config_git.pl
+ 
+-lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl
+lib/Config_git.pl: make_patchnum.pl
+ 	$(MINIPERL) make_patchnum.pl
+ 
+ # make sure that we recompile perl.c if the git version changes
+@@ -588,8 +588,8 @@ perl$(OBJ_EXT): git_version.h
+ # loading, we need to build perl first.
+ case "$usedl$static_cwd" in
+ defineundef)
+-    util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
+-     x2p_deps="\$(MINIPERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
+    util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
+     x2p_deps="\$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
+     ;;
+ definedefine)
+     util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
+@@ -613,7 +613,7 @@ x2p/s2p: $x2p_deps
+ x2p/find2perl: $x2p_deps
+ 	cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
+ 
+-utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL
+utils/Makefile: \$(CONFIGPM) utils/Makefile.PL
+ 	\$(MINIPERL) -Ilib utils/Makefile.PL
+ 
+ utilities:	utils/Makefile $util_deps
+@@ -708,7 +708,7 @@ esac
+ 
+ 
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+-perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib
+perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
+ 	$(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext)
+ 
+ # The file ext.libs is a list of libraries that must be linked in
+@@ -769,7 +769,7 @@ PERLEXPORT		= perl.exp
+ 	;;
+ 	esac
+ 	$spitshell >>$Makefile <<'!NO!SUBS!'
+-perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH)
+perl.exp: makedef.pl $(CONFIGPM) $(SYM) $(SYMH)
+ 	./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp
+ 
+ !NO!SUBS!
+@@ -778,7 +778,7 @@ os2)
+ 	$spitshell >>$Makefile <<'!NO!SUBS!'
+ MINIPERLEXP		= miniperl
+ 
+-perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map
+perl5.def: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map
+ 	./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
+ 
+ !NO!SUBS!
+@@ -838,7 +838,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
+ 	true)
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ 	rm -f $@
+-	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
+	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
+ !NO!SUBS!
+ 		case "$osname" in
+ 		aix)
+@@ -886,7 +886,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ lib/buildcustomize.pl: $& $(mini_obj)
+ 	$(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs)
+-	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+	mv -f miniperl miniperl-target
+	ln -s hostperl miniperl
+	#$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+ 	$(MINIPERL) -f write_buildcustomize.pl
+ !NO!SUBS!
+ 		;;
+@@ -894,7 +896,9 @@ lib/buildcustomize.pl: $& $(mini_obj)
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ lib/buildcustomize.pl: $& $(mini_obj) write    ldcustomize.pl
+ 	$(CC) -o $(MINIPERL_EXE) $(mini_obj    libs)
+-	$(LDLIBPTH) ./miniperl$(HOST    _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+	mv -f miniperl miniperl-target
+	ln -s hostperl miniperl
+	#$(LDLIBPTH) ./miniperl$(HOST    _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+ 	$(MINIPERL) -f write_buildcustomize.pl    
+ !NO!SUBS!
+ 		;;
+@@ -916,7 +920,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
+ 	-@rm -f miniperl.xok
+ 	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+ 	    $(mini_obj) $(libs)
+-	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+	mv -f miniperl miniperl-target
+	ln -s hostperl miniperl
+	#$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+ 	$(MINIPERL) -f write_buildcustomize.pl
+ !NO!SUBS!
+ 		;;
+@@ -927,7 +933,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl
+ 	-@rm -f miniperl.xok
+ 	-@rm \$(MINIPERL_EXE)
+ 	\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
+-	\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+	mv -f miniperl miniperl-target
+	ln -s hostperl miniperl
+	#\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+ 	\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
+ !GROK!THIS!
+ 		else
+@@ -936,7 +944,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
+ 	-@rm -f miniperl.xok
+ 	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+ 	    $(mini_obj) $(libs)
+-	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+	mv -f miniperl miniperl-target
+	ln -s hostperl miniperl
+	#$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+ 	$(MINIPERL) -f write_buildcustomize.pl
+ !NO!SUBS!
+ 		fi
+@@ -967,7 +977,7 @@ case "${osname}" in
+ catamount)
+ $spitshell >>$Makefile <<!GROK!THIS!
+ .PHONY: makeppport
+-makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
+makeppport: \$(CONFIGPM)
+ 	-@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
+ 	(cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
+ 	done
+@@ -977,7 +987,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
+ *)
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+ .PHONY: makeppport
+-makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext)
+makeppport: $(CONFIGPM) $(nonxs_ext)
+ 	$(MINIPERL) mkppport
+ 
+ !NO!SUBS!
+@@ -987,16 +997,16 @@ esac
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+ 
+ .PHONY: preplibrary
+-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
+preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
+ 
+ $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
+ 
+-$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl
+$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl
+ 	$(MINIPERL) configpm
+ 
+ unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
+ 
+-uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
+uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
+ 	$(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
+ #	Commented out so always runs, mktables looks at far more files than we
+ #	can in this makefile to decide if needs to run or not
+@@ -1005,22 +1015,22 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
+ # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
+ # But also this ensures that all extensions are built before we try to scan
+ # them, which picks up Devel::PPPort's documentation.
+-pod/perltoc.pod: $(perltoc_pod_prereqs)  $(PERL_EXE) $(ext) pod/buildtoc
+-	$(RUN_PERL) -f pod/buildtoc -q
+pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc
+	$(MINIPERL) -f pod/buildtoc -q
+ 
+ pod/perlapi.pod: pod/perlintern.pod
+ 
+-pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
+pod/perlintern.pod: autodoc.pl embed.fnc
+ 	$(MINIPERL) autodoc.pl
+ 
+-pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
+ 	$(MINIPERL) pod/perlmodlib.PL -q
+ 
+ pod/perl5200delta.pod: pod/perldelta.pod
+ 	$(RMS) pod/perl5200delta.pod
+ 	$(LNS) perldelta.pod pod/perl5200delta.pod
+ 
+-extra.pods: $(MINIPERL_EXE)
+extra.pods:
+ 	-@test ! -f extra.pods || rm -f `cat extra.pods`
+ 	-@rm -f extra.pods
+ 	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
+@@ -1075,11 +1085,7 @@ done
+ if test "X$hostperl" != X; then
+ 	$spitshell >>$Makefile <<'!NO!SUBS!'
+ install.perl:	$(INSTALL_DEPENDENCE) installperl
+-	$(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+-	-@test ! -s extras.lst || $(MAKE) extras.install
+-
+-install.man:	all installman
+-	$(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
+	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+ 
+ # XXX Experimental. Hardwired values, but useful for testing.
+ # Eventually Configure could ask for some of these values.
+@@ -1097,11 +1103,7 @@ install.html: all installhtml
+ else
+ 	$spitshell >>$Makefile <<'!NO!SUBS!'
+ install.perl:	$(INSTALL_DEPENDENCE) installperl
+-	$(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+-	-@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
+-
+-install.man:	all installman
+-	$(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
+	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
+ 
+ # XXX Experimental. Hardwired values, but useful for testing.
+ # Eventually Configure could ask for some of these values.
+@@ -1206,16 +1208,16 @@ manicheck:	FORCE
+ #
+ # DynaLoader may be needed for extensions that use Makefile.PL.
+ 
+-$(DYNALOADER):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
+$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
+ 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
+ 
+-d_dummy $(dynamic_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
+d_dummy $(dynamic_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
+ 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+ 
+-s_dummy $(static_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
+s_dummy $(static_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
+ 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
+ 
+-n_dummy $(nonxs_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
+n_dummy $(nonxs_ext):	lib/buildcustomize.pl preplibrary FORCE
+ 	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+ !NO!SUBS!
+ 
+@@ -1409,7 +1411,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
+ 
+ case "$targethost" in
+ '') $spitshell >>$Makefile <<'!NO!SUBS!'
+-test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \
+ 	$(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
+ 	$(generated_pods)
+ 	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
+@@ -1417,7 +1419,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+ !NO!SUBS!
+ ;;
+ *) $spitshell >>$Makefile <<!GROK!THIS!
+-test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \
+test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \
+ 	\$(dynamic_ext) \$(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
+ 	\$(generated_pods)
+ 	$to libperl.*
+@@ -1469,7 +1471,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
+ esac
+ 
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
+test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
+ 	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+ 	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
+ !NO!SUBS!
+@@ -1520,7 +1522,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!'
+ 
+ # Can't depend on lib/Config.pm because that might be where miniperl
+ # is crashing.
+-minitest: $(MINIPERL_EXE)
+minitest:
+ 	-@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
+ 	@echo " "
+ 	@echo "You may see some irrelevant test failures if you have been unable"
+-- 
+1.8.1.2
+
@@ -8,13 +8,13 @@

 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Thu Dec 23 03:57:51 UTC 2010
+# Configuration time: Tue Jun 24 03:00:02 UTC 2014
 # Configured by     : Open Embedded
-# Target system     : linux qemux86 2.6.37-rc5-yocto-standard+ #1 preempt mon dec 20 14:21:27 pst 2010 i686 gnulinux 
+# Target system     : linux qemuarm 3.14.5-yocto-standard #1 preempt mon jun 23 19:42:18 cst 2014 armv5tejl gnulinux 

 : Configure command line arguments.
 config_arg0='Configure'
-config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.14.3 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
+config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.20.0 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
 config_argc=28
 config_arg1='-des'
 config_arg2='-Doptimize=-O2'
@@ -26,7 +26,7 @@ config_arg7='-Dinstallprefix=@EXECPREFIX@'
 config_arg8='-Dprefix=@EXECPREFIX@'
 config_arg9='-Dvendorprefix=@EXECPREFIX@'
 config_arg10='-Dsiteprefix=@EXECPREFIX@'
-config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.14.3'
+config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.20.0'
 config_arg12='-Duseshrplib'
 config_arg13='-Dusethreads'
 config_arg14='-Duseithreads'
@@ -67,9 +67,9 @@ api_subversion='0'
 api_version='14'
 api_versionstring='5.14.0'
 ar='ar'
-archlib='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
-archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
-archlib_exp='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
+archlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
+archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
+archlib_exp='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
 archname64=''
 archname='@ARCH@-thread-multi'
 archobjs=''
@@ -87,7 +87,7 @@ castflags='0'
 cat='cat'
 cc='gcc'
 cccdlflags='-fPIC'
-ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi/CORE'
+ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi/CORE'
 ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='gcc'
@@ -576,7 +576,7 @@ doublesize='8'
 drand01='drand48()'
 drand48_r_proto='REENTRANT_PROTO_I_ST'
 dtrace=''
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via GDBM_File SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/APItest/KeywordRPN XS/Typemap attributes mro re threads threads/shared'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -591,7 +591,7 @@ endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via GDBM_File SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/APItest/KeywordRPN XS/Typemap attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPANPLUS CPANPLUS/Dist/Build Class/ISA Devel/SelfStubber Digest Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open2 IPC/Open3 Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta PerlIO/via/QuotedPrint Pod/Escapes Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Plainer Pod/Simple Safe SelfLoader Shell Switch Term/ANSIColor Term/Cap Term/UI Test Test/Harness Test/Simple Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local Unicode/Collate XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent podlators'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
 extern_C='extern'
 extras=''
 fflushNULL='define'
@@ -608,7 +608,7 @@ full_csh='csh'
 full_sed='sed'
 gccansipedantic=''
 gccosandvers=''
-gccversion='4.5.1'
+gccversion='4.9.0'
 getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
 getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
 getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
@@ -635,7 +635,7 @@ gidtype='gid_t'
 glibpth='@EXECPREFIX@/shlib @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@/386 @EXECPREFIX@/ccs/lib @EXECPREFIX@/ucblib @EXECPREFIX@/local/lib '
 gmake='gmake'
 gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version='2.12.1'
+gnulibc_version='2.19'
 grep='grep'
 groupcat='cat /etc/group'
 groupstype='gid_t'
@@ -747,7 +747,7 @@ inc_version_list_init='0'
 incpath=''
 inews=''
 initialinstalllocation='@USRBIN@'
-installarchlib='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
+installarchlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi'
 installbin='@USRBIN@'
 installhtml1dir=''
 installhtml3dir=''
@@ -755,23 +755,23 @@ installman1dir=''
 installman3dir=''
 installprefix='@EXECPREFIX@'
 installprefixexp='@EXECPREFIX@'
-installprivlib='@LIBDIR@/perl/5.14.3'
+installprivlib='@LIBDIR@/perl/5.20.0'
 installscript='@USRBIN@'
-installsitearch='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
+installsitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
 installsitebin='@USRBIN@'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='@LIBDIR@/perl/site_perl/5.14.3'
+installsitelib='@LIBDIR@/perl/site_perl/5.20.0'
 installsiteman1dir=''
 installsiteman3dir=''
 installsitescript='@USRBIN@'
 installstyle='lib/perl'
 installusrbinperl='define'
-installvendorarch='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
+installvendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
 installvendorbin='@USRBIN@'
 installvendorhtml1dir=''
 installvendorhtml3dir=''
-installvendorlib='@LIBDIR@/perl/vendor_perl/5.14.3'
+installvendorlib='@LIBDIR@/perl/vendor_perl/5.20.0'
 installvendorman1dir=''
 installvendorman3dir=''
 installvendorscript='@USRBIN@'
@@ -779,7 +779,7 @@ intsize='4'
 issymlink='test -h'
 ivdformat='"ld"'
 ivtype='long'
-known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/APItest/KeywordRPN XS/Typemap attributes mro re threads threads/shared '
+known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version '
 ksh=''
 ld='gcc'
 lddlflags='-shared -O2 -fstack-protector'
@@ -788,7 +788,7 @@ ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
-libc='@BASELIBDIR@/libc-2.12.1.so'
+libc='@BASELIBDIR@/libc-2.19.so'
 libperl='libperl.so'
 libpth='@BASELIBDIR@ @LIBDIR@'
 libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
@@ -847,23 +847,7 @@ netdb_net_type='in_addr_t'
 nm='nm'
 nm_opt=''
 nm_so_opt='--dynamic'
-nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug \
-B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build \
-Class/ISA Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder \
-ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker \
-ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp \
-FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags \
-IO/Compress IO/Zlib IPC/Cmd IPC/Open2 IPC/Open3 JSON/PP Locale/Codes \
-Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple \
-Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList \
-Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping \
-Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType \
-PerlIO/via/QuotedPrint Pod/Escapes Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc \
-Pod/Plainer Pod/Simple Safe SelfLoader Shell Switch Term/ANSIColor Term/Cap \
-Term/UI Test Test/Harness Test/Simple Text/Balanced Text/ParseWords Text/Tabs \
-Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize \
-Tie/RefHash Time/Local Unicode/Collate Version/Requirements XSLoader autodie \
-autouse base bignum constant encoding/warnings if lib libnet parent podlators'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
 nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
@@ -880,12 +864,12 @@ old_pthread_create_joinable=''
 optimize='-O2'
 orderlib='false'
 osname='linux'
-osvers='2.6.37-rc5-yocto-standard+'
-otherlibdirs='@LIBDIR@/perl/5.14.3'
+osvers='3.14.5-yocto-standard'
+otherlibdirs='@LIBDIR@/perl/5.20.0'
 package='perl5'
 pager='/usr/bin/less -isr'
 passcat='cat /etc/passwd'
-patchlevel='14'
+patchlevel='20'
 path_sep=':'
 perl5='@USRBIN@/perl'
 perl=''
@@ -901,8 +885,8 @@ pmake=''
 pr=''
 prefix='@EXECPREFIX@'
 prefixexp='@EXECPREFIX@'
-privlib='@LIBDIR@/perl/5.14.3'
-privlibexp='@LIBDIR@/perl/5.14.3'
+privlib='@LIBDIR@/perl/5.20.0'
+privlibexp='@LIBDIR@/perl/5.20.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 randbits='48'
@@ -954,17 +938,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
-sitearchexp='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
+sitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
+sitearchexp='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi'
 sitebin='@USRBIN@'
 sitebinexp='@USRBIN@'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='@LIBDIR@/perl/site_perl/5.14.3'
+sitelib='@LIBDIR@/perl/site_perl/5.20.0'
 sitelib_stem='@LIBDIR@/perl/site_perl'
-sitelibexp='@LIBDIR@/perl/site_perl/5.14.3'
+sitelibexp='@LIBDIR@/perl/site_perl/5.20.0'
 siteman1dir=''
 siteman1direxp=''
 siteman3dir=''
@@ -1029,7 +1013,7 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 use5005threads='undef'
-usecrosscompile='undef'
+usecrosscompile='define'
 usedevel='undef'
 usedl='define'
 usedtrace='undef'
@@ -1062,17 +1046,17 @@ uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
 vaproto='define'
-vendorarch='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
-vendorarchexp='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
+vendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
+vendorarchexp='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi'
 vendorbin='@USRBIN@'
 vendorbinexp='@USRBIN@'
 vendorhtml1dir=' '
 vendorhtml1direxp=''
 vendorhtml3dir=' '
 vendorhtml3direxp=''
-vendorlib='@LIBDIR@/perl/vendor_perl/5.14.3'
+vendorlib='@LIBDIR@/perl/vendor_perl/5.20.0'
 vendorlib_stem='@LIBDIR@/perl/vendor_perl'
-vendorlibexp='@LIBDIR@/perl/vendor_perl/5.14.3'
+vendorlibexp='@LIBDIR@/perl/vendor_perl/5.20.0'
 vendorman1dir=' '
 vendorman1direxp=''
 vendorman3dir=' '
@@ -1081,7 +1065,7 @@ vendorprefix='/usr'
 vendorprefixexp='/usr'
 vendorscript='@USRBIN@'
 vendorscriptexp='@USRBIN@'
-version='5.14.3'
+version='5.20.0'
 version_patchlevel_string='version 14 subversion 2'
 versiononly='undef'
 vi=''
@@ -1092,10 +1076,10 @@ yaccflags=''
 zcat=''
 zip='zip'
 PERL_REVISION=5
-PERL_VERSION=14
-PERL_SUBVERSION=2
+PERL_VERSION=20
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=14
+PERL_API_VERSION=20
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=''
 PERL_CONFIG_SH=true
@@ -1108,3 +1092,15 @@ d_sin6_scope_id='define'
 d_prctl='define'
 d_prctl_set_name='define'
 perl_static_inline='static __inline__'
+d_sockaddr_in6='undef'
+d_ip_mreq='undef'
+d_ip_mreq_source='undef'
+d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
+bootstrap_charset='undef'
+d_isblank='define'
+i_stdbool='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+st_ino_sign='1'
+st_ino_size='4'
@@ -0,0 +1,62 @@
+From 25994ac1124566398adee13806ef9a73d2cae150 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Tue, 16 Oct 2012 23:07:56 +0300
+Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent
+ is writable
+
+The site directories do not exist on a typical Debian system.  The build
+systems will create them when necessary, so there's no need for a prompt
+suggesting local::lib if the first existing parent directory is writable.
+
+Also, writability of the core directories is not interesting as we
+explicitly tell CPAN not to touch those with INSTALLDIRS=site.
+
+Bug-Debian: http://bugs.debian.org/688842
+Patch-Name: debian/cpan-missing-site-dirs.diff
+---
+ cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
+index 4416072..187f5c4 100644
+--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
+@@ -2045,11 +2045,34 @@ sub _print_urllist {
+     };
+ }
+ 
+# Debian modification: return true if this directory
+# or the first existing one upwards is writable
+sub _can_write_to_this_or_parent {
+    my ($dir) = @_;
+    my @parts = File::Spec->splitdir($dir);
+    while (@parts) {
+        my $cur = File::Spec->catdir(@parts);
+        return 1 if -w $cur;
+        return 0 if -e _;
+        pop @parts;
+    }
+    return 0;
+}
+
+# Debian specific modification: the site directories don't necessarily
+# exist on the system, but the build systems create them when necessary,
+# so return true if the first existing directory upwards is writable
+#
+# Furthermore, on Debian, only test the site directories
+# (installsite*, expanded to /usr/local/{share,lib}/perl),
+# not the core ones 
+# (install*lib, expanded to /usr/{share,lib}/perl).
+# We pass INSTALLDIRS=site by default to keep CPAN from touching
+# the core directories.
+
+ sub _can_write_to_libdirs {
+-    return -w $Config{installprivlib}
+-        && -w $Config{installarchlib}
+-        && -w $Config{installsitelib}
+-        && -w $Config{installsitearch}
+    return _can_write_to_this_or_parent($Config{installsitelib})
+        && _can_write_to_this_or_parent($Config{installsitearch})
+ }
+ 
+ sub _using_installbase {
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be Mon Sep 17 00:00:00 2001
+From 64c9ad40c26f051a275a8b963cc849ca0ddd3cbb Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Provide a sensible INSTALLDIRS default for modules installed from
@@ -11,14 +10,14 @@ ordering, but not ours.

 Patch-Name: debian/cpan_definstalldirs.diff
 ---
- cpan/CPAN/lib/CPAN/FirstTime.pm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 667bdca..c38c890 100644
+index d1a8eef..4416072 100644
 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm
 +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -990,7 +990,7 @@ sub init {
+@@ -1023,7 +1023,7 @@ sub init {
     my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
 
     if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
@@ -26,8 +25,8 @@ index 667bdca..c38c890 100644
 +        my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
         my_dflt_prompt(make_arg => "", $matcher);
         if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
-             $CPAN::Frontend->mywarn( 
-@@ -1022,7 +1022,7 @@ sub init {
+             $CPAN::Frontend->mywarn(
+@@ -1055,7 +1055,7 @@ sub init {
     my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
                    $matcher);
 
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b Mon Sep 17 00:00:00 2001
+From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove overly restrictive DB_File version check.
@@ -10,8 +9,8 @@ Package dependencies ensure the correct library is linked at run-time.

 Patch-Name: debian/db_file_ver.diff
 ---
- cpan/DB_File/version.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ cpan/DB_File/version.c | 2 ++
+ 1 file changed, 2 insertions(+)

 diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
 index e01f6f6..544e6ee 100644
@@ -1,24 +1,22 @@
-Upstream-Status:Inappropriate [debian patches]
-From 16ebe1f5232621d8894aa6c6210fdf2fc9b54a84 Mon Sep 17 00:00:00 2001
+From 2f3e4b35da039600de403083b5a0c7391751d02e Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
-Subject: Replace generic man(1) instructions with Debian-specific
- information.
+Subject: Replace generic man(1) instructions with Debian-specific information.

 Indicate that the user needs to install the perl-doc package.

 Patch-Name: debian/doc_info.diff
 ---
- pod/perl.pod |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
+ pod/perl.pod | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)

 diff --git a/pod/perl.pod b/pod/perl.pod
-index 29cabf1..529ad6f 100644
+index 2e8d0d8..8810769 100644
 --- a/pod/perl.pod
 +++ b/pod/perl.pod
-@@ -261,8 +261,16 @@ For ease of access, the Perl manual has been split up into several sections.
-     perlwin32		Perl notes for Windows
+@@ -274,8 +274,16 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp
 
+ =for buildtoc __END__
 
 -On a Unix-like system, these documentation files will usually also be
 -available as manpages for use with the F<man> program.
@@ -33,5 +31,5 @@ index 29cabf1..529ad6f 100644
 +You should be able to view Perl's documentation with your man(1)
 +program or perldoc(1).
 
- In general, if something strange has gone wrong with your program and you're
- not sure where you should look for help, try the B<-w> switch first.  It will
+ Some documentation is not available as man pages, so if a
+ cross-reference is not found by man, try it with L<perldoc>.  Perldoc can
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 Mon Sep 17 00:00:00 2001
+From 98e7248580af353d781b24715b42af5b6a4caf35 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
@@ -13,14 +12,15 @@ Bug-Debian: http://bugs.debian.org/290336

 Patch-Name: debian/enc2xs_inc.diff
 ---
- cpan/Encode/bin/enc2xs |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ cpan/Encode/bin/enc2xs | 8 ++++----
+ t/porting/customized.t | 3 +++
+ 2 files changed, 7 insertions(+), 4 deletions(-)

 diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index 773c0a0..bc1ae1b 100644
+index c44487d..a9af54f 100644
 --- a/cpan/Encode/bin/enc2xs
 +++ b/cpan/Encode/bin/enc2xs
-@@ -924,11 +924,11 @@ use vars qw(
+@@ -929,11 +929,11 @@ use vars qw(
 sub find_e2x{
     eval { require File::Find; };
     my (@inc, %e2x_dir);
@@ -34,7 +34,7 @@ index 773c0a0..bc1ae1b 100644
          my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
              $atime,$mtime,$ctime,$blksize,$blocks)
              = lstat($_) or return;
-@@ -938,7 +938,7 @@ sub find_e2x{
+@@ -943,7 +943,7 @@ sub find_e2x{
              $e2x_dir{$File::Find::dir} ||= $mtime;
          }
          return;
@@ -43,7 +43,7 @@ index 773c0a0..bc1ae1b 100644
     warn join("\n", keys %e2x_dir), "\n";
     for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
     $_E2X = $d;
-@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
+@@ -1010,7 +1010,7 @@ sub make_configlocal_pm {
 	    $LocalMod{$enc} ||= $mod;
 	}
     };
@@ -52,3 +52,19 @@ index 773c0a0..bc1ae1b 100644
     $_ModLines = "";
     for my $enc ( sort keys %LocalMod ) {
         $_ModLines .=
+diff --git a/t/porting/customized.t b/t/porting/customized.t
+index a769c58..6b9977f 100644
+--- a/t/porting/customized.t
+++ b/t/porting/customized.t
+@@ -99,8 +99,11 @@ foreach my $module ( sort keys %Modules ) {
+       print $data_fh join(' ', $module, $file, $id), "\n";
+       next;
+     }
+SKIP: {
+    skip("$file modified for Debian", 1) if $file eq 'cpan/Encode/bin/enc2xs';
+     my $should_be = $customised{ $module }->{ $file };
+     is( $id, $should_be, "SHA for $file matches stashed SHA" );
+}
+   }
+ }
+ 
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 973bed42db538804179f39d66dab37c82c6ade24 Mon Sep 17 00:00:00 2001
+From 81255b67014bda2ec127e0856436acfa554a068c Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove Errno version check due to upgrade problems with long-running
@@ -13,14 +12,14 @@ compatible, but built on a different machine.

 Patch-Name: debian/errno_ver.diff
 ---
- ext/Errno/Errno_pm.PL |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
+ ext/Errno/Errno_pm.PL | 5 -----
+ 1 file changed, 5 deletions(-)

 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 56bc815..01f510a 100644
+index 55ad01a..e4a31ef 100644
 --- a/ext/Errno/Errno_pm.PL
 +++ b/ext/Errno/Errno_pm.PL
-@@ -332,13 +332,8 @@ EOF
+@@ -277,13 +277,8 @@ sub write_errno_pm {
 
 package Errno;
 require Exporter;
@@ -28,8 +27,8 @@ index 56bc815..01f510a 100644
 use strict;
 
 -"\$Config{'archname'}-\$Config{'osvers'}" eq
-"$Config{'archname'}-$Config{'osvers'}" or
-	die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
+-"$archname-$Config{'osvers'}" or
+-	die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
 -
 our \$VERSION = "$VERSION";
 \$VERSION = eval \$VERSION;
@@ -0,0 +1,37 @@
+From 2870b992e4b5e8bb0b9c44c9aff81adaaf9de439 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 10 May 2014 23:34:14 +0300
+Subject: EU:MM: set location of libperl.a under /usr/lib
+
+The Debian packaging moves libperl.a a couple of levels up from the
+CORE directory to match other static libraries.
+
+Patch-Name: debian/extutils_set_libperl_path.diff
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
+ pp.c                                            | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 8b86a24..f977476 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2462,7 +2462,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
+ 	($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
+     }
+     unless ($libperl && -f $lperl) { # Ilya's code...
+-	my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
+	my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/../..";
+ 	$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
+ 	$libperl ||= "libperl$self->{LIB_EXT}";
+ 	$libperl   = "$dir/$libperl";
+diff --git a/pp.c b/pp.c
+index 4ec6887..a44c137 100644
+--- a/pp.c
+++ b/pp.c
+@@ -1,4 +1,4 @@
+-/*    pp.c
+ /*    pp.c
+  *
+  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  *    2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From ca66b95be369b47a6d372c3653be57cd737f7f21 Mon Sep 17 00:00:00 2001
+From 8deb14b24ee17694a2f23a78e8782b24c116daae Mon Sep 17 00:00:00 2001
 From: Andreas Marschke <andreas.marschke@googlemail.com>
 Date: Sat, 17 Sep 2011 11:38:42 +0100
 Subject: Configure CPAN::Distribution with correct name of html2text
@@ -18,14 +17,14 @@ Please see the attached patch for a quick fix of this issue.
 as the html2text.pl which is expected, but should provide similar
 functionality].
 ---
- cpan/CPAN/lib/CPAN/Distribution.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
-index 637ab27..a8193d9 100644
+index 9a08707..332a627 100644
 --- a/cpan/CPAN/lib/CPAN/Distribution.pm
 +++ b/cpan/CPAN/lib/CPAN/Distribution.pm
-@@ -3715,7 +3715,7 @@ sub _display_url {
+@@ -4031,7 +4031,7 @@ sub _display_url {
       if $CPAN::DEBUG;
 
     # should we define it in the config instead?
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001
+From c7ffe0cc3105cb627fbbb7d0c7dbb53f1f236a17 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Mon, 30 May 2011 22:54:24 +0300
 Subject: Document that CCFLAGS should include $Config{ccflags}
@@ -12,14 +11,14 @@ binary interface on some platforms.

 Patch-Name: fixes/document_makemaker_ccflags.diff
 ---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++
+ 1 file changed, 4 insertions(+)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-index be9624e..c56ca8f 100644
+index d2fabf6..fabb021 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-@@ -1524,6 +1524,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
+@@ -1716,6 +1716,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
 String that will be included in the compiler call command line between
 the arguments INC and OPTIMIZE.
 
@@ -0,0 +1,110 @@
+From 8b7b31d6b2368717514a05dc0e968c1357511733 Mon Sep 17 00:00:00 2001
+From: Jonathan Nieder <jrnieder@gmail.com>
+Date: Fri, 27 Jul 2012 10:35:07 -0500
+Subject: Memoize::Storable: respect 'nstore' option not respected
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Memoize(3perl) says:
+
+                tie my %cache => 'Memoize::Storable', $filename, 'nstore';
+                memoize 'function', SCALAR_CACHE => [HASH => \%cache];
+
+        Include the ‘nstore’ option to have the "Storable" database
+        written in ‘network order’.  (See Storable for more details
+        about this.)
+
+In fact the "nstore" option does no such thing.  Option parsing looks
+like this:
+
+        @options{@_} = ();
+
+$self->{OPTIONS}{'nstore'} is accordingly set to undef.  Later
+Memoize::Storable checks if the option is true, and since undef is
+not true, the "else" branch is always taken.
+
+        if ($self->{OPTIONS}{'nstore'}) {
+                Storable::nstore($self->{H}, $self->{FILENAME});
+        } else {
+                Storable::store($self->{H}, $self->{FILENAME});
+        }
+
+Correcting the condition to (exists $self->{OPTIONS}{'nstore'}) fixes
+it.
+
+Noticed because git-svn, which uses the 'nstore' option for its
+on-disk caches, was producing
+
+        Byte order is not compatible at ../../lib/Storable.pm
+
+when run using a perl with a different integer size (and hence
+byteorder).
+
+Reported by Tim Retout (RT#77790)
+
+Bug-Debian: http://bugs.debian.org/587650
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=77790
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=77790
+Patch-Name: fixes/memoize_storable_nstore.diff
+---
+ cpan/Memoize/Memoize/Storable.pm |  2 +-
+ cpan/Memoize/t/tie_storable.t    | 24 ++++++++++++++++++++----
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/cpan/Memoize/Memoize/Storable.pm b/cpan/Memoize/Memoize/Storable.pm
+index 1314797..87876f2 100644
+--- a/cpan/Memoize/Memoize/Storable.pm
+++ b/cpan/Memoize/Memoize/Storable.pm
+@@ -55,7 +55,7 @@ sub DESTROY {
+   require Carp if $Verbose;
+   my $self= shift;
+   print STDERR "Memoize::Storable::DESTROY(@_)\n" if $Verbose;
+-  if ($self->{OPTIONS}{'nstore'}) {
+  if (exists $self->{OPTIONS}{'nstore'}) {
+     Storable::nstore($self->{H}, $self->{FILENAME});
+   } else {
+     Storable::store($self->{H}, $self->{FILENAME});
+diff --git a/cpan/Memoize/t/tie_storable.t b/cpan/Memoize/t/tie_storable.t
+index de3b8dc..a624238 100644
+--- a/cpan/Memoize/t/tie_storable.t
+++ b/cpan/Memoize/t/tie_storable.t
+@@ -31,18 +31,34 @@ if ($@) {
+   exit 0;
+ }
+ 
+-print "1..4\n";
+print "1..9\n";
+ 
+ $file = "storable$$";
+ 1 while unlink $file;
+ tryout('Memoize::Storable', $file, 1);  # Test 1..4
+ 1 while unlink $file;
+tryout('Memoize::Storable', $file, 5, 'nstore');  # Test 5..8
+assert_netorder($file, 9);  # Test 9
+1 while unlink $file;
+
+
+sub assert_netorder {
+  my ($file, $testno) = @_;
+
+  my $netorder = Storable::file_magic($file)->{'netorder'};
+  print ($netorder ? "ok $testno\n" : "not ok $testno\n");
+}
+ 
+ sub tryout {
+-  my ($tiepack, $file, $testno) = @_;
+  my ($tiepack, $file, $testno, $option) = @_;
+ 
+-  tie my %cache => $tiepack, $file
+-    or die $!;
+  if (defined $option) {
+    tie my %cache => $tiepack, $file, $option
+      or die $!;
+  } else {
+    tie my %cache => $tiepack, $file
+      or die $!;
+  }
+ 
+   memoize 'c5', 
+   SCALAR_CACHE => [HASH => \%cache],
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001
+From e2e1127a521d942bd9aea4c1290cdf46c15c35fd Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Thu, 20 Sep 2007 19:47:14 +1000
 Subject: Document the Net::SMTP 'Port' option
@@ -9,14 +8,14 @@ Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038

 Patch-Name: fixes/net_smtp_docs.diff
 ---
- cpan/libnet/Net/SMTP.pm |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ cpan/libnet/Net/SMTP.pm | 1 +
+ 1 file changed, 1 insertion(+)

 diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
-index a28496d..07b2498 100644
+index 705b5c5..17c1d21 100644
 --- a/cpan/libnet/Net/SMTP.pm
 +++ b/cpan/libnet/Net/SMTP.pm
-@@ -625,6 +625,7 @@ Net::SMTP will attempt to extract the address from the value passed.
+@@ -637,6 +637,7 @@ Net::SMTP will attempt to extract the address from the value passed.
 
 B<Debug> - Enable debugging information
 
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001
+From f290a5ebd91e89d63b2a1958420f53e22d20c4ee Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Respect umask during installation
@@ -9,43 +8,43 @@ site directories.

 Patch-Name: fixes/respect_umask.diff
 ---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   18 +++++++++---------
- dist/ExtUtils-Install/lib/ExtUtils/Install.pm   |   18 +++++++++---------
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++---------
+ dist/ExtUtils-Install/lib/ExtUtils/Install.pm   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 6964eea..865d36d 100644
+index 4140432..8fdb67c 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2053,7 +2053,7 @@ doc__install : doc_site_install
+@@ -2075,7 +2075,7 @@ doc__install : doc_site_install
 	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
 
 pure_perl_install :: all
 -	$(NOECHO) $(MOD_INSTALL) \
 +	$(NOECHO) umask 022; $(MOD_INSTALL) \
- 		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- 		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
-@@ -2067,7 +2067,7 @@ pure_perl_install :: all
+ };
+ 
+     push @m,
+@@ -2095,7 +2095,7 @@ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
 
 
 pure_site_install :: all
 -	$(NOECHO) $(MOD_INSTALL) \
 +	$(NOECHO) umask 022; $(MOD_INSTALL) \
- 		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLSITELIB) \
-@@ -2080,7 +2080,7 @@ pure_site_install :: all
+ };
+     push @m,
+ q{		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+@@ -2113,7 +2113,7 @@ q{		$(INST_LIB) $(DESTINSTALLSITELIB) \
 		}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
 
 pure_vendor_install :: all
 -	$(NOECHO) $(MOD_INSTALL) \
 +	$(NOECHO) umask 022; $(MOD_INSTALL) \
- 		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- 		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
-@@ -2092,8 +2092,8 @@ pure_vendor_install :: all
- 
+ };
+     push @m,
+ q{		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+@@ -2145,8 +2145,8 @@ doc_vendor_install :: all
+     push @m, q{
 doc_perl_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
 -	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
@@ -55,7 +54,7 @@ index 6964eea..865d36d 100644
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLPRIVLIB)" \
 		LINKTYPE "$(LINKTYPE)" \
-@@ -2103,8 +2103,8 @@ doc_perl_install :: all
+@@ -2156,8 +2156,8 @@ doc_perl_install :: all
 
 doc_site_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
@@ -66,7 +65,7 @@ index 6964eea..865d36d 100644
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLSITELIB)" \
 		LINKTYPE "$(LINKTYPE)" \
-@@ -2114,8 +2114,8 @@ doc_site_install :: all
+@@ -2167,8 +2167,8 @@ doc_site_install :: all
 
 doc_vendor_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
@@ -78,10 +77,10 @@ index 6964eea..865d36d 100644
 		"installed into" "$(INSTALLVENDORLIB)" \
 		LINKTYPE "$(LINKTYPE)" \
 diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-index 3b030a5..cb0e9e0 100644
+index eec57aa..06cc530 100644
 --- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
 +++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
-@@ -468,7 +468,7 @@ sub _can_write_dir {
+@@ -450,7 +450,7 @@ sub _can_write_dir {
 
 =pod
 
@@ -90,7 +89,7 @@ index 3b030a5..cb0e9e0 100644
 
 Wrapper around File::Path::mkpath() to handle errors.
 
-@@ -485,13 +485,13 @@ writable.
+@@ -467,13 +467,13 @@ writable.
 =cut
 
 sub _mkpath {
@@ -107,7 +106,7 @@ index 3b030a5..cb0e9e0 100644
             _choke("Can't create '$dir'","$@");
         }
 
-@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -782,7 +782,7 @@ sub install { #XXX OS-SPECIFIC
         _chdir($cwd);
     }
     foreach my $targetdir (sort keys %check_dirs) {
@@ -116,7 +115,7 @@ index 3b030a5..cb0e9e0 100644
     }
     foreach my $found (@found_files) {
         my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
-@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
                     $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
                         unless $dry_run;
                 } elsif ( ! -d $targetdir ) {
@@ -125,7 +124,7 @@ index 3b030a5..cb0e9e0 100644
                 }
                 print "Installing $targetfile\n";
 
-@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC
+@@ -836,7 +836,7 @@ sub install { #XXX OS-SPECIFIC
 
     if ($pack{'write'}) {
         $dir = install_rooted_dir(dirname($pack{'write'}));
@@ -134,7 +133,7 @@ index 3b030a5..cb0e9e0 100644
         print "Writing $pack{'write'}\n" if $verbose;
         $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
     }
-@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory).
+@@ -1176,7 +1176,7 @@ be prepended as a directory to each installed file (and directory).
 sub pm_to_blib {
     my($fromto,$autodir,$pm_filter) = @_;
 
@@ -143,7 +142,7 @@ index 3b030a5..cb0e9e0 100644
     while(my($from, $to) = each %$fromto) {
         if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
             print "Skip $to (unchanged)\n";
-@@ -1213,7 +1213,7 @@ sub pm_to_blib {
+@@ -1199,7 +1199,7 @@ sub pm_to_blib {
             # we wont try hard here. its too likely to mess things up.
             forceunlink($to);
         } else {
@@ -0,0 +1,32 @@
+From 651aaac47361c03d15681b6cfdba0056a348fbb7 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sun, 27 Nov 2011 16:27:07 +0000
+Subject: Disable failing GNU/Hurd tests dist/threads/t/stack.t
+
+These tests fail on GNU/Hurd owing to libpthread using fixed-size stacks.
+This is a known limitation that should get fixed in the future.
+
+For now, disable the tests.
+
+Bug-Debian: http://bugs.debian.org/650175
+
+Patch-Name: debian/hurd_test_skip_stack.diff
+---
+ dist/threads/t/stack.t | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dist/threads/t/stack.t b/dist/threads/t/stack.t
+index cfd6cf7..84cc527 100644
+--- a/dist/threads/t/stack.t
+++ b/dist/threads/t/stack.t
+@@ -7,6 +7,10 @@ BEGIN {
+         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
+         exit(0);
+     }
+    if ($^O eq 'gnu') {
+        print("1..0 # SKIP fails on GNU/Hurd (Debian #650175)\n");
+        exit(0);
+    }
+ }
+ 
+ use ExtUtils::testlib;
@@ -1,16 +1,15 @@
-Upstream-Status:Inappropriate [debian patches]
-From ab89a31d1f46388a61953349c3546e4082cd38de Mon Sep 17 00:00:00 2001
+From 035ae97a9c2bf8ed73031e8879a0f860797544c1 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Debian policy doesn't install .packlist files for core or vendor.

 Patch-Name: debian/instmodsh_doc.diff
 ---
- cpan/ExtUtils-MakeMaker/bin/instmodsh |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-index 5874aa6..6a2f03e 100644
+index 8b9aa95..e551434 100644
 --- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
 +++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
@@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules
@@ -1,25 +1,24 @@
-Upstream-Status:Inappropriate [debian patches]
-From 704f6017119ce0301a9105944512120a38a43a02 Mon Sep 17 00:00:00 2001
+From c089c8eb475a2018e8028e23b07defb5789a5633 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.

 Patch-Name: debian/ld_run_path.diff
 ---
- .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++
+ 1 file changed, 3 insertions(+)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-index cf4826f..eb212b5 100644
+index e39c8b2..0b933ce 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-@@ -54,6 +54,9 @@ sub _unix_os2_ext {
-     my($pwd) = cwd(); # from Cwd.pm
-     my($found) = 0;
+@@ -56,6 +56,9 @@ sub _unix_os2_ext {
+     my ( $pwd )   = cwd();    # from Cwd.pm
+     my ( $found ) = 0;
 
 +    # Debian-specific: don't use LD_RUN_PATH for standard dirs
 +    $ld_run_path_seen{$_}++ for @libpath;
 +
-     foreach my $thislib (split ' ', $potential_libs) {
+     foreach my $thislib ( split ' ', $potential_libs ) {
 
- 	# Handle possible linker path arguments.
+         # Handle possible linker path arguments.
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 7465b6d008187580eabe655b9c8e75351d3d24b4 Mon Sep 17 00:00:00 2001
+From 54e202518f081aa42d5ff733d56c4d42395bcba4 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be
@@ -7,11 +6,11 @@ Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be

 Patch-Name: debian/libnet_config_path.diff
 ---
- cpan/libnet/Net/Config.pm |    7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ cpan/libnet/Net/Config.pm | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)

 diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm
-index db51c1f..8404593 100644
+index ba16332..4b1ea19 100644
 --- a/cpan/libnet/Net/Config.pm
 +++ b/cpan/libnet/Net/Config.pm
@@ -57,9 +57,8 @@ my %nc = (
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From d70e88badfcc6edd05e884597f19fbbdcf2cf6a7 Mon Sep 17 00:00:00 2001
+From 967a87e268bd348423f72dec993eda444ce9f53d Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Note that libperl-dev package is required for embedded linking
@@ -8,15 +7,15 @@ Bug-Debian: http://bugs.debian.org/186778

 Patch-Name: debian/libperl_embed_doc.diff
 ---
- lib/ExtUtils/Embed.pm |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ lib/ExtUtils/Embed.pm | 3 +++
+ 1 file changed, 3 insertions(+)

 diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
-index 9710630..86f13b5 100644
+index 3f983c1..0ec8a67 100644
 --- a/lib/ExtUtils/Embed.pm
 +++ b/lib/ExtUtils/Embed.pm
-@@ -305,6 +305,9 @@ and extensions in your C/C++ applications.
- Typically, an application B<Makefile> will invoke ExtUtils::Embed
+@@ -296,6 +296,9 @@ and extensions in your C/C++ applications.
+ Typically, an application F<Makefile> will invoke C<ExtUtils::Embed>
 functions while building your application.  
 
 +Note that on Debian systems the B<libperl-dev> package is required for
@@ -24,4 +23,4 @@ index 9710630..86f13b5 100644
 +
 =head1 @EXPORT
 
- ExtUtils::Embed exports the following functions:
+ C<ExtUtils::Embed> exports the following functions:
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 11633e598640b02e19329f323623af254fbac451 Mon Sep 17 00:00:00 2001
+From f994a741e51287494ed62b10738be6856aadce71 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Tweak @INC ordering for Debian
@@ -19,14 +18,14 @@ version than is included in core.

 Patch-Name: debian/mod_paths.diff
 ---
- perl.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 58 insertions(+), 0 deletions(-)
+ perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 58 insertions(+)

 diff --git a/perl.c b/perl.c
-index f756e02..d26dcb0 100644
+index 27d0d9e..1fe2f1c 100644
 --- a/perl.c
 +++ b/perl.c
-@@ -4219,6 +4219,11 @@ S_init_perllib(pTHX)
+@@ -4367,6 +4367,11 @@ S_init_perllib(pTHX)
 		      INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
 #endif
 
@@ -38,7 +37,7 @@ index f756e02..d26dcb0 100644
 #ifdef SITEARCH_EXP
     /* sitearch is always relative to sitelib on Windows for
      * DLL-based path intuition to work correctly */
-@@ -4336,6 +4341,59 @@ S_init_perllib(pTHX)
+@@ -4484,6 +4489,59 @@ S_init_perllib(pTHX)
 		      INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
 #endif
 
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From fbb5f07872d45bac76b5c3c83b50a19aa5da10b0 Mon Sep 17 00:00:00 2001
+From 333efa7c9da43d94272a872a59a6cd28da8ca245 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Thu, 8 May 2008 14:32:33 +0300
 Subject: Adjust Module::Build manual page extensions for the Debian Perl
@@ -9,28 +8,28 @@ Bug-Debian: http://bugs.debian.org/479460

 Patch-Name: debian/module_build_man_extensions.diff
 ---
- cpan/Module-Build/lib/Module/Build/Base.pm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
-index fba916a..82df4cc 100644
+index 84e137f..4422cd4 100644
 --- a/cpan/Module-Build/lib/Module/Build/Base.pm
 +++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -3246,7 +3246,7 @@ sub manify_bin_pods {
+@@ -3226,7 +3226,7 @@ sub manify_bin_pods {
   foreach my $file (keys %$files) {
     # Pod::Simple based parsers only support one document per instance.
     # This is expected to change in a future version (Pod::Simple > 3.03).
-    my $parser  = Pod::Man->new( section => 1 ); # binaries go in section 1
-+    my $parser  = Pod::Man->new( section => '1p' ); # binaries go in section 1p
+-    my $parser  = Pod::Man->new( %podman_args );
+    my $parser  = Pod::Man->new( %podman_args, section => '1p' ); # binaries go in section 1p
     my $manpage = $self->man1page_name( $file ) . '.' .
- 	          $self->config( 'man1ext' );
+                   $self->config( 'man1ext' );
     my $outfile = File::Spec->catfile($mandir, $manpage);
-@@ -3271,7 +3271,7 @@ sub manify_lib_pods {
+@@ -3252,7 +3252,7 @@ sub manify_lib_pods {
   while (my ($file, $relfile) = each %$files) {
     # Pod::Simple based parsers only support one document per instance.
     # This is expected to change in a future version (Pod::Simple > 3.03).
-    my $parser  = Pod::Man->new( section => 3 ); # libraries go in section 3
-+    my $parser  = Pod::Man->new( section => '3pm' ); # libraries go in section 3pm
+-    my $parser  = Pod::Man->new( %podman_args );
+    my $parser  = Pod::Man->new( %podman_args, section => '3pm' ); # libraries go in section 3pm
     my $manpage = $self->man3page_name( $relfile ) . '.' .
- 	          $self->config( 'man3ext' );
+                   $self->config( 'man3ext' );
     my $outfile = File::Spec->catfile( $mandir, $manpage);
@@ -1,39 +1,43 @@
-Upstream-Status:Inappropriate [debian patches]
-From 44c7521619dd0e637920393184affcb26a27d5b7 Mon Sep 17 00:00:00 2001
+From 127c026bbb63907b196febf3558842d8f01e52ef Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Don't install .packlist or perllocal.pod for perl or vendor

 Patch-Name: debian/no_packlist_perllocal.diff
 ---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   31 +++--------------------
- 1 files changed, 4 insertions(+), 27 deletions(-)
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++----------------------
+ 1 file changed, 4 insertions(+), 32 deletions(-)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 42bbb83..a16e2d0 100644
+index f977476..0a6797f 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2054,8 +2054,6 @@ doc__install : doc_site_install
+@@ -2079,11 +2079,6 @@ pure_perl_install :: all
+ };
 
- pure_perl_install :: all
- 	$(NOECHO) umask 022; $(MOD_INSTALL) \
-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+     push @m,
+-q{		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
 -		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+-} unless $self->{NO_PACKLIST};
+-
+-    push @m,
+ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
 		$(INST_BIN) $(DESTINSTALLBIN) \
-@@ -2081,8 +2079,6 @@ pure_site_install :: all
- 
+@@ -2115,10 +2110,6 @@ q{		$(INST_LIB) $(DESTINSTALLSITELIB) \
 pure_vendor_install :: all
 	$(NOECHO) umask 022; $(MOD_INSTALL) \
-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+ };
+-    push @m,
+-q{		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
 -		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
- 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
-@@ -2091,37 +2087,19 @@ pure_vendor_install :: all
- 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+-} unless $self->{NO_PACKLIST};
 
+     push @m,
+ q{		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+@@ -2144,37 +2135,19 @@ doc_vendor_install :: all
+ 
+     push @m, q{
 doc_perl_install :: all
 -	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
 -	-$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
@@ -70,9 +74,9 @@ index 42bbb83..a16e2d0 100644
 -		EXE_FILES "$(EXE_FILES)" \
 -		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
- };
+ } unless $self->{NO_PERLLOCAL};
 
-@@ -2130,13 +2108,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+@@ -2183,13 +2156,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
 	$(NOECHO) $(NOOP)
 
 uninstall_from_perldirs ::
@@ -0,0 +1,29 @@
+From dc495a233b95d7e3e6900845847035da8f01aa59 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sat, 14 Apr 2012 11:34:05 +0100
+Subject: Invoke x-terminal-emulator rather than xterm in perl5db.pl
+
+In Debian systems, xterm might not exist or might not be the preferred
+terminal emulator. Use x-terminal-emulator instead
+
+Bug-Debian: http://bugs.debian.org/668490
+Forwarded: not-needed
+
+Patch-Name: debian/perl5db-x-terminal-emulator.patch
+---
+ lib/perl5db.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/perl5db.pl b/lib/perl5db.pl
+index 707d04d..6ac4d36 100644
+--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
+@@ -6945,7 +6945,7 @@ properly set up.
+ sub xterm_get_fork_TTY {
+     ( my $name = $0 ) =~ s,^.*[/\\],,s;
+     open XT,
+-qq[3>&1 xterm -title "Daughter Perl debugger $pids $name" -e sh -c 'tty 1>&3;\
+qq[3>&1 x-terminal-emulator -T "Daughter Perl debugger $pids $name" -e sh -c 'tty 1>&3;\
+  sleep 10000000' |];
+ 
+     # Get the output from 'tty' and clean it up a little.
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 Mon Sep 17 00:00:00 2001
+From 70eb3e56e884e62bcf837c1f8cd32e35e5552889 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Fri, 9 Jan 2009 18:54:47 +0200
 Subject: Make perlivp skip include directories in /usr/local
@@ -23,18 +22,18 @@ Signed-off-by: Niko Tyni <ntyni@debian.org>

 Patch-Name: debian/perlivp.diff
 ---
- utils/perlivp.PL |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ utils/perlivp.PL | 1 +
+ 1 file changed, 1 insertion(+)

 diff --git a/utils/perlivp.PL b/utils/perlivp.PL
-index 6fcb670..1401cac 100644
+index c2f0a11..cc49f96 100644
 --- a/utils/perlivp.PL
 +++ b/utils/perlivp.PL
-@@ -142,6 +142,7 @@ my $INC_total = 0;
+@@ -153,6 +153,7 @@ my $INC_total = 0;
 my $INC_there = 0;
 foreach (@INC) {
     next if $_ eq '.'; # skip -d test here
 +    next if m|/usr/local|; # not shipped on Debian
     if (-d $_) {
-         print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'};
+         print "## Perl \@INC directory '$_' exists.\n" if $opt{'v'};
         $INC_there++;
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 148e2717682ce8c65475ffdeea84b3cdd1ab1649 Mon Sep 17 00:00:00 2001
+From 9ff12f918da84dc355b75fbaa5374a8e276f76d7 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Fiddle with *PREFIX and variables written to the makefile
@@ -11,17 +10,17 @@ modules).

 Patch-Name: debian/prefix_changes.diff
 ---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm  |   12 ++++++------
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |    3 +--
- cpan/ExtUtils-MakeMaker/t/INST.t                |    4 +---
- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t         |   10 +++++-----
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm  | 12 ++++++------
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |  3 +--
+ cpan/ExtUtils-MakeMaker/t/INST.t                |  4 +---
+ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t         | 10 +++++-----
 4 files changed, 13 insertions(+), 16 deletions(-)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-index a38f274..93d3fe9 100644
+index 2066311..0a1fb49 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS.
+@@ -765,8 +765,6 @@ all POD files in MAN1PODS and MAN3PODS.
 sub manifypods_target {
     my($self) = shift;
 
@@ -30,16 +29,16 @@ index a38f274..93d3fe9 100644
     my $dependencies  = '';
 
     # populate manXpods & dependencies:
-@@ -718,7 +716,7 @@ END
+@@ -782,7 +780,7 @@ END
     foreach my $section (qw(1 3)) {
         my $pods = $self->{"MAN${section}PODS"};
-         push @man_cmds, $self->split_command(<<CMD, %$pods);
+         push @man_cmds, $self->split_command(<<CMD, map {($_,$pods->{$_})} sort keys %$pods);
 -	\$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
 +	\$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
 CMD
     }
 
-@@ -1521,9 +1519,11 @@ sub init_INSTALL_from_PREFIX {
+@@ -1748,9 +1746,11 @@ sub init_INSTALL_from_PREFIX {
         $self->{SITEPREFIX}   ||= $sprefix;
         $self->{VENDORPREFIX} ||= $vprefix;
 
@@ -55,24 +54,24 @@ index a38f274..93d3fe9 100644
 
     my $arch    = $Config{archname};
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index a16e2d0..c308c49 100644
+index 0a6797f..c19a5f9 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2981,8 +2981,7 @@ sub prefixify {
-     print STDERR "  prefixify $var => $path\n" if $Verbose >= 2;
-     print STDERR "    from $sprefix to $rprefix\n" if $Verbose >= 2;
+@@ -3029,8 +3029,7 @@ sub prefixify {
+     warn "  prefixify $var => $path\n" if $Verbose >= 2;
+     warn "    from $sprefix to $rprefix\n" if $Verbose >= 2;
 
 -    if( $self->{ARGS}{PREFIX} &&
-        $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) 
+-        $path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
 +    if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
     {
 
-         print STDERR "    cannot prefix, using default.\n" if $Verbose >= 2;
+         warn "    cannot prefix, using default.\n" if $Verbose >= 2;
 diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
-index 6aac294..28294f2 100644
+index 91058bb..e399ced 100644
 --- a/cpan/ExtUtils-MakeMaker/t/INST.t
 +++ b/cpan/ExtUtils-MakeMaker/t/INST.t
-@@ -61,9 +61,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
+@@ -65,9 +65,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
 is( $mm->{NAME}, 'Big::Dummy',  'NAME' );
 is( $mm->{VERSION}, 0.01,            'VERSION' );
 
@@ -84,7 +83,7 @@ index 6aac294..28294f2 100644
 is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
 
 diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
-index fbb18a3..8987569 100644
+index e8de7c6..3fb3f12 100644
 --- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
 +++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
@@ -10,7 +10,7 @@ BEGIN {
@@ -96,8 +95,8 @@ index fbb18a3..8987569 100644
 use MakeMaker::Test::Utils;
 use MakeMaker::Test::Setup::BFD;
 use ExtUtils::MakeMaker;
-@@ -58,16 +58,16 @@ like( $stdout->read, qr{
- 			Writing\ MYMETA.yml\n
+@@ -62,16 +62,16 @@ like( $stdout->read, qr{
+                         (?:Writing\ MYMETA.yml\ and\ MYMETA.json\n)?
 }x );
 
 -is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 063566907896ff32bea27897fa73cebbbd7bacce Mon Sep 17 00:00:00 2001
+From f2d2ddd656999f51148c66a3efce76bda8d2f9ca Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Prune the list of libraries wanted to what we actually need.
@@ -11,29 +10,29 @@ and some of the original list may be present on buildds (see Bug#128355).

 Patch-Name: debian/prune_libs.diff
 ---
- Configure |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
+ Configure | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)

 diff --git a/Configure b/Configure
-index d9911f9..f59f75c 100755
+index 293ef61..3f80a76 100755
 --- a/Configure
 +++ b/Configure
-@@ -1367,8 +1367,7 @@ libswanted_uselargefiles=''
+@@ -1387,8 +1387,7 @@ libswanted_uselargefiles=''
 : set usesocks on the Configure command line to enable socks.
 : List of libraries we want.
 : If anyone needs extra -lxxx, put those in a hint file.
-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+-libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
 -libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
 +libswanted='gdbm gdbm_compat db dl m c crypt'
 : We probably want to search /usr/shlib before most other libraries.
 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
 glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-@@ -22308,7 +22307,7 @@ sunos*X4*)
+@@ -22796,7 +22795,7 @@ sunos*X4*)
     ;;
 *) case "$usedl" in
     $define|true|[yY]*)
-	    set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 
-+	    set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'` 
+-	    set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
+	    set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'`
 	    shift
 	    perllibs="$*"
 	    ;;
@@ -0,0 +1,27 @@
+From 55a3d4b004595a9f171d79329c9d218f0b850bd8 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 17 May 2014 14:57:01 +0300
+Subject: Skip a regeneration check in unrelated git repositories
+
+If the test is run in a git repository without lib/.gitignore,
+for instance because the repository only imported the Perl tarball,
+the regeneration check is broken because lib/.gitignore is missing.
+
+Patch-Name: debian/regen-skip.diff
+---
+ regen/lib_cleanup.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl
+index c9d6e43..fece1ed 100644
+--- a/regen/lib_cleanup.pl
+++ b/regen/lib_cleanup.pl
+@@ -159,7 +159,7 @@ foreach ('win32/Makefile', 'win32/makefile.mk') {
+ }
+ 
+ # This must come last as it can exit early:
+-if ($TAP && !-d '.git' && !-f 'lib/.gitignore') {
+if ($TAP && !-d '.git' || !-f 'lib/.gitignore') {
+     print "ok # skip not being run from a git checkout, hence no lib/.gitignore\n";
+     exit 0;
+ }
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From ff2815399ad94915da2e63cb3c4bbd2d02dac4b2 Mon Sep 17 00:00:00 2001
+From 21747cdd5381a9466fc75ead783980ced8b184a3 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Fri, 5 Aug 2011 10:50:18 +0300
 Subject: Skip a crashing test case in t/op/threads.t on GNU/kFreeBSD
@@ -14,27 +13,28 @@ Skip the test until the culprit is found.

 Patch-Name: debian/skip-kfreebsd-crash.diff
 ---
- t/op/threads.t |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ t/op/threads.t | 4 ++++
+ 1 file changed, 4 insertions(+)

 diff --git a/t/op/threads.t b/t/op/threads.t
-index 24e84e4..6a91366 100644
+index 6fb2410..67b5f4a 100644
 --- a/t/op/threads.t
 +++ b/t/op/threads.t
-@@ -342,6 +342,9 @@ threads->create(
+@@ -376,6 +376,9 @@ EOF
+ }
 
- EOI
 
 +SKIP: {
 +    skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1
 +        if $^O eq 'gnukfreebsd';
 # [perl #78494] Pipes shared between threads block when closed
- watchdog 10;
 {
-@@ -351,5 +354,6 @@ watchdog 10;
+   my $perl = which_perl;
+@@ -384,6 +387,7 @@ EOF
   threads->create(sub { })->join;
   ok(1, "Pipes shared between threads do not block when closed");
 }
 +}
 
- # EOF
+ # [perl #105208] Typeglob clones should not be cloned again during a join
+ {
@@ -0,0 +1,28 @@
+From 4d1b20bcec1610d22b718ffae154427a7a218632 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 22 Apr 2011 11:15:32 +0300
+Subject: Skip tests specific to the upstream Git repository
+
+These tests fail if run from a different git repository than
+upstream. This complicates things needlessly for downstream packagers.
+
+Skip the tests altogether even if the .git directory exists.
+
+Patch-Name: debian/skip-upstream-git-tests.diff
+---
+ t/test.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/test.pl b/t/test.pl
+index 30db88c..0fdc4f4 100644
+--- a/t/test.pl
+++ b/t/test.pl
+@@ -159,7 +159,7 @@ sub skip_all_without_config {
+ 
+ sub find_git_or_skip {
+     my ($source_dir, $reason);
+-    if (-d '.git') {
+    if (-d '.git' && ! -d 'debian') {
+ 	$source_dir = '.';
+     } elsif (-l 'MANIFEST' && -l 'AUTHORS') {
+ 	my $where = readlink 'MANIFEST';
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 718e9cbd59f0739fc9104af111e42fff66f927a7 Mon Sep 17 00:00:00 2001
+From 2f332eeedbf63f72f6b1b157a912282a31a25d3b Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni@debian.org>
 Date: Sun, 3 Oct 2010 21:36:17 +0300
 Subject: Squelch locale warnings in Debian package maintainer scripts
@@ -16,30 +15,30 @@ the warning will be triggered normally again at that point.

 Patch-Name: debian/squelch-locale-warnings.diff
 ---
- locale.c           |    4 ++++
- pod/perllocale.pod |    8 ++++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
+ locale.c           | 4 ++++
+ pod/perllocale.pod | 8 ++++++++
+ 2 files changed, 12 insertions(+)

 diff --git a/locale.c b/locale.c
-index 4631b86..94a0962 100644
+index 6e8728c..f55c4b2 100644
 --- a/locale.c
 +++ b/locale.c
-@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
- 	char *p;
- 	const bool locwarn = (printwarn > 1 ||
- 			(printwarn &&
+@@ -512,6 +512,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+     char *p;
+     const bool locwarn = (printwarn > 1 ||
+                     (printwarn &&
 +
-+			 /* Debian specific change - see http://bugs.debian.org/508764 */
-+			 (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
+                     /* Debian specific change - see http://bugs.debian.org/508764 */
+                     (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
 +
- 			 (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
- 
- 	if (locwarn) {
+                      (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
+     bool done = FALSE;
+     const char *system_default_locale = NULL;
 diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index 8926d8b..6c55889 100644
+index 914281f..15de0d4 100644
 --- a/pod/perllocale.pod
 +++ b/pod/perllocale.pod
-@@ -861,6 +861,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
+@@ -1151,6 +1151,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
 The message tells about some problem in your system's locale support,
 and you should investigate what the problem is.
 
@@ -1,5 +1,4 @@
-Upstream-Status:Inappropriate [debian patches]
-From 492e0d6b4e3e0d786fb88b9058d581f6466c4a3e Mon Sep 17 00:00:00 2001
+From f33f120f0fdf7cd100066390fe0bc426d45b1929 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Set umask approproately for site install directories
@@ -8,23 +7,23 @@ Policy requires group writable site directories

 Patch-Name: debian/writable_site_dirs.diff
 ---
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 865d36d..4ee6b3f 100644
+index 8fdb67c..8b86a24 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2067,7 +2067,7 @@ pure_perl_install :: all
+@@ -2095,7 +2095,7 @@ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
 
 
 pure_site_install :: all
 -	$(NOECHO) umask 022; $(MOD_INSTALL) \
 +	$(NOECHO) umask 02; $(MOD_INSTALL) \
- 		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLSITELIB) \
-@@ -2103,8 +2103,8 @@ doc_perl_install :: all
+ };
+     push @m,
+ q{		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+@@ -2156,8 +2156,8 @@ doc_perl_install :: all
 
 doc_site_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
@@ -2,31 +2,40 @@ Upstream-Status:Inappropriate [debian patch]

 Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files

-Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-===================================================================
--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++----------------------
+ 1 file changed, 4 insertions(+), 32 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2079,11 +2079,6 @@ pure_perl_install :: all
+ };
 
- pure_perl_install :: all
- 	$(NOECHO) $(MOD_INSTALL) \
-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+     push @m,
+-q{		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
 -		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+-} unless $self->{NO_PACKLIST};
+-
+-    push @m,
+ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
 		$(INST_BIN) $(DESTINSTALLBIN) \
-@@ -2074,8 +2072,6 @@ pure_site_install :: all
- 
+@@ -2115,10 +2110,6 @@ q{		$(INST_LIB) $(DESTINSTALLSITELIB) \
 pure_vendor_install :: all
 	$(NOECHO) $(MOD_INSTALL) \
-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+ };
+-    push @m,
+-q{		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
 -		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
- 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
-@@ -2084,37 +2080,19 @@ pure_vendor_install :: all
- 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+-} unless $self->{NO_PACKLIST};
 
+     push @m,
+ q{		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+@@ -2144,37 +2135,19 @@ doc_vendor_install :: all
+ 
+     push @m, q{
 doc_perl_install :: all
 -	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
 -	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
@@ -63,9 +72,9 @@ Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 -		EXE_FILES "$(EXE_FILES)" \
 -		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
- };
+ } unless $self->{NO_PERLLOCAL};
 
-@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIR
+@@ -2183,13 +2156,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
 	$(NOECHO) $(NOOP)
 
 uninstall_from_perldirs ::
@@ -80,3 +89,6 @@ Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 };
 
     join("",@m);
+-- 
+1.8.1.2
+
@@ -0,0 +1,38 @@
+dist/threads/t/join.t: adjust ps option
+
+The ps's option '-f' is not supported by busybox in oe.
+
+Upstream-Status: [oe specific]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ dist/threads/t/join.t | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dist/threads/t/join.t b/dist/threads/t/join.t
+--- a/dist/threads/t/join.t
+++ b/dist/threads/t/join.t
+@@ -118,7 +118,7 @@ if ($^O eq 'linux') {
+                  })->join;
+     #print "# mainthread: \$0 = $0\n";
+     #print "# pid = $$\n";
+-    if (open PS, "ps -f |") { # Note: must work in (all) systems.
+    if (open PS, "ps |") { # Note: must work in (all) systems.
+         my ($sawpid, $sawexe);
+         while (<PS>) {
+             chomp;
+@@ -135,10 +135,10 @@ if ($^O eq 'linux') {
+         if ($sawpid) {
+             ok($sawpid && $sawexe, 'altering $0 is effective');
+         } else {
+-            skip("\$0 check: did not see pid $$ in 'ps -f |'");
+            skip("\$0 check: did not see pid $$ in 'ps |'");
+         }
+     } else {
+-        skip("\$0 check: opening 'ps -f |' failed: $!");
+        skip("\$0 check: opening 'ps |' failed: $!");
+     }
+ } else {
+     skip("\$0 check: only on Linux");
+-- 
+1.8.1.2
+
@@ -0,0 +1,26 @@
+ext/DynaLoader/t/DynaLoader.t: fix calling dl_findfile() failed
+
+Use '$Config{libc}' as the libc file name
+
+Upstream-Status: oe specific
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ ext/DynaLoader/t/DynaLoader.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/DynaLoader/t/DynaLoader.t b/ext/DynaLoader/t/DynaLoader.t
+index ade1f8e..3567afe 100644
+--- a/ext/DynaLoader/t/DynaLoader.t
+++ b/ext/DynaLoader/t/DynaLoader.t
+@@ -106,7 +106,7 @@ ok( defined $dlerr, "dl_error() returning an error message: '$dlerr'" );
+ # ... dl_findfile()
+ SKIP: {
+     my @files = ();
+-    eval { @files = DynaLoader::dl_findfile("c") };
+    eval { @files = DynaLoader::dl_findfile($Config{libc}) };
+     is( $@, '', "calling dl_findfile()" );
+     # Some platforms are known to not have a "libc"
+     # (not at least by that name) that the dl_findfile()
+-- 
+1.8.1.2
+
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0"

-LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
-                    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
+LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
+                    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"

 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl-native"
@@ -17,11 +17,10 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
           file://MM_Unix.pm.patch \
           file://debian/errno_ver.diff \
           file://dynaloaderhack.patch \
-           file://perl-build-in-t-dir.patch \
           file://perl-5.14.3-fix-CVE-2010-4777.patch "

-SRC_URI[md5sum] = "f6a3d878c688d111b495c87db56c5be5"
-SRC_URI[sha256sum] = "03638a4f01bc26b81231233671524b4163849a3a9ea5cc2397293080c4ea339f"
+SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
+SRC_URI[sha256sum] = "4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"

 S = "${WORKDIR}/perl-${PV}"

@@ -87,16 +86,19 @@ do_install () {
 	install lib/ExtUtils/typemap ${D}${libdir}/perl/${PV}/ExtUtils/

 	# perl shared library headers
-	for i in av.h bitcount.h config.h cop.h cv.h dosish.h embed.h embedvar.h \
-		EXTERN.h fakesdio.h fakethr.h form.h gv.h handy.h hv.h INTERN.h \
-		intrpvar.h iperlsys.h keywords.h l1_char_class_tab.h malloc_ctl.h \
-		metaconfig.h mg.h mydtrace.h nostdio.h opcode.h op.h opnames.h \
-		op_reg_common.h overload.h pad.h parser.h patchlevel.h perlapi.h \
-		perl.h perlio.h perliol.h perlsdio.h perlsfio.h perlvars.h \
-		perly.h pp.h pp_proto.h proto.h reentr.h regcharclass.h regcomp.h \
-		regexp.h regnodes.h scope.h sv.h thread.h time64_config.h \
-		time64.h uconfig.h unixish.h utf8.h utfebcdic.h util.h \
-		uudmap.h warnings.h XSUB.h 
+	# reference perl 5.20.0-1 in debian:
+	# https://packages.debian.org/experimental/i386/perl/filelist
+	for i in av.h bitcount.h charclass_invlists.h config.h cop.h cv.h dosish.h \
+		embed.h embedvar.h EXTERN.h fakesdio.h feature.h form.h git_version.h \
+		gv.h handy.h hv_func.h hv.h inline.h INTERN.h intrpvar.h iperlsys.h \
+		keywords.h l1_char_class_tab.h malloc_ctl.h metaconfig.h mg_data.h \
+		mg.h mg_raw.h mg_vtable.h mydtrace.h nostdio.h opcode.h op.h \
+		opnames.h op_reg_common.h overload.h pad.h parser.h patchlevel.h \
+		perlapi.h perl.h perlio.h perliol.h perlsdio.h perlvars.h perly.h \
+		pp.h pp_proto.h proto.h reentr.h regcharclass.h regcomp.h regexp.h \
+		regnodes.h scope.h sv.h thread.h time64_config.h time64.h uconfig.h \
+		unicode_constants.h unixish.h utf8.h utfebcdic.h util.h uudmap.h \
+		vutil.h warnings.h XSUB.h
 	do
 		install $i ${D}${libdir}/perl/${PV}/CORE
 	done
@@ -5,37 +5,24 @@ SRC_URI += "file://run-ptest \

 do_install_ptest () {
 	mkdir -p ${D}${PTEST_PATH}
-	cp -pv TestInit.pm MANIFEST config.sh ${D}${PTEST_PATH}/
+	sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl
+	sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh
+	tar -cf - * --exclude \*.o --exclude libperl.so --exclude Makefile --exclude makefile --exclude hostperl \
+		--exclude miniperl --exclude generate_uudmap | ( cd ${D}${PTEST_PATH} && tar -xf - )

-	tar -cf - t/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
-	ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/
-	ln -sf ${libdir}/perl/${PV} ${D}${PTEST_PATH}/lib
+	sed -i -e "s,${D},,g" \
+	       -e "s,--sysroot=${STAGING_DIR_HOST},,g" \
+	       -e "s,-isystem${STAGING_INCDIR} ,,g" \
+	       -e "s,${STAGING_LIBDIR},${libdir},g" \
+	       -e "s,${STAGING_BINDIR},${bindir},g" \
+	       -e "s,${STAGING_INCDIR},${includedir},g" \
+	       -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
+	       -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
+	       -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
+	    ${D}${PTEST_PATH}/lib/Config.pm

-	for dir in `find ext/ dist/ cpan/ -maxdepth 2 -type d -name t ` ; do
-	    tar -cf - $dir | ( cd ${D}${PTEST_PATH} && tar -xf - )
-	done
-	for file in `find ext dist cpan -name \*.t -o -name \test.pl`;  do
-	    tar -cf - $file | ( cd ${D}${PTEST_PATH} && tar -xf - )
-	done
+	ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl

-	# Tweaks to make tests pass
-	cp -pv lib/unicore/TestProp.pl ${D}${libdir}/perl/${PV}/unicore/
-	# Put all *.t files from the lib dir in the ptest package
-	cd lib
-	for file in `find -name \*.t`; do
-	    tar -cf - $file | ( cd ${D}${libdir}/perl/${PV} && tar -xf - )
-	done
-	cd ..
-
-	mkdir -p ${D}${libdir}/perl/${PV}/XS
-	cp -pv lib/XS/APItest.pm ${D}${libdir}/perl/${PV}/XS/
-	cp -pv lib/XS/Typemap.pm ${D}${libdir}/perl/${PV}/XS/
-	mkdir -p ${D}${libdir}/perl/${PV}/auto/XS/APItest
-	cp -pv lib/auto/XS/APItest/APItest.so ${D}${libdir}/perl/${PV}/auto/XS/APItest/
-	mkdir -p ${D}${libdir}/perl/${PV}/auto/XS/Typemap
-	cp -pv lib/auto/XS/Typemap/Typemap.so ${D}${libdir}/perl/${PV}/auto/XS/Typemap/
-	cp -pv cpan/Digest-MD5/README ${D}${PTEST_PATH}/cpan/Digest-MD5/
-	cp -pv cpan/Digest-MD5/MD5.xs ${D}${PTEST_PATH}/cpan/Digest-MD5/
 }

 python populate_packages_prepend() {
@@ -2,8 +2,8 @@ SUMMARY = "Perl scripting language"
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "devel"
 LICENSE = "Artistic-1.0 | GPL-1.0"
-LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
-		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
+LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
+		    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
@@ -13,7 +13,11 @@ PR = "r1"
 PROVIDES += "libmodule-build-perl"

 SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
-	file://debian/arm_thread_stress_timeout.diff \
+"
+
+# Pick up patches from debian
+# http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
+SRC_URI += " \
 	file://debian/cpan_definstalldirs.diff \
 	file://debian/db_file_ver.diff \
 	file://debian/doc_info.diff \
@@ -25,30 +29,27 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
 	file://debian/extutils_set_libperl_path.diff \
 	file://debian/no_packlist_perllocal.diff \
 	file://debian/prefix_changes.diff \
-	file://debian/fakeroot.diff \
 	file://debian/instmodsh_doc.diff \
 	file://debian/ld_run_path.diff \
 	file://debian/libnet_config_path.diff \
-	file://debian/m68k_thread_stress.diff \
 	file://debian/mod_paths.diff \
 	file://debian/module_build_man_extensions.diff \
 	file://debian/prune_libs.diff \
 	file://debian/fixes/net_smtp_docs.diff \
 	file://debian/perlivp.diff \
-	file://debian/disable-zlib-bundling.diff \
-	file://debian/cpanplus_definstalldirs.diff \
-	file://debian/cpanplus_config_path.diff \
-	file://debian/deprecate-with-apt.diff \
 	file://debian/squelch-locale-warnings.diff \
 	file://debian/skip-upstream-git-tests.diff \
-	file://debian/fixes/extutils-cbuilder-cflags.diff \
-	file://debian/fixes/module-build-home-directory.diff \
 	file://debian/skip-kfreebsd-crash.diff \
 	file://debian/fixes/document_makemaker_ccflags.diff \
-	file://debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch \
-	file://debian/fixes/pod_fixes.diff \
 	file://debian/find_html2text.diff \
-	\
+	file://debian/hurd_test_skip_stack.diff \
+	file://debian/perl5db-x-terminal-emulator.patch \
+	file://debian/cpan-missing-site-dirs.diff \
+	file://debian/fixes/memoize_storable_nstore.diff \
+	file://debian/regen-skip.diff \
+"
+
+SRC_URI += " \
        file://Makefile.patch \
        file://Makefile.SH.patch \
        file://installperl.patch \
@@ -56,17 +57,13 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
        file://perl-moreconfig.patch \
        file://letgcc-find-errno.patch \
        file://generate-sh.patch \
-        file://09_fix_installperl.patch \
        file://native-perlinc.patch \
        file://perl-enable-gdbm.patch \
        file://cross-generate_uudmap.patch \
 	file://fix_bad_rpath.patch \
-	file://perl-build-in-t-dir.patch \
 	file://perl-archlib-exp.patch \
 	file://dynaloaderhack.patch \
 	\
-        file://0001-Fix-misparsing-of-maketext-strings.patch \
-        file://0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch \
        \
        file://config.sh \
        file://config.sh-32 \
@@ -75,11 +72,18 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
        file://config.sh-64 \
        file://config.sh-64-le \
        file://config.sh-64-be \
-        file://perl-5.14.3-fix-CVE-2010-4777.patch "
-#	file://debian/fakeroot.diff
+        file://perl-5.14.3-fix-CVE-2010-4777.patch \
+        file://0001-Makefile.SH-fix-do_install-failed.patch \
+"

-SRC_URI[md5sum] = "f6a3d878c688d111b495c87db56c5be5"
-SRC_URI[sha256sum] = "03638a4f01bc26b81231233671524b4163849a3a9ea5cc2397293080c4ea339f"
+# Fix test case issues
+SRC_URI_append_class-target = " \
+            file://test/dist-threads-t-join.t-adjust-ps-option.patch \
+            file://test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch \
+           "
+
+SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
+SRC_URI[sha256sum] = "4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"

 inherit perlnative siteinfo

@@ -191,6 +195,7 @@ do_compile() {
 }

 do_install() {
+	#export hostperl="${STAGING_BINDIR_NATIVE}/perl-native/perl${PV}"
 	oe_runmake install DESTDIR=${D}
        # Add perl pointing at current version
        ln -sf perl${PV} ${D}${bindir}/perl
@@ -246,7 +251,6 @@ perl_package_preprocess () {
            ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \
            ${PKGD}${libdir}/perl/${PV}/ExtUtils/Liblist/Kid.pm \
            ${PKGD}${libdir}/perl/${PV}/FileCache.pm \
-            ${PKGD}${libdir}/perl/${PV}/cacheout.pl \
            ${PKGD}${libdir}/perl/${PV}/pod/*.pod \
            ${PKGD}${libdir}/perl/config.sh
 }