diff -Nru libcapture-tiny-perl-0.32/Changes libcapture-tiny-perl-0.48/Changes
--- libcapture-tiny-perl-0.32/Changes	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/Changes	2018-04-22 07:01:19.000000000 +0000
@@ -1,5 +1,73 @@
 Revision history for Capture-Tiny
 
+0.48      2018-04-22 09:01:08+02:00 Europe/Oslo
+
+  - No changes from 0.47-TRIAL
+
+0.47      2017-07-26 10:34:24-04:00 America/New_York (TRIAL RELEASE)
+
+  [Fixed]
+
+  - Appends PID to random file names for tee signalling to avoid
+    random name collision when used in multiple forked children.
+
+0.46      2017-02-25 14:19:22-05:00 America/New_York
+
+  - No changes from 0.45-TRIAL
+
+0.45      2017-02-23 13:22:43-05:00 America/New_York (TRIAL RELEASE)
+
+  [Internal]
+
+  - Avoid variable shadowing to improve debuggability.
+
+0.44      2016-08-05 13:40:33-04:00 America/New_York
+
+  [Docs]
+
+  - Note that dropping privileges during a capture can lead to
+    temporary files not cleaned up.
+
+0.42      2016-05-31 12:40:10-04:00 America/New_York
+
+  - No changes from 0.41
+
+0.41      2016-05-23 11:58:15-04:00 America/New_York (TRIAL RELEASE)
+
+  [Fixed]
+
+  - Fixed some failing tests when STDIN is routed to /dev/null
+
+0.40      2016-05-23 11:42:35-04:00 America/New_York
+
+  - No changes from 0.39
+
+0.39      2016-05-02 10:21:48-04:00 America/New_York (TRIAL RELEASE)
+
+  [Fixed]
+
+  - Fix in 0.37 tickled a very obscure regular expressions bug in perl <
+    5.18; should now be fixed.
+
+0.37      2016-05-02 07:08:31-04:00 America/New_York (TRIAL RELEASE)
+
+  [Fixed]
+
+  - Skip some tests if locale can't be determined.
+
+0.36      2016-02-28 21:36:57-05:00 America/New_York
+
+  [Docs]
+
+  - Fixed typos.
+
+0.34      2016-02-18 23:26:13-05:00 America/New_York
+
+  [Fixed]
+
+  - Removed spurious JSON::PP dependency added by a broken
+    Dist::Zilla plugin.
+
 0.32      2016-02-18 10:12:02-05:00 America/New_York
 
   [Docs]
diff -Nru libcapture-tiny-perl-0.32/cpanfile libcapture-tiny-perl-0.48/cpanfile
--- libcapture-tiny-perl-0.32/cpanfile	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/cpanfile	2018-04-22 07:01:19.000000000 +0000
@@ -3,7 +3,6 @@
 requires "File::Spec" => "0";
 requires "File::Temp" => "0";
 requires "IO::Handle" => "0";
-requires "JSON::PP" => "2.27300";
 requires "Scalar::Util" => "0";
 requires "perl" => "5.006";
 requires "strict" => "0";
@@ -29,9 +28,9 @@
   requires "Dist::Zilla" => "5";
   requires "Dist::Zilla::Plugin::OSPrereqs" => "0";
   requires "Dist::Zilla::Plugin::Prereqs" => "0";
+  requires "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" => "0";
   requires "Dist::Zilla::Plugin::RemovePrereqs" => "0";
   requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.072";
-  requires "English" => "0";
   requires "File::Spec" => "0";
   requires "File::Temp" => "0";
   requires "IO::Handle" => "0";
@@ -40,10 +39,12 @@
   requires "Pod::Wordlist" => "0";
   requires "Software::License::Apache_2_0" => "0";
   requires "Test::CPAN::Meta" => "0";
+  requires "Test::MinimumVersion" => "0";
   requires "Test::More" => "0";
+  requires "Test::Perl::Critic" => "0";
   requires "Test::Pod" => "1.41";
   requires "Test::Pod::Coverage" => "1.08";
+  requires "Test::Portability::Files" => "0";
   requires "Test::Spelling" => "0.12";
   requires "Test::Version" => "1";
-  requires "blib" => "1.01";
 };
diff -Nru libcapture-tiny-perl-0.32/debian/changelog libcapture-tiny-perl-0.48/debian/changelog
--- libcapture-tiny-perl-0.32/debian/changelog	2016-02-18 18:08:26.000000000 +0000
+++ libcapture-tiny-perl-0.48/debian/changelog	2021-03-19 20:28:16.000000000 +0000
@@ -1,3 +1,75 @@
+libcapture-tiny-perl (0.48-1~16.04.sav0) xenial; urgency=medium
+
+  * Backport to Xenial
+
+ -- Rob Savoury <savoury@savos.tech>  Fri, 19 Mar 2021 13:28:16 -0700
+
+libcapture-tiny-perl (0.48-1) unstable; urgency=medium
+
+  [ Alex Muntada ]
+  * Remove inactive pkg-perl members from Uploaders.
+
+  [ Damyan Ivanov ]
+  * declare conformance with Policy 4.1.3 (no changes needed)
+
+  [ Salvatore Bonaccorso ]
+  * Update Vcs-* headers for switch to salsa.debian.org
+  * Import upstream version 0.48
+  * Update copyright years for debian/* packaging files
+  * Bump Debhelper compat level to 10
+  * Declare compliance with Debian policy 4.1.4
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 22 Apr 2018 15:35:11 +0200
+
+libcapture-tiny-perl (0.46-1) unstable; urgency=medium
+
+  [ gregor herrmann ]
+  * Remove Jonathan Yu from Uploaders. Thanks for your work!
+  * Remove Ryan Niebur from Uploaders. Thanks for your work!
+
+  [ Salvatore Bonaccorso ]
+  * Import upstream version 0.46
+  * Update copyright years for debian/* packaging files
+  * Declare compliance with Debian policy 4.0.0
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Thu, 22 Jun 2017 21:57:49 +0200
+
+libcapture-tiny-perl (0.44-1) unstable; urgency=medium
+
+  * Import upstream version 0.44
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 06 Aug 2016 07:39:28 +0200
+
+libcapture-tiny-perl (0.42-1) unstable; urgency=medium
+
+  * Import upstream version 0.42
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Tue, 31 May 2016 21:56:58 +0200
+
+libcapture-tiny-perl (0.40-1) unstable; urgency=medium
+
+  [ gregor herrmann ]
+  * debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
+
+  [ Salvatore Bonaccorso ]
+  * Import upstream version 0.40
+  * Declare compliance with Debian policy 3.9.8
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 23 May 2016 20:13:12 +0200
+
+libcapture-tiny-perl (0.36-1) unstable; urgency=medium
+
+  * Import upstream version 0.36
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 29 Feb 2016 09:18:07 +0100
+
+libcapture-tiny-perl (0.34-1) unstable; urgency=medium
+
+  * Import upstream version 0.34
+  * Revert "Add (build-)dependency for JSON:PP"
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Fri, 19 Feb 2016 06:52:22 +0100
+
 libcapture-tiny-perl (0.32-1) unstable; urgency=medium
 
   * debian/control: Use HTTPS transport protocol for Vcs-Git URI
diff -Nru libcapture-tiny-perl-0.32/debian/compat libcapture-tiny-perl-0.48/debian/compat
--- libcapture-tiny-perl-0.32/debian/compat	2016-02-18 18:08:26.000000000 +0000
+++ libcapture-tiny-perl-0.48/debian/compat	2018-04-22 13:35:11.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru libcapture-tiny-perl-0.32/debian/control libcapture-tiny-perl-0.48/debian/control
--- libcapture-tiny-perl-0.32/debian/control	2016-02-18 18:08:26.000000000 +0000
+++ libcapture-tiny-perl-0.48/debian/control	2018-04-22 13:35:11.000000000 +0000
@@ -1,27 +1,22 @@
 Source: libcapture-tiny-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
-Uploaders: Ryan Niebur <ryan@debian.org>,
-           Jonathan Yu <jawnsy@cpan.org>,
-           gregor herrmann <gregoa@debian.org>,
-           Salvatore Bonaccorso <carnil@debian.org>,
-           Alessandro Ghedini <ghedo@debian.org>
+Uploaders: gregor herrmann <gregoa@debian.org>,
+           Salvatore Bonaccorso <carnil@debian.org>
 Section: perl
+Testsuite: autopkgtest-pkg-perl
 Priority: optional
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 10)
 Build-Depends-Indep: perl,
-                     perl (>= 5.21.5) | libjson-pp-perl (>= 2.27300),
                      libtest-version-perl
-Standards-Version: 3.9.7
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libcapture-tiny-perl.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libcapture-tiny-perl.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libcapture-tiny-perl
+Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libcapture-tiny-perl.git
 Homepage: https://metacpan.org/release/Capture-Tiny
-Testsuite: autopkgtest-pkg-perl
 
 Package: libcapture-tiny-perl
 Architecture: all
 Depends: ${misc:Depends},
-         ${perl:Depends},
-         perl (>= 5.21.5) | libjson-pp-perl (>= 2.27300)
+         ${perl:Depends}
 Description: module to capture STDOUT and STDERR
  Capture::Tiny is a Perl module that provides a simple, portable way to
  capture anything sent to STDOUT or STDERR, regardless of whether it comes
diff -Nru libcapture-tiny-perl-0.32/debian/copyright libcapture-tiny-perl-0.48/debian/copyright
--- libcapture-tiny-perl-0.32/debian/copyright	2016-02-18 18:08:26.000000000 +0000
+++ libcapture-tiny-perl-0.48/debian/copyright	2018-04-22 13:35:11.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: Capture-Tiny
 Upstream-Contact: David Golden <dagolden@cpan.org>
 Source: https://metacpan.org/release/Capture-Tiny
@@ -11,7 +11,7 @@
 Copyright: 2009, Ryan Niebur <ryanryan52@gmail.com>
  2010, Jonathan Yu <jawnsy@cpan.org>
  2011-2014, gregor herrmann <gregoa@debian.org>
- 2011-2016, Salvatore Bonaccorso <carnil@debian.org>
+ 2011-2018, Salvatore Bonaccorso <carnil@debian.org>
  2011, Alessandro Ghedini <ghedo@debian.org>
 License: Apache-2.0 or Artistic or GPL-1+
 
diff -Nru libcapture-tiny-perl-0.32/dist.ini libcapture-tiny-perl-0.48/dist.ini
--- libcapture-tiny-perl-0.32/dist.ini	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/dist.ini	2018-04-22 07:01:19.000000000 +0000
@@ -12,6 +12,9 @@
 stopwords = resending
 stopwords = undiagnosed
 
+[ReleaseStatus::FromVersion]
+testing = second_decimal_odd
+
 [OSPrereqs / MSWin32]
 Win32API::File = 0
 
diff -Nru libcapture-tiny-perl-0.32/lib/Capture/Tiny.pm libcapture-tiny-perl-0.48/lib/Capture/Tiny.pm
--- libcapture-tiny-perl-0.32/lib/Capture/Tiny.pm	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/lib/Capture/Tiny.pm	2018-04-22 07:01:19.000000000 +0000
@@ -3,7 +3,7 @@
 use warnings;
 package Capture::Tiny;
 # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs
-our $VERSION = '0.32';
+our $VERSION = '0.48';
 use Carp ();
 use Exporter ();
 use IO::Handle ();
@@ -81,7 +81,7 @@
 #--------------------------------------------------------------------------#
 
 sub _relayer {
-  my ($fh, $layers) = @_;
+  my ($fh, $apply_layers) = @_;
   # _debug("# requested layers (@{$layers}) for @{[fileno $fh]}\n");
 
   # eliminate pseudo-layers
@@ -91,7 +91,7 @@
       binmode( $fh, ":pop" );
   }
   # apply other layers
-  my @to_apply = @$layers;
+  my @to_apply = @$apply_layers;
   shift @to_apply; # eliminate initial :unix
   # _debug("# applying layers  (unix @to_apply) to @{[fileno $fh]}\n");
   binmode($fh, ":" . join(":",@to_apply));
@@ -214,7 +214,7 @@
     stderr  => $stash->{capture}{$which},
   };
   # flag file is used to signal the child is ready
-  $stash->{flag_files}{$which} = scalar tmpnam();
+  $stash->{flag_files}{$which} = scalar( tmpnam() ) . $$;
   # execute @cmd as a separate process
   if ( $IS_WIN32 ) {
     my $old_eval_err=$@;
@@ -436,7 +436,7 @@
 
 =head1 VERSION
 
-version 0.32
+version 0.48
 
 =head1 SYNOPSIS
 
@@ -619,7 +619,7 @@
 
 =head2 PerlIO layers
 
-Capture::Tiny does it's best to preserve PerlIO layers such as ':utf8' or
+Capture::Tiny does its best to preserve PerlIO layers such as ':utf8' or
 ':crlf' when capturing (only for Perl 5.8.1+) .  Layers should be applied to
 STDOUT or STDERR I<before> the call to C<capture> or C<tee>.  This may not work
 for tied filehandles (see below).
@@ -705,6 +705,17 @@
 captures.  Other problems may occur in the child or parent, as well.
 Forking in a capture block is not recommended.
 
+=head3 Using threads
+
+Filehandles are global.  Mixing up I/O and captures in different threads
+without coordination is going to cause problems.  Besides, threads are
+officially discouraged.
+
+=head3 Dropping privileges during a capture
+
+If you drop privileges during a capture, temporary files created to
+facilitate the capture may not be cleaned up afterwards.
+
 =head2 No support for Perl 5.8.0
 
 It's just too buggy when it comes to layers and UTF-8.  Perl 5.8.1 or later
@@ -729,7 +740,7 @@
 
 =head1 SEE ALSO
 
-This module was, inspired by L<IO::CaptureOutput>, which provides
+This module was inspired by L<IO::CaptureOutput>, which provides
 similar functionality without the ability to tee output and with more
 complicated code and API.  L<IO::CaptureOutput> does not handle layers
 or most of the unusual cases described in the L</Limitations> section and
@@ -853,7 +864,7 @@
 
 =head1 CONTRIBUTORS
 
-=for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler fecundf
+=for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler fecundf Graham Knop Peter Rabbitson
 
 =over 4
 
@@ -869,6 +880,14 @@
 
 fecundf <not.com+github@gmail.com>
 
+=item *
+
+Graham Knop <haarg@haarg.org>
+
+=item *
+
+Peter Rabbitson <ribasushi@cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE
diff -Nru libcapture-tiny-perl-0.32/Makefile.PL libcapture-tiny-perl-0.48/Makefile.PL
--- libcapture-tiny-perl-0.32/Makefile.PL	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/Makefile.PL	2018-04-22 07:01:19.000000000 +0000
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.043.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.012.
 use strict;
 use warnings;
 
@@ -22,7 +22,6 @@
     "File::Spec" => 0,
     "File::Temp" => 0,
     "IO::Handle" => 0,
-    "JSON::PP" => "2.27300",
     "Scalar::Util" => 0,
     "strict" => 0,
     "warnings" => 0
@@ -34,7 +33,7 @@
     "Test::More" => "0.62",
     "lib" => 0
   },
-  "VERSION" => "0.32",
+  "VERSION" => "0.48",
   "test" => {
     "TESTS" => "t/*.t"
   }
@@ -49,7 +48,6 @@
   "File::Temp" => 0,
   "IO::File" => 0,
   "IO::Handle" => 0,
-  "JSON::PP" => "2.27300",
   "Scalar::Util" => 0,
   "Test::More" => "0.62",
   "lib" => 0,
@@ -68,7 +66,7 @@
   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
 
 if ( $^O eq 'MSWin32' ) {
-	$WriteMakefileArgs{PREREQ_PM}{'Win32API::File'} = '0';
+	$WriteMakefileArgs{PREREQ_PM}{'Win32API::File'} = $FallbackPrereqs{'Win32API::File'} = '0';
 }
 
 WriteMakefile(%WriteMakefileArgs);
diff -Nru libcapture-tiny-perl-0.32/MANIFEST libcapture-tiny-perl-0.48/MANIFEST
--- libcapture-tiny-perl-0.32/MANIFEST	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/MANIFEST	2018-04-22 07:01:19.000000000 +0000
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.043.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.012.
 CONTRIBUTING.mkdn
 Changes
 LICENSE
@@ -45,10 +45,10 @@
 t/lib/Utils.pm
 xt/author/00-compile.t
 xt/author/critic.t
+xt/author/minimum-version.t
 xt/author/pod-coverage.t
 xt/author/pod-spell.t
 xt/author/pod-syntax.t
+xt/author/portability.t
 xt/author/test-version.t
 xt/release/distmeta.t
-xt/release/minimum-version.t
-xt/release/portability.t
diff -Nru libcapture-tiny-perl-0.32/META.json libcapture-tiny-perl-0.48/META.json
--- libcapture-tiny-perl-0.32/META.json	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/META.json	2018-04-22 07:01:19.000000000 +0000
@@ -4,7 +4,7 @@
       "David Golden <dagolden@cpan.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150001",
+   "generated_by" : "Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "apache_2_0"
    ],
@@ -35,9 +35,9 @@
             "Dist::Zilla" : "5",
             "Dist::Zilla::Plugin::OSPrereqs" : "0",
             "Dist::Zilla::Plugin::Prereqs" : "0",
+            "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" : "0",
             "Dist::Zilla::Plugin::RemovePrereqs" : "0",
             "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.072",
-            "English" : "0",
             "File::Spec" : "0",
             "File::Temp" : "0",
             "IO::Handle" : "0",
@@ -46,12 +46,14 @@
             "Pod::Wordlist" : "0",
             "Software::License::Apache_2_0" : "0",
             "Test::CPAN::Meta" : "0",
+            "Test::MinimumVersion" : "0",
             "Test::More" : "0",
+            "Test::Perl::Critic" : "0",
             "Test::Pod" : "1.41",
             "Test::Pod::Coverage" : "1.08",
+            "Test::Portability::Files" : "0",
             "Test::Spelling" : "0.12",
-            "Test::Version" : "1",
-            "blib" : "1.01"
+            "Test::Version" : "1"
          }
       },
       "runtime" : {
@@ -61,7 +63,6 @@
             "File::Spec" : "0",
             "File::Temp" : "0",
             "IO::Handle" : "0",
-            "JSON::PP" : "2.27300",
             "Scalar::Util" : "0",
             "perl" : "5.006",
             "strict" : "0",
@@ -84,7 +85,7 @@
    "provides" : {
       "Capture::Tiny" : {
          "file" : "lib/Capture/Tiny.pm",
-         "version" : "0.32"
+         "version" : "0.48"
       }
    },
    "release_status" : "stable",
@@ -99,12 +100,16 @@
          "web" : "https://github.com/dagolden/Capture-Tiny"
       }
    },
-   "version" : "0.32",
+   "version" : "0.48",
    "x_authority" : "cpan:DAGOLDEN",
    "x_contributors" : [
-      "Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>",
+      "Dagfinn Ilmari Manns\u00e5ker <ilmari@ilmari.org>",
       "David E. Wheeler <david@justatheory.com>",
-      "fecundf <not.com+github@gmail.com>"
-   ]
+      "fecundf <not.com+github@gmail.com>",
+      "Graham Knop <haarg@haarg.org>",
+      "Peter Rabbitson <ribasushi@cpan.org>"
+   ],
+   "x_generated_by_perl" : "v5.26.1",
+   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0239"
 }
 
diff -Nru libcapture-tiny-perl-0.32/META.yml libcapture-tiny-perl-0.48/META.yml
--- libcapture-tiny-perl-0.32/META.yml	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/META.yml	2018-04-22 07:01:19.000000000 +0000
@@ -11,7 +11,7 @@
 configure_requires:
   ExtUtils::MakeMaker: '6.17'
 dynamic_config: 1
-generated_by: 'Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150001'
+generated_by: 'Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010'
 license: apache
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -28,14 +28,13 @@
 provides:
   Capture::Tiny:
     file: lib/Capture/Tiny.pm
-    version: '0.32'
+    version: '0.48'
 requires:
   Carp: '0'
   Exporter: '0'
   File::Spec: '0'
   File::Temp: '0'
   IO::Handle: '0'
-  JSON::PP: '2.27300'
   Scalar::Util: '0'
   perl: '5.006'
   strict: '0'
@@ -44,9 +43,13 @@
   bugtracker: https://github.com/dagolden/Capture-Tiny/issues
   homepage: https://github.com/dagolden/Capture-Tiny
   repository: https://github.com/dagolden/Capture-Tiny.git
-version: '0.32'
+version: '0.48'
 x_authority: cpan:DAGOLDEN
 x_contributors:
   - 'Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>'
   - 'David E. Wheeler <david@justatheory.com>'
   - 'fecundf <not.com+github@gmail.com>'
+  - 'Graham Knop <haarg@haarg.org>'
+  - 'Peter Rabbitson <ribasushi@cpan.org>'
+x_generated_by_perl: v5.26.1
+x_serialization_backend: 'YAML::Tiny version 1.70'
diff -Nru libcapture-tiny-perl-0.32/README libcapture-tiny-perl-0.48/README
--- libcapture-tiny-perl-0.32/README	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/README	2018-04-22 07:01:19.000000000 +0000
@@ -3,7 +3,7 @@
     programs
 
 VERSION
-    version 0.32
+    version 0.48
 
 SYNOPSIS
       use Capture::Tiny ':all';
@@ -173,10 +173,10 @@
     platform.
 
   PerlIO layers
-    Capture::Tiny does it's best to preserve PerlIO layers such as ':utf8'
-    or ':crlf' when capturing (only for Perl 5.8.1+) . Layers should be
-    applied to STDOUT or STDERR *before* the call to "capture" or "tee".
-    This may not work for tied filehandles (see below).
+    Capture::Tiny does its best to preserve PerlIO layers such as ':utf8' or
+    ':crlf' when capturing (only for Perl 5.8.1+) . Layers should be applied
+    to STDOUT or STDERR *before* the call to "capture" or "tee". This may
+    not work for tied filehandles (see below).
 
   Modifying filehandles before capturing
     Generally speaking, you should do little or no manipulation of the
@@ -256,6 +256,15 @@
     for captures. Other problems may occur in the child or parent, as well.
     Forking in a capture block is not recommended.
 
+   Using threads
+    Filehandles are global. Mixing up I/O and captures in different threads
+    without coordination is going to cause problems. Besides, threads are
+    officially discouraged.
+
+   Dropping privileges during a capture
+    If you drop privileges during a capture, temporary files created to
+    facilitate the capture may not be cleaned up afterwards.
+
   No support for Perl 5.8.0
     It's just too buggy when it comes to layers and UTF-8. Perl 5.8.1 or
     later is recommended.
@@ -276,7 +285,7 @@
     proceed.
 
 SEE ALSO
-    This module was, inspired by IO::CaptureOutput, which provides similar
+    This module was inspired by IO::CaptureOutput, which provides similar
     functionality without the ability to tee output and with more
     complicated code and API. IO::CaptureOutput does not handle layers or
     most of the unusual cases described in the "Limitations" section and I
@@ -353,6 +362,10 @@
 
     *   fecundf <not.com+github@gmail.com>
 
+    *   Graham Knop <haarg@haarg.org>
+
+    *   Peter Rabbitson <ribasushi@cpan.org>
+
 COPYRIGHT AND LICENSE
     This software is Copyright (c) 2009 by David Golden.
 
diff -Nru libcapture-tiny-perl-0.32/t/00-report-prereqs.dd libcapture-tiny-perl-0.48/t/00-report-prereqs.dd
--- libcapture-tiny-perl-0.32/t/00-report-prereqs.dd	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/t/00-report-prereqs.dd	2018-04-22 07:01:19.000000000 +0000
@@ -9,9 +9,9 @@
                                       'Dist::Zilla' => '5',
                                       'Dist::Zilla::Plugin::OSPrereqs' => '0',
                                       'Dist::Zilla::Plugin::Prereqs' => '0',
+                                      'Dist::Zilla::Plugin::ReleaseStatus::FromVersion' => '0',
                                       'Dist::Zilla::Plugin::RemovePrereqs' => '0',
                                       'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.072',
-                                      'English' => '0',
                                       'File::Spec' => '0',
                                       'File::Temp' => '0',
                                       'IO::Handle' => '0',
@@ -20,12 +20,14 @@
                                       'Pod::Wordlist' => '0',
                                       'Software::License::Apache_2_0' => '0',
                                       'Test::CPAN::Meta' => '0',
+                                      'Test::MinimumVersion' => '0',
                                       'Test::More' => '0',
+                                      'Test::Perl::Critic' => '0',
                                       'Test::Pod' => '1.41',
                                       'Test::Pod::Coverage' => '1.08',
+                                      'Test::Portability::Files' => '0',
                                       'Test::Spelling' => '0.12',
-                                      'Test::Version' => '1',
-                                      'blib' => '1.01'
+                                      'Test::Version' => '1'
                                     }
                     },
        'runtime' => {
@@ -35,7 +37,6 @@
                                       'File::Spec' => '0',
                                       'File::Temp' => '0',
                                       'IO::Handle' => '0',
-                                      'JSON::PP' => '2.27300',
                                       'Scalar::Util' => '0',
                                       'perl' => '5.006',
                                       'strict' => '0',
diff -Nru libcapture-tiny-perl-0.32/t/00-report-prereqs.t libcapture-tiny-perl-0.48/t/00-report-prereqs.t
--- libcapture-tiny-perl-0.32/t/00-report-prereqs.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/t/00-report-prereqs.t	2018-04-22 07:01:19.000000000 +0000
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.021
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027
 
 use Test::More tests => 1;
 
@@ -68,7 +68,7 @@
 );
 
 # Add static prereqs to the included modules list
-my $static_prereqs = do 't/00-report-prereqs.dd';
+my $static_prereqs = do './t/00-report-prereqs.dd';
 
 # Merge all prereqs (either with ::Prereqs or a hashref)
 my $full_prereqs = _merge_prereqs(
@@ -78,12 +78,14 @@
 
 # Add dynamic prereqs to the included modules list (if we can)
 my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
-if ( $source && $HAS_CPAN_META ) {
-    if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
-        $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
-    }
+my $cpan_meta_error;
+if ( $source && $HAS_CPAN_META
+    && (my $meta = eval { CPAN::Meta->load_file($source) } )
+) {
+    $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
 }
 else {
+    $cpan_meta_error = $@;    # capture error from CPAN::Meta->load_file($source)
     $source = 'static metadata';
 }
 
@@ -169,10 +171,18 @@
     diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
 }
 
+if ( $cpan_meta_error || @dep_errors ) {
+    diag "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n";
+}
+
+if ( $cpan_meta_error ) {
+    my ($orig_source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
+    diag "\nCPAN::Meta->load_file('$orig_source') failed with: $cpan_meta_error\n";
+}
+
 if ( @dep_errors ) {
     diag join("\n",
-        "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
-        "The following REQUIRED prerequisites were not satisfied:\n",
+        "\nThe following REQUIRED prerequisites were not satisfied:\n",
         @dep_errors,
         "\n"
     );
diff -Nru libcapture-tiny-perl-0.32/t/12-stdin-string.t libcapture-tiny-perl-0.48/t/12-stdin-string.t
--- libcapture-tiny-perl-0.32/t/12-stdin-string.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/t/12-stdin-string.t	2018-04-22 07:01:19.000000000 +0000
@@ -53,7 +53,7 @@
 }
 
 is( next_fd, $fd, "no file descriptors leaked" );
-restore_std(qw/stdout/);
+restore_std(qw/stdin/);
 
 exit 0;
 
diff -Nru libcapture-tiny-perl-0.32/t/lib/Cases.pm libcapture-tiny-perl-0.48/t/lib/Cases.pm
--- libcapture-tiny-perl-0.32/t/lib/Cases.pm	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/t/lib/Cases.pm	2018-04-22 07:01:19.000000000 +0000
@@ -10,6 +10,11 @@
   run_test
 );
 
+my $locale_ok = eval {
+    my $err = capture_stderr { system($^X, '-we', 1) };
+    $err !~ /setting locale failed/i;
+};
+
 my $have_diff = eval {
   require Test::Differences;
   Test::Differences->import;
@@ -259,6 +264,12 @@
   my $skip_utf8 = shift || '';
   local $ENV{PERL_CAPTURE_TINY_TIMEOUT} = 0; # don't timeout during testing
   for my $m ( keys %methods ) {
+    if ( ($m eq 'sys' || substr($test_type,0,3) eq 'tee' ) && ! $locale_ok ) {
+        SKIP: {
+            skip "Perl could not initialize locale", 1
+        };
+        next;
+    }
     for my $c ( keys %channels ) {
       for my $t ( keys %texts     ) {
         next if $t eq 'unicode' && $skip_utf8;
diff -Nru libcapture-tiny-perl-0.32/Todo libcapture-tiny-perl-0.48/Todo
--- libcapture-tiny-perl-0.32/Todo	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/Todo	2018-04-22 07:01:19.000000000 +0000
@@ -6,4 +6,3 @@
 
 - Test utf8 output
 - Test with curses
-- Add tee_stdout and tee_stderr functions (?)
diff -Nru libcapture-tiny-perl-0.32/xt/author/00-compile.t libcapture-tiny-perl-0.48/xt/author/00-compile.t
--- libcapture-tiny-perl-0.32/xt/author/00-compile.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/00-compile.t	2018-04-22 07:01:19.000000000 +0000
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.054
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.058
 
 use Test::More;
 
@@ -19,7 +19,9 @@
 local $ENV{HOME} = File::Temp::tempdir( CLEANUP => 1 );
 
 
-my $inc_switch = -d 'blib' ? '-Mblib' : '-Ilib';
+my @switches = (
+    -d 'blib' ? '-Mblib' : '-Ilib',
+);
 
 use File::Spec;
 use IPC::Open3;
@@ -33,14 +35,18 @@
     # see L<perlfaq8/How can I capture STDERR from an external command?>
     my $stderr = IO::Handle->new;
 
-    my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]");
+    diag('Running: ', join(', ', map { my $str = $_; $str =~ s/'/\\'/g; q{'} . $str . q{'} }
+            $^X, @switches, '-e', "require q[$lib]"))
+        if $ENV{PERL_COMPILE_TEST_DEBUG};
+
+    my $pid = open3($stdin, '>&STDERR', $stderr, $^X, @switches, '-e', "require q[$lib]");
     binmode $stderr, ':crlf' if $^O eq 'MSWin32';
     my @_warnings = <$stderr>;
     waitpid($pid, 0);
     is($?, 0, "$lib loaded ok");
 
     shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/
-        and not eval { require blib; blib->VERSION('1.01') };
+        and not eval { +require blib; blib->VERSION('1.01') };
 
     if (@_warnings)
     {
diff -Nru libcapture-tiny-perl-0.32/xt/author/critic.t libcapture-tiny-perl-0.48/xt/author/critic.t
--- libcapture-tiny-perl-0.32/xt/author/critic.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/critic.t	2018-04-22 07:01:19.000000000 +0000
@@ -3,10 +3,5 @@
 use strict;
 use warnings;
 
-use Test::More;
-use English qw(-no_match_vars);
-
-eval "use Test::Perl::Critic";
-plan skip_all => 'Test::Perl::Critic required to criticise code' if $@;
-Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc";
+use Test::Perl::Critic (-profile => "perlcritic.rc") x!! -e "perlcritic.rc";
 all_critic_ok();
diff -Nru libcapture-tiny-perl-0.32/xt/author/minimum-version.t libcapture-tiny-perl-0.48/xt/author/minimum-version.t
--- libcapture-tiny-perl-0.32/xt/author/minimum-version.t	1970-01-01 00:00:00.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/minimum-version.t	2018-04-22 07:01:19.000000000 +0000
@@ -0,0 +1,6 @@
+#!perl
+
+use Test::More;
+
+use Test::MinimumVersion;
+all_minimum_version_ok( qq{5.010} );
diff -Nru libcapture-tiny-perl-0.32/xt/author/pod-spell.t libcapture-tiny-perl-0.48/xt/author/pod-spell.t
--- libcapture-tiny-perl-0.32/xt/author/pod-spell.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/pod-spell.t	2018-04-22 07:01:19.000000000 +0000
@@ -2,30 +2,36 @@
 use warnings;
 use Test::More;
 
-# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007000
+# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007005
 use Test::Spelling 0.12;
 use Pod::Wordlist;
 
 
 add_stopwords(<DATA>);
-all_pod_files_spelling_ok( qw( bin lib  ) );
+all_pod_files_spelling_ok( qw( bin lib ) );
 __DATA__
-UTF
-seekable
-prototyped
-resending
-undiagnosed
+Capture
+Dagfinn
 David
 Golden
-dagolden
-Dagfinn
+Graham
 Ilmari
+Knop
 Mannsåker
-ilmari
+Peter
+Rabbitson
+Tiny
+UTF
 Wheeler
+dagolden
 david
 fecundf
-not
+haarg
+ilmari
 lib
-Capture
-Tiny
+not
+prototyped
+resending
+ribasushi
+seekable
+undiagnosed
diff -Nru libcapture-tiny-perl-0.32/xt/author/portability.t libcapture-tiny-perl-0.48/xt/author/portability.t
--- libcapture-tiny-perl-0.32/xt/author/portability.t	1970-01-01 00:00:00.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/portability.t	2018-04-22 07:01:19.000000000 +0000
@@ -0,0 +1,10 @@
+use strict;
+use warnings;
+
+use Test::More;
+
+eval 'use Test::Portability::Files';
+plan skip_all => 'Test::Portability::Files required for testing portability'
+    if $@;
+options(test_one_dot => 0);
+run_tests();
diff -Nru libcapture-tiny-perl-0.32/xt/author/test-version.t libcapture-tiny-perl-0.48/xt/author/test-version.t
--- libcapture-tiny-perl-0.32/xt/author/test-version.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/author/test-version.t	2018-04-22 07:01:19.000000000 +0000
@@ -2,7 +2,7 @@
 use warnings;
 use Test::More;
 
-# generated by Dist::Zilla::Plugin::Test::Version 1.05
+# generated by Dist::Zilla::Plugin::Test::Version 1.09
 use Test::Version;
 
 my @imports = qw( version_all_ok );
@@ -17,7 +17,6 @@
 push @imports, $params
     if version->parse( $Test::Version::VERSION ) >= version->parse('1.002');
 
-
 Test::Version->import(@imports);
 
 version_all_ok;
diff -Nru libcapture-tiny-perl-0.32/xt/release/minimum-version.t libcapture-tiny-perl-0.48/xt/release/minimum-version.t
--- libcapture-tiny-perl-0.32/xt/release/minimum-version.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/release/minimum-version.t	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#!perl
-
-use Test::More;
-
-eval "use Test::MinimumVersion";
-plan skip_all => "Test::MinimumVersion required for testing minimum versions"
-  if $@;
-all_minimum_version_ok( qq{5.010} );
diff -Nru libcapture-tiny-perl-0.32/xt/release/portability.t libcapture-tiny-perl-0.48/xt/release/portability.t
--- libcapture-tiny-perl-0.32/xt/release/portability.t	2016-02-18 15:12:08.000000000 +0000
+++ libcapture-tiny-perl-0.48/xt/release/portability.t	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use Test::More;
-
-eval 'use Test::Portability::Files';
-plan skip_all => 'Test::Portability::Files required for testing portability'
-    if $@;
-options(test_one_dot => 0);
-run_tests();