From dcbd7aefb803be1ea31ae2e5a1bb60c4b9a6570e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 31 May 2021 00:20:51 +0200 Subject: [PATCH] - up to 5.34.0 --- ...oy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch | 18 ++-- perl-modules | 102 +++++++++--------- perl-modules2 | 6 +- perl-write-permissions.patch | 4 +- perl.spec | 8 +- perl_585-microperl_uconfig.patch | 14 +-- 6 files changed, 80 insertions(+), 72 deletions(-) diff --git a/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch b/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch index d07a384..939465c 100644 --- a/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch +++ b/perl-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch @@ -49,18 +49,24 @@ index 33e08e2..7160f54 100644 RETVAL->dbp = dbp; } else { RETVAL = NULL; -@@ -109,12 +111,14 @@ gdbm_DESTROY(db) +@@ -109,15 +111,17 @@ gdbm_DESTROY(db) PREINIT: int i = store_value; - CODE: -- gdbm_close(db); + CODE: +- if (gdbm_file_close(db)) { +- croak("gdbm_close: %s; %s", gdbm_strerror(gdbm_errno), +- strerror(errno)); +- } - do { - if (db->filter[i]) - SvREFCNT_dec(db->filter[i]); - } while (i-- > 0); - safefree(db); + if (db && db->owner == aTHX) { -+ gdbm_close(db); ++ if (gdbm_file_close(db)) { ++ croak("gdbm_close: %s; %s", gdbm_strerror(gdbm_errno), ++ strerror(errno)); ++ } + do { + if (db->filter[i]) + SvREFCNT_dec(db->filter[i]); @@ -68,8 +74,8 @@ index 33e08e2..7160f54 100644 + safefree(db); + } - #define gdbm_FETCH(db,key) gdbm_fetch(db->dbp,key) - datum_value + void + gdbm_UNTIE(db, count) diff --git a/ext/NDBM_File/NDBM_File.xs b/ext/NDBM_File/NDBM_File.xs index 52e60fc..af223e5 100644 --- a/ext/NDBM_File/NDBM_File.xs diff --git a/perl-modules b/perl-modules index ea7438f..e0e5100 100644 --- a/perl-modules +++ b/perl-modules @@ -1,82 +1,82 @@ -# Module versions from Perl 5.32.1 distribution. -Archive::Tar = 2.36 +# Module versions from Perl 5.34.0 distribution. +Archive::Tar = 2.38 Attribute::Handlers = 1.01 -CPAN = 2.27 +CPAN = 2.28 CPAN::Meta = 2.150010 CPAN::Meta::YAML = 0.018 -Compress::Raw::Bzip2 = 2.093 -Compress::Raw::Zlib = 2.093 -Compress::Zlib = 2.093 -Devel::PPPort = 3.57 -Devel::Peek = 1.28 -Digest = 1.17_01 -Digest::MD5 = 2.55_01 +Compress::Raw::Bzip2 = 2.101 +Compress::Raw::Zlib = 2.101 +Compress::Zlib = 2.102 +Devel::PPPort = 3.62 +Devel::Peek = 1.3 +Digest = 1.19 +Digest::MD5 = 2.58 Digest::SHA = 6.02 -Encode = 3.06 -ExtUtils::CBuilder = 0.280234 -ExtUtils::Command = 7.44 +Encode = 3.08 +ExtUtils::CBuilder = 0.280236 +ExtUtils::Command = 7.62 ExtUtils::Embed = 1.35 -ExtUtils::Install = 2.14 -ExtUtils::MakeMaker = 7.44 -ExtUtils::Manifest = 1.72 -ExtUtils::ParseXS = 3.40 +ExtUtils::Install = 2.2 +ExtUtils::MakeMaker = 7.62 +ExtUtils::Manifest = 1.73 +ExtUtils::ParseXS = 3.43 File::Compare = 1.1006 -File::Temp = 0.2309 +File::Temp = 0.2311 Filter::Simple = 0.96 -FindBin = 1.51 -GDBM_File = 1.18 -Getopt::Long = 2.51 -Hash::Util = 0.23 -I18N::LangTags = 0.44 -IO = 1.43 -IO::Zlib = 1.10 +FindBin = 1.52 +GDBM_File = 1.19 +Getopt::Long = 2.52 +Hash::Util = 0.25 +I18N::LangTags = 0.45 +IO = 1.46 +IO::Zlib = 1.11 IPC::Cmd = 1.04 -IPC::SysV = 2.07 -JSON::PP = 4.04 +IPC::SysV = 2.09 +JSON::PP = 4.06 Locale::Maketext = 1.29 Locale::Maketext::Simple = 0.21_01 -MIME::Base64 = 3.15 +MIME::Base64 = 3.16 Math::BigInt = 1.999818 Math::BigInt::FastCalc = 0.5009 Math::BigRat = 0.2614 -Math::Complex = 1.5901 +Math::Complex = 1.5902 Math::Trig = 1.23 Memoize = 1.03_01 -Module::CoreList = 5.20210123 -Module::Load = 0.34 -Module::Load::Conditional = 0.70 +Module::CoreList = 5.20210520 +Module::Load = 0.36 +Module::Load::Conditional = 0.74 Module::Metadata = 1.000037 -NEXT = 0.67_01 +NEXT = 0.68 Params::Check = 0.38 Parse::CPAN::Meta = 2.150010 Perl::OSType = 1.010 -PerlIO::via::QuotedPrint = 0.08 +PerlIO::via::QuotedPrint = 0.09 Pod::Escapes = 1.07 -Pod::Simple = 3.40 -Safe = 2.41_01 -Socket = 2.029 -Storable = 3.21 +Pod::Simple = 3.42 +Safe = 2.43 +Socket = 2.031 +Storable = 3.23 Sys::Syslog = 0.36 Term::ANSIColor = 5.01 Term::Cap = 1.17 Test = 1.31 -Test::Builder::Tester = 1.302175 -Test::Harness = 3.42 -Test::Simple = 1.302175 -Test::Tester = 1.302175 -Test::use::ok = 1.302175 -Text::Balanced = 2.03 +Test::Builder::Tester = 1.302183 +Test::Harness = 3.43 +Test::Simple = 1.302183 +Test::Tester = 1.302183 +Test::use::ok = 1.302183 +Text::Balanced = 2.04 Text::ParseWords = 3.30 Text::Tabs = 2013.0523 Tie::File = 1.06 -Tie::RefHash = 1.39 -Time::HiRes = 1.9764 +Tie::RefHash = 1.40 +Time::HiRes = 1.9767 Time::Piece = 1.3401 UNIVERSAL = 1.13 -Unicode::Collate = 1.27 -Unicode::Normalize = 1.27 -autodie = 2.32 +Unicode::Collate = 1.29 +Unicode::Normalize = 1.28 +autodie = 2.34 bignum = 0.51 -libnet = 3.11 +libnet = 3.13 parent = 0.238 -version = 0.9924 +version = 0.9928 diff --git a/perl-modules2 b/perl-modules2 index f660a44..11165ac 100644 --- a/perl-modules2 +++ b/perl-modules2 @@ -1,4 +1,4 @@ -# Non-straight named module versions from Perl 5.32.1 distribution. -IO-Compress IO::Compress::Base = 2.093 -PathTools File::Spec = 3.78 +# Non-straight named module versions from Perl 5.34.0 distribution. +IO-Compress IO::Compress::Base = 2.102 +PathTools File::Spec = 3.80 Scalar-List-Utils List::Util = 1.55 diff --git a/perl-write-permissions.patch b/perl-write-permissions.patch index b24883c..64eaded 100644 --- a/perl-write-permissions.patch +++ b/perl-write-permissions.patch @@ -2,7 +2,7 @@ diff -urNp -x '*.orig' perl-5.32.1.org/cpan/ExtUtils-Install/lib/ExtUtils/Instal --- perl-5.32.1.org/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm 2020-12-18 11:04:35.000000000 +0100 +++ perl-5.32.1/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm 2021-04-01 22:48:39.572968964 +0200 @@ -825,7 +825,7 @@ sub install { #XXX OS-SPECIFIC - utime($atime,$mtime + Is_VMS,$targetfile) unless $dry_run>1; + utime($atime,$mtime + _Is_VMS,$targetfile) unless $dry_run>1; - $mode = 0444 | ( $mode & 0111 ? 0111 : 0 ); @@ -13,7 +13,7 @@ diff -urNp -x '*.orig' perl-5.32.1.org/cpan/ExtUtils-Install/lib/ExtUtils/Instal @@ -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$/; diff --git a/perl.spec b/perl.spec index 754998c..ec3de7e 100644 --- a/perl.spec +++ b/perl.spec @@ -43,8 +43,8 @@ %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.32.1 -%define rel 5 +%define ver 5.34.0 +%define rel 1 Summary: Practical Extraction and Report Language (Perl) Summary(cs.UTF-8): Programovací jazyk Perl Summary(da.UTF-8): Programmeringssproget Perl @@ -73,7 +73,7 @@ Epoch: 1 License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: https://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz -# Source0-md5: 7f104064b906ad8c7329ca5e409a32d7 +# Source0-md5: df7ecb0653440b26dc951ad9dbfab517 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db Source2: %{name}.prov @@ -1225,6 +1225,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/ExtUtils::Miniperl.3perl* %{_mandir}/man3/ExtUtils::Mkbootstrap.3perl* %{_mandir}/man3/ExtUtils::Mksymlists.3perl* +%{_mandir}/man3/ExtUtils::PL2Bat.3perl* %{_mandir}/man3/ExtUtils::Packlist.3perl* %{_mandir}/man3/ExtUtils::ParseXS*.3perl* %{_mandir}/man3/ExtUtils::Typemaps*.3perl* @@ -1672,6 +1673,7 @@ rm -rf $RPM_BUILD_ROOT %{perl_privlib}/pod/perlfaq*.pod %{perl_privlib}/pod/perlfunc.pod %{_mandir}/man1/perldoc.1* +%{_mandir}/man1/perldocstyle.1* %files tools %defattr(644,root,root,755) diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch index f276779..d1ab849 100644 --- a/perl_585-microperl_uconfig.patch +++ b/perl_585-microperl_uconfig.patch @@ -4,9 +4,9 @@ diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.h perl-5.32.1/uconfig.h @@ -5261,5 +5261,5 @@ /* Generated from: - * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH -- * 6e8898de349ca5bd5102aa12be91e6884110157cb9267e661f6fc797bbd54649 uconfig.sh -+ * 5d72b5bac11a4773e6490158d2275d9d933929c27b1a0728324e14addf64b9cb uconfig.sh + * 6edd641b187b02d0daa8cb53f5d22f2dcca115a0d3e744f51b0292d2db484ca5 config_h.SH +- * a9ec40c778a205e0256475b5ef025389f7ea06d75d09ac92414f6b99839577e8 uconfig.sh ++ * 53517d8479a10c057164fb5c7a7e622259dd031c80920f9b6a3614b5a5f94267 uconfig.sh * ex: set ro: */ diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.sh perl-5.32.1/uconfig.sh --- perl-5.32.1.org/uconfig.sh 2020-12-18 11:04:36.000000000 +0100 @@ -15,8 +15,8 @@ diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.sh perl-5.32.1/uconfig.sh afsroot='/afs' alignbytes='4' aphostname='/bin/hostname' --archlib='/usr/local/lib/perl5/5.32/unknown' --archlibexp='/usr/local/lib/perl5/5.32/unknown' +-archlib='/usr/local/lib/perl5/5.34/unknown' +-archlibexp='/usr/local/lib/perl5/5.34/unknown' -archname='unknown' asctime_r_proto='0' -bin='/usr/local/bin' @@ -53,8 +53,8 @@ diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.sh perl-5.32.1/uconfig.sh perl_static_inline='static' phostname='hostname' pidtype=int --privlib='/usr/local/lib/perl5/5.32' --privlibexp='/usr/local/lib/perl5/5.32' +-privlib='/usr/local/lib/perl5/5.34' +-privlibexp='/usr/local/lib/perl5/5.34' procselfexe='' prototype='undef' ptrsize='4' -- 2.43.0