From f5b778c6477d53d853b61e515e576dee255c5b8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 25 Jun 2018 21:38:30 +0200 Subject: [PATCH] - up to 5.28.0 but test suite fails --- ...oy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch | 16 ++-- perl-modules | 86 +++++++++---------- perl-modules2 | 6 +- perl-write-permissions.patch | 6 +- perl.spec | 10 ++- perl_585-microperl_uconfig.patch | 14 +-- 6 files changed, 70 insertions(+), 68 deletions(-) diff --git a/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch b/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch index 9b503c6..d07a384 100644 --- a/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch +++ b/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch @@ -41,14 +41,14 @@ index 33e08e2..7160f54 100644 GDBM_FILE dbp ; SV * filter[4]; int filtering ; -@@ -89,6 +90,7 @@ gdbm_TIEHASH(dbtype, name, read_write, mode) - if ((dbp = gdbm_open(name, GDBM_BLOCKSIZE, read_write, mode, - (FATALFUNC) croak_string))) { - RETVAL = (GDBM_File)safecalloc(1, sizeof(GDBM_File_type)) ; -+ RETVAL->owner = aTHX; - RETVAL->dbp = dbp ; - } - +@@ -99,6 +99,7 @@ gdbm_TIEHASH(dbtype, name, read_write, m + } + if (dbp) { + RETVAL = (GDBM_File)safecalloc(1, sizeof(GDBM_File_type)); ++ RETVAL->owner = aTHX; + RETVAL->dbp = dbp; + } else { + RETVAL = NULL; @@ -109,12 +111,14 @@ gdbm_DESTROY(db) PREINIT: int i = store_value; diff --git a/perl-modules b/perl-modules index 0750260..7be7d8f 100644 --- a/perl-modules +++ b/perl-modules @@ -1,52 +1,52 @@ -# Module versions from Perl 5.26.2 distribution. -Archive::Tar = 2.24 -Attribute::Handlers = 0.99 -CPAN = 2.18 +# Module versions from Perl 5.28.0 distribution. +Archive::Tar = 2.30 +Attribute::Handlers = 1.01 +CPAN = 2.20 CPAN::Meta = 2.150010 CPAN::Meta::YAML = 0.018 Compress::Raw::Bzip2 = 2.074 -Compress::Raw::Zlib = 2.074 +Compress::Raw::Zlib = 2.076 Compress::Zlib = 2.074 -Devel::PPPort = 3.35 -Devel::Peek = 1.26 +Devel::PPPort = 3.40 +Devel::Peek = 1.27 Digest = 1.17_01 Digest::MD5 = 2.55 -Digest::SHA = 5.96 -Encode = 2.88 -ExtUtils::CBuilder = 0.280225 -ExtUtils::Command = 7.24 -ExtUtils::Embed = 1.34 -ExtUtils::Install = 2.04 -ExtUtils::MakeMaker = 7.24 +Digest::SHA = 6.01 +Encode = 2.97 +ExtUtils::CBuilder = 0.280230 +ExtUtils::Command = 7.34 +ExtUtils::Embed = 1.35 +ExtUtils::Install = 2.14 +ExtUtils::MakeMaker = 7.34 ExtUtils::Manifest = 1.70 -ExtUtils::ParseXS = 3.34 +ExtUtils::ParseXS = 3.39 File::Compare = 1.1006 File::Temp = 0.2304 -Filter::Simple = 0.93 +Filter::Simple = 0.95 FindBin = 1.51 -GDBM_File = 1.15 +GDBM_File = 1.17 Hash::Util = 0.22 -I18N::LangTags = 0.42 -IO = 1.38 +I18N::LangTags = 0.43 +IO = 1.39 IO::Zlib = 1.10 -IPC::Cmd = 0.96 +IPC::Cmd = 1.00 IPC::SysV = 2.07 -JSON::PP = 2.27400_02 -Locale::Codes = 3.42 -Locale::Maketext = 1.28 +JSON::PP = 2.97001 +Locale::Codes = 3.56 +Locale::Maketext = 1.29 Locale::Maketext::Simple = 0.21_01 MIME::Base64 = 3.15 -Math::BigInt = 1.999806 -Math::BigInt::FastCalc = 0.5005 -Math::BigRat = 0.2611 +Math::BigInt = 1.999811 +Math::BigInt::FastCalc = 0.5006 +Math::BigRat = 0.2613 Math::Complex = 1.5901 Math::Trig = 1.23 Memoize = 1.03_01 -Module::CoreList = 5.20180414_26 +Module::CoreList = 5.20180622 Module::Load = 0.32 Module::Load::Conditional = 0.68 Module::Metadata = 1.000033 -NEXT = 0.67 +NEXT = 0.67_01 Params::Check = 0.38 Parse::CPAN::Meta = 2.150010 Perl::OSType = 1.010 @@ -55,29 +55,29 @@ Pod::Escapes = 1.07 Pod::Parser = 1.63 Pod::Simple = 3.35 Safe = 2.40 -Socket = 2.020_03 -Storable = 2.62 +Socket = 2.027 +Storable = 3.08 Sys::Syslog = 0.35 Term::ANSIColor = 4.06 Term::Cap = 1.17 -Test = 1.30 -Test::Builder::Tester = 1.302073 -Test::Harness = 3.38 -Test::Simple = 1.302073 -Test::Tester = 1.302073 -Test::use::ok = 1.302073 +Test = 1.31 +Test::Builder::Tester = 1.302133 +Test::Harness = 3.42 +Test::Simple = 1.302133 +Test::Tester = 1.302133 +Test::use::ok = 1.302133 Text::Balanced = 2.03 Text::ParseWords = 3.30 Text::Tabs = 2013.0523 Tie::File = 1.02 Tie::RefHash = 1.39 -Time::HiRes = 1.9741 -Time::Piece = 1.31 +Time::HiRes = 1.9759 +Time::Piece = 1.3204 UNIVERSAL = 1.13 -Unicode::Collate = 1.19 -Unicode::Normalize = 1.25 +Unicode::Collate = 1.25 +Unicode::Normalize = 1.26 autodie = 2.29 -bignum = 0.47 -libnet = 3.10 +bignum = 0.49 +libnet = 3.11 parent = 0.236 -version = 0.9917 +version = 0.9923 diff --git a/perl-modules2 b/perl-modules2 index 77f5c31..860e1e7 100644 --- a/perl-modules2 +++ b/perl-modules2 @@ -1,4 +1,4 @@ -# Non-straight named module versions from Perl 5.26.2 distribution. +# Non-straight named module versions from Perl 5.28.0 distribution. IO-Compress IO::Compress::Base = 2.074 -PathTools File::Spec = 3.67 -Scalar-List-Utils List::Util = 1.4602 +PathTools File::Spec = 3.74 +Scalar-List-Utils List::Util = 1.5 diff --git a/perl-write-permissions.patch b/perl-write-permissions.patch index 760136a..9cc71e7 100644 --- a/perl-write-permissions.patch +++ b/perl-write-permissions.patch @@ -9,14 +9,14 @@ $mode = $mode | 0222 if $realtarget ne $targetfile; _chmod( $mode, $targetfile, $verbose ); -@@ -1215,7 +1215,7 @@ +@@ -1233,7 +1233,7 @@ sub pm_to_blib { } my($mode,$atime,$mtime) = (stat $from)[2,8,9]; - utime($atime,$mtime+$Is_VMS,$to); + utime($atime,$mtime+Is_VMS,$to); - _chmod(0444 | ( $mode & 0111 ? 0111 : 0 ),$to); + _chmod(0644 | ( $mode & 0111 ? 0111 : 0 ),$to); next unless $from =~ /\.pm$/; - _autosplit($to,$autodir); + _autosplit($to,$autodir) if defined $autodir; } --- perl-5.20.0/cpan/ExtUtils-Install/t/Install.t.orig 2014-05-29 13:11:07.961096445 +0200 +++ perl-5.20.0/cpan/ExtUtils-Install/t/Install.t 2014-05-29 13:11:20.681234036 +0200 diff --git a/perl.spec b/perl.spec index 4bd61c2..e1b7ac4 100644 --- a/perl.spec +++ b/perl.spec @@ -25,7 +25,7 @@ # NOTE # - modules in 5.20.0: http://search.cpan.org/~rjbs/perl-5.20.0/ -%define abi 5.26.0 +%define abi 5.28.0 %define perlthread %{?with_threads:-thread-multi} %define perl_privlib %{_datadir}/perl5/%{ver} @@ -43,7 +43,7 @@ %define perl_mod2verrel() %([ -f %{SOURCE4} ] && awk -vp=%1 -vr=%2 '$1 == p { print $4"-"r }' %{SOURCE4} || echo ERROR) %define perl_mod2version() %([ -f %{SOURCE4} ] && awk -vp=%1 '$1 == p { m=$2; printf("perl-%s = %s\\n", p, $4)}END{if (!m) printf("# Error looking up [%s]\\n", p) }' %{SOURCE4} || echo ERROR) -%define ver 5.26.2 +%define ver 5.28.0 %define rel 1 Summary: Practical Extraction and Report Language (Perl) Summary(cs.UTF-8): Programovací jazyk Perl @@ -73,7 +73,7 @@ Epoch: 1 License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz -# Source0-md5: 1fa1b53eeff76aa37b17bfc9b2771671 +# Source0-md5: f3245183c0a08f65e94a3333995af08e Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db Source2: %{name}.prov @@ -84,7 +84,7 @@ Patch3: %{name}_581-soname.patch Patch4: %{name}-test-noproc.patch # Test regen.t checks result of this patch. # To run test manually run, from BUILD/perl-*: -# LD_LIBRARY_PATH=$(pwd) ./preload ./libperl.so ./perl t/porting/regen.t +# PERL5LIB=$(pwd) LD_LIBRARY_PATH=$(pwd) ./preload ./libperl.so ./perl t/porting/regen.t # Make sure sha output from test matches sha from uconfig.h Patch5: %{name}_585-microperl_uconfig.patch Patch6: %{name}-write-permissions.patch @@ -1471,6 +1471,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/SDBM_File.3perl* %{perl_archlib}/Storable.pm +%dir %{perl_archlib}/Storable +%{perl_archlib}/Storable/Limit.pm %dir %{perl_archlib}/auto/Storable %attr(755,root,root) %{perl_archlib}/auto/Storable/Storable.so %{_mandir}/man3/Storable.3perl* diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch index 84794b6..dbf9fd2 100644 --- a/perl_585-microperl_uconfig.patch +++ b/perl_585-microperl_uconfig.patch @@ -4,8 +4,8 @@ afsroot='/afs' alignbytes='4' aphostname='/bin/hostname' --archlib='/usr/local/lib/perl5/5.26/unknown' --archlibexp='/usr/local/lib/perl5/5.26/unknown' +-archlib='/usr/local/lib/perl5/5.28/unknown' +-archlibexp='/usr/local/lib/perl5/5.28/unknown' -archname='unknown' asctime_r_proto='0' -bin='/usr/local/bin' @@ -42,8 +42,8 @@ perl_static_inline='static' phostname='hostname' pidtype=int --privlib='/usr/local/lib/perl5/5.26' --privlibexp='/usr/local/lib/perl5/5.26' +-privlib='/usr/local/lib/perl5/5.28' +-privlibexp='/usr/local/lib/perl5/5.28' procselfexe='' prototype='undef' @@ -700,8 +691,6 @@ @@ -60,7 +60,7 @@ @@ -4735,5 +4735,5 @@ /* Generated from: - * a0cea6273c16c1c5d8625665c84bda01926ce960c26873d4e5596b5b02a53e92 config_h.SH -- * b1c042726e6a17692921b6947c4e7c196c5c0cee011667ba719b15af7c31e669 uconfig.sh -+ * e52958b2fc077af6dfab034b997d83d2697d5393063c23449e16d225b491364a uconfig.sh + * 86429d6dea8cb2d81b30da9d916693eb4c04ebeb21969c8df6f470ac77cd5c92 config_h.SH +- * 472eafc083bb70e26f6130fa170fb8c4370c88404dc212129a44575e82f6c963 uconfig.sh ++ * a9cb1aaa1fb12047bcd01a59c7c5ff010c05b0ed2581ccfe43f5d900ce8ceb18 uconfig.sh * ex: set ro: */ -- 2.43.0