mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-21 00:21:37 +01:00
main/perl: upgrade to 5.26.0
This commit is contained in:
Natanael Copa
parent
e73837308b
commit
6bb190b8a2
File diff suppressed because it is too large
Load Diff
@ -1,112 +0,0 @@
|
||||
From 3a57bd4d5e78d639b78eed9fcc27028720f8d326 Mon Sep 17 00:00:00 2001
|
||||
From: James E Keenan <jkeenan@cpan.org>
|
||||
Date: Sun, 25 Sep 2016 19:48:52 -0400
|
||||
Subject: [PATCH] Time-HiRes: bring up-to-date with CPAN.
|
||||
|
||||
The ext3/ext2 filesystems do not have subsecond resolution, therefore skip the
|
||||
t/utime.t test. [rt.cpan.org #116127]
|
||||
---
|
||||
dist/Time-HiRes/Changes | 5 +++++
|
||||
dist/Time-HiRes/HiRes.pm | 2 +-
|
||||
dist/Time-HiRes/t/utime.t | 43 ++++++++++++++++++++++++++++++++++++++++---
|
||||
3 files changed, 46 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dist/Time-HiRes/Changes b/dist/Time-HiRes/Changes
|
||||
index d54fda8..e21623b 100644
|
||||
--- a/dist/Time-HiRes/Changes
|
||||
+++ b/dist/Time-HiRes/Changes
|
||||
@@ -1,5 +1,10 @@
|
||||
Revision history for the Perl extension Time::HiRes.
|
||||
|
||||
+1.9740 [2016-09-25]
|
||||
+ - the ext3/ext2 filesystems do not have subsecond resolution,
|
||||
+ therefore skip the t/utime.t test
|
||||
+ [rt.cpan.org #116127]
|
||||
+
|
||||
1.9739 [2016-06-28]
|
||||
- the upcoming macOS 10.12 (Sierra, the operating system formerly
|
||||
known as OS X, or Darwin) has implemented the clock_gettime()
|
||||
diff --git a/dist/Time-HiRes/HiRes.pm b/dist/Time-HiRes/HiRes.pm
|
||||
index 2071e5e..a4c5002 100644
|
||||
--- a/dist/Time-HiRes/HiRes.pm
|
||||
+++ b/dist/Time-HiRes/HiRes.pm
|
||||
@@ -28,7 +28,7 @@ our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
|
||||
stat lstat utime
|
||||
);
|
||||
|
||||
-our $VERSION = '1.9739';
|
||||
+our $VERSION = '1.9740';
|
||||
our $XS_VERSION = $VERSION;
|
||||
$VERSION = eval $VERSION;
|
||||
|
||||
diff --git a/dist/Time-HiRes/t/utime.t b/dist/Time-HiRes/t/utime.t
|
||||
index ede2e78..795252e 100644
|
||||
--- a/dist/Time-HiRes/t/utime.t
|
||||
+++ b/dist/Time-HiRes/t/utime.t
|
||||
@@ -3,6 +3,7 @@ use strict;
|
||||
BEGIN {
|
||||
require Time::HiRes;
|
||||
require Test::More;
|
||||
+ require File::Temp;
|
||||
unless(&Time::HiRes::d_hires_utime) {
|
||||
Test::More::plan(skip_all => "no hires_utime");
|
||||
}
|
||||
@@ -15,6 +16,35 @@ BEGIN {
|
||||
if ($^O eq 'gnukfreebsd') {
|
||||
Test::More::plan(skip_all => "futimens() and utimensat() not working in $^O");
|
||||
}
|
||||
+ if ($^O eq 'linux' && -e '/proc/mounts') {
|
||||
+ # The linux might be wrong when ext3
|
||||
+ # is available in other operating systems,
|
||||
+ # but then we need other methods for detecting
|
||||
+ # the filesystem type of the tempfiles.
|
||||
+ my ($fh, $fn) = File::Temp::tempfile(UNLINK => 1);
|
||||
+ sub getfstype {
|
||||
+ my ($fn) = @_;
|
||||
+ my $cmd = "df $fn";
|
||||
+ open(my $df, "$cmd |") or die "$cmd: $!";
|
||||
+ my @df = <$df>; # Assume $df[0] is header line.
|
||||
+ my $dev = +(split(" ", $df[1]))[0];
|
||||
+ open(my $mounts, "/proc/mounts") or die "/proc/mounts: $!";
|
||||
+ while (<$mounts>) {
|
||||
+ my @m = split(" ");
|
||||
+ if ($m[0] eq $dev) { return $m[2] }
|
||||
+ }
|
||||
+ return;
|
||||
+ }
|
||||
+ my $fstype = getfstype($fn);
|
||||
+ unless (defined $fstype) {
|
||||
+ warn "Unknown fstype for $fn\n";
|
||||
+ } else {
|
||||
+ print "# fstype = $fstype\n";
|
||||
+ if ($fstype eq 'ext3' || $fstype eq 'ext2') {
|
||||
+ Test::More::plan(skip_all => "fstype $fstype has no subsecond timestamps in $^O");
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
use Test::More tests => 18;
|
||||
@@ -23,9 +53,16 @@ use File::Temp qw( tempfile );
|
||||
|
||||
use Config;
|
||||
|
||||
-# Cygwin timestamps have less precision.
|
||||
-my $atime = $^O eq 'cygwin' ? 1.1111111 : 1.111111111;
|
||||
-my $mtime = $^O eq 'cygwin' ? 2.2222222 : 2.222222222;
|
||||
+# Hope initially for nanosecond accuracy.
|
||||
+my $atime = 1.111111111;
|
||||
+my $mtime = 2.222222222;
|
||||
+
|
||||
+if ($^O eq 'cygwin') {
|
||||
+ # Cygwin timestamps have less precision.
|
||||
+ $atime = 1.1111111;
|
||||
+ $mtime = 2.2222222;
|
||||
+}
|
||||
+print "# \$^O = $^O, atime = $atime, mtime = $mtime\n";
|
||||
|
||||
print "# utime \$fh\n";
|
||||
{
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
|
||||
# Contributor: Valery Kartel <valery.kartel@gmail.com>
|
||||
pkgname=perl
|
||||
pkgver=5.24.1
|
||||
pkgrel=2
|
||||
pkgver=5.26.0
|
||||
pkgrel=0
|
||||
pkgdesc="Larry Wall's Practical Extraction and Report Language"
|
||||
url="http://www.perl.org/"
|
||||
arch="all"
|
||||
@ -14,8 +14,6 @@ depends_dev="perl-utils"
|
||||
makedepends=""
|
||||
subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch miniperl"
|
||||
source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
|
||||
0001-Upgrade-Time-HiRes-to-1.9739.patch
|
||||
0002-Time-HiRes-bring-up-to-date-with-CPAN.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
|
||||
@ -90,12 +88,15 @@ doc() {
|
||||
|
||||
dev() {
|
||||
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_archlib "$subpkgdir"/$_privlib
|
||||
mv "$pkgdir"/$_archlib/Devel "$subpkgdir"/$_archlib/ || return 1
|
||||
mv "$pkgdir"/$_privlib/Encode "$subpkgdir"/$_privlib/ || return 1
|
||||
mv "$pkgdir"/$_archlib/Devel "$subpkgdir"/$_archlib/
|
||||
mv "$pkgdir"/$_privlib/Encode "$subpkgdir"/$_privlib/
|
||||
|
||||
mv "$pkgdir"/usr/bin/h2xs \
|
||||
"$pkgdir"/usr/bin/perlivp \
|
||||
"$pkgdir"/usr/bin/enc2xs \
|
||||
"$pkgdir"/usr/bin/xsubpp \
|
||||
"$subpkgdir"/usr/bin/
|
||||
|
||||
rm "$pkgdir"/usr/bin/pstruct "$pkgdir"/usr/bin/perlbug
|
||||
ln -sf /usr/bin/c2ph "$subpkgdir"/usr/bin/pstruct
|
||||
ln -sf /usr/bin/perlthanks "$subpkgdir"/usr/bin/perlbug
|
||||
default_dev
|
||||
}
|
||||
|
||||
@ -104,19 +105,28 @@ utils() {
|
||||
depends="$pkgname"
|
||||
mkdir -p "$subpkgdir"/usr/bin
|
||||
local file
|
||||
for file in cpan encguess json_pp piconv ptar ptardiff ptargrep shasum \
|
||||
splain zipdetails prove
|
||||
for file in \
|
||||
corelist \
|
||||
cpan \
|
||||
encguess \
|
||||
libnetcfg \
|
||||
h2ph \
|
||||
instmodsh \
|
||||
json_pp \
|
||||
perlbug \
|
||||
perlthanks \
|
||||
piconv \
|
||||
pl2pm \
|
||||
prove \
|
||||
ptar \
|
||||
ptardiff \
|
||||
ptargrep \
|
||||
shasum \
|
||||
splain \
|
||||
zipdetails
|
||||
do
|
||||
mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/ || return 1
|
||||
done
|
||||
}
|
||||
|
||||
md5sums="765ef511b5b87a164e2531403ee16b3c perl-5.24.1.tar.gz
|
||||
5179406909208c0c42e4f8559af1cd9a 0001-Upgrade-Time-HiRes-to-1.9739.patch
|
||||
c378c25f05a21fbad0fe910c88698f18 0002-Time-HiRes-bring-up-to-date-with-CPAN.patch"
|
||||
sha256sums="e6c185c9b09bdb3f1b13f678999050c639859a7ef39c8cad418448075f5918af perl-5.24.1.tar.gz
|
||||
4117c5c2fdea06eb53a44a581bc840ecaca2041646ccf4e5e631efa21793a590 0001-Upgrade-Time-HiRes-to-1.9739.patch
|
||||
9a0a0ff1a6d1477207d2ca1dfb3808ae1e94db2e1939da08e05da30d10acb7b1 0002-Time-HiRes-bring-up-to-date-with-CPAN.patch"
|
||||
sha512sums="6694d7951f782ef45e75f7b607b7843b597581c7818133f506cceeddf0380799916ea101d9efb5557c04b9038db013cc32118a4f2d0fe707f6edfc1572dbb2c2 perl-5.24.1.tar.gz
|
||||
2f6d4c5ff851737ec6e79ea1c78d7b4ee361b68ae250fae67d5137dbb093787935a6d482caa355df4e1e4c319c4cd25d31df795a9b3cfb6a81103e773df59c54 0001-Upgrade-Time-HiRes-to-1.9739.patch
|
||||
64e18a0676aec18616fd85c940a4cb2adbeb039e38405a406637b556c64949ac4c83b75943e5afbe0a50452b1c9592058c4f14f3add767ec849257509025d1fb 0002-Time-HiRes-bring-up-to-date-with-CPAN.patch"
|
||||
sha512sums="a99e44660df82ebd840ea5662c3a044d83ced878ad7e6c86c71ceaee18ce51f83878c275b14c8b039a0d298f818b0064bf8b0087d5b478e95159825728ff187b perl-5.26.0.tar.gz"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user