22f7d649e2
Additionally, add buster to all of them. Finally, move all EOL versions into a completely separate `eol/` directory so that the repository is a little easier manage (and so we can limit testing of all old EOL versions to only when something inside the `eol/` directory changes).
213 lines
6.6 KiB
Diff
213 lines
6.6 KiB
Diff
diff --git a/Configure b/Configure
|
|
index bdcfaf1..1824010 100755
|
|
--- a/Configure
|
|
+++ b/Configure
|
|
@@ -4703,7 +4703,7 @@ else
|
|
fi
|
|
$rm -f try try.*
|
|
case "$gccversion" in
|
|
-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
|
|
esac
|
|
case "$gccversion" in
|
|
'') gccosandvers='' ;;
|
|
@@ -4743,7 +4743,7 @@ esac
|
|
# gcc 3.* complain about adding -Idirectories that they already know about,
|
|
# so we will take those off from locincpth.
|
|
case "$gccversion" in
|
|
-3*)
|
|
+3.*)
|
|
echo "main(){}">try.c
|
|
for incdir in $locincpth; do
|
|
warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
|
|
@@ -5469,13 +5469,13 @@ fi
|
|
case "$hint" in
|
|
default|recommended)
|
|
case "$gccversion" in
|
|
- 1*) dflt="$dflt -fpcc-struct-return" ;;
|
|
+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
|
|
esac
|
|
case "$optimize:$DEBUGGING" in
|
|
*-g*:old) dflt="$dflt -DDEBUGGING";;
|
|
esac
|
|
case "$gccversion" in
|
|
- 2*) if $test -d /etc/conf/kconfig.d &&
|
|
+ 2.*) if $test -d /etc/conf/kconfig.d &&
|
|
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
|
|
then
|
|
# Interactive Systems (ISC) POSIX mode.
|
|
@@ -5484,7 +5484,7 @@ default|recommended)
|
|
;;
|
|
esac
|
|
case "$gccversion" in
|
|
- 1*) ;;
|
|
+ 1.*) ;;
|
|
2.[0-8]*) ;;
|
|
?*) set strict-aliasing -fno-strict-aliasing
|
|
eval $checkccflag
|
|
@@ -5602,7 +5602,7 @@ case "$cppflags" in
|
|
;;
|
|
esac
|
|
case "$gccversion" in
|
|
-1*) cppflags="$cppflags -D__GNUC__"
|
|
+1.*) cppflags="$cppflags -D__GNUC__"
|
|
esac
|
|
case "$mips_type" in
|
|
'');;
|
|
@@ -23612,7 +23612,7 @@ fi
|
|
|
|
: add -D_FORTIFY_SOURCE if feasible and not already there
|
|
case "$gccversion" in
|
|
-[4567].*) case "$optimize$ccflags" in
|
|
+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
|
|
*-O*) case "$ccflags$cppsymbols" in
|
|
*_FORTIFY_SOURCE=*) # Don't add it again.
|
|
echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
|
|
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
|
|
index 6341396..701d22d 100644
|
|
--- a/cpan/Time-Local/t/Local.t
|
|
+++ b/cpan/Time-Local/t/Local.t
|
|
@@ -85,19 +85,17 @@ my $epoch_is_64
|
|
|
|
for ( @time, @neg_time ) {
|
|
my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
|
|
- $year -= 1900;
|
|
$mon--;
|
|
|
|
SKIP: {
|
|
skip '1970 test on VOS fails.', 12
|
|
- if $^O eq 'vos' && $year == 70;
|
|
+ if $^O eq 'vos' && $year == 1970;
|
|
skip 'this platform does not support negative epochs.', 12
|
|
- if $year < 70 && !$neg_epoch_ok;
|
|
+ if $year < 1970 && !$neg_epoch_ok;
|
|
|
|
# Test timelocal()
|
|
{
|
|
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
- my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
|
|
+ my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
|
|
|
|
my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
|
|
|
|
@@ -106,13 +104,12 @@ SKIP: {
|
|
is( $h, $hour, "timelocal hour for @$_" );
|
|
is( $D, $mday, "timelocal day for @$_" );
|
|
is( $M, $mon, "timelocal month for @$_" );
|
|
- is( $Y, $year, "timelocal year for @$_" );
|
|
+ is( $Y, $year - 1900, "timelocal year for @$_" );
|
|
}
|
|
|
|
# Test timegm()
|
|
{
|
|
- my $year_in = $year < 70 ? $year + 1900 : $year;
|
|
- my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
|
|
+ my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
|
|
|
|
my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
|
|
|
|
@@ -121,14 +118,13 @@ SKIP: {
|
|
is( $h, $hour, "timegm hour for @$_" );
|
|
is( $D, $mday, "timegm day for @$_" );
|
|
is( $M, $mon, "timegm month for @$_" );
|
|
- is( $Y, $year, "timegm year for @$_" );
|
|
+ is( $Y, $year - 1900, "timegm year for @$_" );
|
|
}
|
|
}
|
|
}
|
|
|
|
for (@bad_time) {
|
|
my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
|
|
- $year -= 1900;
|
|
$mon--;
|
|
|
|
eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
|
|
@@ -229,6 +225,30 @@ SKIP:
|
|
);
|
|
}
|
|
|
|
+# 2-digit years
|
|
+{
|
|
+ my $current_year = ( localtime() )[5];
|
|
+ my $pre_break = ( $current_year + 49 ) - 100;
|
|
+ my $break = ( $current_year + 50 ) - 100;
|
|
+ my $post_break = ( $current_year + 51 ) - 100;
|
|
+
|
|
+ is(
|
|
+ ( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
|
|
+ $pre_break + 100,
|
|
+ "year $pre_break is treated as next century",
|
|
+ );
|
|
+ is(
|
|
+ ( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
|
|
+ $break + 100,
|
|
+ "year $break is treated as next century",
|
|
+ );
|
|
+ is(
|
|
+ ( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
|
|
+ $post_break,
|
|
+ "year $post_break is treated as current century",
|
|
+ );
|
|
+}
|
|
+
|
|
SKIP:
|
|
{
|
|
skip 'These tests only run for the package maintainer.', 8
|
|
diff --git a/hints/linux.sh b/hints/linux.sh
|
|
index 3f38ea0..c749f0f 100644
|
|
--- a/hints/linux.sh
|
|
+++ b/hints/linux.sh
|
|
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
|
|
|
|
# Check if we're about to use Intel's ICC compiler
|
|
case "`${cc:-cc} -V 2>&1`" in
|
|
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
|
|
+*"Intel(R) C"*" Compiler"*)
|
|
# record the version, formats:
|
|
# icc (ICC) 10.1 20080801
|
|
# icpc (ICC) 10.1 20080801
|
|
@@ -165,6 +165,9 @@ esac
|
|
# plibpth to bypass this check.
|
|
if [ -x /usr/bin/gcc ] ; then
|
|
gcc=/usr/bin/gcc
|
|
+# clang also provides -print-search-dirs
|
|
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
|
|
+ gcc=${cc:-cc}
|
|
else
|
|
gcc=gcc
|
|
fi
|
|
@@ -178,6 +181,16 @@ case "$plibpth" in
|
|
;;
|
|
esac
|
|
|
|
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
|
|
+# available functions, like memem, won't be used. See the discussion in
|
|
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
|
|
+# at least on alpine linux, the ldd --version output contains the
|
|
+# string 'musl.'
|
|
+case `ldd --version 2>&1` in
|
|
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
|
|
+ *) ;;
|
|
+esac
|
|
+
|
|
# libquadmath is sometimes installed as gcc internal library,
|
|
# so contrary to our usual policy of *not* looking at gcc internal
|
|
# directories we now *do* look at them, in case they contain
|
|
diff --git a/pp.c b/pp.c
|
|
index fbba3bd..1e0a5eb 100644
|
|
--- a/pp.c
|
|
+++ b/pp.c
|
|
@@ -3737,8 +3737,12 @@ PP(pp_crypt)
|
|
#if defined(__GLIBC__) || defined(__EMX__)
|
|
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
|
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
|
- /* work around glibc-2.2.5 bug */
|
|
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
|
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
|
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
|
+ * time in glibc-2.3.X */
|
|
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
|
+#endif
|
|
}
|
|
#endif
|
|
}
|