diff -Nru libcarp-clan-perl-6.04/Changes libcarp-clan-perl-6.06/Changes
--- libcarp-clan-perl-6.04/Changes	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/Changes	2016-05-29 05:57:39.000000000 +0000
@@ -12,6 +12,15 @@
 Version history:
 ----------------
 
+Version 6.06  29.05.2016
+ + Avoid failure due to version self-check in 20pre560.t
+   This test seems like a footgun for release management reasons, but apprently
+   I wasn't quite as careful as I tried to be in keeping the last release minimal.
+
+Version 6.05  29.05.2016
+ + Patch tests failing due to 5.25.1+'s deprecated unquoted { } in regex.
+   (RT #114537)
+
 Version 6.04  24.10.2009
  + Solved RT ticket #50796 (inform type of license)
  + Made the test suite compatible with Perl versions < v5.6.0
diff -Nru libcarp-clan-perl-6.04/debian/changelog libcarp-clan-perl-6.06/debian/changelog
--- libcarp-clan-perl-6.04/debian/changelog	2015-08-17 18:01:06.000000000 +0000
+++ libcarp-clan-perl-6.06/debian/changelog	2021-03-21 05:41:40.000000000 +0000
@@ -1,3 +1,24 @@
+libcarp-clan-perl (6.06-1~16.04.sav0) xenial; urgency=medium
+
+  * Backport to Xenial
+
+ -- Rob Savoury <savoury@savos.tech>  Sat, 20 Mar 2021 22:41:40 -0700
+
+libcarp-clan-perl (6.06-1) unstable; urgency=medium
+
+  [ Salvatore Bonaccorso ]
+  * debian/control: Use HTTPS transport protocol for Vcs-Git URI
+
+  [ gregor herrmann ]
+  * debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
+
+  [ Salvatore Bonaccorso ]
+  * Imported Upstream version 6.06
+  * Update copyright years for debian/* packaging files
+  * Declare compliance with Debian policy 3.9.8
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 29 May 2016 14:04:55 +0200
+
 libcarp-clan-perl (6.04-2) unstable; urgency=low
 
   [ Salvatore Bonaccorso ]
diff -Nru libcarp-clan-perl-6.04/debian/control libcarp-clan-perl-6.06/debian/control
--- libcarp-clan-perl-6.04/debian/control	2015-08-17 18:01:06.000000000 +0000
+++ libcarp-clan-perl-6.06/debian/control	2016-05-29 12:05:21.000000000 +0000
@@ -7,9 +7,9 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
 Uploaders: Martín Ferrari <tincho@debian.org>, Jonathan Yu <jawnsy@cpan.org>,
  Salvatore Bonaccorso <carnil@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: https://metacpan.org/release/Carp-Clan
-Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libcarp-clan-perl.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libcarp-clan-perl.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libcarp-clan-perl.git
 Testsuite: autopkgtest-pkg-perl
 
diff -Nru libcarp-clan-perl-6.04/debian/copyright libcarp-clan-perl-6.06/debian/copyright
--- libcarp-clan-perl-6.04/debian/copyright	2015-08-17 18:01:06.000000000 +0000
+++ libcarp-clan-perl-6.06/debian/copyright	2016-05-29 12:05:21.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Carp-Clan
 Upstream-Contact: Steffen Beyer <stbey@cpan.org>
 Source: https://metacpan.org/release/Carp-Clan
@@ -13,7 +13,7 @@
  2008, Martín Ferrari <martin.ferrari@gmail.com>
  2008, Roberto C. Sanchez <roberto@debian.org>
  2009, Jonathan Yu <jawnsy@cpan.org>
- 2010-2015, Salvatore Bonaccorso <carnil@debian.org>
+ 2010-2016, Salvatore Bonaccorso <carnil@debian.org>
 License: Artistic or GPL-1+
 
 License: Artistic
diff -Nru libcarp-clan-perl-6.04/lib/Carp/Clan.pm libcarp-clan-perl-6.06/lib/Carp/Clan.pm
--- libcarp-clan-perl-6.04/lib/Carp/Clan.pm	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/lib/Carp/Clan.pm	2016-05-29 05:58:37.000000000 +0000
@@ -1,7 +1,7 @@
 
 ##
 ## Based on Carp.pm from Perl 5.005_03.
-## Last modified 24-Oct-2009 by Steffen Beyer.
+## Last modified 22-May-2016 by Kent Fredric.
 ## Should be reasonably backwards compatible.
 ##
 ## This module is free software and can
@@ -28,7 +28,7 @@
 
 $Verbose = 0;        # If true then make _shortmsg call _longmsg instead.
 
-$VERSION = '6.04';
+$VERSION = '6.06';
 
 # _longmsg() crawls all the way up the stack reporting on all the function
 # calls made. The error string, $error, is originally constructed from the
diff -Nru libcarp-clan-perl-6.04/MANIFEST libcarp-clan-perl-6.06/MANIFEST
--- libcarp-clan-perl-6.04/MANIFEST	2009-10-24 21:28:01.000000000 +0000
+++ libcarp-clan-perl-6.06/MANIFEST	2016-05-29 05:59:52.000000000 +0000
@@ -1,15 +1,17 @@
 Changes
-MANIFEST
-Makefile.PL
-README
 lib/Carp/Clan.pm
 lib/Carp/Clan.pod
 license/Artistic.txt
 license/GNU_GPL.txt
+Makefile.PL
+MANIFEST			This list of files
+MANIFEST.SKIP
+README
 t/01pod.t
 t/03yaml.t
 t/10basic.t
 t/11basic.t
 t/20pre560.t
 t/21pre560.t
-META.yml                                 Module meta-data (added by MakeMaker)
+META.yml                                 Module YAML meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff -Nru libcarp-clan-perl-6.04/MANIFEST.SKIP libcarp-clan-perl-6.06/MANIFEST.SKIP
--- libcarp-clan-perl-6.04/MANIFEST.SKIP	1970-01-01 00:00:00.000000000 +0000
+++ libcarp-clan-perl-6.06/MANIFEST.SKIP	2016-05-22 06:05:19.000000000 +0000
@@ -0,0 +1,72 @@
+# Mailmap shouldn't ship to CPAN
+^\.mailmap$
+# Git droppings shouldn't ship
+.*\.orig$
+
+
+#!start included /home/kent/perl5/perlbrew/perls/5.22.1-nossp-sdbm-nopmc/lib/5.22.1/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$         # 6.18 through 6.25 generated this
+\b_eumm/                # 7.05_05 and above
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# and Module::Build::Tiny generated files
+\b_build_params$
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$
+\..*\.sw.?$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+
+# Avoid prove files
+\B\.prove$
+
+# Avoid MYMETA files
+^MYMETA\.
+#!end included /home/kent/perl5/perlbrew/perls/5.22.1-nossp-sdbm-nopmc/lib/5.22.1/ExtUtils/MANIFEST.SKIP
+
diff -Nru libcarp-clan-perl-6.04/META.json libcarp-clan-perl-6.06/META.json
--- libcarp-clan-perl-6.04/META.json	1970-01-01 00:00:00.000000000 +0000
+++ libcarp-clan-perl-6.06/META.json	2016-05-29 05:59:52.000000000 +0000
@@ -0,0 +1,42 @@
+{
+   "abstract" : "Report errors from perspective of caller of a \"clan\" of modules",
+   "author" : [
+      "Steffen Beyer <STBEY@cpan.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Carp-Clan",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "Test::Exception" : "0"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "version" : "6.06",
+   "x_serialization_backend" : "JSON::PP version 2.27300"
+}
diff -Nru libcarp-clan-perl-6.04/META.yml libcarp-clan-perl-6.06/META.yml
--- libcarp-clan-perl-6.04/META.yml	2009-10-24 21:28:01.000000000 +0000
+++ libcarp-clan-perl-6.06/META.yml	2016-05-29 05:59:52.000000000 +0000
@@ -1,14 +1,23 @@
---- #YAML:1.0
-name:                Carp-Clan
-version:             6.04
-abstract:            Report errors from perspective of caller of a "clan" of modules
-license:             perl
-author:              
-    - Steffen Beyer <STBEY@cpan.org>
-generated_by:        ExtUtils::MakeMaker version 6.42
-distribution_type:   module
-requires:     
-    Test::Exception:               0
+---
+abstract: 'Report errors from perspective of caller of a "clan" of modules'
+author:
+  - 'Steffen Beyer <STBEY@cpan.org>'
+build_requires:
+  ExtUtils::MakeMaker: '0'
+configure_requires:
+  ExtUtils::MakeMaker: '0'
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005'
+license: perl
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: Carp-Clan
+no_index:
+  directory:
+    - t
+    - inc
+requires:
+  Test::Exception: '0'
+version: '6.06'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -Nru libcarp-clan-perl-6.04/README libcarp-clan-perl-6.06/README
--- libcarp-clan-perl-6.04/README	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/README	2016-05-29 05:58:06.000000000 +0000
@@ -26,10 +26,10 @@
 What's new in this release:
 ---------------------------
 
-Version 6.04  24.10.2009
- + Solved RT ticket #50796 (inform type of license)
- + Made the test suite compatible with Perl versions < v5.6.0
-
+Version 6.06  29.05.2016
+ + Avoid failure due to version self-check in 20pre560.t
+   This test seems like a footgun for release management reasons, but apprently
+   I wasn't quite as careful as I tried to be in keeping the last release minimal.
 
 Copyright & License:
 --------------------
diff -Nru libcarp-clan-perl-6.04/t/11basic.t libcarp-clan-perl-6.06/t/11basic.t
--- libcarp-clan-perl-6.04/t/11basic.t	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/t/11basic.t	2016-05-22 06:07:13.000000000 +0000
@@ -145,7 +145,7 @@
 
 eval { main::confess('CONFESSing'); };
 
-if ( $@ =~ /\bCONFESSing at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/ )
+if ( $@ =~ /\bCONFESSing at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/ )
 {
     print "ok $n\n";
 }
@@ -169,7 +169,7 @@
     main::cluck('CLUCKing');
 };
 
-if ( $@ =~ /\bCLUCKing at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/ ) {
+if ( $@ =~ /\bCLUCKing at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/ ) {
     print "ok $n\n";
 }
 else { print "not ok $n\n"; }
@@ -186,7 +186,7 @@
 
 eval { Carp::Clan::confess("confessING"); };
 
-if ( $@ =~ /\bconfessING at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/ )
+if ( $@ =~ /\bconfessING at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/ )
 {
     print "ok $n\n";
 }
@@ -210,7 +210,7 @@
     Carp::Clan::cluck("cluckING");
 };
 
-if ( $@ =~ /\bcluckING at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/ ) {
+if ( $@ =~ /\bcluckING at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/ ) {
     print "ok $n\n";
 }
 else { print "not ok $n\n"; }
@@ -235,7 +235,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -264,7 +264,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -292,7 +292,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -321,7 +321,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -349,7 +349,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -378,7 +378,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -406,7 +406,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -435,7 +435,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -463,7 +463,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -492,7 +492,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -520,7 +520,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -549,7 +549,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -577,7 +577,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -606,7 +606,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -628,7 +628,7 @@
          .*\bC::c\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -645,7 +645,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -665,7 +665,7 @@
          .*\bC::c\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bB::b\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bA::a\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -685,7 +685,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -707,7 +707,7 @@
          .*\bC::c\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('croak',\ 'CrOaKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -724,7 +724,7 @@
          .*\bC::c\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\('confess',\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -744,7 +744,7 @@
          .*\bC::c\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bB::b\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bA::a\('carp',\ 'CaRpInG'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
@@ -764,7 +764,7 @@
          .*\bC::c\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\('cluck',\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x
     )
 {
     print "ok $n\n";
diff -Nru libcarp-clan-perl-6.04/t/20pre560.t libcarp-clan-perl-6.06/t/20pre560.t
--- libcarp-clan-perl-6.04/t/20pre560.t	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/t/20pre560.t	2016-05-29 05:56:04.000000000 +0000
@@ -31,7 +31,7 @@
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
-if ($Carp::Clan::VERSION eq '6.04')
+if ($Carp::Clan::VERSION eq '6.06')
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
diff -Nru libcarp-clan-perl-6.04/t/21pre560.t libcarp-clan-perl-6.06/t/21pre560.t
--- libcarp-clan-perl-6.04/t/21pre560.t	2009-10-24 21:28:00.000000000 +0000
+++ libcarp-clan-perl-6.06/t/21pre560.t	2016-05-22 06:07:13.000000000 +0000
@@ -111,7 +111,7 @@
 
 eval { &{*{$main::{'confess'}}}("CONFESSing"); };
 
-if ($@ =~ /\bCONFESSing at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/)
+if ($@ =~ /\bCONFESSing at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -123,7 +123,7 @@
 
 eval { local $SIG{'__WARN__'} = sub { die $_[0]; }; &{*{$main::{'cluck'}}}("CLUCKing"); };
 
-if ($@ =~ /\bCLUCKing at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/)
+if ($@ =~ /\bCLUCKing at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -135,7 +135,7 @@
 
 eval { Carp::Clan::confess("confessING"); };
 
-if ($@ =~ /\bconfessING at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/)
+if ($@ =~ /\bconfessING at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -147,7 +147,7 @@
 
 eval { local $SIG{'__WARN__'} = sub { die $_[0]; }; Carp::Clan::cluck("cluckING"); };
 
-if ($@ =~ /\bcluckING at .+\n.*\b(?:eval {\.\.\.}|require 0) called at\b/)
+if ($@ =~ /\bcluckING at .+\n.*\b(?:eval \{\.\.\.\}|require 0) called at\b/)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -170,7 +170,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -189,7 +189,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -212,7 +212,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -231,7 +231,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -254,7 +254,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -273,7 +273,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -296,7 +296,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -315,7 +315,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -338,7 +338,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -357,7 +357,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -380,7 +380,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -399,7 +399,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -422,7 +422,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -441,7 +441,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -458,7 +458,7 @@
          .*\bC::c\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -471,7 +471,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -484,7 +484,7 @@
          .*\bC::c\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bB::b\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bA::a\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -497,7 +497,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -514,7 +514,7 @@
          .*\bC::c\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(1,\ 'CrOaKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -527,7 +527,7 @@
          .*\bC::c\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bB::b\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
          .*\bA::a\(2,\ 'CoNfEsSiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -540,7 +540,7 @@
          .*\bC::c\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bB::b\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
          .*\bA::a\(3,\ 'CaRpInG'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;
 
@@ -553,7 +553,7 @@
          .*\bC::c\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bB::b\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
          .*\bA::a\(4,\ 'ClUcKiNg'\)\ called\ at\ .+\n
-         .*\b(?:eval\ {\.\.\.}|require\ 0)\ called\ at\ /x)
+         .*\b(?:eval\ \{\.\.\.\}|require\ 0)\ called\ at\ /x)
 {print "ok $n\n";} else {print "not ok $n\n";}
 $n++;