diff --git a/perl/PKGBUILD b/perl/PKGBUILD
index 1fe9e4f5..f2f44618 100644
--- a/perl/PKGBUILD
+++ b/perl/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
 pkgname=perl
-pkgver=5.20.2
+pkgver=5.22.0
 pkgrel=1
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
@@ -14,146 +14,143 @@ source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
         perlbin.sh
         perlbin.csh
         perl-5.18.0-cygwin.patch
-        perl-5.20.0-msys2.patch
+        perl-5.22.0-msys2.patch
         perl-nostdio.patch)
 options=('makeflags' '!purge' 'emptydirs')
 # NOTE: This array is automatically generated by `./patchprov`.
 #       If you want to add entries, do so in the next array.
-provides=('perl-Archive-Tar=1.96'
-          'perl-Attribute-Handlers=0.96'
-          'perl-autodie=2.23'
+provides=('perl-Archive-Tar=2.04'
+          'perl-Attribute-Handlers=0.97'
+          'perl-autodie=2.26'
           'perl-AutoLoader=5.74'
           'perl-autouse=1.08'
-          'perl-B-Debug=1.19'
+          'perl-B-Debug=1.23'
           'perl-base=2.22'
-          'perl-bignum=0.37'
-          'perl-Carp=1.3301'
-          'perl-CGI=3.65'
-          'perl-Compress-Raw-Bzip2=2.064'
-          'perl-Compress-Raw-Zlib=2.065'
-          'perl-Config-Perl-V=0.22'
-          'perl-constant=1.31'
-          'perl-CPAN-Meta-Requirements=2.125'
+          'perl-bignum=0.39'
+          'perl-Carp=1.36'
+          'perl-Compress-Raw-Bzip2=2.068'
+          'perl-Compress-Raw-Zlib=2.068'
+          'perl-Config-Perl-V=0.24'
+          'perl-constant=1.33'
+          'perl-CPAN-Meta-Requirements=2.132'
           'perl-CPAN-Meta-YAML=0.012'
-          'perl-CPAN-Meta=2.140640'
-          'perl-CPAN=2.05'
-          'perl-Data-Dumper=2.151'
-          'perl-DB_File=1.831'
-          'perl-Devel-PPPort=3.21'
+          'perl-CPAN-Meta=2.150001'
+          'perl-CPAN=2.11'
+          'perl-Data-Dumper=2.158'
+          'perl-DB_File=1.835'
+          'perl-Devel-PPPort=3.31'
           'perl-Devel-SelfStubber=1.05'
-          'perl-Digest-MD5=2.53'
-          'perl-Digest-SHA=5.88'
+          'perl-Digest-MD5=2.54'
+          'perl-Digest-SHA=5.95'
           'perl-Digest=1.17'
           'perl-Dumpvalue=1.17'
-          'perl-Encode=2.60'
+          'perl-Encode=2.72'
           'perl-encoding-warnings=0.11'
           'perl-Env=1.04'
-          'perl-experimental=0.007'
-          'perl-Exporter=5.71'
-          'perl-ExtUtils-CBuilder=0.280217'
-          'perl-ExtUtils-Command=1.18'
+          'perl-experimental=0.013'
+          'perl-Exporter=5.72'
+          'perl-ExtUtils-CBuilder=0.280221'
+          'perl-ExtUtils-Command=1.20'
           'perl-ExtUtils-Constant=0.23'
-          'perl-ExtUtils-Install=1.67'
-          'perl-ExtUtils-MakeMaker=6.98'
-          'perl-ExtUtils-Manifest=1.63'
-          'perl-ExtUtils-ParseXS=3.24'
+          'perl-ExtUtils-Install=2.04'
+          'perl-ExtUtils-MakeMaker=7.04_01'
+          'perl-ExtUtils-Manifest=1.70'
+          'perl-ExtUtils-ParseXS=3.28'
           'perl-File-Fetch=0.48'
           'perl-File-Path=2.09'
           'perl-File-Temp=0.2304'
-          'perl-Filter-Simple=0.91'
-          'perl-Filter-Util-Call=1.49'
-          'perl-Getopt-Long=2.42'
-          'perl-HTTP-Tiny=0.043'
+          'perl-Filter-Simple=0.92'
+          'perl-Filter-Util-Call=1.54'
+          'perl-Getopt-Long=2.45'
+          'perl-HTTP-Tiny=0.054'
           'perl-I18N-Collate=1.02'
           'perl-I18N-LangTags=0.40'
-          'perl-if=0.0603'
-          'perl-IO-Compress=2.064'
-          'perl-IO-Socket-IP=0.29'
+          'perl-if=0.0604'
+          'perl-IO-Compress=2.068'
+          'perl-IO-Socket-IP=0.37'
           'perl-IO-Zlib=1.10'
-          'perl-IO=1.31'
+          'perl-IO=1.35'
           'perl-IPC-Cmd=0.92'
           'perl-IPC-SysV=2.04'
-          'perl-JSON-PP=2.27203'
+          'perl-JSON-PP=2.27300'
           'perl-lib=0.63'
-          'perl-libnet=1.25'
-          'perl-Locale-Codes=3.30'
+          'perl-libnet=3.05'
+          'perl-Locale-Codes=3.34'
           'perl-Locale-Maketext-Simple=0.21'
-          'perl-Locale-Maketext=1.25'
+          'perl-Locale-Maketext=1.26'
           'perl-Math-BigInt-FastCalc=0.31'
-          'perl-Math-BigInt=1.9993'
-          'perl-Math-BigRat=0.2606'
+          'perl-Math-BigInt=1.9997'
+          'perl-Math-BigRat=0.2608'
           'perl-Math-Complex=1.59'
           'perl-Memoize=1.03'
-          'perl-MIME-Base64=3.14'
-          'perl-Module-Build=0.4205'
-          'perl-Module-CoreList=5.020001'
-          'perl-Module-Load-Conditional=0.62'
+          'perl-MIME-Base64=3.15'
+          'perl-Module-CoreList=5.20150520'
+          'perl-Module-Load-Conditional=0.64'
           'perl-Module-Load=0.32'
           'perl-Module-Loaded=0.08'
-          'perl-Module-Metadata=1.000019'
+          'perl-Module-Metadata=1.000026'
           'perl-Net-Ping=2.43'
-          'perl-Package-Constants=0.04'
           'perl-Params-Check=0.38'
-          'perl-parent=0.228'
+          'perl-parent=0.232'
           'perl-Parse-CPAN-Meta=1.4414'
-          'perl-PathTools=3.48'
-          'perl-Perl-OSType=1.007'
-          'perl-perlfaq=5.0150044'
-          'perl-PerlIO-via-QuotedPrint=0.07'
+          'perl-PathTools=3.56'
+          'perl-Perl-OSType=1.008'
+          'perl-perlfaq=5.021009'
+          'perl-PerlIO-via-QuotedPrint=0.08'
           'perl-Pod-Checker=1.60'
-          'perl-Pod-Escapes=1.06'
-          'perl-Pod-Parser=1.62'
-          'perl-Pod-Perldoc=3.23'
-          'perl-Pod-Simple=3.28'
-          'perl-Pod-Usage=1.63'
+          'perl-Pod-Escapes=1.07'
+          'perl-Pod-Parser=1.63'
+          'perl-Pod-Perldoc=3.25'
+          'perl-Pod-Simple=3.29'
+          'perl-Pod-Usage=1.64'
           'perl-podlators=2.5.3'
-          'perl-Safe=2.37'
-          'perl-Scalar-List-Utils=1.38'
+          'perl-Safe=2.39'
+          'perl-Scalar-List-Utils=1.41'
           'perl-Search-Dict=1.07'
-          'perl-SelfLoader=1.21'
-          'perl-Socket=2.013'
-          'perl-Storable=2.49'
+          'perl-SelfLoader=1.22'
+          'perl-Socket=2.018'
+          'perl-Storable=2.53'
           'perl-Sys-Syslog=0.33'
-          'perl-Term-ANSIColor=4.02'
+          'perl-Term-ANSIColor=4.03'
           'perl-Term-Cap=1.15'
-          'perl-Term-Complete=1.402'
-          'perl-Term-ReadLine=1.14'
-          'perl-Test-Harness=3.30'
-          'perl-Test-Simple=1.001002'
+          'perl-Term-Complete=1.403'
+          'perl-Term-ReadLine=1.15'
+          'perl-Test-Harness=3.35'
+          'perl-Test-Simple=1.001014'
           'perl-Test=1.26'
           'perl-Text-Abbrev=1.02'
-          'perl-Text-Balanced=2.02'
-          'perl-Text-ParseWords=3.29'
+          'perl-Text-Balanced=2.03'
+          'perl-Text-ParseWords=3.30'
           'perl-Text-Tabs=2013.0523'
           'perl-Thread-Queue=3.05'
           'perl-Thread-Semaphore=2.12'
-          'perl-threads-shared=1.46'
-          'perl-threads=1.93'
-          'perl-Tie-File=1.00'
+          'perl-threads-shared=1.48'
+          'perl-threads=2.01'
+          'perl-Tie-File=1.01'
           'perl-Tie-RefHash=1.39'
           'perl-Time-HiRes=1.9726'
           'perl-Time-Local=1.2300'
-          'perl-Time-Piece=1.27'
-          'perl-Unicode-Collate=1.04'
-          'perl-Unicode-Normalize=1.17'
+          'perl-Time-Piece=1.29'
+          'perl-Unicode-Collate=1.12'
+          'perl-Unicode-Normalize=1.18'
           'perl-version=0.9909'
-          'perl-XSLoader=0.17')
+          'perl-XSLoader=0.20')
 # Add your own provides here
 provides=(${provides[@]})
-md5sums=('21062666f1c627aeb6dbff3c6952738b'
+md5sums=('f67b152160431b3180fb766bdc2d02e2'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
          '50a495019bbaf298604795e6bb36394a'
-         '4e8d70350f4f9567e710d3512c5be0eb'
+         '66e17cd1d891012dd4ab5faaad812acc'
          '26ccfe0cb6348404c4152eb0b3080e65')
 
 prepare() {
-  chmod -R -644 ${srcdir}/${pkgname}-${pkgver}
+  chmod -R 0666 ${srcdir}/${pkgname}-${pkgver}
   cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -p1 -i ${srcdir}/perl-nostdio.patch
   patch -p1 -i ${srcdir}/perl-5.18.0-cygwin.patch
-  patch -p1 -i ${srcdir}/perl-5.20.0-msys2.patch
+  patch -p1 -i ${srcdir}/perl-5.22.0-msys2.patch
 
   sed -i 's#version vutil.c .*#version vutil.c f1c7e4778fcf78c04141f562b80183b91cbbf6c9#' t/porting/customized.dat
 
@@ -184,7 +181,7 @@ build() {
     -Dman1ext=1perl -Dman3ext=3perl \
     -Darchname=${ARCH}-msys-threads \
     -Dmyarchname=${ARCH}-msys \
-    -Dlibperl=msys-perl5_20.dll \
+    -Dlibperl=msys-perl5_22.dll \
     -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" \
     -Dcc=gcc -Dld=g++
 
@@ -229,7 +226,7 @@ package() {
   install -d -m755 "$pkgdir/usr/bin/site_perl"
 
   (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
+  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct)
 
   # Remove all pod files *except* those under /usr/lib/perl5/core_perl/pod/
   # (FS#16488)
diff --git a/perl/perl-5.20.0-msys2.patch b/perl/perl-5.22.0-msys2.patch
similarity index 61%
rename from perl/perl-5.20.0-msys2.patch
rename to perl/perl-5.22.0-msys2.patch
index 4700e720..6161a4df 100644
--- a/perl/perl-5.20.0-msys2.patch
+++ b/perl/perl-5.22.0-msys2.patch
@@ -1,6 +1,6 @@
-diff -Naur perl-5.20.0-orig/configpm perl-5.20.0/configpm
---- perl-5.20.0-orig/configpm	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/configpm	2014-06-29 12:25:01.788400000 +0400
+diff -Naur perl-5.22.0-orig/configpm perl-5.22.0/configpm
+--- perl-5.22.0-orig/configpm	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/configpm	2015-06-04 15:43:07.286200000 +0300
 @@ -443,8 +443,8 @@
  
  my $osname = fetch_string({}, 'osname');
@@ -12,10 +12,10 @@ diff -Naur perl-5.20.0-orig/configpm perl-5.20.0/configpm
  
  $heavy_txt .= sprintf <<'ENDOFBEG', $osname, $osname, $from, $osname, $env_cygwin;
  # This file was created by configpm when Perl was built. Any changes
-diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure	2014-06-29 12:17:38.741800000 +0400
-+++ perl-5.20.0/Configure	2014-06-29 12:18:38.661200000 +0400
-@@ -3359,6 +3359,9 @@
+diff -Naur perl-5.22.0-orig/Configure perl-5.22.0/Configure
+--- perl-5.22.0-orig/Configure	2015-06-04 15:41:48.933200000 +0300
++++ perl-5.22.0/Configure	2015-06-04 15:43:07.301800000 +0300
+@@ -3426,6 +3426,9 @@
  		cygwin*) osname=cygwin
  			osvers="$3"
  			;;
@@ -25,7 +25,7 @@ diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
  		*dc.osx) osname=dcosx
  			osvers="$3"
  			;;
-@@ -8382,7 +8385,7 @@
+@@ -8591,7 +8594,7 @@
  	;;
  *)	case "$useshrplib" in
  	'')	case "$osname" in
@@ -34,7 +34,7 @@ diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
  			dflt=y
  			also='Building a shared libperl is required for dynamic loading to work on your system.'
  			;;
-@@ -8466,6 +8469,13 @@
+@@ -8662,6 +8665,13 @@
  			majonly=cygperl5.$majonly.$so
  			dflt=$majmin
  			;;
@@ -48,7 +48,7 @@ diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
  		*)	# Try to guess based on whether libc has major.minor.
  			case "$libc" in
  			*libc.$so.[0-9]*.[0-9]*) dflt=$majmin ;;
-@@ -8563,6 +8573,9 @@
+@@ -8753,6 +8763,9 @@
  	cygwin)
  		# cygwin needs only ldlibpth
  		;;
@@ -58,16 +58,16 @@ diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
  	*)
  		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
  		;;
-@@ -21980,7 +21993,7 @@
- BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES BSDCOMPAT bsdi
- bull c cadmus clipper CMU COFF COMPILER_VERSION
- concurrent convex cpu cray CRAY CRAYMPP ctix CX_UX
--CYGWIN DECC DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO
-+CYGWIN MSYS DECC DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO
- Dynix DynixPTX ELF encore EPI EXTENSIONS FAVOR_BSD
- FILE_OFFSET_BITS FreeBSD GCC_NEW_VARARGS gcos gcx gimpel
- GLIBC GLIBC_MINOR
-@@ -22563,6 +22576,7 @@
+@@ -22754,7 +22767,7 @@
+ BSDCOMPAT bsdi BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES bull
+ byteorder byte_order
+ c cadmus clang clipper CMU COFF COMPILER_VERSION concurrent
+-convex cpu CRAY cray CRAYMPP ctix CX_UX CYGWIN
++convex cpu CRAY cray CRAYMPP ctix CX_UX MSYS CYGWIN
+ DECC DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO Dynix DynixPTX
+ ELF encore EPI EXTENSIONS
+ FAVOR_BSD FILE_OFFSET_BITS FORTIFY_SOURCE FreeBSD
+@@ -23360,6 +23373,7 @@
  	Win32*)
  		case "$osname" in
  		cygwin) avail_ext="$avail_ext $xxx" ;;
@@ -75,9 +75,9 @@ diff -Naur perl-5.20.0-orig/Configure perl-5.20.0/Configure
  		esac
  		;;
  	XS/APItest|xs/apitest)
-diff -Naur perl-5.20.0-orig/cpan/Archive-Tar/t/02_methods.t perl-5.20.0/cpan/Archive-Tar/t/02_methods.t
---- perl-5.20.0-orig/cpan/Archive-Tar/t/02_methods.t	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/Archive-Tar/t/02_methods.t	2014-06-29 12:18:54.947800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Archive-Tar/t/02_methods.t perl-5.22.0/cpan/Archive-Tar/t/02_methods.t
+--- perl-5.22.0-orig/cpan/Archive-Tar/t/02_methods.t	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/Archive-Tar/t/02_methods.t	2015-06-04 15:43:08.393800000 +0300
 @@ -60,7 +60,7 @@
  my $LONG_FILE = qq[directory/really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-really-long-directory-name/myfile];
  
@@ -87,39 +87,9 @@ diff -Naur perl-5.20.0-orig/cpan/Archive-Tar/t/02_methods.t perl-5.20.0/cpan/Arc
                      && length( cwd(). $LONG_FILE ) > 247;
  
  if(!$TOO_LONG) {
-diff -Naur perl-5.20.0-orig/cpan/CGI/lib/CGI.pm perl-5.20.0/cpan/CGI/lib/CGI.pm
---- perl-5.20.0-orig/cpan/CGI/lib/CGI.pm	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CGI/lib/CGI.pm	2014-06-29 12:18:54.947800000 +0400
-@@ -156,6 +156,8 @@
-     $OS = 'EPOC';
- } elsif ($OS =~ /^cygwin/i) {
-     $OS = 'CYGWIN';
-+} elsif ($OS =~ /^msys/i) {
-+    $OS = 'MSYS';
- } elsif ($OS =~ /^NetWare/i) {
-     $OS = 'NETWARE';
- } else {
-@@ -163,7 +165,7 @@
- }
- 
- # Some OS logic.  Binary mode enabled on DOS, NT and VMS
--$needs_binmode = $OS=~/^(WINDOWS|DOS|OS2|MSWin|CYGWIN|NETWARE)/;
-+$needs_binmode = $OS=~/^(WINDOWS|DOS|OS2|MSWin|CYGWIN|MSYS|NETWARE)/;
- 
- # This is the default class for the CGI object to use when all else fails.
- $DefaultClass = 'CGI' unless defined $CGI::DefaultClass;
-@@ -174,7 +176,7 @@
- # The path separator is a slash, backslash or semicolon, depending
- # on the platform.
- $SL = {
--     UNIX    => '/',  OS2 => '\\', EPOC      => '/', CYGWIN => '/', NETWARE => '/',
-+     UNIX    => '/',  OS2 => '\\', EPOC      => '/', CYGWIN => '/', MSYS => '/', NETWARE => '/',
-      WINDOWS => '\\', DOS => '\\', MACINTOSH => ':', VMS    => '/'
-     }->{$OS};
- 
-diff -Naur perl-5.20.0-orig/cpan/Compress-Raw-Zlib/Makefile.PL perl-5.20.0/cpan/Compress-Raw-Zlib/Makefile.PL
---- perl-5.20.0-orig/cpan/Compress-Raw-Zlib/Makefile.PL	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/Compress-Raw-Zlib/Makefile.PL	2014-06-29 12:18:54.947800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Compress-Raw-Zlib/Makefile.PL perl-5.22.0/cpan/Compress-Raw-Zlib/Makefile.PL
+--- perl-5.22.0-orig/cpan/Compress-Raw-Zlib/Makefile.PL	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/Compress-Raw-Zlib/Makefile.PL	2015-06-04 15:43:10.125400000 +0300
 @@ -28,7 +28,7 @@
  # ExtUtils::Install.
  
@@ -129,9 +99,9 @@ diff -Naur perl-5.20.0-orig/cpan/Compress-Raw-Zlib/Makefile.PL perl-5.20.0/cpan/
          and not ($ENV{PERL_MM_USE_DEFAULT} or $ENV{PERL_CORE}))
  {
      print <<EOM ;
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fail/META-1_4.yml perl-5.20.0/cpan/CPAN-Meta/t/data-fail/META-1_4.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fail/META-1_4.yml	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-fail/META-1_4.yml	2014-06-29 12:50:05.618000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fail/META-1_4.yml perl-5.22.0/cpan/CPAN-Meta/t/data-fail/META-1_4.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fail/META-1_4.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-fail/META-1_4.yml	2015-06-04 15:43:10.125400000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -142,9 +112,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fail/META-1_4.yml perl-5.20.0/
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml	2014-06-29 12:50:39.626000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -155,9 +125,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-vers
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml	2014-06-29 12:51:05.163200000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -76,6 +76,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -168,9 +138,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/META-1_4.yml perl-5.20
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml	2014-06-29 12:51:23.930000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -181,9 +151,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trai
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/META-1_4.yml perl-5.20.0/cpan/CPAN-Meta/t/data-test/META-1_4.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/META-1_4.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-test/META-1_4.yml	2014-06-29 12:51:52.462400000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/META-1_4.yml perl-5.22.0/cpan/CPAN-Meta/t/data-test/META-1_4.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/META-1_4.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-test/META-1_4.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -194,9 +164,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/META-1_4.yml perl-5.20.0/
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml perl-5.20.0/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml	2014-06-29 12:52:08.702000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml perl-5.22.0/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -207,9 +177,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml perl-
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/unicode.yml perl-5.20.0/cpan/CPAN-Meta/t/data-test/unicode.yml
---- perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/unicode.yml	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/cpan/CPAN-Meta/t/data-test/unicode.yml	2014-06-29 12:52:24.239600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/unicode.yml perl-5.22.0/cpan/CPAN-Meta/t/data-test/unicode.yml
+--- perl-5.22.0-orig/cpan/CPAN-Meta/t/data-test/unicode.yml	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/CPAN-Meta/t/data-test/unicode.yml	2015-06-04 15:43:10.141000000 +0300
 @@ -77,6 +77,9 @@
    Module::Build::Platform::cygwin:
      file: lib/Module/Build/Platform/cygwin.pm
@@ -220,9 +190,9 @@ diff -Naur perl-5.20.0-orig/cpan/CPAN-Meta/t/data-test/unicode.yml perl-5.20.0/c
    Module::Build::Platform::darwin:
      file: lib/Module/Build/Platform/darwin.pm
      version: 0.36_08
-diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-btree.t perl-5.20.0/cpan/DB_File/t/db-btree.t
---- perl-5.20.0-orig/cpan/DB_File/t/db-btree.t	2014-05-26 17:35:54.000000000 +0400
-+++ perl-5.20.0/cpan/DB_File/t/db-btree.t	2014-06-29 12:23:10.315000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/DB_File/t/db-btree.t perl-5.22.0/cpan/DB_File/t/db-btree.t
+--- perl-5.22.0-orig/cpan/DB_File/t/db-btree.t	2015-06-01 19:47:29.000000000 +0300
++++ perl-5.22.0/cpan/DB_File/t/db-btree.t	2015-06-04 15:43:10.156600000 +0300
 @@ -105,7 +105,7 @@
  {
      my $data = shift ;
@@ -241,9 +211,9 @@ diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-btree.t perl-5.20.0/cpan/DB_File/t
  
  ok(18, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640)
     || $noMode{$^O} );
-diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-hash.t perl-5.20.0/cpan/DB_File/t/db-hash.t
---- perl-5.20.0-orig/cpan/DB_File/t/db-hash.t	2014-05-26 17:35:54.000000000 +0400
-+++ perl-5.20.0/cpan/DB_File/t/db-hash.t	2014-06-29 12:23:10.315000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/DB_File/t/db-hash.t perl-5.22.0/cpan/DB_File/t/db-hash.t
+--- perl-5.22.0-orig/cpan/DB_File/t/db-hash.t	2015-06-01 19:47:29.000000000 +0300
++++ perl-5.22.0/cpan/DB_File/t/db-hash.t	2015-06-04 15:43:11.045800000 +0300
 @@ -69,7 +69,7 @@
  {
      my $data = shift ;
@@ -262,9 +232,9 @@ diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-hash.t perl-5.20.0/cpan/DB_File/t/
  
  ok(16, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640) ||
     $noMode{$^O} );
-diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-recno.t perl-5.20.0/cpan/DB_File/t/db-recno.t
---- perl-5.20.0-orig/cpan/DB_File/t/db-recno.t	2014-05-26 17:35:54.000000000 +0400
-+++ perl-5.20.0/cpan/DB_File/t/db-recno.t	2014-06-29 12:23:10.315000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/DB_File/t/db-recno.t perl-5.22.0/cpan/DB_File/t/db-recno.t
+--- perl-5.22.0-orig/cpan/DB_File/t/db-recno.t	2015-06-01 19:47:29.000000000 +0300
++++ perl-5.22.0/cpan/DB_File/t/db-recno.t	2015-06-04 15:43:11.045800000 +0300
 @@ -125,7 +125,7 @@
  
  sub normalise
@@ -283,22 +253,55 @@ diff -Naur perl-5.20.0-orig/cpan/DB_File/t/db-recno.t perl-5.20.0/cpan/DB_File/t
  
  ok(18, ((stat($Dfile))[2] & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640)
  	||  $noMode{$^O} );
-diff -Naur perl-5.20.0-orig/cpan/Digest-SHA/shasum perl-5.20.0/cpan/Digest-SHA/shasum
---- perl-5.20.0-orig/cpan/Digest-SHA/shasum	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Digest-SHA/shasum	2014-06-29 12:23:10.315000000 +0400
-@@ -202,7 +202,7 @@
+diff -Naur perl-5.22.0-orig/cpan/Digest-SHA/shasum perl-5.22.0/cpan/Digest-SHA/shasum
+--- perl-5.22.0-orig/cpan/Digest-SHA/shasum	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/Digest-SHA/shasum	2015-06-04 15:43:11.061400000 +0300
+@@ -206,7 +206,7 @@
  	## explicitly overridden by command line "--text" or
- 	## "--portable" options.
+ 	## "--UNIVERSAL" or "--portable" options.
  
 -my $isDOSish = ($^O =~ /^(MSWin\d\d|os2|dos|mint|cygwin)$/);
 +my $isDOSish = ($^O =~ /^(MSWin\d\d|os2|dos|mint|cygwin|msys)$/);
- if ($isDOSish) { $binary = 1 unless $text || $portable }
+ if ($isDOSish) { $binary = 1 unless $text || $UNIVERSAL || $portable }
  
- my $modesym = $binary ? '*' : ($portable ? '?' : ($BITS ? '^' : ' '));
-diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm perl-5.20.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
---- perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm	2014-06-29 12:56:41.795600000 +0400
-@@ -160,6 +160,8 @@
+ my $modesym = $binary ? '*' : ($UNIVERSAL ? 'U' :
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-Command/t/eu_command.t perl-5.22.0/cpan/ExtUtils-Command/t/eu_command.t
+--- perl-5.22.0-orig/cpan/ExtUtils-Command/t/eu_command.t	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-Command/t/eu_command.t	2015-06-04 15:43:11.357800000 +0300
+@@ -95,7 +95,7 @@
+     SKIP: {
+         if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' ||
+             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
+-            $^O eq 'MacOS'
++            $^O eq 'msys' || $^O eq 'MacOS'
+            ) {
+             skip( "different file permission semantics on $^O", 3);
+         }
+@@ -135,7 +135,7 @@
+     SKIP: {
+         if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' ||
+             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
+-            $^O eq 'MacOS'   || $^O eq 'haiku'
++            $^O eq 'msys'    || $^O eq 'MacOS' || $^O eq 'haiku'
+            ) {
+             skip( "different file permission semantics on $^O", 5);
+         }
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm perl-5.22.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+--- perl-5.22.0-orig/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm	2015-06-04 15:43:11.357800000 +0300
+@@ -98,7 +98,7 @@
+ my $Is_VMS     = $^O eq 'VMS';
+ my $Is_MacPerl = $^O eq 'MacOS';
+ my $Is_Win32   = $^O eq 'MSWin32';
+-my $Is_cygwin  = $^O eq 'cygwin';
++my $Is_cygwin  = $^O eq 'cygwin' || $^O eq 'msys';
+ my $CanMoveAtBoot = ($Is_Win32 || $Is_cygwin);
+ 
+ # *note* CanMoveAtBoot is only incidentally the same condition as below
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+--- perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm	2015-05-16 15:23:24.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm	2015-06-04 15:43:11.061400000 +0300
+@@ -170,6 +170,8 @@
              }
              elsif ( $^O eq 'cygwin' && -f ( $fullname = "$thispth/$thislib.dll" ) ) {
              }
@@ -307,9 +310,9 @@ diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
              elsif ( -f ( $fullname = "$thispth/Slib$thislib$Config_libext" ) ) {
              }
              elsif ($^O eq 'dgux'
-diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm perl-5.20.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
---- perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+--- perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm	2015-05-16 15:23:24.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm	2015-06-04 15:43:11.061400000 +0300
 @@ -57,7 +57,7 @@
      _is_win95() ? $Is{Win95} = 1 : $Is{Win32} = 1;
  }
@@ -319,9 +322,9 @@ diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm perl-5.20
  $Is{NW5}    = $Config{osname} eq 'NetWare';  # intentional
  $Is{BeOS}   = ($^O =~ /beos/i or $^O eq 'haiku');
  $Is{DOS}    = $^O eq 'dos';
-diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t perl-5.20.0/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t
---- perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t
+--- perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t	2015-06-04 15:43:11.077000000 +0300
 @@ -9,7 +9,7 @@
  use Test::More;
  
@@ -331,9 +334,9 @@ diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t perl-5.20.0/cp
  		plan tests => 14;
  	} else {
  		plan skip_all => "This is not cygwin";
-diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Unix.t perl-5.20.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t
---- perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Unix.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Unix.t perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t
+--- perl-5.22.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Unix.t	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t	2015-06-04 15:43:11.077000000 +0300
 @@ -8,7 +8,7 @@
  BEGIN {
      use Test::More;
@@ -343,9 +346,21 @@ diff -Naur perl-5.20.0-orig/cpan/ExtUtils-MakeMaker/t/MM_Unix.t perl-5.20.0/cpan
          plan skip_all => 'Non-Unix platform';
      }
      else {
-diff -Naur perl-5.20.0-orig/cpan/File-Temp/lib/File/Temp.pm perl-5.20.0/cpan/File-Temp/lib/File/Temp.pm
---- perl-5.20.0-orig/cpan/File-Temp/lib/File/Temp.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/File-Temp/lib/File/Temp.pm	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/ExtUtils-Manifest/t/Manifest.t perl-5.22.0/cpan/ExtUtils-Manifest/t/Manifest.t
+--- perl-5.22.0-orig/cpan/ExtUtils-Manifest/t/Manifest.t	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/ExtUtils-Manifest/t/Manifest.t	2015-06-04 15:43:11.357800000 +0300
+@@ -456,7 +456,7 @@
+ 
+ SKIP: {
+     chmod( 0400, 'MANIFEST' );
+-    skip "Can't make MANIFEST read-only", 2 if -w 'MANIFEST' or $Config{osname} eq 'cygwin';
++    skip "Can't make MANIFEST read-only", 2 if -w 'MANIFEST' or $Config{osname} eq 'cygwin' or $Config{osname} eq 'msys';
+ 
+     eval {
+         maniadd({ 'foo' => 'bar' });
+diff -Naur perl-5.22.0-orig/cpan/File-Temp/lib/File/Temp.pm perl-5.22.0/cpan/File-Temp/lib/File/Temp.pm
+--- perl-5.22.0-orig/cpan/File-Temp/lib/File/Temp.pm	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/cpan/File-Temp/lib/File/Temp.pm	2015-06-04 15:43:11.077000000 +0300
 @@ -691,7 +691,7 @@
    return 1 if $level == STANDARD;
  
@@ -364,9 +379,9 @@ diff -Naur perl-5.20.0-orig/cpan/File-Temp/lib/File/Temp.pm perl-5.20.0/cpan/Fil
    }
    # fall-through if we can't unlink now
    _deferred_unlink($fh, $path, 0);
-diff -Naur perl-5.20.0-orig/cpan/IO-Compress/t/cz-14gzopen.t perl-5.20.0/cpan/IO-Compress/t/cz-14gzopen.t
---- perl-5.20.0-orig/cpan/IO-Compress/t/cz-14gzopen.t	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/IO-Compress/t/cz-14gzopen.t	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/IO-Compress/t/cz-14gzopen.t perl-5.22.0/cpan/IO-Compress/t/cz-14gzopen.t
+--- perl-5.22.0-orig/cpan/IO-Compress/t/cz-14gzopen.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/IO-Compress/t/cz-14gzopen.t	2015-06-04 15:43:11.092600000 +0300
 @@ -490,7 +490,7 @@
      SKIP:
      {
@@ -385,9 +400,9 @@ diff -Naur perl-5.20.0-orig/cpan/IO-Compress/t/cz-14gzopen.t perl-5.20.0/cpan/IO
  
          writeFile($name, "abc");
          chmod 0222, $name ;
-diff -Naur perl-5.20.0-orig/cpan/IO-Socket-IP/t/11sockopts.t perl-5.20.0/cpan/IO-Socket-IP/t/11sockopts.t
---- perl-5.20.0-orig/cpan/IO-Socket-IP/t/11sockopts.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/IO-Socket-IP/t/11sockopts.t	2014-06-29 12:58:52.866800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/IO-Socket-IP/t/11sockopts.t perl-5.22.0/cpan/IO-Socket-IP/t/11sockopts.t
+--- perl-5.22.0-orig/cpan/IO-Socket-IP/t/11sockopts.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/IO-Socket-IP/t/11sockopts.t	2015-06-04 15:43:11.108200000 +0300
 @@ -11,7 +11,7 @@
  use Socket qw( SOL_SOCKET SO_REUSEADDR SO_REUSEPORT SO_BROADCAST );
  
@@ -397,9 +412,9 @@ diff -Naur perl-5.20.0-orig/cpan/IO-Socket-IP/t/11sockopts.t perl-5.20.0/cpan/IO
     # I honestly have no idea why this fails, and people don't seem to be able
     # to reproduce it on a development box. I'll mark it TODO for now until we
     # can gain any more insight into it.
-diff -Naur perl-5.20.0-orig/cpan/IPC-Cmd/t/03_run-forked.t perl-5.20.0/cpan/IPC-Cmd/t/03_run-forked.t
---- perl-5.20.0-orig/cpan/IPC-Cmd/t/03_run-forked.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/IPC-Cmd/t/03_run-forked.t	2014-06-29 12:58:31.869200000 +0400
+diff -Naur perl-5.22.0-orig/cpan/IPC-Cmd/t/03_run-forked.t perl-5.22.0/cpan/IPC-Cmd/t/03_run-forked.t
+--- perl-5.22.0-orig/cpan/IPC-Cmd/t/03_run-forked.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/IPC-Cmd/t/03_run-forked.t	2015-06-04 15:43:11.108200000 +0300
 @@ -44,7 +44,7 @@
  ok($r->{'timeout'}, "[$sleep 5] runs longer than 2 seconds");
  
@@ -409,9 +424,9 @@ diff -Naur perl-5.20.0-orig/cpan/IPC-Cmd/t/03_run-forked.t perl-5.20.0/cpan/IPC-
    # https://rt.cpan.org/Ticket/Display.html?id=85912
    sub runSub {
         my $blah = "blahblah";
-diff -Naur perl-5.20.0-orig/cpan/IPC-SysV/t/ipcsysv.t perl-5.20.0/cpan/IPC-SysV/t/ipcsysv.t
---- perl-5.20.0-orig/cpan/IPC-SysV/t/ipcsysv.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/IPC-SysV/t/ipcsysv.t	2014-06-29 12:23:10.330600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/IPC-SysV/t/ipcsysv.t perl-5.22.0/cpan/IPC-SysV/t/ipcsysv.t
+--- perl-5.22.0-orig/cpan/IPC-SysV/t/ipcsysv.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/IPC-SysV/t/ipcsysv.t	2015-06-04 15:43:11.108200000 +0300
 @@ -39,18 +39,18 @@
    {
      return if $did_diag++;
@@ -434,10 +449,10 @@ diff -Naur perl-5.20.0-orig/cpan/IPC-SysV/t/ipcsysv.t perl-5.20.0/cpan/IPC-SysV/
  
  EOM
      }
-diff -Naur perl-5.20.0-orig/cpan/libnet/Net/Domain.pm perl-5.20.0/cpan/libnet/Net/Domain.pm
---- perl-5.20.0-orig/cpan/libnet/Net/Domain.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/libnet/Net/Domain.pm	2014-06-29 12:28:20.451200000 +0400
-@@ -169,7 +169,7 @@
+diff -Naur perl-5.22.0-orig/cpan/libnet/lib/Net/Domain.pm perl-5.22.0/cpan/libnet/lib/Net/Domain.pm
+--- perl-5.22.0-orig/cpan/libnet/lib/Net/Domain.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/libnet/lib/Net/Domain.pm	2015-06-04 15:43:11.357800000 +0300
+@@ -172,7 +172,7 @@
      }
  
      chop($dom = `domainname 2>/dev/null`)
@@ -446,52 +461,33 @@ diff -Naur perl-5.20.0-orig/cpan/libnet/Net/Domain.pm perl-5.20.0/cpan/libnet/Ne
  
      if (defined $dom) {
        my @h = ();
-diff -Naur perl-5.20.0-orig/cpan/libnet/Net/Netrc.pm perl-5.20.0/cpan/libnet/Net/Netrc.pm
---- perl-5.20.0-orig/cpan/libnet/Net/Netrc.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/libnet/Net/Netrc.pm	2014-06-29 12:23:10.346200000 +0400
-@@ -51,7 +51,8 @@
+diff -Naur perl-5.22.0-orig/cpan/libnet/lib/Net/Netrc.pm perl-5.22.0/cpan/libnet/lib/Net/Netrc.pm
+--- perl-5.22.0-orig/cpan/libnet/lib/Net/Netrc.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/libnet/lib/Net/Netrc.pm	2015-06-04 15:43:11.373400000 +0300
+@@ -58,6 +58,7 @@
    unless ($^O eq 'os2'
      || $^O eq 'MSWin32'
      || $^O eq 'MacOS'
--    || $^O =~ /^cygwin/)
-+    || $^O =~ /^cygwin/
-+    || $^O =~ /^msys/)
++    || $^O =~ /^msys/
+     || $^O =~ /^cygwin/)
    {
      my @stat = stat($file);
- 
-diff -Naur perl-5.20.0-orig/cpan/libnet/t/netrc.t perl-5.20.0/cpan/libnet/t/netrc.t
---- perl-5.20.0-orig/cpan/libnet/t/netrc.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/libnet/t/netrc.t	2014-06-29 12:23:10.346200000 +0400
-@@ -48,7 +48,7 @@
+diff -Naur perl-5.22.0-orig/cpan/libnet/t/netrc.t perl-5.22.0/cpan/libnet/t/netrc.t
+--- perl-5.22.0-orig/cpan/libnet/t/netrc.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/libnet/t/netrc.t	2015-06-04 15:43:11.373400000 +0300
+@@ -47,7 +47,7 @@
  
  SKIP: {
- 	skip('incompatible stat() handling for OS', 4), next SKIP 
--		if ($^O =~ /os2|win32|macos|cygwin/i or $] < 5.005);
-+		if ($^O =~ /os2|win32|macos|cygwin|msys/i or $] < 5.005);
- 	
- 	my $warn;
- 	local $SIG{__WARN__} = sub {
-diff -Naur perl-5.20.0-orig/cpan/Module-Build/t/destinations.t perl-5.20.0/cpan/Module-Build/t/destinations.t
---- perl-5.20.0-orig/cpan/Module-Build/t/destinations.t	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/Module-Build/t/destinations.t	2014-06-29 12:23:10.346200000 +0400
-@@ -300,11 +300,11 @@
- sub have_same_ending {
-   my ($dir1, $dir2, $message) = @_;
+         skip('incompatible stat() handling for OS', 4), next SKIP 
+-                if $^O =~ /os2|win32|macos|cygwin/i;
++                if $^O =~ /os2|win32|macos|cygwin|msys/i;
  
--  $dir1 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
-+  $dir1 =~ s{/$}{} if ($^O eq 'cygwin' or $^O eq 'msys'); # remove any trailing slash
-   my (undef, $dirs1, undef) = splitpath $dir1;
-   my @dir1 = splitdir $dirs1;
- 
--  $dir2 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
-+  $dir2 =~ s{/$}{} if ($^O eq 'cygwin' or $^O eq 'msys'); # remove any trailing slash
-   my (undef, $dirs2, undef) = splitpath $dir2;
-   my @dir2 = splitdir $dirs2;
- 
-diff -Naur perl-5.20.0-orig/cpan/Perl-OSType/lib/Perl/OSType.pm perl-5.20.0/cpan/Perl-OSType/lib/Perl/OSType.pm
---- perl-5.20.0-orig/cpan/Perl-OSType/lib/Perl/OSType.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Perl-OSType/lib/Perl/OSType.pm	2014-06-29 12:23:10.346200000 +0400
-@@ -44,6 +44,7 @@
+         my $warn;
+         local $SIG{__WARN__} = sub {
+diff -Naur perl-5.22.0-orig/cpan/Perl-OSType/lib/Perl/OSType.pm perl-5.22.0/cpan/Perl-OSType/lib/Perl/OSType.pm
+--- perl-5.22.0-orig/cpan/Perl-OSType/lib/Perl/OSType.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Perl-OSType/lib/Perl/OSType.pm	2015-06-04 15:43:11.108200000 +0300
+@@ -46,6 +46,7 @@
    solaris     Unix
    sunos       Unix
    cygwin      Unix
@@ -499,9 +495,9 @@ diff -Naur perl-5.20.0-orig/cpan/Perl-OSType/lib/Perl/OSType.pm perl-5.20.0/cpan
    os2         Unix
    interix     Unix
    gnu         Unix
-diff -Naur perl-5.20.0-orig/cpan/Pod-Parser/lib/Pod/Find.pm perl-5.20.0/cpan/Pod-Parser/lib/Pod/Find.pm
---- perl-5.20.0-orig/cpan/Pod-Parser/lib/Pod/Find.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Pod-Parser/lib/Pod/Find.pm	2014-06-29 13:00:10.211600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Pod-Parser/lib/Pod/Find.pm perl-5.22.0/cpan/Pod-Parser/lib/Pod/Find.pm
+--- perl-5.22.0-orig/cpan/Pod-Parser/lib/Pod/Find.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Pod-Parser/lib/Pod/Find.pm	2015-06-04 15:43:11.123800000 +0300
 @@ -482,7 +482,7 @@
      # have a case-tolerant file system, but File::Spec
      # does not recognize 'darwin' yet. And cygwin also has "pods",
@@ -511,9 +507,9 @@ diff -Naur perl-5.20.0-orig/cpan/Pod-Parser/lib/Pod/Find.pm perl-5.20.0/cpan/Pod
       && -d File::Spec->catdir($dir,'pods')) {
        $dir = File::Spec->catdir($dir,'pods');
        redo Dir;
-diff -Naur perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm perl-5.20.0/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
---- perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm	2014-06-29 12:23:10.346200000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm perl-5.22.0/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
+--- perl-5.22.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm	2015-06-04 15:43:11.123800000 +0300
 @@ -29,7 +29,7 @@
   *is_mswin32 = $^O eq 'MSWin32'  ? \&TRUE : \&FALSE unless defined &is_mswin32;
   *is_dos     = $^O eq 'dos'      ? \&TRUE : \&FALSE unless defined &is_dos;
@@ -523,9 +519,9 @@ diff -Naur perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm perl-5.20
   *is_linux   = $^O eq 'linux'    ? \&TRUE : \&FALSE unless defined &is_linux;
   *is_hpux    = $^O =~ m/hpux/    ? \&TRUE : \&FALSE unless defined &is_hpux;
   *is_openbsd = $^O =~ m/openbsd/ ? \&TRUE : \&FALSE unless defined &is_openbsd;
-diff -Naur perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm perl-5.20.0/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
---- perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm	2014-06-29 12:23:10.361800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm perl-5.22.0/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+--- perl-5.22.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm	2015-06-04 15:43:11.139400000 +0300
 @@ -66,7 +66,7 @@
   *is_mswin32 = $^O eq 'MSWin32' ? \&TRUE : \&FALSE unless defined &is_mswin32;
   *is_dos     = $^O eq 'dos'     ? \&TRUE : \&FALSE unless defined &is_dos;
@@ -535,9 +531,21 @@ diff -Naur perl-5.20.0-orig/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm perl-5.20.0/cpan
   *is_linux   = $^O eq 'linux'   ? \&TRUE : \&FALSE unless defined &is_linux;
   *is_hpux    = $^O =~ m/hpux/   ? \&TRUE : \&FALSE unless defined &is_hpux;
  }
-diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/t/syslog.t perl-5.20.0/cpan/Sys-Syslog/t/syslog.t
---- perl-5.20.0-orig/cpan/Sys-Syslog/t/syslog.t	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/Sys-Syslog/t/syslog.t	2014-06-29 12:23:10.361800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Socket/t/socketpair.t perl-5.22.0/cpan/Socket/t/socketpair.t
+--- perl-5.22.0-orig/cpan/Socket/t/socketpair.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Socket/t/socketpair.t	2015-06-04 15:43:11.373400000 +0300
+@@ -35,7 +35,7 @@
+ 	    }
+ 	    warn "Something unexpectedly hung during testing";
+ 	    kill "INT", $parent or die "Kill failed: $!";
+-	    if( $^O eq "cygwin" ) {
++	    if( $^O eq "cygwin" || $^O eq "msys" ) {
+ 		# sometimes the above isn't enough on cygwin
+ 		sleep 1; # wait a little, it might have worked after all
+ 		system( "/bin/kill -f $parent; echo die $parent" );
+diff -Naur perl-5.22.0-orig/cpan/Sys-Syslog/t/syslog.t perl-5.22.0/cpan/Sys-Syslog/t/syslog.t
+--- perl-5.22.0-orig/cpan/Sys-Syslog/t/syslog.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Sys-Syslog/t/syslog.t	2015-06-04 15:43:11.139400000 +0300
 @@ -17,7 +17,7 @@
  $^W = 0 if $] < 5.006;
  
@@ -547,9 +555,9 @@ diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/t/syslog.t perl-5.20.0/cpan/Sys-Sysl
  
  # if testing in core, check that the module is at least available
  if ($ENV{PERL_CORE}) {
-diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/win32/compile.pl perl-5.20.0/cpan/Sys-Syslog/win32/compile.pl
---- perl-5.20.0-orig/cpan/Sys-Syslog/win32/compile.pl	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Sys-Syslog/win32/compile.pl	2014-06-29 12:23:10.361800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Sys-Syslog/win32/compile.pl perl-5.22.0/cpan/Sys-Syslog/win32/compile.pl
+--- perl-5.22.0-orig/cpan/Sys-Syslog/win32/compile.pl	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Sys-Syslog/win32/compile.pl	2015-06-04 15:43:11.139400000 +0300
 @@ -127,7 +127,7 @@
      ),
  );    
@@ -559,9 +567,9 @@ diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/win32/compile.pl perl-5.20.0/cpan/Sy
  my $is_Win32  = $^O =~ /Win32/i;
  
  my %const = (
-diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/win32/Win32.pm perl-5.20.0/cpan/Sys-Syslog/win32/Win32.pm
---- perl-5.20.0-orig/cpan/Sys-Syslog/win32/Win32.pm	2014-02-01 01:55:50.000000000 +0400
-+++ perl-5.20.0/cpan/Sys-Syslog/win32/Win32.pm	2014-06-29 12:23:10.361800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Sys-Syslog/win32/Win32.pm perl-5.22.0/cpan/Sys-Syslog/win32/Win32.pm
+--- perl-5.22.0-orig/cpan/Sys-Syslog/win32/Win32.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Sys-Syslog/win32/Win32.pm	2015-06-04 15:43:11.139400000 +0300
 @@ -39,7 +39,7 @@
      ),
  );    
@@ -571,9 +579,9 @@ diff -Naur perl-5.20.0-orig/cpan/Sys-Syslog/win32/Win32.pm perl-5.20.0/cpan/Sys-
  my $is_Win32  = $^O =~ /Win32/i;
  
  my %const = (
-diff -Naur perl-5.20.0-orig/cpan/Time-HiRes/Makefile.PL perl-5.20.0/cpan/Time-HiRes/Makefile.PL
---- perl-5.20.0-orig/cpan/Time-HiRes/Makefile.PL	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Time-HiRes/Makefile.PL	2014-06-29 12:23:10.361800000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Time-HiRes/Makefile.PL perl-5.22.0/cpan/Time-HiRes/Makefile.PL
+--- perl-5.22.0-orig/cpan/Time-HiRes/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Time-HiRes/Makefile.PL	2015-06-04 15:43:11.155000000 +0300
 @@ -21,7 +21,7 @@
  
  # TBD: Can we just use $Config(exe_ext) here instead of this complex
@@ -592,9 +600,9 @@ diff -Naur perl-5.20.0-orig/cpan/Time-HiRes/Makefile.PL perl-5.20.0/cpan/Time-Hi
          print "Looking for <w32api/windows.h>... ";
          if (has_include('w32api/windows.h')) {
  	    $has_w32api_windows_h++;
-diff -Naur perl-5.20.0-orig/cpan/Time-HiRes/t/stat.t perl-5.20.0/cpan/Time-HiRes/t/stat.t
---- perl-5.20.0-orig/cpan/Time-HiRes/t/stat.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/cpan/Time-HiRes/t/stat.t	2014-06-29 12:23:10.377400000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Time-HiRes/t/stat.t perl-5.22.0/cpan/Time-HiRes/t/stat.t
+--- perl-5.22.0-orig/cpan/Time-HiRes/t/stat.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Time-HiRes/t/stat.t	2015-06-04 15:43:11.155000000 +0300
 @@ -6,7 +6,7 @@
  	require Test::More;
  	Test::More::plan(skip_all => "no hi-res stat");
@@ -604,9 +612,9 @@ diff -Naur perl-5.20.0-orig/cpan/Time-HiRes/t/stat.t perl-5.20.0/cpan/Time-HiRes
  	require Test::More;
  	Test::More::plan(skip_all =>
  		"$^O file timestamps not reliable enough for stat test");
-diff -Naur perl-5.20.0-orig/cpan/Win32/Makefile.PL perl-5.20.0/cpan/Win32/Makefile.PL
---- perl-5.20.0-orig/cpan/Win32/Makefile.PL	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32/Makefile.PL	2014-06-29 21:11:23.299600000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32/Makefile.PL perl-5.22.0/cpan/Win32/Makefile.PL
+--- perl-5.22.0-orig/cpan/Win32/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32/Makefile.PL	2015-06-04 15:43:11.155000000 +0300
 @@ -3,7 +3,7 @@
  use warnings;
  use ExtUtils::MakeMaker;
@@ -624,9 +632,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32/Makefile.PL perl-5.20.0/cpan/Win32/Makefi
 +$param{LIBS} = ['-L/usr/lib/w32api -lole32 -lversion'] if ($^O eq "cygwin" or $^O eq "msys");
  
  WriteMakefile(%param);
-diff -Naur perl-5.20.0-orig/cpan/Win32/t/GetCurrentThreadId.t perl-5.20.0/cpan/Win32/t/GetCurrentThreadId.t
---- perl-5.20.0-orig/cpan/Win32/t/GetCurrentThreadId.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32/t/GetCurrentThreadId.t	2014-06-29 12:23:10.377400000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32/t/GetCurrentThreadId.t perl-5.22.0/cpan/Win32/t/GetCurrentThreadId.t
+--- perl-5.22.0-orig/cpan/Win32/t/GetCurrentThreadId.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32/t/GetCurrentThreadId.t	2015-06-04 15:43:11.155000000 +0300
 @@ -10,7 +10,7 @@
  
  my $pid = $$+0; # make sure we don't copy any magic to $pid
@@ -636,9 +644,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32/t/GetCurrentThreadId.t perl-5.20.0/cpan/W
      skip(!defined &Cygwin::pid_to_winpid,
  	 Cygwin::pid_to_winpid($pid),
  	 Win32::GetCurrentProcessId());
-diff -Naur perl-5.20.0-orig/cpan/Win32/t/Unicode.t perl-5.20.0/cpan/Win32/t/Unicode.t
---- perl-5.20.0-orig/cpan/Win32/t/Unicode.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32/t/Unicode.t	2014-06-29 12:23:10.393000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32/t/Unicode.t perl-5.22.0/cpan/Win32/t/Unicode.t
+--- perl-5.22.0-orig/cpan/Win32/t/Unicode.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32/t/Unicode.t	2015-06-04 15:43:11.170600000 +0300
 @@ -52,7 +52,7 @@
      next if /^\./;
      # On Cygwin 1.7 readdir() returns the utf8 representation of the
@@ -657,9 +665,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32/t/Unicode.t perl-5.20.0/cpan/Win32/t/Unic
      $subdir = Cygwin::posix_to_win_path($subdir, 1);
  }
  $subdir =~ s,/,\\,g;
-diff -Naur perl-5.20.0-orig/cpan/Win32API-File/File.pm perl-5.20.0/cpan/Win32API-File/File.pm
---- perl-5.20.0-orig/cpan/Win32API-File/File.pm	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32API-File/File.pm	2014-06-29 12:23:10.393000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32API-File/File.pm perl-5.22.0/cpan/Win32API-File/File.pm
+--- perl-5.22.0-orig/cpan/Win32API-File/File.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32API-File/File.pm	2015-06-04 15:43:11.170600000 +0300
 @@ -738,7 +738,7 @@
  
  	return $self->_fileno() if defined $self->_fileno();
@@ -669,9 +677,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32API-File/File.pm perl-5.20.0/cpan/Win32API
  
  # FIXME: We don't always open the handle, better to query the handle or to set
  # the right access info at TIEHANDLE time.
-diff -Naur perl-5.20.0-orig/cpan/Win32API-File/Makefile.PL perl-5.20.0/cpan/Win32API-File/Makefile.PL
---- perl-5.20.0-orig/cpan/Win32API-File/Makefile.PL	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32API-File/Makefile.PL	2014-06-29 12:23:10.393000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32API-File/Makefile.PL perl-5.22.0/cpan/Win32API-File/Makefile.PL
+--- perl-5.22.0-orig/cpan/Win32API-File/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32API-File/Makefile.PL	2015-06-04 15:43:11.170600000 +0300
 @@ -5,7 +5,7 @@
  use strict;
  # See lib/ExtUtils/MakeMaker.pm for details of how to influence
@@ -681,9 +689,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32API-File/Makefile.PL perl-5.20.0/cpan/Win3
      die "OS unsupported\n";
  }
  
-diff -Naur perl-5.20.0-orig/cpan/Win32API-File/t/file.t perl-5.20.0/cpan/Win32API-File/t/file.t
---- perl-5.20.0-orig/cpan/Win32API-File/t/file.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/cpan/Win32API-File/t/file.t	2014-06-29 12:23:10.393000000 +0400
+diff -Naur perl-5.22.0-orig/cpan/Win32API-File/t/file.t perl-5.22.0/cpan/Win32API-File/t/file.t
+--- perl-5.22.0-orig/cpan/Win32API-File/t/file.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/cpan/Win32API-File/t/file.t	2015-06-04 15:43:11.170600000 +0300
 @@ -151,7 +151,7 @@
  $ok or print "# ",fileLastError(),"\n";
  print $ok ? "" : "not ", "ok ", ++$test, "\n";	# ok 19
@@ -720,9 +728,9 @@ diff -Naur perl-5.20.0-orig/cpan/Win32API-File/t/file.t perl-5.20.0/cpan/Win32AP
  $ok or print "# ",$let.substr($path,3)."/win.ini ",fileLastError(),"\n";
  print $ok ? "" : "not ", "ok ", ++$test, "\n";	# ok 50
  
-diff -Naur perl-5.20.0-orig/Cross/Makefile-cross-SH perl-5.20.0/Cross/Makefile-cross-SH
---- perl-5.20.0-orig/Cross/Makefile-cross-SH	2014-05-26 17:34:18.000000000 +0400
-+++ perl-5.20.0/Cross/Makefile-cross-SH	2014-06-29 12:23:10.393000000 +0400
+diff -Naur perl-5.22.0-orig/Cross/Makefile-cross-SH perl-5.22.0/Cross/Makefile-cross-SH
+--- perl-5.22.0-orig/Cross/Makefile-cross-SH	2015-05-13 23:19:28.000000000 +0300
++++ perl-5.22.0/Cross/Makefile-cross-SH	2015-06-04 15:43:11.186200000 +0300
 @@ -61,7 +61,7 @@
  				${revision}.${patchlevel}.${subversion} \
  			     -install_name \$(shrpdir)/\$@"
@@ -732,7 +740,7 @@ diff -Naur perl-5.20.0-orig/Cross/Makefile-cross-SH perl-5.20.0/Cross/Makefile-c
  		linklibperl="-lperl"
  		;;
  	sunos*)
-@@ -469,7 +469,7 @@
+@@ -467,7 +467,7 @@
  
  !NO!SUBS!
  case "$osname" in
@@ -741,7 +749,7 @@ diff -Naur perl-5.20.0-orig/Cross/Makefile-cross-SH perl-5.20.0/Cross/Makefile-c
  	;; # Let cygwin/Makefile.SHs do its work.
  *)
  	$spitshell >>$Makefile <<'!NO!SUBS!'
-@@ -960,7 +960,7 @@
+@@ -958,7 +958,7 @@
  	-rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
  	-rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
  	-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
@@ -750,54 +758,21 @@ diff -Naur perl-5.20.0-orig/Cross/Makefile-cross-SH perl-5.20.0/Cross/Makefile-c
  	-rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl
  	-rm -f config.over
  
-diff -Naur perl-5.20.0-orig/dist/ExtUtils-Command/t/eu_command.t perl-5.20.0/dist/ExtUtils-Command/t/eu_command.t
---- perl-5.20.0-orig/dist/ExtUtils-Command/t/eu_command.t	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/dist/ExtUtils-Command/t/eu_command.t	2014-06-29 12:23:21.281800000 +0400
-@@ -95,7 +95,7 @@
-     SKIP: {
-         if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' ||
-             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
--            $^O eq 'MacOS'
-+            $^O eq 'msys'    || $^O eq 'MacOS'
-            ) {
-             skip( "different file permission semantics on $^O", 3);
-         }
-@@ -135,7 +135,7 @@
-     SKIP: {
-         if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' ||
-             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
--            $^O eq 'MacOS'
-+            $^O eq 'msys'    || $^O eq 'MacOS'
-            ) {
-             skip( "different file permission semantics on $^O", 5);
-         }
-diff -Naur perl-5.20.0-orig/dist/ExtUtils-Install/lib/ExtUtils/Install.pm perl-5.20.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
---- perl-5.20.0-orig/dist/ExtUtils-Install/lib/ExtUtils/Install.pm	2014-05-26 17:34:19.000000000 +0400
-+++ perl-5.20.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm	2014-06-29 12:23:21.281800000 +0400
-@@ -98,7 +98,7 @@
- my $Is_VMS     = $^O eq 'VMS';
- my $Is_MacPerl = $^O eq 'MacOS';
- my $Is_Win32   = $^O eq 'MSWin32';
--my $Is_cygwin  = $^O eq 'cygwin';
-+my $Is_cygwin  = ($^O eq 'cygwin' || $^O eq 'msys');
- my $CanMoveAtBoot = ($Is_Win32 || $Is_cygwin);
- 
- # *note* CanMoveAtBoot is only incidentally the same condition as below
-diff -Naur perl-5.20.0-orig/dist/IO/t/io_xs.t perl-5.20.0/dist/IO/t/io_xs.t
---- perl-5.20.0-orig/dist/IO/t/io_xs.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/dist/IO/t/io_xs.t	2014-06-29 12:23:21.281800000 +0400
-@@ -47,6 +47,8 @@
-       and skip "fsync() documented to fail on non-writable handles on AIX", 1;
+diff -Naur perl-5.22.0-orig/dist/IO/t/io_xs.t perl-5.22.0/dist/IO/t/io_xs.t
+--- perl-5.22.0-orig/dist/IO/t/io_xs.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/IO/t/io_xs.t	2015-06-04 15:43:11.186200000 +0300
+@@ -43,6 +43,8 @@
+       and skip "fsync() documented to fail on non-writable handles on $^O", 1;
      $^O eq 'cygwin'
        and skip "fsync() on cygwin uses FlushFileBuffers which requires a writable handle", 1;
 +    $^O eq 'msys'
 +      and skip "fsync() on msys uses FlushFileBuffers which requires a writable handle", 1;
+     $^O eq 'VMS'
+       and skip "fsync() not allowed on a read-only handle on $^O", 1;
      open my $fh, "<", "t/io_xs.t"
-        or skip "Cannot open t/io_xs.t read-only: $!", 1;
-     ok($fh->sync, "sync to a read only handle")
-diff -Naur perl-5.20.0-orig/dist/Net-Ping/lib/Net/Ping.pm perl-5.20.0/dist/Net-Ping/lib/Net/Ping.pm
---- perl-5.20.0-orig/dist/Net-Ping/lib/Net/Ping.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/Net-Ping/lib/Net/Ping.pm	2014-06-29 12:30:00.312200000 +0400
+diff -Naur perl-5.22.0-orig/dist/Net-Ping/lib/Net/Ping.pm perl-5.22.0/dist/Net-Ping/lib/Net/Ping.pm
+--- perl-5.22.0-orig/dist/Net-Ping/lib/Net/Ping.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/Net-Ping/lib/Net/Ping.pm	2015-06-04 15:43:11.186200000 +0300
 @@ -154,7 +154,7 @@
    }
    elsif ($self->{"proto"} eq "icmp")
@@ -825,9 +800,9 @@ diff -Naur perl-5.20.0-orig/dist/Net-Ping/lib/Net/Ping.pm perl-5.20.0/dist/Net-P
                # "Connection refused" means reachable
                # Good, continue
              } else {
-diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/110_icmp_inst.t perl-5.20.0/dist/Net-Ping/t/110_icmp_inst.t
---- perl-5.20.0-orig/dist/Net-Ping/t/110_icmp_inst.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/Net-Ping/t/110_icmp_inst.t	2014-06-29 12:23:21.297400000 +0400
+diff -Naur perl-5.22.0-orig/dist/Net-Ping/t/110_icmp_inst.t perl-5.22.0/dist/Net-Ping/t/110_icmp_inst.t
+--- perl-5.22.0-orig/dist/Net-Ping/t/110_icmp_inst.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/Net-Ping/t/110_icmp_inst.t	2015-06-04 15:43:11.186200000 +0300
 @@ -20,8 +20,8 @@
  
  SKIP: {
@@ -848,9 +823,9 @@ diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/110_icmp_inst.t perl-5.20.0/dist/Net
    return unless eval { require Win32 };
    return unless defined &Win32::IsAdminUser;
    return Win32::IsAdminUser();
-diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/500_ping_icmp.t perl-5.20.0/dist/Net-Ping/t/500_ping_icmp.t
---- perl-5.20.0-orig/dist/Net-Ping/t/500_ping_icmp.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/Net-Ping/t/500_ping_icmp.t	2014-06-29 12:23:21.297400000 +0400
+diff -Naur perl-5.22.0-orig/dist/Net-Ping/t/500_ping_icmp.t perl-5.22.0/dist/Net-Ping/t/500_ping_icmp.t
+--- perl-5.22.0-orig/dist/Net-Ping/t/500_ping_icmp.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/Net-Ping/t/500_ping_icmp.t	2015-06-04 15:43:11.201800000 +0300
 @@ -20,8 +20,8 @@
  
  SKIP: {
@@ -871,9 +846,9 @@ diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/500_ping_icmp.t perl-5.20.0/dist/Net
    return unless eval { require Win32 };
    return unless defined &Win32::IsAdminUser;
    return Win32::IsAdminUser();
-diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/510_ping_udp.t perl-5.20.0/dist/Net-Ping/t/510_ping_udp.t
---- perl-5.20.0-orig/dist/Net-Ping/t/510_ping_udp.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/Net-Ping/t/510_ping_udp.t	2014-06-29 12:23:21.297400000 +0400
+diff -Naur perl-5.22.0-orig/dist/Net-Ping/t/510_ping_udp.t perl-5.22.0/dist/Net-Ping/t/510_ping_udp.t
+--- perl-5.22.0-orig/dist/Net-Ping/t/510_ping_udp.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/Net-Ping/t/510_ping_udp.t	2015-06-04 15:43:11.201800000 +0300
 @@ -4,7 +4,7 @@
  use Config;
  
@@ -883,9 +858,9 @@ diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/510_ping_udp.t perl-5.20.0/dist/Net-
     return unless eval { require Win32 };
     return unless defined &Win32::GetOSVersion();
  
-diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/520_icmp_ttl.t perl-5.20.0/dist/Net-Ping/t/520_icmp_ttl.t
---- perl-5.20.0-orig/dist/Net-Ping/t/520_icmp_ttl.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/Net-Ping/t/520_icmp_ttl.t	2014-06-29 12:23:21.297400000 +0400
+diff -Naur perl-5.22.0-orig/dist/Net-Ping/t/520_icmp_ttl.t perl-5.22.0/dist/Net-Ping/t/520_icmp_ttl.t
+--- perl-5.22.0-orig/dist/Net-Ping/t/520_icmp_ttl.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/Net-Ping/t/520_icmp_ttl.t	2015-06-04 15:43:11.201800000 +0300
 @@ -19,8 +19,8 @@
  
  SKIP: {
@@ -906,10 +881,10 @@ diff -Naur perl-5.20.0-orig/dist/Net-Ping/t/520_icmp_ttl.t perl-5.20.0/dist/Net-
    return unless eval { require Win32 };
    return unless defined &Win32::IsAdminUser;
    return Win32::IsAdminUser();
-diff -Naur perl-5.20.0-orig/dist/PathTools/Cwd.pm perl-5.20.0/dist/PathTools/Cwd.pm
---- perl-5.20.0-orig/dist/PathTools/Cwd.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/Cwd.pm	2014-06-29 13:07:29.476400000 +0400
-@@ -308,6 +308,15 @@
+diff -Naur perl-5.22.0-orig/dist/PathTools/Cwd.pm perl-5.22.0/dist/PathTools/Cwd.pm
+--- perl-5.22.0-orig/dist/PathTools/Cwd.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/Cwd.pm	2015-06-04 15:43:11.373400000 +0300
+@@ -142,6 +142,15 @@
      realpath		=> 'fast_abs_path',
     },
  
@@ -925,7 +900,7 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/Cwd.pm perl-5.20.0/dist/PathTools/Cwd
     epoc =>
     {
      cwd			=> '_epoc_cwd',
-@@ -414,7 +423,7 @@
+@@ -250,7 +259,7 @@
      }
  }
  
@@ -934,9 +909,18 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/Cwd.pm perl-5.20.0/dist/PathTools/Cwd
    # We need to make sure cwd() is called with no args, because it's
    # got an arg-less prototype and will die if args are present.
    local $^W = 0;
-diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Cygwin.pm perl-5.20.0/dist/PathTools/lib/File/Spec/Cygwin.pm
---- perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Cygwin.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/lib/File/Spec/Cygwin.pm	2014-06-29 13:08:21.580400000 +0400
+@@ -351,7 +360,7 @@
+ 
+ sub chdir {
+     my $newdir = @_ ? shift : '';	# allow for no arg (chdir to HOME dir)
+-    if ($^O eq "cygwin") {
++    if ($^O eq "cygwin" || $^O eq "msys") {
+       $newdir =~ s|\A///+|//|;
+       $newdir =~ s|(?<=[^/])//+|/|g;
+     }
+diff -Naur perl-5.22.0-orig/dist/PathTools/lib/File/Spec/Cygwin.pm perl-5.22.0/dist/PathTools/lib/File/Spec/Cygwin.pm
+--- perl-5.22.0-orig/dist/PathTools/lib/File/Spec/Cygwin.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/lib/File/Spec/Cygwin.pm	2015-06-04 15:43:11.201800000 +0300
 @@ -118,7 +118,7 @@
  =cut
  
@@ -946,10 +930,10 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Cygwin.pm perl-5.20.0/d
      and defined &Cygwin::mount_flags;
  
    my $drive = shift;
-diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Unix.pm perl-5.20.0/dist/PathTools/lib/File/Spec/Unix.pm
---- perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Unix.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/lib/File/Spec/Unix.pm	2014-06-29 13:10:04.337600000 +0400
-@@ -69,7 +69,7 @@
+diff -Naur perl-5.22.0-orig/dist/PathTools/lib/File/Spec/Unix.pm perl-5.22.0/dist/PathTools/lib/File/Spec/Unix.pm
+--- perl-5.22.0-orig/dist/PathTools/lib/File/Spec/Unix.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/lib/File/Spec/Unix.pm	2015-06-04 15:43:11.217400000 +0300
+@@ -72,7 +72,7 @@
        $node = $1;
      }
      # This used to be
@@ -958,9 +942,9 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec/Unix.pm perl-5.20.0/dis
      # but that made tests 29, 30, 35, 46, and 213 (as of #13272) to fail
      # (Mainly because trailing "" directories didn't get stripped).
      # Why would cygwin avoid collapsing multiple slashes into one? --jhi
-diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec.pm perl-5.20.0/dist/PathTools/lib/File/Spec.pm
---- perl-5.20.0-orig/dist/PathTools/lib/File/Spec.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/lib/File/Spec.pm	2014-06-29 13:10:43.400000000 +0400
+diff -Naur perl-5.22.0-orig/dist/PathTools/lib/File/Spec.pm perl-5.22.0/dist/PathTools/lib/File/Spec.pm
+--- perl-5.22.0-orig/dist/PathTools/lib/File/Spec.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/lib/File/Spec.pm	2015-06-04 15:43:11.217400000 +0300
 @@ -14,7 +14,8 @@
  	      NetWare => 'Win32', # Yes, File::Spec::Win32 works on NetWare.
  	      symbian => 'Win32', # Yes, File::Spec::Win32 works on symbian.
@@ -971,9 +955,9 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/lib/File/Spec.pm perl-5.20.0/dist/Pat
  
  
  my $module = $module{$^O} || 'Unix';
-diff -Naur perl-5.20.0-orig/dist/PathTools/t/crossplatform.t perl-5.20.0/dist/PathTools/t/crossplatform.t
---- perl-5.20.0-orig/dist/PathTools/t/crossplatform.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/t/crossplatform.t	2014-06-29 13:11:16.940000000 +0400
+diff -Naur perl-5.22.0-orig/dist/PathTools/t/crossplatform.t perl-5.22.0/dist/PathTools/t/crossplatform.t
+--- perl-5.22.0-orig/dist/PathTools/t/crossplatform.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/t/crossplatform.t	2015-06-04 15:43:11.217400000 +0300
 @@ -6,7 +6,7 @@
  use Test::More;
  local $|=1;
@@ -983,9 +967,9 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/t/crossplatform.t perl-5.20.0/dist/Pa
  my $tests_per_platform = 10;
  
  my $vms_unix_rpt = 0;
-diff -Naur perl-5.20.0-orig/dist/PathTools/t/cwd.t perl-5.20.0/dist/PathTools/t/cwd.t
---- perl-5.20.0-orig/dist/PathTools/t/cwd.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/dist/PathTools/t/cwd.t	2014-06-29 13:11:58.467200000 +0400
+diff -Naur perl-5.22.0-orig/dist/PathTools/t/cwd.t perl-5.22.0/dist/PathTools/t/cwd.t
+--- perl-5.22.0-orig/dist/PathTools/t/cwd.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/dist/PathTools/t/cwd.t	2015-06-04 15:43:11.217400000 +0300
 @@ -40,7 +40,7 @@
  my $tests = 31;
  # _perl_abs_path() currently only works when the directory separator
@@ -995,9 +979,9 @@ diff -Naur perl-5.20.0-orig/dist/PathTools/t/cwd.t perl-5.20.0/dist/PathTools/t/
  $tests += 4 if $EXTRA_ABSPATH_TESTS;
  plan tests => $tests;
  
-diff -Naur perl-5.20.0-orig/ext/DynaLoader/DynaLoader_pm.PL perl-5.20.0/ext/DynaLoader/DynaLoader_pm.PL
---- perl-5.20.0-orig/ext/DynaLoader/DynaLoader_pm.PL	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/DynaLoader/DynaLoader_pm.PL	2014-06-29 12:23:21.297400000 +0400
+diff -Naur perl-5.22.0-orig/ext/DynaLoader/DynaLoader_pm.PL perl-5.22.0/ext/DynaLoader/DynaLoader_pm.PL
+--- perl-5.22.0-orig/ext/DynaLoader/DynaLoader_pm.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/DynaLoader/DynaLoader_pm.PL	2015-06-04 15:43:11.217400000 +0300
 @@ -472,6 +472,9 @@
  	    <<$^O-eq-cygwin>>
              push(@names,"cyg$_.$dl_so")  unless m:/:;
@@ -1008,22 +992,22 @@ diff -Naur perl-5.20.0-orig/ext/DynaLoader/DynaLoader_pm.PL perl-5.20.0/ext/Dyna
              push(@names,"lib$_.$dl_so")  unless m:/:;
              push(@names,"$_.a")          if !m/\.a$/ and $dlsrc eq "dl_dld.xs";
              push(@names, $_);
-diff -Naur perl-5.20.0-orig/ext/DynaLoader/t/DynaLoader.t perl-5.20.0/ext/DynaLoader/t/DynaLoader.t
---- perl-5.20.0-orig/ext/DynaLoader/t/DynaLoader.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/DynaLoader/t/DynaLoader.t	2014-06-29 12:32:00.241800000 +0400
+diff -Naur perl-5.22.0-orig/ext/DynaLoader/t/DynaLoader.t perl-5.22.0/ext/DynaLoader/t/DynaLoader.t
+--- perl-5.22.0-orig/ext/DynaLoader/t/DynaLoader.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/DynaLoader/t/DynaLoader.t	2015-06-04 15:43:11.217400000 +0300
 @@ -112,7 +112,7 @@
      # (not at least by that name) that the dl_findfile()
      # could find.
-     skip "dl_findfile test not appropriate on $^O", 1
+     skip( "dl_findfile test not appropriate on $^O", 1 )
 -	if $^O =~ /(win32|vms|openbsd|bitrig|cygwin|vos)/i;
 +	if $^O =~ /(win32|vms|openbsd|bitrig|cygwin|msys|vos)/i;
      # Play safe and only try this test if this system
      # looks pretty much Unix-like.
-     skip "dl_findfile test not appropriate on $^O", 1
-diff -Naur perl-5.20.0-orig/ext/File-Find/lib/File/Find.pm perl-5.20.0/ext/File-Find/lib/File/Find.pm
---- perl-5.20.0-orig/ext/File-Find/lib/File/Find.pm	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/File-Find/lib/File/Find.pm	2014-06-29 13:13:52.815200000 +0400
-@@ -1106,7 +1106,7 @@
+     skip( "dl_findfile test not appropriate on $^O", 1 )
+diff -Naur perl-5.22.0-orig/ext/File-Find/lib/File/Find.pm perl-5.22.0/ext/File-Find/lib/File/Find.pm
+--- perl-5.22.0-orig/ext/File-Find/lib/File/Find.pm	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/File-Find/lib/File/Find.pm	2015-06-04 15:43:11.233000000 +0300
+@@ -784,7 +784,7 @@
  
  $File::Find::dont_use_nlink = 1
      if $^O eq 'os2' || $^O eq 'dos' || $^O eq 'amigaos' || $Is_Win32 ||
@@ -1032,9 +1016,9 @@ diff -Naur perl-5.20.0-orig/ext/File-Find/lib/File/Find.pm perl-5.20.0/ext/File-
  
  # Set dont_use_nlink in your hint file if your system's stat doesn't
  # report the number of links in a directory as an indication
-diff -Naur perl-5.20.0-orig/ext/File-Find/t/find.t perl-5.20.0/ext/File-Find/t/find.t
---- perl-5.20.0-orig/ext/File-Find/t/find.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/File-Find/t/find.t	2014-06-29 13:14:07.775600000 +0400
+diff -Naur perl-5.22.0-orig/ext/File-Find/t/find.t perl-5.22.0/ext/File-Find/t/find.t
+--- perl-5.22.0-orig/ext/File-Find/t/find.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/File-Find/t/find.t	2015-06-04 15:43:11.233000000 +0300
 @@ -12,7 +12,7 @@
      }
      $SIG{'__WARN__'} = sub { $warn_msg = $_[0]; warn "# $_[0]"; };
@@ -1044,9 +1028,9 @@ diff -Naur perl-5.20.0-orig/ext/File-Find/t/find.t perl-5.20.0/ext/File-Find/t/f
          # This is a hack - at present File::Find does not produce native names
          # on Win32 or VMS, so force File::Spec to use Unix names.
          # must be set *before* importing File::Find
-diff -Naur perl-5.20.0-orig/ext/File-Glob/t/basic.t perl-5.20.0/ext/File-Glob/t/basic.t
---- perl-5.20.0-orig/ext/File-Glob/t/basic.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/File-Glob/t/basic.t	2014-06-29 12:23:21.313000000 +0400
+diff -Naur perl-5.22.0-orig/ext/File-Glob/t/basic.t perl-5.22.0/ext/File-Glob/t/basic.t
+--- perl-5.22.0-orig/ext/File-Glob/t/basic.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/File-Glob/t/basic.t	2015-06-04 15:43:11.233000000 +0300
 @@ -137,7 +137,7 @@
  # should return an empty list, and set ERROR
  SKIP: {
@@ -1056,9 +1040,9 @@ diff -Naur perl-5.20.0-orig/ext/File-Glob/t/basic.t perl-5.20.0/ext/File-Glob/t/
      skip "AFS", 2 if Cwd::cwd() =~ m#^$Config{'afsroot'}#s;
      skip "running as root", 2 if not $>;
  
-diff -Naur perl-5.20.0-orig/ext/NDBM_File/Makefile.PL perl-5.20.0/ext/NDBM_File/Makefile.PL
---- perl-5.20.0-orig/ext/NDBM_File/Makefile.PL	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/ext/NDBM_File/Makefile.PL	2014-06-29 20:49:40.461200000 +0400
+diff -Naur perl-5.22.0-orig/ext/NDBM_File/Makefile.PL perl-5.22.0/ext/NDBM_File/Makefile.PL
+--- perl-5.22.0-orig/ext/NDBM_File/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/NDBM_File/Makefile.PL	2015-06-04 15:43:11.233000000 +0300
 @@ -1,7 +1,7 @@
  use ExtUtils::MakeMaker;
  WriteMakefile(
@@ -1068,9 +1052,9 @@ diff -Naur perl-5.20.0-orig/ext/NDBM_File/Makefile.PL perl-5.20.0/ext/NDBM_File/
      XSPROTOARG => '-noprototypes', 		# XXX remove later?
      VERSION_FROM => 'NDBM_File.pm',
      INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
-diff -Naur perl-5.20.0-orig/ext/ODBM_File/Makefile.PL perl-5.20.0/ext/ODBM_File/Makefile.PL
---- perl-5.20.0-orig/ext/ODBM_File/Makefile.PL	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/ext/ODBM_File/Makefile.PL	2014-06-29 20:49:31.475600000 +0400
+diff -Naur perl-5.22.0-orig/ext/ODBM_File/Makefile.PL perl-5.22.0/ext/ODBM_File/Makefile.PL
+--- perl-5.22.0-orig/ext/ODBM_File/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/ODBM_File/Makefile.PL	2015-06-04 15:43:11.233000000 +0300
 @@ -1,7 +1,7 @@
  use ExtUtils::MakeMaker;
  WriteMakefile(
@@ -1080,9 +1064,9 @@ diff -Naur perl-5.20.0-orig/ext/ODBM_File/Makefile.PL perl-5.20.0/ext/ODBM_File/
      XSPROTOARG => '-noprototypes', 		# XXX remove later?
      VERSION_FROM => 'ODBM_File.pm', 
  );
-diff -Naur perl-5.20.0-orig/ext/POSIX/t/sysconf.t perl-5.20.0/ext/POSIX/t/sysconf.t
---- perl-5.20.0-orig/ext/POSIX/t/sysconf.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/POSIX/t/sysconf.t	2014-06-29 12:23:21.313000000 +0400
+diff -Naur perl-5.22.0-orig/ext/POSIX/t/sysconf.t perl-5.22.0/ext/POSIX/t/sysconf.t
+--- perl-5.22.0-orig/ext/POSIX/t/sysconf.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/POSIX/t/sysconf.t	2015-06-04 15:43:11.233000000 +0300
 @@ -161,7 +161,7 @@
  }
  
@@ -1092,9 +1076,9 @@ diff -Naur perl-5.20.0-orig/ext/POSIX/t/sysconf.t perl-5.20.0/ext/POSIX/t/syscon
          pop @sys_consts;
          skip("No _SC_TZNAME_MAX on Cygwin", 1);
      }
-diff -Naur perl-5.20.0-orig/ext/POSIX/t/time.t perl-5.20.0/ext/POSIX/t/time.t
---- perl-5.20.0-orig/ext/POSIX/t/time.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/POSIX/t/time.t	2014-06-29 12:23:21.313000000 +0400
+diff -Naur perl-5.22.0-orig/ext/POSIX/t/time.t perl-5.22.0/ext/POSIX/t/time.t
+--- perl-5.22.0-orig/ext/POSIX/t/time.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/POSIX/t/time.t	2015-06-04 15:43:11.233000000 +0300
 @@ -17,7 +17,7 @@
      # actually do anything.  Cygwin works in some places, but not others.  The
      # other Win32's below are guesses.
@@ -1104,9 +1088,9 @@ diff -Naur perl-5.20.0-orig/ext/POSIX/t/time.t perl-5.20.0/ext/POSIX/t/time.t
            $^O eq "MSWin32" || $^O eq "dos" || $^O eq "interix";
      tzset();
      my @tzname = tzname();
-diff -Naur perl-5.20.0-orig/ext/Win32CORE/t/win32core.t perl-5.20.0/ext/Win32CORE/t/win32core.t
---- perl-5.20.0-orig/ext/Win32CORE/t/win32core.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/ext/Win32CORE/t/win32core.t	2014-06-29 12:34:21.303800000 +0400
+diff -Naur perl-5.22.0-orig/ext/Win32CORE/t/win32core.t perl-5.22.0/ext/Win32CORE/t/win32core.t
+--- perl-5.22.0-orig/ext/Win32CORE/t/win32core.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/Win32CORE/t/win32core.t	2015-06-04 15:43:11.248600000 +0300
 @@ -24,8 +24,8 @@
  my $errno = 0 + $!;
  my $sys_errno = 0 + $^E;
@@ -1118,9 +1102,21 @@ diff -Naur perl-5.20.0-orig/ext/Win32CORE/t/win32core.t perl-5.20.0/ext/Win32COR
      # [perl #42925] - Loading Win32::GetLastError() via the forwarder function
      # should not affect the last error being retrieved
      is($sys_errno, 42, '$^E is preserved across Win32 autoload');
-diff -Naur perl-5.20.0-orig/haiku/Haiku/Makefile.PL perl-5.20.0/haiku/Haiku/Makefile.PL
---- perl-5.20.0-orig/haiku/Haiku/Makefile.PL	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/haiku/Haiku/Makefile.PL	2014-06-29 12:23:21.313000000 +0400
+diff -Naur perl-5.22.0-orig/ext/XS-APItest/t/call_checker.t perl-5.22.0/ext/XS-APItest/t/call_checker.t
+--- perl-5.22.0-orig/ext/XS-APItest/t/call_checker.t	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/ext/XS-APItest/t/call_checker.t	2015-06-04 15:43:11.373400000 +0300
+@@ -5,7 +5,7 @@
+ use XS::APItest;
+ 
+ {
+-    local $TODO = $^O eq "cygwin" ? "[perl #78502] function pointers don't match on cygwin" : "";
++    local $TODO = ($^O eq "cygwin" || $^O eq "msys") ? "[perl #78502] function pointers don't match on cygwin" : "";
+     ok( eval { XS::APItest::test_cv_getset_call_checker(); 1 })
+       or diag $@;
+ }
+diff -Naur perl-5.22.0-orig/haiku/Haiku/Makefile.PL perl-5.22.0/haiku/Haiku/Makefile.PL
+--- perl-5.22.0-orig/haiku/Haiku/Makefile.PL	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/haiku/Haiku/Makefile.PL	2015-06-04 15:43:11.248600000 +0300
 @@ -6,7 +6,7 @@
  }
  
@@ -1130,9 +1126,9 @@ diff -Naur perl-5.20.0-orig/haiku/Haiku/Makefile.PL perl-5.20.0/haiku/Haiku/Make
  
  WriteMakefile(
      NAME          => 'Haiku',
-diff -Naur perl-5.20.0-orig/hints/cygwin.sh perl-5.20.0/hints/cygwin.sh
---- perl-5.20.0-orig/hints/cygwin.sh	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/hints/cygwin.sh	2014-06-29 12:23:21.313000000 +0400
+diff -Naur perl-5.22.0-orig/hints/cygwin.sh perl-5.22.0/hints/cygwin.sh
+--- perl-5.22.0-orig/hints/cygwin.sh	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/hints/cygwin.sh	2015-06-04 15:43:11.248600000 +0300
 @@ -31,6 +31,7 @@
  man3ext='3pm'
  test -z "$use64bitint" && use64bitint='define'
@@ -1141,9 +1137,9 @@ diff -Naur perl-5.20.0-orig/hints/cygwin.sh perl-5.20.0/hints/cygwin.sh
  ccflags="$ccflags -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__"
  # - otherwise i686-cygwin
  archname='cygwin'
-diff -Naur perl-5.20.0-orig/hints/msys.sh perl-5.20.0/hints/msys.sh
---- perl-5.20.0-orig/hints/msys.sh	1970-01-01 03:00:00.000000000 +0300
-+++ perl-5.20.0/hints/msys.sh	2014-06-29 12:23:21.328600000 +0400
+diff -Naur perl-5.22.0-orig/hints/msys.sh perl-5.22.0/hints/msys.sh
+--- perl-5.22.0-orig/hints/msys.sh	1970-01-01 03:00:00.000000000 +0300
++++ perl-5.22.0/hints/msys.sh	2015-06-04 15:43:11.248600000 +0300
 @@ -0,0 +1,83 @@
 +#! /bin/sh
 +# msys.sh - hints for building perl using the MSYS environment for Win32
@@ -1228,10 +1224,10 @@ diff -Naur perl-5.20.0-orig/hints/msys.sh perl-5.20.0/hints/msys.sh
 +#ldflags="$ldflags -s"
 +#ccdlflags="$ccdlflags -s"
 +#lddlflags="$lddlflags -s"
-diff -Naur perl-5.20.0-orig/install_lib.pl perl-5.20.0/install_lib.pl
---- perl-5.20.0-orig/install_lib.pl	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/install_lib.pl	2014-06-29 12:23:21.328600000 +0400
-@@ -45,7 +45,7 @@
+diff -Naur perl-5.22.0-orig/install_lib.pl perl-5.22.0/install_lib.pl
+--- perl-5.22.0-orig/install_lib.pl	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/install_lib.pl	2015-06-04 15:43:11.248600000 +0300
+@@ -46,7 +46,7 @@
  $Is_VMS = $^O eq 'VMS';
  $Is_W32 = $^O eq 'MSWin32';
  $Is_OS2 = $^O eq 'os2';
@@ -1240,9 +1236,9 @@ diff -Naur perl-5.20.0-orig/install_lib.pl perl-5.20.0/install_lib.pl
  $Is_Darwin = $^O eq 'darwin';
  $Is_NetWare = $Config{osname} eq 'NetWare';
  
-diff -Naur perl-5.20.0-orig/installman perl-5.20.0/installman
---- perl-5.20.0-orig/installman	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/installman	2014-06-29 12:23:21.328600000 +0400
+diff -Naur perl-5.22.0-orig/installman perl-5.22.0/installman
+--- perl-5.22.0-orig/installman	2015-05-13 23:19:29.000000000 +0300
++++ perl-5.22.0/installman	2015-06-04 15:43:11.248600000 +0300
 @@ -146,7 +146,7 @@
  	    next;
  	}
@@ -1252,9 +1248,9 @@ diff -Naur perl-5.20.0-orig/installman perl-5.20.0/installman
              $manpage =~ s#::#.#g;
  	}
          my $tmp = "${mandir}/${manpage}.tmp";
-diff -Naur perl-5.20.0-orig/lib/AnyDBM_File.t perl-5.20.0/lib/AnyDBM_File.t
---- perl-5.20.0-orig/lib/AnyDBM_File.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/lib/AnyDBM_File.t	2014-06-29 12:23:21.328600000 +0400
+diff -Naur perl-5.22.0-orig/lib/AnyDBM_File.t perl-5.22.0/lib/AnyDBM_File.t
+--- perl-5.22.0-orig/lib/AnyDBM_File.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/AnyDBM_File.t	2015-06-04 15:43:11.264200000 +0300
 @@ -15,7 +15,8 @@
  $Is_Dosish = ($^O eq 'amigaos' || $^O eq 'MSWin32' ||
  	      $^O eq 'NetWare' || $^O eq 'dos' ||
@@ -1265,10 +1261,10 @@ diff -Naur perl-5.20.0-orig/lib/AnyDBM_File.t perl-5.20.0/lib/AnyDBM_File.t
  
  my $filename = "Any_dbmx$$";
  unlink <"$filename*">;
-diff -Naur perl-5.20.0-orig/lib/ExtUtils/t/Embed.t perl-5.20.0/lib/ExtUtils/t/Embed.t
---- perl-5.20.0-orig/lib/ExtUtils/t/Embed.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/lib/ExtUtils/t/Embed.t	2014-06-29 12:23:21.328600000 +0400
-@@ -104,7 +104,7 @@
+diff -Naur perl-5.22.0-orig/lib/ExtUtils/t/Embed.t perl-5.22.0/lib/ExtUtils/t/Embed.t
+--- perl-5.22.0-orig/lib/ExtUtils/t/Embed.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/ExtUtils/t/Embed.t	2015-06-04 15:43:11.264200000 +0300
+@@ -112,7 +112,7 @@
          s!-bE:(\S+)!-bE:$perl_exp!;
      }
     }
@@ -1277,7 +1273,7 @@ diff -Naur perl-5.20.0-orig/lib/ExtUtils/t/Embed.t perl-5.20.0/lib/ExtUtils/t/Em
         ;
     }
     elsif ($Config{'libperl'} !~ /\Alibperl\./) {
-@@ -147,7 +147,7 @@
+@@ -155,7 +155,7 @@
  unlink("$exe.manifest") if $cl and $Config{'ccversion'} =~ /^(\d+)/ and $1 >= 14;
  unlink("$exe$Config{exe_ext}") if $skip_exe;
  unlink("embed_test.map","embed_test.lis") if $^O eq 'VMS';
@@ -1286,9 +1282,9 @@ diff -Naur perl-5.20.0-orig/lib/ExtUtils/t/Embed.t perl-5.20.0/lib/ExtUtils/t/Em
  unlink($testlib)	       if $libperl_copied;
  
  # gcc -g -I.. -L../ -o perl_test perl_test.c -lperl `../perl -I../lib -MExtUtils::Embed -I../ -e ccflags -e ldopts`
-diff -Naur perl-5.20.0-orig/lib/File/Compare.t perl-5.20.0/lib/File/Compare.t
---- perl-5.20.0-orig/lib/File/Compare.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/lib/File/Compare.t	2014-06-29 12:34:59.377800000 +0400
+diff -Naur perl-5.22.0-orig/lib/File/Compare.t perl-5.22.0/lib/File/Compare.t
+--- perl-5.22.0-orig/lib/File/Compare.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/File/Compare.t	2015-06-04 15:43:11.264200000 +0300
 @@ -105,7 +105,7 @@
      TODO: {
          my $why = "spaces after filename silently truncated";
@@ -1298,9 +1294,9 @@ diff -Naur perl-5.20.0-orig/lib/File/Compare.t perl-5.20.0/lib/File/Compare.t
          todo_skip $why, $how_many if $condition;
          is($donetests[2], 0, "file/fileCR [$donetests[2]]");
      }
-diff -Naur perl-5.20.0-orig/lib/File/Copy.t perl-5.20.0/lib/File/Copy.t
---- perl-5.20.0-orig/lib/File/Copy.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/lib/File/Copy.t	2014-06-29 12:23:21.344200000 +0400
+diff -Naur perl-5.22.0-orig/lib/File/Copy.t perl-5.22.0/lib/File/Copy.t
+--- perl-5.22.0-orig/lib/File/Copy.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/File/Copy.t	2015-06-04 15:43:11.264200000 +0300
 @@ -173,7 +173,7 @@
  
    SKIP: {
@@ -1310,18 +1306,9 @@ diff -Naur perl-5.20.0-orig/lib/File/Copy.t perl-5.20.0/lib/File/Copy.t
  
      open(F, ">file-$$") or die $!;
      print F "dummy content\n";
-@@ -365,7 +365,7 @@
-             is (__$perm5, __$c_perm1, "Permission bits set correctly");
-             TODO: {
-                 local $TODO = 'Permission bits inconsistent under cygwin'
--                   if $^O eq 'cygwin';
-+                   if ($^O eq 'cygwin' or $^O eq 'msys');
-                 is (__$perm3, __$c_perm3, "Permission bits not modified");
-                 is (__$perm6, __$c_perm3, "Permission bits not modified");
-             }
-diff -Naur perl-5.20.0-orig/lib/Net/hostent.t perl-5.20.0/lib/Net/hostent.t
---- perl-5.20.0-orig/lib/Net/hostent.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/lib/Net/hostent.t	2014-06-29 12:23:23.855800000 +0400
+diff -Naur perl-5.22.0-orig/lib/Net/hostent.t perl-5.22.0/lib/Net/hostent.t
+--- perl-5.22.0-orig/lib/Net/hostent.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/Net/hostent.t	2015-06-04 15:43:11.264200000 +0300
 @@ -57,7 +57,7 @@
  
  SKIP: {
@@ -1331,10 +1318,10 @@ diff -Naur perl-5.20.0-orig/lib/Net/hostent.t perl-5.20.0/lib/Net/hostent.t
  
      print "# name = " . $h->name . ", aliases = " . join (",", @{$h->aliases}) . "\n";
  
-diff -Naur perl-5.20.0-orig/lib/perl5db.pl perl-5.20.0/lib/perl5db.pl
---- perl-5.20.0-orig/lib/perl5db.pl	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/lib/perl5db.pl	2014-06-29 12:23:23.855800000 +0400
-@@ -1517,7 +1517,7 @@
+diff -Naur perl-5.22.0-orig/lib/perl5db.pl perl-5.22.0/lib/perl5db.pl
+--- perl-5.22.0-orig/lib/perl5db.pl	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/perl5db.pl	2015-06-04 15:43:11.279800000 +0300
+@@ -1526,7 +1526,7 @@
  
  =cut
  
@@ -1343,9 +1330,9 @@ diff -Naur perl-5.20.0-orig/lib/perl5db.pl perl-5.20.0/lib/perl5db.pl
  
          # /dev/tty is binary. use stdin for textmode
          undef $console;
-diff -Naur perl-5.20.0-orig/lib/User/grent.t perl-5.20.0/lib/User/grent.t
---- perl-5.20.0-orig/lib/User/grent.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/lib/User/grent.t	2014-06-29 12:23:24.183400000 +0400
+diff -Naur perl-5.22.0-orig/lib/User/grent.t perl-5.22.0/lib/User/grent.t
+--- perl-5.22.0-orig/lib/User/grent.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/User/grent.t	2015-06-04 15:43:11.295400000 +0300
 @@ -18,7 +18,7 @@
  }
  
@@ -1355,9 +1342,9 @@ diff -Naur perl-5.20.0-orig/lib/User/grent.t perl-5.20.0/lib/User/grent.t
      our @grent = getgrgid $gid; # This is the function getgrgid.
      unless (@grent) { plan skip_all => "no gid 0"; }
  }
-diff -Naur perl-5.20.0-orig/lib/User/pwent.t perl-5.20.0/lib/User/pwent.t
---- perl-5.20.0-orig/lib/User/pwent.t	2014-02-01 01:55:51.000000000 +0400
-+++ perl-5.20.0/lib/User/pwent.t	2014-06-29 12:23:24.199000000 +0400
+diff -Naur perl-5.22.0-orig/lib/User/pwent.t perl-5.22.0/lib/User/pwent.t
+--- perl-5.22.0-orig/lib/User/pwent.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/lib/User/pwent.t	2015-06-04 15:43:11.295400000 +0300
 @@ -21,7 +21,7 @@
      # On VMS getpwuid(0) may return [$gid,0] UIC info (which may not exist).
      # It is better to use the $< uid for testing on VMS instead.
@@ -1376,9 +1363,9 @@ diff -Naur perl-5.20.0-orig/lib/User/pwent.t perl-5.20.0/lib/User/pwent.t
      print "not " unless (   $pwent->uid == $uid_expect
                           || $pwent->uid == 500         );  # go figure
  }
-diff -Naur perl-5.20.0-orig/makedepend.SH perl-5.20.0/makedepend.SH
---- perl-5.20.0-orig/makedepend.SH	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/makedepend.SH	2014-06-29 12:23:24.199000000 +0400
+diff -Naur perl-5.22.0-orig/makedepend.SH perl-5.22.0/makedepend.SH
+--- perl-5.22.0-orig/makedepend.SH	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/makedepend.SH	2015-06-04 15:43:11.295400000 +0300
 @@ -118,6 +118,7 @@
      uwin)     uwinfix="-e s,\\\\\\\\,/,g -e s,\\([a-zA-Z]\\):/,/\\1/,g" ;;
      os2)      uwinfix="-e s,\\\\\\\\,/,g" ;;
@@ -1387,9 +1374,9 @@ diff -Naur perl-5.20.0-orig/makedepend.SH perl-5.20.0/makedepend.SH
      posix-bc) uwinfix="-e s/\\*POSIX(\\(.*\\))/\\1/" ;;
      vos)      uwinfix="-e s/\#/\\\#/" ;;
      *)        uwinfix="" ;;
-diff -Naur perl-5.20.0-orig/Makefile.SH perl-5.20.0/Makefile.SH
---- perl-5.20.0-orig/Makefile.SH	2014-06-29 12:17:38.741800000 +0400
-+++ perl-5.20.0/Makefile.SH	2014-06-29 12:40:57.441000000 +0400
+diff -Naur perl-5.22.0-orig/Makefile.SH perl-5.22.0/Makefile.SH
+--- perl-5.22.0-orig/Makefile.SH	2015-06-04 15:41:48.964400000 +0300
++++ perl-5.22.0/Makefile.SH	2015-06-04 15:43:11.295400000 +0300
 @@ -61,8 +61,8 @@
  				${revision}.${patchlevel}.${subversion} \
  			     -install_name \$(shrpdir)/\$@"
@@ -1401,7 +1388,7 @@ diff -Naur perl-5.20.0-orig/Makefile.SH perl-5.20.0/Makefile.SH
  		linklibperl="-L. -lperl"
  		;;
  	sunos*)
-@@ -783,7 +783,7 @@
+@@ -774,7 +774,7 @@
  
  !NO!SUBS!
  	;;
@@ -1410,7 +1397,7 @@ diff -Naur perl-5.20.0-orig/Makefile.SH perl-5.20.0/Makefile.SH
  	$spitshell >>$Makefile <<'!NO!SUBS!'
  cygwin.c: cygwin/cygwin.c
  	$(LNS) cygwin/cygwin.c
-@@ -1261,7 +1261,7 @@
+@@ -1266,7 +1266,7 @@
  	-rm -f perl.exp ext.libs $(generated_pods) uni.data opmini.o perlmini.o pod/roffitall
  	-rm -f perl.export perl.dll perl.libexp perl.map perl.def
  	-rm -f *perl.xok
@@ -1419,9 +1406,9 @@ diff -Naur perl-5.20.0-orig/Makefile.SH perl-5.20.0/Makefile.SH
  	-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
  	-rm -f config.arch config.over $(DTRACE_H)
  
-diff -Naur perl-5.20.0-orig/regen/regen_lib.pl perl-5.20.0/regen/regen_lib.pl
---- perl-5.20.0-orig/regen/regen_lib.pl	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/regen/regen_lib.pl	2014-06-29 12:23:24.199000000 +0400
+diff -Naur perl-5.22.0-orig/regen/regen_lib.pl perl-5.22.0/regen/regen_lib.pl
+--- perl-5.22.0-orig/regen/regen_lib.pl	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/regen/regen_lib.pl	2015-06-04 15:43:11.311000000 +0300
 @@ -7,7 +7,7 @@
  
  # Common functions needed by the regen scripts
@@ -1431,9 +1418,9 @@ diff -Naur perl-5.20.0-orig/regen/regen_lib.pl perl-5.20.0/regen/regen_lib.pl
  
  $Verbose = 0;
  @ARGV = grep { not($_ eq '-q' and $Verbose = -1) }
-diff -Naur perl-5.20.0-orig/symbian/sanity.pl perl-5.20.0/symbian/sanity.pl
---- perl-5.20.0-orig/symbian/sanity.pl	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/symbian/sanity.pl	2014-06-29 12:23:24.199000000 +0400
+diff -Naur perl-5.22.0-orig/symbian/sanity.pl perl-5.22.0/symbian/sanity.pl
+--- perl-5.22.0-orig/symbian/sanity.pl	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/symbian/sanity.pl	2015-06-04 15:43:11.311000000 +0300
 @@ -2,7 +2,7 @@
  
  if (exists $ENV{'!C:'}) {
@@ -1443,10 +1430,10 @@ diff -Naur perl-5.20.0-orig/symbian/sanity.pl perl-5.20.0/symbian/sanity.pl
    print "I'm sorry but only cmd.exe with e.g. the ActivePerl will work.\n";
    exit(1);
  }
-diff -Naur perl-5.20.0-orig/t/io/eintr.t perl-5.20.0/t/io/eintr.t
---- perl-5.20.0-orig/t/io/eintr.t	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/io/eintr.t	2014-06-29 12:23:24.199000000 +0400
-@@ -50,7 +50,7 @@
+diff -Naur perl-5.22.0-orig/t/io/eintr.t perl-5.22.0/t/io/eintr.t
+--- perl-5.22.0-orig/t/io/eintr.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/io/eintr.t	2015-06-04 15:43:11.311000000 +0300
+@@ -52,7 +52,7 @@
  # platforms
  
  my ($osmajmin) = $Config{osvers} =~ /^(\d+\.\d+)/;
@@ -1455,10 +1442,10 @@ diff -Naur perl-5.20.0-orig/t/io/eintr.t perl-5.20.0/t/io/eintr.t
       ($^O eq 'solaris' && $Config{osvers} eq '2.8') || $^O eq 'nto' ||
       ($^O eq 'darwin' && $osmajmin < 9) ||
      ((int($]*1000) & 1) == 0)
-diff -Naur perl-5.20.0-orig/t/io/fs.t perl-5.20.0/t/io/fs.t
---- perl-5.20.0-orig/t/io/fs.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/io/fs.t	2014-06-29 13:15:49.768400000 +0400
-@@ -36,7 +36,7 @@
+diff -Naur perl-5.22.0-orig/t/io/fs.t perl-5.22.0/t/io/fs.t
+--- perl-5.22.0-orig/t/io/fs.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/io/fs.t	2015-06-04 15:43:11.311000000 +0300
+@@ -39,7 +39,7 @@
      !($^O eq 'MSWin32' || $^O eq 'NetWare' ||
        $^O eq 'dos'     || $^O eq 'os2'     ||
        $^O eq 'cygwin'  || $^O eq 'amigaos' ||
@@ -1467,16 +1454,16 @@ diff -Naur perl-5.20.0-orig/t/io/fs.t perl-5.20.0/t/io/fs.t
       );
  
  if (defined &Win32::IsWinNT && Win32::IsWinNT()) {
-@@ -57,7 +57,7 @@
+@@ -60,7 +60,7 @@
  $needs_fh_reopen = 1 if (defined &Win32::IsWin95 && Win32::IsWin95());
  
  my $skip_mode_checks =
 -    $^O eq 'cygwin' && $ENV{CYGWIN} !~ /ntsec/;
 +    $^O eq 'msys' && $ENV{MSYS} !~ /ntsec/;
  
- plan tests => 55;
+ plan tests => 61;
  
-@@ -119,7 +119,7 @@
+@@ -122,7 +122,7 @@
          skip "hard links not that hard in $^O", 1 if $^O eq 'amigaos';
  	skip "no mode checks", 1 if $skip_mode_checks;
  
@@ -1485,7 +1472,7 @@ diff -Naur perl-5.20.0-orig/t/io/fs.t perl-5.20.0/t/io/fs.t
  #          is($mode & 0777, 0777, "mode of triply-linked file");
  #      } else {
              is(sprintf("0%o", $mode & 0777), 
-@@ -432,7 +432,7 @@
+@@ -454,7 +454,7 @@
  # check if rename() can be used to just change case of filename
  SKIP: {
      skip "Works in Cygwin only if check_case is set to relaxed", 1
@@ -1494,10 +1481,10 @@ diff -Naur perl-5.20.0-orig/t/io/fs.t perl-5.20.0/t/io/fs.t
  
      chdir "./$tmpdir";
      open(FH,'>x') || die "Can't create x";
-diff -Naur perl-5.20.0-orig/t/io/inplace.t perl-5.20.0/t/io/inplace.t
---- perl-5.20.0-orig/t/io/inplace.t	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/io/inplace.t	2014-06-29 12:23:24.214600000 +0400
-@@ -37,7 +37,7 @@
+diff -Naur perl-5.22.0-orig/t/io/inplace.t perl-5.22.0/t/io/inplace.t
+--- perl-5.22.0-orig/t/io/inplace.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/io/inplace.t	2015-06-04 15:43:11.311000000 +0300
+@@ -38,7 +38,7 @@
  {
      # based on code, dosish systems can't do no-backup inplace
      # edits
@@ -1506,9 +1493,9 @@ diff -Naur perl-5.20.0-orig/t/io/inplace.t perl-5.20.0/t/io/inplace.t
  	and skip("Can't inplace edit without backups on $^O", 4);
      
      our @ifiles = ( tempfile(), tempfile(), tempfile() );
-diff -Naur perl-5.20.0-orig/t/io/tell.t perl-5.20.0/t/io/tell.t
---- perl-5.20.0-orig/t/io/tell.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/io/tell.t	2014-06-29 12:42:30.611400000 +0400
+diff -Naur perl-5.22.0-orig/t/io/tell.t perl-5.22.0/t/io/tell.t
+--- perl-5.22.0-orig/t/io/tell.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/io/tell.t	2015-06-04 15:43:11.326600000 +0300
 @@ -11,7 +11,7 @@
  $TST = 'TST';
  
@@ -1527,9 +1514,9 @@ diff -Naur perl-5.20.0-orig/t/io/tell.t perl-5.20.0/t/io/tell.t
      print "not ok 28 # TODO: file pointer not at eof\n";
    }
    elsif ($^O eq "vos") {
-diff -Naur perl-5.20.0-orig/t/lib/cygwin.t perl-5.20.0/t/lib/cygwin.t
---- perl-5.20.0-orig/t/lib/cygwin.t	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/lib/cygwin.t	2014-06-29 12:23:24.214600000 +0400
+diff -Naur perl-5.22.0-orig/t/lib/cygwin.t perl-5.22.0/t/lib/cygwin.t
+--- perl-5.22.0-orig/t/lib/cygwin.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/lib/cygwin.t	2015-06-04 15:43:11.326600000 +0300
 @@ -4,7 +4,7 @@
      chdir 't' if -d 't';
      @INC = ('../lib');
@@ -1539,9 +1526,9 @@ diff -Naur perl-5.20.0-orig/t/lib/cygwin.t perl-5.20.0/t/lib/cygwin.t
  }
  
  plan(tests => 16);
-diff -Naur perl-5.20.0-orig/t/lib/dbmt_common.pl perl-5.20.0/t/lib/dbmt_common.pl
---- perl-5.20.0-orig/t/lib/dbmt_common.pl	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/lib/dbmt_common.pl	2014-06-29 12:23:24.214600000 +0400
+diff -Naur perl-5.22.0-orig/t/lib/dbmt_common.pl perl-5.22.0/t/lib/dbmt_common.pl
+--- perl-5.22.0-orig/t/lib/dbmt_common.pl	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/lib/dbmt_common.pl	2015-06-04 15:43:11.326600000 +0300
 @@ -43,7 +43,7 @@
  }
  SKIP: {
@@ -1551,9 +1538,9 @@ diff -Naur perl-5.20.0-orig/t/lib/dbmt_common.pl perl-5.20.0/t/lib/dbmt_common.p
      my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
  	$blksize,$blocks) = stat($Dfile);
      is($mode & 0777, 0640);
-diff -Naur perl-5.20.0-orig/t/op/groups.t perl-5.20.0/t/op/groups.t
---- perl-5.20.0-orig/t/op/groups.t	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/op/groups.t	2014-06-29 12:23:24.214600000 +0400
+diff -Naur perl-5.22.0-orig/t/op/groups.t perl-5.22.0/t/op/groups.t
+--- perl-5.22.0-orig/t/op/groups.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/groups.t	2015-06-04 15:43:11.326600000 +0300
 @@ -284,7 +284,7 @@
  
  # Test if this is Cygwin
@@ -1563,9 +1550,9 @@ diff -Naur perl-5.20.0-orig/t/op/groups.t perl-5.20.0/t/op/groups.t
  }
  
  # Get perl's supplementary groups and the number of times each gid
-diff -Naur perl-5.20.0-orig/t/op/magic.t perl-5.20.0/t/op/magic.t
---- perl-5.20.0-orig/t/op/magic.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/op/magic.t	2014-06-29 12:23:24.230200000 +0400
+diff -Naur perl-5.22.0-orig/t/op/magic.t perl-5.22.0/t/op/magic.t
+--- perl-5.22.0-orig/t/op/magic.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/magic.t	2015-06-04 15:43:11.326600000 +0300
 @@ -54,7 +54,7 @@
  $Is_VMS      = $^O eq 'VMS';
  $Is_Dos      = $^O eq 'dos';
@@ -1575,10 +1562,10 @@ diff -Naur perl-5.20.0-orig/t/op/magic.t perl-5.20.0/t/op/magic.t
  
  $PERL =
     ($Is_NetWare ? 'perl'   :
-diff -Naur perl-5.20.0-orig/t/op/require_errors.t perl-5.20.0/t/op/require_errors.t
---- perl-5.20.0-orig/t/op/require_errors.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/op/require_errors.t	2014-06-29 12:23:24.230200000 +0400
-@@ -72,7 +72,7 @@
+diff -Naur perl-5.22.0-orig/t/op/require_errors.t perl-5.22.0/t/op/require_errors.t
+--- perl-5.22.0-orig/t/op/require_errors.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/require_errors.t	2015-06-04 15:43:11.326600000 +0300
+@@ -73,7 +73,7 @@
      push @INC, '../lib';
      require Cwd;
      require File::Spec::Functions;
@@ -1587,7 +1574,7 @@ diff -Naur perl-5.20.0-orig/t/op/require_errors.t perl-5.20.0/t/op/require_error
          require Win32;
      }
  
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
      my $olduid = $>;
      eval { $> = 1; };
      skip "Can't test permissions meaningfully if you're superuser", 2
@@ -1596,10 +1583,10 @@ diff -Naur perl-5.20.0-orig/t/op/require_errors.t perl-5.20.0/t/op/require_error
  
      local @INC = ".";
      eval "use $module";
-diff -Naur perl-5.20.0-orig/t/op/sigdispatch.t perl-5.20.0/t/op/sigdispatch.t
---- perl-5.20.0-orig/t/op/sigdispatch.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/op/sigdispatch.t	2014-06-29 12:44:11.155800000 +0400
-@@ -43,7 +43,7 @@
+diff -Naur perl-5.22.0-orig/t/op/sigdispatch.t perl-5.22.0/t/op/sigdispatch.t
+--- perl-5.22.0-orig/t/op/sigdispatch.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/sigdispatch.t	2015-06-04 15:43:11.326600000 +0300
+@@ -44,7 +44,7 @@
      skip('We can\'t test blocking without sigprocmask', 17)
  	if is_miniperl() || !$Config{d_sigprocmask};
      skip("This doesn\'t work on $^O threaded builds RT#88814", 17)
@@ -1608,7 +1595,7 @@ diff -Naur perl-5.20.0-orig/t/op/sigdispatch.t perl-5.20.0/t/op/sigdispatch.t
  	    && $Config{useithreads};
  
      require POSIX;
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
      kill 'SIGUSR1', $$;
      is $gotit, 0, 'Haven\'t received third signal yet';
  
@@ -1617,7 +1604,7 @@ diff -Naur perl-5.20.0-orig/t/op/sigdispatch.t perl-5.20.0/t/op/sigdispatch.t
      is POSIX::sigpending($pending), '0 but true', 'sigpending';
      is $pending->ismember(&POSIX::SIGUSR1), 1, 'SIGUSR1 is pending';
      
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
  
  SKIP: {
      skip("alarm cannot interrupt blocking system calls on $^O", 2)
@@ -1626,10 +1613,10 @@ diff -Naur perl-5.20.0-orig/t/op/sigdispatch.t perl-5.20.0/t/op/sigdispatch.t
      # RT #88774
      # make sure the signal handler's called in an eval block *before*
      # the eval is popped
-diff -Naur perl-5.20.0-orig/t/op/stat.t perl-5.20.0/t/op/stat.t
---- perl-5.20.0-orig/t/op/stat.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/op/stat.t	2014-06-29 12:23:24.230200000 +0400
-@@ -28,7 +28,7 @@
+diff -Naur perl-5.22.0-orig/t/op/stat.t perl-5.22.0/t/op/stat.t
+--- perl-5.22.0-orig/t/op/stat.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/stat.t	2015-06-04 15:43:11.342200000 +0300
+@@ -33,7 +33,7 @@
  $ENV{LANGUAGE} = 'C';		# Ditto in GNU.
  
  $Is_Amiga   = $^O eq 'amigaos';
@@ -1638,7 +1625,7 @@ diff -Naur perl-5.20.0-orig/t/op/stat.t perl-5.20.0/t/op/stat.t
  $Is_Darwin  = $^O eq 'darwin';
  $Is_Dos     = $^O eq 'dos';
  $Is_MSWin32 = $^O eq 'MSWin32';
-@@ -117,7 +117,7 @@
+@@ -122,7 +122,7 @@
      SKIP: {
          skip "No link count", 1 if $Config{dont_use_nlink};
          skip "Cygwin9X fakes hard links by copying", 1
@@ -1647,9 +1634,9 @@ diff -Naur perl-5.20.0-orig/t/op/stat.t perl-5.20.0/t/op/stat.t
  
          is($nlink, 2,     'Link count on hard linked file' );
      }
-diff -Naur perl-5.20.0-orig/t/op/taint.t perl-5.20.0/t/op/taint.t
---- perl-5.20.0-orig/t/op/taint.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/op/taint.t	2014-06-29 12:23:24.230200000 +0400
+diff -Naur perl-5.22.0-orig/t/op/taint.t perl-5.22.0/t/op/taint.t
+--- perl-5.22.0-orig/t/op/taint.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/taint.t	2015-06-04 15:43:11.342200000 +0300
 @@ -46,7 +46,7 @@
  my $Is_MSWin32  = $^O eq 'MSWin32';
  my $Is_NetWare  = $^O eq 'NetWare';
@@ -1659,9 +1646,9 @@ diff -Naur perl-5.20.0-orig/t/op/taint.t perl-5.20.0/t/op/taint.t
  my $Is_OpenBSD  = $^O eq 'openbsd';
  my $Is_MirBSD   = $^O eq 'mirbsd';
  my $Invoke_Perl = $Is_VMS      ? 'MCR Sys$Disk:[]Perl.exe' :
-diff -Naur perl-5.20.0-orig/t/op/time.t perl-5.20.0/t/op/time.t
---- perl-5.20.0-orig/t/op/time.t	2014-02-01 01:55:52.000000000 +0400
-+++ perl-5.20.0/t/op/time.t	2014-06-29 12:23:24.230200000 +0400
+diff -Naur perl-5.22.0-orig/t/op/time.t perl-5.22.0/t/op/time.t
+--- perl-5.22.0-orig/t/op/time.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/op/time.t	2015-06-04 15:43:11.342200000 +0300
 @@ -50,7 +50,7 @@
  SKIP: {
      # This conditional of "No tzset()" is stolen from ext/POSIX/t/time.t
@@ -1671,9 +1658,9 @@ diff -Naur perl-5.20.0-orig/t/op/time.t perl-5.20.0/t/op/time.t
             $^O eq "djgpp" || $^O eq "MSWin32" || $^O eq "dos" ||
             $^O eq "interix";
  
-diff -Naur perl-5.20.0-orig/t/porting/extrefs.t perl-5.20.0/t/porting/extrefs.t
---- perl-5.20.0-orig/t/porting/extrefs.t	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/porting/extrefs.t	2014-06-29 12:23:24.245800000 +0400
+diff -Naur perl-5.22.0-orig/t/porting/extrefs.t perl-5.22.0/t/porting/extrefs.t
+--- perl-5.22.0-orig/t/porting/extrefs.t	2015-05-13 23:19:30.000000000 +0300
++++ perl-5.22.0/t/porting/extrefs.t	2015-06-04 15:43:11.342200000 +0300
 @@ -48,7 +48,7 @@
  sub try_compile_and_link {
      my ($c, %args) = @_;
@@ -1683,10 +1670,10 @@ diff -Naur perl-5.20.0-orig/t/porting/extrefs.t perl-5.20.0/t/porting/extrefs.t
                   $^O eq 'os2' && $Config{ldflags} =~ /-Zexe\b/) ? '.exe' :
                  (($^O eq 'vos') ? $Config{exe_ext} : '');
  
-diff -Naur perl-5.20.0-orig/t/test.pl perl-5.20.0/t/test.pl
---- perl-5.20.0-orig/t/test.pl	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/t/test.pl	2014-06-29 12:23:24.245800000 +0400
-@@ -572,7 +572,7 @@
+diff -Naur perl-5.22.0-orig/t/test.pl perl-5.22.0/t/test.pl
+--- perl-5.22.0-orig/t/test.pl	2015-05-19 15:07:30.000000000 +0300
++++ perl-5.22.0/t/test.pl	2015-06-04 15:43:11.342200000 +0300
+@@ -616,7 +616,7 @@
  my $is_mswin    = $^O eq 'MSWin32';
  my $is_netware  = $^O eq 'NetWare';
  my $is_vms      = $^O eq 'VMS';
@@ -1695,9 +1682,9 @@ diff -Naur perl-5.20.0-orig/t/test.pl perl-5.20.0/t/test.pl
  
  sub _quote_args {
      my ($runperl, $args) = @_;
-diff -Naur perl-5.20.0-orig/utils/perlbug.PL perl-5.20.0/utils/perlbug.PL
---- perl-5.20.0-orig/utils/perlbug.PL	2014-05-26 17:34:20.000000000 +0400
-+++ perl-5.20.0/utils/perlbug.PL	2014-06-29 12:23:24.245800000 +0400
+diff -Naur perl-5.22.0-orig/utils/perlbug.PL perl-5.22.0/utils/perlbug.PL
+--- perl-5.22.0-orig/utils/perlbug.PL	2015-05-13 23:19:31.000000000 +0300
++++ perl-5.22.0/utils/perlbug.PL	2015-06-04 15:43:11.357800000 +0300
 @@ -723,7 +723,7 @@
      my @env =
          qw(PATH LD_LIBRARY_PATH LANG PERL_BADLANG SHELL HOME LOGDIR LANGUAGE);
@@ -1707,9 +1694,9 @@ diff -Naur perl-5.20.0-orig/utils/perlbug.PL perl-5.20.0/utils/perlbug.PL
      my %env;
      @env{@env} = @env;
      for my $env (sort keys %env) {
-diff -Naur perl-5.20.0-orig/win32/FindExt.pm perl-5.20.0/win32/FindExt.pm
---- perl-5.20.0-orig/win32/FindExt.pm	2014-05-26 17:34:21.000000000 +0400
-+++ perl-5.20.0/win32/FindExt.pm	2014-06-29 12:23:24.245800000 +0400
+diff -Naur perl-5.22.0-orig/win32/FindExt.pm perl-5.22.0/win32/FindExt.pm
+--- perl-5.22.0-orig/win32/FindExt.pm	2015-05-13 23:19:31.000000000 +0300
++++ perl-5.22.0/win32/FindExt.pm	2015-06-04 15:43:11.357800000 +0300
 @@ -24,7 +24,7 @@
      push @no, "ODBM_File"
        unless ($config->{i_dbm} || $config->{i_rpcsvcdbm}) && !$config->{d_cplusplus};