From cf4cc6db406ce63c65f6759f410ea1f8f780f9da Mon Sep 17 00:00:00 2001
From: Peter Martini <PeterCMartini@GMail.com>
Date: Sat, 30 Apr 2016 17:47:14 -0400
Subject: [PATCH] 5.22.1 -> 5.22.2

---
 5.008.009-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.008.009-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.010.001-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.010.001-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.012.005-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.012.005-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.014.004-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.014.004-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.016.003-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.016.003-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.018.004-64bit,threaded/DevelPatchPerl.patch | 45 ++++++++++++++++++-
 5.018.004-64bit/DevelPatchPerl.patch          | 45 ++++++++++++++++++-
 5.020.003-64bit,threaded/DevelPatchPerl.patch |  4 +-
 5.020.003-64bit/DevelPatchPerl.patch          |  4 +-
 .../DevelPatchPerl.patch                      |  2 +-
 .../Dockerfile                                | 10 ++---
 .../DevelPatchPerl.patch                      |  2 +-
 .../Dockerfile                                | 10 ++---
 Releases.yaml                                 |  4 +-
 19 files changed, 534 insertions(+), 42 deletions(-)
 rename {5.022.001-64bit,threaded => 5.022.002-64bit,threaded}/DevelPatchPerl.patch (90%)
 rename {5.022.001-64bit,threaded => 5.022.002-64bit,threaded}/Dockerfile (74%)
 rename {5.022.001-64bit => 5.022.002-64bit}/DevelPatchPerl.patch (90%)
 rename {5.022.001-64bit => 5.022.002-64bit}/Dockerfile (74%)

diff --git a/5.008.009-64bit,threaded/DevelPatchPerl.patch b/5.008.009-64bit,threaded/DevelPatchPerl.patch
index 3d7c039..7f31e1d 100644
--- a/5.008.009-64bit,threaded/DevelPatchPerl.patch
+++ b/5.008.009-64bit,threaded/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 6f20c5e..684f369 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -253,20 +253,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index ac264c3..fb5a46e 100644
 --- a/hints/linux.sh
@@ -347,14 +388,14 @@ index 030db74..0d15a40 100644
      }
  
 diff --git a/patchlevel.h b/patchlevel.h
-index 82f11ed..9d98556 100644
+index 82f11ed..2254fd1 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -121,6 +121,7 @@ hunk.
  #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
  static const char *local_patches[] = {
  	NULL
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.008.009-64bit/DevelPatchPerl.patch b/5.008.009-64bit/DevelPatchPerl.patch
index 3d7c039..7f31e1d 100644
--- a/5.008.009-64bit/DevelPatchPerl.patch
+++ b/5.008.009-64bit/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 6f20c5e..684f369 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -253,20 +253,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index ac264c3..fb5a46e 100644
 --- a/hints/linux.sh
@@ -347,14 +388,14 @@ index 030db74..0d15a40 100644
      }
  
 diff --git a/patchlevel.h b/patchlevel.h
-index 82f11ed..9d98556 100644
+index 82f11ed..2254fd1 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -121,6 +121,7 @@ hunk.
  #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
  static const char *local_patches[] = {
  	NULL
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.010.001-64bit,threaded/DevelPatchPerl.patch b/5.010.001-64bit,threaded/DevelPatchPerl.patch
index 9086d06..a76fc16 100644
--- a/5.010.001-64bit,threaded/DevelPatchPerl.patch
+++ b/5.010.001-64bit,threaded/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 124b8fc..670fabc 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -257,20 +257,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
 index 29c2f4d..c266b6a 100755
 --- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -446,14 +487,14 @@ index 22a97eb..6eac035 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index 4442407..5169551 100644
+index 4442407..b82feab 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -131,6 +131,7 @@ static const char * const local_patches[] = {
  	NULL
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
          PERL_GIT_UNCOMMITTED_CHANGES	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.010.001-64bit/DevelPatchPerl.patch b/5.010.001-64bit/DevelPatchPerl.patch
index 9086d06..a76fc16 100644
--- a/5.010.001-64bit/DevelPatchPerl.patch
+++ b/5.010.001-64bit/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 124b8fc..670fabc 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -257,20 +257,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
 index 29c2f4d..c266b6a 100755
 --- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -446,14 +487,14 @@ index 22a97eb..6eac035 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index 4442407..5169551 100644
+index 4442407..b82feab 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -131,6 +131,7 @@ static const char * const local_patches[] = {
  	NULL
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
          PERL_GIT_UNCOMMITTED_CHANGES	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.012.005-64bit,threaded/DevelPatchPerl.patch b/5.012.005-64bit,threaded/DevelPatchPerl.patch
index 6122dd5..69d7fe7 100644
--- a/5.012.005-64bit,threaded/DevelPatchPerl.patch
+++ b/5.012.005-64bit,threaded/DevelPatchPerl.patch
@@ -23,6 +23,47 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 124b8fc..670fabc 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -257,20 +257,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
 index 2cfb4e8..d58f053 100755
 --- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -432,14 +473,14 @@ index de26d84..52b0492 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index f1a12bd..61bf49d 100644
+index f1a12bd..420296d 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -131,6 +131,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.012.005-64bit/DevelPatchPerl.patch b/5.012.005-64bit/DevelPatchPerl.patch
index 6122dd5..69d7fe7 100644
--- a/5.012.005-64bit/DevelPatchPerl.patch
+++ b/5.012.005-64bit/DevelPatchPerl.patch
@@ -23,6 +23,47 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 124b8fc..670fabc 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -257,20 +257,31 @@ sub write_errno_pm {
+     unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
 index 2cfb4e8..d58f053 100755
 --- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -432,14 +473,14 @@ index de26d84..52b0492 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index f1a12bd..61bf49d 100644
+index f1a12bd..420296d 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -131,6 +131,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.014.004-64bit,threaded/DevelPatchPerl.patch b/5.014.004-64bit,threaded/DevelPatchPerl.patch
index cae82c7..5f5cd48 100644
--- a/5.014.004-64bit,threaded/DevelPatchPerl.patch
+++ b/5.014.004-64bit,threaded/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 56bc815..cf688be 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -248,20 +248,31 @@ sub write_errno_pm {
+     unless ($^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index d0ac9fa..fb5a46e 100644
 --- a/hints/linux.sh
@@ -269,14 +310,14 @@ index 13a15b4..a564bb3 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index 4d9cd6d..c5ac24a 100644
+index 4d9cd6d..0052d4a 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.014.004-64bit/DevelPatchPerl.patch b/5.014.004-64bit/DevelPatchPerl.patch
index cae82c7..5f5cd48 100644
--- a/5.014.004-64bit/DevelPatchPerl.patch
+++ b/5.014.004-64bit/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 56bc815..cf688be 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -248,20 +248,31 @@ sub write_errno_pm {
+     unless ($^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index d0ac9fa..fb5a46e 100644
 --- a/hints/linux.sh
@@ -269,14 +310,14 @@ index 13a15b4..a564bb3 100644
  
  	# Presumably this can be simplified
 diff --git a/patchlevel.h b/patchlevel.h
-index 4d9cd6d..c5ac24a 100644
+index 4d9cd6d..0052d4a 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.016.003-64bit,threaded/DevelPatchPerl.patch b/5.016.003-64bit,threaded/DevelPatchPerl.patch
index 49d5da8..f8204c2 100644
--- a/5.016.003-64bit,threaded/DevelPatchPerl.patch
+++ b/5.016.003-64bit,threaded/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 439f254..a324604 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -242,20 +242,31 @@ sub write_errno_pm {
+     unless ($^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 688c68d..fb5a46e 100644
 --- a/hints/linux.sh
@@ -240,14 +281,14 @@ index 688c68d..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index be508d1..11ae2e8 100644
+index be508d1..d71558a 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.016.003-64bit/DevelPatchPerl.patch b/5.016.003-64bit/DevelPatchPerl.patch
index 49d5da8..f8204c2 100644
--- a/5.016.003-64bit/DevelPatchPerl.patch
+++ b/5.016.003-64bit/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 439f254..a324604 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -242,20 +242,31 @@ sub write_errno_pm {
+     unless ($^O eq 'beos') {	# trust what we have / get later
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 688c68d..fb5a46e 100644
 --- a/hints/linux.sh
@@ -240,14 +281,14 @@ index 688c68d..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index be508d1..11ae2e8 100644
+index be508d1..d71558a 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.018.004-64bit,threaded/DevelPatchPerl.patch b/5.018.004-64bit,threaded/DevelPatchPerl.patch
index 770daf7..4269b56 100644
--- a/5.018.004-64bit,threaded/DevelPatchPerl.patch
+++ b/5.018.004-64bit,threaded/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index b707911..2588f0b 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -236,20 +236,31 @@ sub write_errno_pm {
+     {	# BeOS (support now removed) did not enter this block
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a148248..fb5a46e 100644
 --- a/hints/linux.sh
@@ -223,14 +264,14 @@ index a148248..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index cb033ea..1318325 100644
+index cb033ea..78c727d 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.018.004-64bit/DevelPatchPerl.patch b/5.018.004-64bit/DevelPatchPerl.patch
index 770daf7..4269b56 100644
--- a/5.018.004-64bit/DevelPatchPerl.patch
+++ b/5.018.004-64bit/DevelPatchPerl.patch
@@ -1,3 +1,44 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index b707911..2588f0b 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -236,20 +236,31 @@ sub write_errno_pm {
+     {	# BeOS (support now removed) did not enter this block
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a148248..fb5a46e 100644
 --- a/hints/linux.sh
@@ -223,14 +264,14 @@ index a148248..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index cb033ea..1318325 100644
+index cb033ea..78c727d 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.020.003-64bit,threaded/DevelPatchPerl.patch b/5.020.003-64bit,threaded/DevelPatchPerl.patch
index 90a3b7d..9511940 100644
--- a/5.020.003-64bit,threaded/DevelPatchPerl.patch
+++ b/5.020.003-64bit,threaded/DevelPatchPerl.patch
@@ -36,14 +36,14 @@ index 956adfc..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index f416602..4917564 100644
+index f416602..e8062d1 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.020.003-64bit/DevelPatchPerl.patch b/5.020.003-64bit/DevelPatchPerl.patch
index 90a3b7d..9511940 100644
--- a/5.020.003-64bit/DevelPatchPerl.patch
+++ b/5.020.003-64bit/DevelPatchPerl.patch
@@ -36,14 +36,14 @@ index 956adfc..fb5a46e 100644
             if ldd $DBLIB | grep pthread >/dev/null
             then
 diff --git a/patchlevel.h b/patchlevel.h
-index f416602..4917564 100644
+index f416602..e8062d1 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
  	,"uncommitted-changes"
  #endif
  	PERL_GIT_UNPUSHED_COMMITS    	/* do not remove this line */
-+	,"Devel::PatchPerl 1.32"
++	,"Devel::PatchPerl 1.38"
  	,NULL
  };
  
diff --git a/5.022.001-64bit,threaded/DevelPatchPerl.patch b/5.022.002-64bit,threaded/DevelPatchPerl.patch
similarity index 90%
rename from 5.022.001-64bit,threaded/DevelPatchPerl.patch
rename to 5.022.002-64bit,threaded/DevelPatchPerl.patch
index 05177e4..2f19889 100644
--- a/5.022.001-64bit,threaded/DevelPatchPerl.patch
+++ b/5.022.002-64bit,threaded/DevelPatchPerl.patch
@@ -1,5 +1,5 @@
 diff --git a/patchlevel.h b/patchlevel.h
-index bd56612..3d5f668 100644
+index bfd796b..69d5fb0 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
diff --git a/5.022.001-64bit,threaded/Dockerfile b/5.022.002-64bit,threaded/Dockerfile
similarity index 74%
rename from 5.022.001-64bit,threaded/Dockerfile
rename to 5.022.002-64bit,threaded/Dockerfile
index 9789655..f160c29 100644
--- a/5.022.001-64bit,threaded/Dockerfile
+++ b/5.022.002-64bit,threaded/Dockerfile
@@ -9,10 +9,10 @@ RUN mkdir /usr/src/perl
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
-    && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
-    && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
-    && rm perl-5.22.1.tar.bz2 \
+RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.2.tar.bz2 -o perl-5.22.2.tar.bz2 \
+    && echo 'e2f465446dcd45a7fa3da696037f9ebe73e78e55 *perl-5.22.2.tar.bz2' | sha1sum -c - \
+    && tar --strip-components=1 -xjf perl-5.22.2.tar.bz2 -C /usr/src/perl \
+    && rm perl-5.22.2.tar.bz2 \
     && cat *.patch | patch -p1 \
     && ./Configure -Dusethreads -Duse64bitall -Duseshrplib  -des \
     && make -j$(nproc) \
@@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2
 
 WORKDIR /root
 
-CMD ["perl5.22.1","-de0"]
+CMD ["perl5.22.2","-de0"]
diff --git a/5.022.001-64bit/DevelPatchPerl.patch b/5.022.002-64bit/DevelPatchPerl.patch
similarity index 90%
rename from 5.022.001-64bit/DevelPatchPerl.patch
rename to 5.022.002-64bit/DevelPatchPerl.patch
index 05177e4..2f19889 100644
--- a/5.022.001-64bit/DevelPatchPerl.patch
+++ b/5.022.002-64bit/DevelPatchPerl.patch
@@ -1,5 +1,5 @@
 diff --git a/patchlevel.h b/patchlevel.h
-index bd56612..3d5f668 100644
+index bfd796b..69d5fb0 100644
 --- a/patchlevel.h
 +++ b/patchlevel.h
 @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
diff --git a/5.022.001-64bit/Dockerfile b/5.022.002-64bit/Dockerfile
similarity index 74%
rename from 5.022.001-64bit/Dockerfile
rename to 5.022.002-64bit/Dockerfile
index e7dda9f..4bb46e1 100644
--- a/5.022.001-64bit/Dockerfile
+++ b/5.022.002-64bit/Dockerfile
@@ -9,10 +9,10 @@ RUN mkdir /usr/src/perl
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
-    && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
-    && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
-    && rm perl-5.22.1.tar.bz2 \
+RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.2.tar.bz2 -o perl-5.22.2.tar.bz2 \
+    && echo 'e2f465446dcd45a7fa3da696037f9ebe73e78e55 *perl-5.22.2.tar.bz2' | sha1sum -c - \
+    && tar --strip-components=1 -xjf perl-5.22.2.tar.bz2 -C /usr/src/perl \
+    && rm perl-5.22.2.tar.bz2 \
     && cat *.patch | patch -p1 \
     && ./Configure -Duse64bitall -Duseshrplib  -des \
     && make -j$(nproc) \
@@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2
 
 WORKDIR /root
 
-CMD ["perl5.22.1","-de0"]
+CMD ["perl5.22.2","-de0"]
diff --git a/Releases.yaml b/Releases.yaml
index b232ed2..a74f50d 100644
--- a/Releases.yaml
+++ b/Releases.yaml
@@ -39,6 +39,6 @@ releases:
     sha1:    eedf9e3be3c83bef15911996ed18703cffe4d113
     pause:   SHAY
 
-  - version: 5.22.1
-    sha1:    29f9b320b0299577a3e1d02e9e8ef8f26f160332
+  - version: 5.22.2
+    sha1:    e2f465446dcd45a7fa3da696037f9ebe73e78e55
     pause:   SHAY