Skip to content

Commit 881b8c3

Browse files
committed
⚙️ Regenerate/rename Dockerfiles and patches
Generate new Debian buster Dockerfiles and patches for Perls 5.26 through 5.30, and rename existing files to the new directory structure.
1 parent 55da8cb commit 881b8c3

File tree

120 files changed

+2324
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2324
-0
lines changed

5.008.009-main,threaded/DevelPatchPerl.patch renamed to 5.008.009-main,threaded-jessie/DevelPatchPerl.patch

+62
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
diff --git a/Configure b/Configure
2+
index e746fe3..335e968 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -4547,6 +4547,22 @@ case "$gccversion" in
6+
$rm -f try try.*
7+
esac
8+
9+
+# gcc 4.9 by default does some optimizations that break perl.
10+
+# see ticket 121505.
11+
+#
12+
+# The -fwrapv disables those optimizations (and probably others,) so
13+
+# for gcc 4.9 (and later, since the optimizations probably won't go
14+
+# away), add -fwrapv unless the user requests -fno-wrapv, which
15+
+# disables -fwrapv, or if the user requests -fsanitize=undefined,
16+
+# which turns the overflows -fwrapv ignores into runtime errors.
17+
+case "$gccversion" in
18+
+4.[3-9].*|4.[1-9][0-9]*|[5-9].*|[1-9][0-9]*)
19+
+ case "$ccflags" in
20+
+ *-fno-wrapv*|*-fsanitize=undefined*|*-fwrapv*) ;;
21+
+ *) ccflags="$ccflags -fwrapv" ;;
22+
+ esac
23+
+esac
24+
+
25+
: What should the include directory be ?
26+
echo " "
27+
$echo $n "Hmm... $c"
128
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
229
index 6f20c5e..684f369 100644
330
--- a/ext/Errno/Errno_pm.PL
@@ -536,3 +563,38 @@ index 9bde518..45eb782 100755
536563
# if the hash has already been populated with a significant amount
537564
# of entries the number of mask bits can be higher
538565
my $keys = scalar keys %$hr;
566+
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
567+
index a3ff285..4b54598 100644
568+
--- a/utils/h2ph.PL
569+
+++ b/utils/h2ph.PL
570+
@@ -783,6 +783,11 @@ sub build_preamble_if_necessary
571+
572+
open PREAMBLE, ">$preamble" or die "Cannot open $preamble: $!";
573+
print PREAMBLE "# This file was created by h2ph version $VERSION\n";
574+
+ # Prevent non-portable hex constants from warning.
575+
+ #
576+
+ # We still produce an overflow warning if we can't represent
577+
+ # a hex constant as an integer.
578+
+ print PREAMBLE "no warnings qw(portable);\n";
579+
580+
foreach (sort keys %define) {
581+
if ($opt_D) {
582+
@@ -800,6 +805,18 @@ sub build_preamble_if_necessary
583+
# integer:
584+
print PREAMBLE
585+
"unless (defined &$_) { sub $_() { $1 } }\n\n";
586+
+ } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
587+
+ # hex integer
588+
+ # Special cased, since perl warns on hex integers
589+
+ # that can't be represented in a UV.
590+
+ #
591+
+ # This way we get the warning at time of use, so the user
592+
+ # only gets the warning if they happen to use this
593+
+ # platform-specific definition.
594+
+ my $code = $1;
595+
+ $code = "hex('$code')" if length $code > 10;
596+
+ print PREAMBLE
597+
+ "unless (defined &$_) { sub $_() { $code } }\n\n";
598+
} elsif ($define{$_} =~ /^\w+$/) {
599+
print PREAMBLE
600+
"unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";

5.008.009-main/DevelPatchPerl.patch renamed to 5.008.009-main-jessie/DevelPatchPerl.patch

+62
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
diff --git a/Configure b/Configure
2+
index e746fe3..335e968 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -4547,6 +4547,22 @@ case "$gccversion" in
6+
$rm -f try try.*
7+
esac
8+
9+
+# gcc 4.9 by default does some optimizations that break perl.
10+
+# see ticket 121505.
11+
+#
12+
+# The -fwrapv disables those optimizations (and probably others,) so
13+
+# for gcc 4.9 (and later, since the optimizations probably won't go
14+
+# away), add -fwrapv unless the user requests -fno-wrapv, which
15+
+# disables -fwrapv, or if the user requests -fsanitize=undefined,
16+
+# which turns the overflows -fwrapv ignores into runtime errors.
17+
+case "$gccversion" in
18+
+4.[3-9].*|4.[1-9][0-9]*|[5-9].*|[1-9][0-9]*)
19+
+ case "$ccflags" in
20+
+ *-fno-wrapv*|*-fsanitize=undefined*|*-fwrapv*) ;;
21+
+ *) ccflags="$ccflags -fwrapv" ;;
22+
+ esac
23+
+esac
24+
+
25+
: What should the include directory be ?
26+
echo " "
27+
$echo $n "Hmm... $c"
128
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
229
index 6f20c5e..684f369 100644
330
--- a/ext/Errno/Errno_pm.PL
@@ -536,3 +563,38 @@ index 9bde518..45eb782 100755
536563
# if the hash has already been populated with a significant amount
537564
# of entries the number of mask bits can be higher
538565
my $keys = scalar keys %$hr;
566+
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
567+
index a3ff285..4b54598 100644
568+
--- a/utils/h2ph.PL
569+
+++ b/utils/h2ph.PL
570+
@@ -783,6 +783,11 @@ sub build_preamble_if_necessary
571+
572+
open PREAMBLE, ">$preamble" or die "Cannot open $preamble: $!";
573+
print PREAMBLE "# This file was created by h2ph version $VERSION\n";
574+
+ # Prevent non-portable hex constants from warning.
575+
+ #
576+
+ # We still produce an overflow warning if we can't represent
577+
+ # a hex constant as an integer.
578+
+ print PREAMBLE "no warnings qw(portable);\n";
579+
580+
foreach (sort keys %define) {
581+
if ($opt_D) {
582+
@@ -800,6 +805,18 @@ sub build_preamble_if_necessary
583+
# integer:
584+
print PREAMBLE
585+
"unless (defined &$_) { sub $_() { $1 } }\n\n";
586+
+ } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
587+
+ # hex integer
588+
+ # Special cased, since perl warns on hex integers
589+
+ # that can't be represented in a UV.
590+
+ #
591+
+ # This way we get the warning at time of use, so the user
592+
+ # only gets the warning if they happen to use this
593+
+ # platform-specific definition.
594+
+ my $code = $1;
595+
+ $code = "hex('$code')" if length $code > 10;
596+
+ print PREAMBLE
597+
+ "unless (defined &$_) { sub $_() { $code } }\n\n";
598+
} elsif ($define{$_} =~ /^\w+$/) {
599+
print PREAMBLE
600+
"unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
File renamed without changes.

5.008.009-slim,threaded/DevelPatchPerl.patch renamed to 5.008.009-slim,threaded-jessie/DevelPatchPerl.patch

+62
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
diff --git a/Configure b/Configure
2+
index e746fe3..335e968 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -4547,6 +4547,22 @@ case "$gccversion" in
6+
$rm -f try try.*
7+
esac
8+
9+
+# gcc 4.9 by default does some optimizations that break perl.
10+
+# see ticket 121505.
11+
+#
12+
+# The -fwrapv disables those optimizations (and probably others,) so
13+
+# for gcc 4.9 (and later, since the optimizations probably won't go
14+
+# away), add -fwrapv unless the user requests -fno-wrapv, which
15+
+# disables -fwrapv, or if the user requests -fsanitize=undefined,
16+
+# which turns the overflows -fwrapv ignores into runtime errors.
17+
+case "$gccversion" in
18+
+4.[3-9].*|4.[1-9][0-9]*|[5-9].*|[1-9][0-9]*)
19+
+ case "$ccflags" in
20+
+ *-fno-wrapv*|*-fsanitize=undefined*|*-fwrapv*) ;;
21+
+ *) ccflags="$ccflags -fwrapv" ;;
22+
+ esac
23+
+esac
24+
+
25+
: What should the include directory be ?
26+
echo " "
27+
$echo $n "Hmm... $c"
128
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
229
index 6f20c5e..684f369 100644
330
--- a/ext/Errno/Errno_pm.PL
@@ -536,3 +563,38 @@ index 9bde518..45eb782 100755
536563
# if the hash has already been populated with a significant amount
537564
# of entries the number of mask bits can be higher
538565
my $keys = scalar keys %$hr;
566+
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
567+
index a3ff285..4b54598 100644
568+
--- a/utils/h2ph.PL
569+
+++ b/utils/h2ph.PL
570+
@@ -783,6 +783,11 @@ sub build_preamble_if_necessary
571+
572+
open PREAMBLE, ">$preamble" or die "Cannot open $preamble: $!";
573+
print PREAMBLE "# This file was created by h2ph version $VERSION\n";
574+
+ # Prevent non-portable hex constants from warning.
575+
+ #
576+
+ # We still produce an overflow warning if we can't represent
577+
+ # a hex constant as an integer.
578+
+ print PREAMBLE "no warnings qw(portable);\n";
579+
580+
foreach (sort keys %define) {
581+
if ($opt_D) {
582+
@@ -800,6 +805,18 @@ sub build_preamble_if_necessary
583+
# integer:
584+
print PREAMBLE
585+
"unless (defined &$_) { sub $_() { $1 } }\n\n";
586+
+ } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
587+
+ # hex integer
588+
+ # Special cased, since perl warns on hex integers
589+
+ # that can't be represented in a UV.
590+
+ #
591+
+ # This way we get the warning at time of use, so the user
592+
+ # only gets the warning if they happen to use this
593+
+ # platform-specific definition.
594+
+ my $code = $1;
595+
+ $code = "hex('$code')" if length $code > 10;
596+
+ print PREAMBLE
597+
+ "unless (defined &$_) { sub $_() { $code } }\n\n";
598+
} elsif ($define{$_} =~ /^\w+$/) {
599+
print PREAMBLE
600+
"unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";

5.008.009-slim/DevelPatchPerl.patch renamed to 5.008.009-slim-jessie/DevelPatchPerl.patch

+62
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
diff --git a/Configure b/Configure
2+
index e746fe3..335e968 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -4547,6 +4547,22 @@ case "$gccversion" in
6+
$rm -f try try.*
7+
esac
8+
9+
+# gcc 4.9 by default does some optimizations that break perl.
10+
+# see ticket 121505.
11+
+#
12+
+# The -fwrapv disables those optimizations (and probably others,) so
13+
+# for gcc 4.9 (and later, since the optimizations probably won't go
14+
+# away), add -fwrapv unless the user requests -fno-wrapv, which
15+
+# disables -fwrapv, or if the user requests -fsanitize=undefined,
16+
+# which turns the overflows -fwrapv ignores into runtime errors.
17+
+case "$gccversion" in
18+
+4.[3-9].*|4.[1-9][0-9]*|[5-9].*|[1-9][0-9]*)
19+
+ case "$ccflags" in
20+
+ *-fno-wrapv*|*-fsanitize=undefined*|*-fwrapv*) ;;
21+
+ *) ccflags="$ccflags -fwrapv" ;;
22+
+ esac
23+
+esac
24+
+
25+
: What should the include directory be ?
26+
echo " "
27+
$echo $n "Hmm... $c"
128
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
229
index 6f20c5e..684f369 100644
330
--- a/ext/Errno/Errno_pm.PL
@@ -536,3 +563,38 @@ index 9bde518..45eb782 100755
536563
# if the hash has already been populated with a significant amount
537564
# of entries the number of mask bits can be higher
538565
my $keys = scalar keys %$hr;
566+
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
567+
index a3ff285..4b54598 100644
568+
--- a/utils/h2ph.PL
569+
+++ b/utils/h2ph.PL
570+
@@ -783,6 +783,11 @@ sub build_preamble_if_necessary
571+
572+
open PREAMBLE, ">$preamble" or die "Cannot open $preamble: $!";
573+
print PREAMBLE "# This file was created by h2ph version $VERSION\n";
574+
+ # Prevent non-portable hex constants from warning.
575+
+ #
576+
+ # We still produce an overflow warning if we can't represent
577+
+ # a hex constant as an integer.
578+
+ print PREAMBLE "no warnings qw(portable);\n";
579+
580+
foreach (sort keys %define) {
581+
if ($opt_D) {
582+
@@ -800,6 +805,18 @@ sub build_preamble_if_necessary
583+
# integer:
584+
print PREAMBLE
585+
"unless (defined &$_) { sub $_() { $1 } }\n\n";
586+
+ } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
587+
+ # hex integer
588+
+ # Special cased, since perl warns on hex integers
589+
+ # that can't be represented in a UV.
590+
+ #
591+
+ # This way we get the warning at time of use, so the user
592+
+ # only gets the warning if they happen to use this
593+
+ # platform-specific definition.
594+
+ my $code = $1;
595+
+ $code = "hex('$code')" if length $code > 10;
596+
+ print PREAMBLE
597+
+ "unless (defined &$_) { sub $_() { $code } }\n\n";
598+
} elsif ($define{$_} =~ /^\w+$/) {
599+
print PREAMBLE
600+
"unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
File renamed without changes.

5.010.001-main,threaded/DevelPatchPerl.patch renamed to 5.010.001-main,threaded-jessie/DevelPatchPerl.patch

+75
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
diff --git a/Configure b/Configure
2+
index 01fa3c0..f986141 100755
3+
--- a/Configure
4+
+++ b/Configure
5+
@@ -4570,6 +4570,22 @@ case "$gccversion" in
6+
$rm -f try try.*
7+
esac
8+
9+
+# gcc 4.9 by default does some optimizations that break perl.
10+
+# see ticket 121505.
11+
+#
12+
+# The -fwrapv disables those optimizations (and probably others,) so
13+
+# for gcc 4.9 (and later, since the optimizations probably won't go
14+
+# away), add -fwrapv unless the user requests -fno-wrapv, which
15+
+# disables -fwrapv, or if the user requests -fsanitize=undefined,
16+
+# which turns the overflows -fwrapv ignores into runtime errors.
17+
+case "$gccversion" in
18+
+4.[3-9].*|4.[1-9][0-9]*|[5-9].*|[1-9][0-9]*)
19+
+ case "$ccflags" in
20+
+ *-fno-wrapv*|*-fsanitize=undefined*|*-fwrapv*) ;;
21+
+ *) ccflags="$ccflags -fwrapv" ;;
22+
+ esac
23+
+esac
24+
+
25+
: What should the include directory be ?
26+
echo " "
27+
$echo $n "Hmm... $c"
128
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
229
index 124b8fc..670fabc 100644
330
--- a/ext/Errno/Errno_pm.PL
@@ -546,6 +573,19 @@ index e400dda..e25e31a 100755
546573
### warn if we are going to skip long file names
547574
if ($TOO_LONG) {
548575
diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
576+
diff --git a/lib/h2ph.t b/lib/h2ph.t
577+
index 27dd7b9..947fae6 100755
578+
--- a/lib/h2ph.t
579+
+++ b/lib/h2ph.t
580+
@@ -41,7 +41,7 @@ $result = runperl( progfile => 'lib/h2ph.pht',
581+
stderr => 1 );
582+
like( $result, qr/syntax OK$/, "output compiles");
583+
584+
-$result = runperl( switches => ["-w"],
585+
+$result = runperl( switches => ['-I.',"-w"],
586+
prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
587+
is( $result, '', "output free of warnings" );
588+
549589
diff --git a/make_ext.pl b/make_ext.pl
550590
index 22a97eb..6eac035 100644
551591
--- a/make_ext.pl
@@ -618,3 +658,38 @@ index 9bde518..45eb782 100755
618658
# if the hash has already been populated with a significant amount
619659
# of entries the number of mask bits can be higher
620660
my $keys = scalar keys %$hr;
661+
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
662+
index cd4b5a0..4820479 100644
663+
--- a/utils/h2ph.PL
664+
+++ b/utils/h2ph.PL
665+
@@ -783,6 +783,11 @@ sub build_preamble_if_necessary
666+
667+
open PREAMBLE, ">$preamble" or die "Cannot open $preamble: $!";
668+
print PREAMBLE "# This file was created by h2ph version $VERSION\n";
669+
+ # Prevent non-portable hex constants from warning.
670+
+ #
671+
+ # We still produce an overflow warning if we can't represent
672+
+ # a hex constant as an integer.
673+
+ print PREAMBLE "no warnings qw(portable);\n";
674+
675+
foreach (sort keys %define) {
676+
if ($opt_D) {
677+
@@ -800,6 +805,18 @@ sub build_preamble_if_necessary
678+
# integer:
679+
print PREAMBLE
680+
"unless (defined &$_) { sub $_() { $1 } }\n\n";
681+
+ } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
682+
+ # hex integer
683+
+ # Special cased, since perl warns on hex integers
684+
+ # that can't be represented in a UV.
685+
+ #
686+
+ # This way we get the warning at time of use, so the user
687+
+ # only gets the warning if they happen to use this
688+
+ # platform-specific definition.
689+
+ my $code = $1;
690+
+ $code = "hex('$code')" if length $code > 10;
691+
+ print PREAMBLE
692+
+ "unless (defined &$_) { sub $_() { $code } }\n\n";
693+
} elsif ($define{$_} =~ /^\w+$/) {
694+
print PREAMBLE
695+
"unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";

0 commit comments

Comments
 (0)