Skip to content

Commit 87b3f5c

Browse files
Tekkizakame
Tekki
authored and
zakame
committed
Change to 5.30.2, update patches.
1 parent 28f5306 commit 87b3f5c

File tree

69 files changed

+3514
-42
lines changed

Some content is hidden

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

69 files changed

+3514
-42
lines changed

‎5.008.009-main,threaded-jessie/DevelPatchPerl.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
492492
}
493493
}
494494

495+
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
496+
index 4f8674f..5fff350 100755
497+
--- a/lib/Time/Local.t
498+
+++ b/lib/Time/Local.t
499+
@@ -96,7 +96,7 @@ for (@time, @neg_time) {
500+
if $year < 70 && ! $neg_epoch_ok;
501+
502+
{
503+
- my $year_in = $year < 70 ? $year + 1900 : $year;
504+
+ my $year_in = $year + 1900;
505+
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
506+
507+
my($s,$m,$h,$D,$M,$Y) = localtime($time);
508+
@@ -110,7 +110,7 @@ for (@time, @neg_time) {
509+
}
510+
511+
{
512+
- my $year_in = $year < 70 ? $year + 1900 : $year;
513+
+ my $year_in = $year + 1900;
514+
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
515+
516+
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
517+
@@ -127,7 +127,6 @@ for (@time, @neg_time) {
518+
519+
for (@bad_time) {
520+
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
521+
- $year -= 1900;
522+
$mon--;
523+
524+
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
525+
@@ -136,14 +135,14 @@ for (@bad_time) {
526+
}
527+
528+
{
529+
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
530+
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
531+
'one hour difference between two calls to timelocal');
532+
533+
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
534+
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
535+
'one day difference between two calls to timelocal');
536+
537+
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
538+
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
539+
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
540+
'60 day difference between two calls to timegm');
541+
}
542+
495543
diff --git a/perl.c b/perl.c
496544
index 82e5538..b9e02fe 100644
497545
--- a/perl.c

‎5.008.009-main-jessie/DevelPatchPerl.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
492492
}
493493
}
494494

495+
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
496+
index 4f8674f..5fff350 100755
497+
--- a/lib/Time/Local.t
498+
+++ b/lib/Time/Local.t
499+
@@ -96,7 +96,7 @@ for (@time, @neg_time) {
500+
if $year < 70 && ! $neg_epoch_ok;
501+
502+
{
503+
- my $year_in = $year < 70 ? $year + 1900 : $year;
504+
+ my $year_in = $year + 1900;
505+
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
506+
507+
my($s,$m,$h,$D,$M,$Y) = localtime($time);
508+
@@ -110,7 +110,7 @@ for (@time, @neg_time) {
509+
}
510+
511+
{
512+
- my $year_in = $year < 70 ? $year + 1900 : $year;
513+
+ my $year_in = $year + 1900;
514+
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
515+
516+
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
517+
@@ -127,7 +127,6 @@ for (@time, @neg_time) {
518+
519+
for (@bad_time) {
520+
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
521+
- $year -= 1900;
522+
$mon--;
523+
524+
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
525+
@@ -136,14 +135,14 @@ for (@bad_time) {
526+
}
527+
528+
{
529+
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
530+
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
531+
'one hour difference between two calls to timelocal');
532+
533+
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
534+
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
535+
'one day difference between two calls to timelocal');
536+
537+
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
538+
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
539+
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
540+
'60 day difference between two calls to timegm');
541+
}
542+
495543
diff --git a/perl.c b/perl.c
496544
index 82e5538..b9e02fe 100644
497545
--- a/perl.c

‎5.008.009-slim,threaded-jessie/DevelPatchPerl.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
492492
}
493493
}
494494

495+
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
496+
index 4f8674f..5fff350 100755
497+
--- a/lib/Time/Local.t
498+
+++ b/lib/Time/Local.t
499+
@@ -96,7 +96,7 @@ for (@time, @neg_time) {
500+
if $year < 70 && ! $neg_epoch_ok;
501+
502+
{
503+
- my $year_in = $year < 70 ? $year + 1900 : $year;
504+
+ my $year_in = $year + 1900;
505+
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
506+
507+
my($s,$m,$h,$D,$M,$Y) = localtime($time);
508+
@@ -110,7 +110,7 @@ for (@time, @neg_time) {
509+
}
510+
511+
{
512+
- my $year_in = $year < 70 ? $year + 1900 : $year;
513+
+ my $year_in = $year + 1900;
514+
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
515+
516+
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
517+
@@ -127,7 +127,6 @@ for (@time, @neg_time) {
518+
519+
for (@bad_time) {
520+
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
521+
- $year -= 1900;
522+
$mon--;
523+
524+
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
525+
@@ -136,14 +135,14 @@ for (@bad_time) {
526+
}
527+
528+
{
529+
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
530+
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
531+
'one hour difference between two calls to timelocal');
532+
533+
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
534+
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
535+
'one day difference between two calls to timelocal');
536+
537+
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
538+
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
539+
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
540+
'60 day difference between two calls to timegm');
541+
}
542+
495543
diff --git a/perl.c b/perl.c
496544
index 82e5538..b9e02fe 100644
497545
--- a/perl.c

‎5.008.009-slim-jessie/DevelPatchPerl.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
492492
}
493493
}
494494

495+
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
496+
index 4f8674f..5fff350 100755
497+
--- a/lib/Time/Local.t
498+
+++ b/lib/Time/Local.t
499+
@@ -96,7 +96,7 @@ for (@time, @neg_time) {
500+
if $year < 70 && ! $neg_epoch_ok;
501+
502+
{
503+
- my $year_in = $year < 70 ? $year + 1900 : $year;
504+
+ my $year_in = $year + 1900;
505+
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
506+
507+
my($s,$m,$h,$D,$M,$Y) = localtime($time);
508+
@@ -110,7 +110,7 @@ for (@time, @neg_time) {
509+
}
510+
511+
{
512+
- my $year_in = $year < 70 ? $year + 1900 : $year;
513+
+ my $year_in = $year + 1900;
514+
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
515+
516+
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
517+
@@ -127,7 +127,6 @@ for (@time, @neg_time) {
518+
519+
for (@bad_time) {
520+
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
521+
- $year -= 1900;
522+
$mon--;
523+
524+
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
525+
@@ -136,14 +135,14 @@ for (@bad_time) {
526+
}
527+
528+
{
529+
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
530+
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
531+
'one hour difference between two calls to timelocal');
532+
533+
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
534+
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
535+
'one day difference between two calls to timelocal');
536+
537+
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
538+
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
539+
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
540+
'60 day difference between two calls to timegm');
541+
}
542+
495543
diff --git a/perl.c b/perl.c
496544
index 82e5538..b9e02fe 100644
497545
--- a/perl.c

‎5.010.001-main,threaded-jessie/DevelPatchPerl.patch

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,44 @@ index f8ca492..204bba0 100644
118118
+foreach (split / /, $Config{libpth}) {
119119
+ $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
120120
}
121+
diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
122+
index c5f7aa8..c7c329a 100644
123+
--- a/ext/SDBM_File/sdbm/sdbm.c
124+
+++ b/ext/SDBM_File/sdbm/sdbm.c
125+
@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
126+
register char *dirname;
127+
register char *pagname;
128+
size_t filelen;
129+
- const size_t dirfext_len = sizeof(DIRFEXT "");
130+
- const size_t pagfext_len = sizeof(PAGFEXT "");
131+
+ const size_t dirfext_size = sizeof(DIRFEXT "");
132+
+ const size_t pagfext_size = sizeof(PAGFEXT "");
133+
134+
if (file == NULL || !*file)
135+
return errno = EINVAL, (DBM *) NULL;
136+
@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
137+
*/
138+
filelen = strlen(file);
139+
140+
- if ((dirname = (char *) malloc(filelen + dirfext_len + 1
141+
- + filelen + pagfext_len + 1)) == NULL)
142+
+ if ((dirname = (char *) malloc(filelen + dirfext_size
143+
+ + filelen + pagfext_size)) == NULL)
144+
return errno = ENOMEM, (DBM *) NULL;
145+
/*
146+
* build the file names
147+
*/
148+
memcpy(dirname, file, filelen);
149+
- memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
150+
- pagname = dirname + filelen + dirfext_len + 1;
151+
+ memcpy(dirname + filelen, DIRFEXT, dirfext_size);
152+
+ pagname = dirname + filelen + dirfext_size;
153+
memcpy(pagname, file, filelen);
154+
- memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
155+
+ memcpy(pagname + filelen, PAGFEXT, pagfext_size);
156+
157+
db = sdbm_prep(dirname, pagname, flags, mode);
158+
free((char *) dirname);
121159
diff --git a/hints/linux.sh b/hints/linux.sh
122160
index c88f157..8cbe7dc 100644
123161
--- a/hints/linux.sh
@@ -576,6 +614,54 @@ index e400dda..e25e31a 100755
576614
### warn if we are going to skip long file names
577615
if ($TOO_LONG) {
578616
diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
617+
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
618+
index 4f8674f..5fff350 100755
619+
--- a/lib/Time/Local.t
620+
+++ b/lib/Time/Local.t
621+
@@ -96,7 +96,7 @@ for (@time, @neg_time) {
622+
if $year < 70 && ! $neg_epoch_ok;
623+
624+
{
625+
- my $year_in = $year < 70 ? $year + 1900 : $year;
626+
+ my $year_in = $year + 1900;
627+
my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
628+
629+
my($s,$m,$h,$D,$M,$Y) = localtime($time);
630+
@@ -110,7 +110,7 @@ for (@time, @neg_time) {
631+
}
632+
633+
{
634+
- my $year_in = $year < 70 ? $year + 1900 : $year;
635+
+ my $year_in = $year + 1900;
636+
my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
637+
638+
my($s,$m,$h,$D,$M,$Y) = gmtime($time);
639+
@@ -127,7 +127,6 @@ for (@time, @neg_time) {
640+
641+
for (@bad_time) {
642+
my($year, $mon, $mday, $hour, $min, $sec) = @$_;
643+
- $year -= 1900;
644+
$mon--;
645+
646+
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
647+
@@ -136,14 +135,14 @@ for (@bad_time) {
648+
}
649+
650+
{
651+
- is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
652+
+ is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
653+
'one hour difference between two calls to timelocal');
654+
655+
- is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
656+
+ is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
657+
'one day difference between two calls to timelocal');
658+
659+
# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
660+
- is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
661+
+ is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
662+
'60 day difference between two calls to timegm');
663+
}
664+
579665
diff --git a/lib/h2ph.t b/lib/h2ph.t
580666
index 27dd7b9..947fae6 100755
581667
--- a/lib/h2ph.t

0 commit comments

Comments
 (0)