From 402c35f4babf849689d8dcd4b351976c409d32a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 19 Feb 2021 14:33:10 +0100 Subject: [PATCH] - up to 5.32.1 * abi set to 5.32.0 (but it should be 5.32.1... I guess) * Pod::Parser is gone in upstream * change perl-modules creation so any failure there will abort build process instead of failing silently (as it was until now) --- perl-modules | 81 ++++++++++++++++---------------- perl-modules2 | 6 +-- perl-test-dst.patch | 11 ----- perl.spec | 48 +++++++------------ perl_585-microperl_uconfig.patch | 14 +++--- 5 files changed, 67 insertions(+), 93 deletions(-) delete mode 100644 perl-test-dst.patch diff --git a/perl-modules b/perl-modules index bfc4e7a..ea7438f 100644 --- a/perl-modules +++ b/perl-modules @@ -1,83 +1,82 @@ -# Module versions from Perl 5.30.3 distribution. -Archive::Tar = 2.32 +# Module versions from Perl 5.32.1 distribution. +Archive::Tar = 2.36 Attribute::Handlers = 1.01 -CPAN = 2.22 +CPAN = 2.27 CPAN::Meta = 2.150010 CPAN::Meta::YAML = 0.018 -Compress::Raw::Bzip2 = 2.089 -Compress::Raw::Zlib = 2.084 -Compress::Zlib = 2.084 -Devel::PPPort = 3.52 +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 +Digest::MD5 = 2.55_01 Digest::SHA = 6.02 -Encode = 3.01 -ExtUtils::CBuilder = 0.280231 -ExtUtils::Command = 7.34 +Encode = 3.06 +ExtUtils::CBuilder = 0.280234 +ExtUtils::Command = 7.44 ExtUtils::Embed = 1.35 ExtUtils::Install = 2.14 -ExtUtils::MakeMaker = 7.34 +ExtUtils::MakeMaker = 7.44 ExtUtils::Manifest = 1.72 ExtUtils::ParseXS = 3.40 File::Compare = 1.1006 File::Temp = 0.2309 -Filter::Simple = 0.95 +Filter::Simple = 0.96 FindBin = 1.51 GDBM_File = 1.18 -Getopt::Long = 2.50 -Hash::Util = 0.22 -I18N::LangTags = 0.43 -IO = 1.40 +Getopt::Long = 2.51 +Hash::Util = 0.23 +I18N::LangTags = 0.44 +IO = 1.43 IO::Zlib = 1.10 -IPC::Cmd = 1.02 +IPC::Cmd = 1.04 IPC::SysV = 2.07 -JSON::PP = 4.02 +JSON::PP = 4.04 Locale::Maketext = 1.29 Locale::Maketext::Simple = 0.21_01 MIME::Base64 = 3.15 -Math::BigInt = 1.999816 -Math::BigInt::FastCalc = 0.5008 +Math::BigInt = 1.999818 +Math::BigInt::FastCalc = 0.5009 Math::BigRat = 0.2614 Math::Complex = 1.5901 Math::Trig = 1.23 Memoize = 1.03_01 -Module::CoreList = 5.20200601_30 +Module::CoreList = 5.20210123 Module::Load = 0.34 -Module::Load::Conditional = 0.68 -Module::Metadata = 1.000036 +Module::Load::Conditional = 0.70 +Module::Metadata = 1.000037 NEXT = 0.67_01 Params::Check = 0.38 Parse::CPAN::Meta = 2.150010 Perl::OSType = 1.010 PerlIO::via::QuotedPrint = 0.08 Pod::Escapes = 1.07 -Pod::Parser = 1.63 -Pod::Simple = 3.35 -Safe = 2.40 -Socket = 2.027 -Storable = 3.15 -Sys::Syslog = 0.35 -Term::ANSIColor = 4.06 +Pod::Simple = 3.40 +Safe = 2.41_01 +Socket = 2.029 +Storable = 3.21 +Sys::Syslog = 0.36 +Term::ANSIColor = 5.01 Term::Cap = 1.17 Test = 1.31 -Test::Builder::Tester = 1.302162 +Test::Builder::Tester = 1.302175 Test::Harness = 3.42 -Test::Simple = 1.302162 -Test::Tester = 1.302162 -Test::use::ok = 1.302162 +Test::Simple = 1.302175 +Test::Tester = 1.302175 +Test::use::ok = 1.302175 Text::Balanced = 2.03 Text::ParseWords = 3.30 Text::Tabs = 2013.0523 -Tie::File = 1.02 +Tie::File = 1.06 Tie::RefHash = 1.39 -Time::HiRes = 1.976 -Time::Piece = 1.33 +Time::HiRes = 1.9764 +Time::Piece = 1.3401 UNIVERSAL = 1.13 Unicode::Collate = 1.27 -Unicode::Normalize = 1.26 -autodie = 2.29 +Unicode::Normalize = 1.27 +autodie = 2.32 bignum = 0.51 libnet = 3.11 -parent = 0.237 +parent = 0.238 version = 0.9924 diff --git a/perl-modules2 b/perl-modules2 index 2fd300c..f660a44 100644 --- a/perl-modules2 +++ b/perl-modules2 @@ -1,4 +1,4 @@ -# Non-straight named module versions from Perl 5.30.3 distribution. -IO-Compress IO::Compress::Base = 2.084 +# Non-straight named module versions from Perl 5.32.1 distribution. +IO-Compress IO::Compress::Base = 2.093 PathTools File::Spec = 3.78 -Scalar-List-Utils List::Util = 1.5 +Scalar-List-Utils List::Util = 1.55 diff --git a/perl-test-dst.patch b/perl-test-dst.patch deleted file mode 100644 index 375b949..0000000 --- a/perl-test-dst.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-5.24.0/cpan/Time-Piece/t/02core_dst.t.orig 2016-03-01 13:33:01.000000000 +0100 -+++ perl-5.24.0/cpan/Time-Piece/t/02core_dst.t 2016-11-03 20:14:33.394601523 +0100 -@@ -127,7 +127,7 @@ - SKIP: { - skip "Extra tests for Linux, BSD only.", 6 unless $is_linux or $is_mac or $is_bsd; - -- local $ENV{TZ} = "EST5EDT4"; -+ local $ENV{TZ} = "EST5EDT4,M3.5.0,M10.5.0"; - Time::Piece::_tzset(); - my $lt = localtime(1373371631); #2013-07-09T12:07:11 - cmp_ok(scalar($lt->tzoffset), 'eq', '-14400'); diff --git a/perl.spec b/perl.spec index c820b81..e580dbb 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.30.0 +%define abi 5.32.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.30.3 +%define ver 5.32.1 %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: 0af2ab0f01ec13e37cc13a27de930936 +# Source0-md5: 7f104064b906ad8c7329ca5e409a32d7 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db Source2: %{name}.prov @@ -91,7 +91,6 @@ Patch6: %{name}-write-permissions.patch Patch7: %{name}-t-syslog.patch Patch8: %{name}-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch Patch10: %{name}-invalid-void-use.patch -Patch11: %{name}-test-dst.patch URL: http://dev.perl.org/perl5/ %ifarch ppc # gcc 3.3.x miscompiles pp_hot.c @@ -454,7 +453,6 @@ Provides: %perl_modversion NEXT Provides: %perl_modversion Params::Check Provides: %perl_modversion Parse::CPAN::Meta Provides: %perl_modversion Pod::Escapes -Provides: %perl_modversion Pod::Parser Provides: %perl_modversion Pod::Simple Provides: %perl_modversion Safe Provides: %perl_modversion Storable @@ -504,10 +502,9 @@ Obsoletes: perl-Module-Load < %perl_modverrel Module::Load 99 Obsoletes: perl-Module-Load-Conditional < %perl_modverrel Module::Load::Conditional 99 Obsoletes: perl-Module-Metadata < %perl_modverrel Module::Metadata 99 Obsoletes: perl-NEXT < %perl_modverrel NEXT 99 -Obsoletes: perl-Params::Check < %perl_modverrel Params::Check 99 +Obsoletes: perl-Params-Check < %perl_modverrel Params::Check 99 Obsoletes: perl-Parse-CPAN-Meta < %perl_modverrel Parse::CPAN::Meta 99 Obsoletes: perl-Pod-Escapes < %perl_modverrel Pod::Escapes 99 -Obsoletes: perl-Pod-Parser < %perl_modverrel Pod::Parser 99 Obsoletes: perl-Pod-Simple < %perl_modverrel Pod::Simple 99 Obsoletes: perl-Safe < %perl_modverrel Safe 99 Obsoletes: perl-Storable < %perl_modverrel Storable 99 @@ -726,7 +723,6 @@ zbyt duża, a rozmiar za mały na tworzenie oddzielnych rozszerzeń. %patch7 -p1 %patch8 -p1 %patch10 -p1 -%patch11 -p1 cat > runperl <<'EOF' #!/bin/sh @@ -855,7 +851,7 @@ WANTED=' cd "$owd" ## remove man pages for other operating systems -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,ce,cygwin,dos}* \ +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,cygwin,dos}* \ $RPM_BUILD_ROOT%{_mandir}/man1/perl{freebsd,hpux,macos,os2,os390}* \ $RPM_BUILD_ROOT%{_mandir}/man1/perl{qnx,solaris,vms,vos,win32}* @@ -934,7 +930,7 @@ owd=$(pwd) %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.perl-non-english-man-pages # update and check perl-modules files -echo '# Module versions from Perl %{ver} distribution.' > perl-modules +echo '# Module versions from Perl %{ver} distribution.' > perl-modules.tmp for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do case $m in libnet) @@ -952,10 +948,11 @@ for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do v=$(%{__perl} -M$m -e "print \$$m::VERSION") ;; esac - echo "$m = $v" -done | LC_ALL=C sort >> perl-modules + echo "$m = $v" >> perl-modules.tmp +done +LC_ALL=C sort perl-modules.tmp > perl-modules && rm perl-modules.tmp -echo '# Non-straight named module versions from Perl %{ver} distribution.' > perl-modules2 +echo '# Non-straight named module versions from Perl %{ver} distribution.' > perl-modules2.tmp for m in $(awk '!/^#/ && !/^$/{print $1"!"$2}' %{SOURCE4}); do mn="${m##*!}" mp="${m%%!*}" @@ -964,8 +961,9 @@ for m in $(awk '!/^#/ && !/^$/{print $1"!"$2}' %{SOURCE4}); do v=$(%{__perl} -M$mn -e "print \$$mn::VERSION") ;; esac - echo "$mp $mn = $v" -done | LC_ALL=C sort >> perl-modules2 + echo "$mp $mn = $v" >> perl-modules2.tmp +done +LC_ALL=C sort perl-modules2.tmp > perl-modules2 && rm perl-modules2.tmp if ! cmp -s %{SOURCE3} perl-modules; then : %{SOURCE3} outdated with $(pwd)/perl-modules @@ -1087,6 +1085,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Tie::File.3perl* %{_mandir}/man3/Tie::Handle.3perl* %{_mandir}/man3/Tie::Hash.3perl* +%{_mandir}/man3/Tie::Hash::NamedCapture.3perl* %{_mandir}/man3/Tie::Memoize.3perl* %{_mandir}/man3/Tie::RefHash.3perl* %{_mandir}/man3/Tie::Scalar.3perl* @@ -1191,15 +1190,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{perl_archlib}/auto/Socket/Socket.so %{_mandir}/man3/Socket.3perl* -%dir %{perl_archlib}/Tie -%dir %{perl_archlib}/Tie/Hash -%{perl_archlib}/Tie/Hash/NamedCapture.pm -%dir %{perl_archlib}/auto/Tie -%dir %{perl_archlib}/auto/Tie/Hash -%dir %{perl_archlib}/auto/Tie/Hash/NamedCapture -%attr(755,root,root) %{perl_archlib}/auto/Tie/Hash/NamedCapture/NamedCapture.so -%{_mandir}/man3/Tie::Hash::NamedCapture.3perl* - %files devel %defattr(644,root,root,755) %doc doc-devel/* @@ -1227,7 +1217,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/ExtUtils::Packlist.3perl* %{_mandir}/man3/ExtUtils::ParseXS*.3perl* %{_mandir}/man3/ExtUtils::Typemaps*.3perl* -%{_mandir}/man3/ExtUtils::XSSymSet.3perl* %{_mandir}/man3/ExtUtils::testlib.3perl* %{perl_privlib}/vmsish.pm %{_mandir}/man3/vmsish.3perl* @@ -1602,16 +1591,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_privlib}/Pod %{_mandir}/man3/Pod::Checker.3perl* %{_mandir}/man3/Pod::Escapes.3perl* -%{_mandir}/man3/Pod::Find.3perl* %{_mandir}/man3/Pod::Html.3perl* -%{_mandir}/man3/Pod::InputObjects.3perl* %{_mandir}/man3/Pod::Man.3perl* %{_mandir}/man3/Pod::ParseLink.3perl* -%{_mandir}/man3/Pod::ParseUtils.3perl* -%{_mandir}/man3/Pod::Parser.3perl* %{_mandir}/man3/Pod::Perldoc*.3perl* -%{_mandir}/man3/Pod::PlainText.3perl* -%{_mandir}/man3/Pod::Select.3perl* %{_mandir}/man3/Pod::Simple*.3perl* %{_mandir}/man3/Pod::Text*.3perl* %{_mandir}/man3/Pod::Usage.3perl* @@ -1701,6 +1684,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ptardiff.1* %attr(755,root,root) %{_bindir}/shasum %{_mandir}/man1/shasum.1* +%attr(755,root,root) %{_bindir}/streamzip +%{_mandir}/man1/streamzip.1* %attr(755,root,root) %{_bindir}/zipdetails %{_mandir}/man1/zipdetails.1* @@ -1747,6 +1732,7 @@ rm -rf $RPM_BUILD_ROOT %{perl_archlib}/encoding.pm %dir %{perl_archlib}/auto/Encode %dir %{perl_archlib}/auto/Encode/*/ +%attr(755,root,root) %{perl_archlib}/auto/Encode/*.so %attr(755,root,root) %{perl_archlib}/auto/Encode/*/*.so %{_mandir}/man1/enc2xs.1* %{_mandir}/man1/piconv.1* diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch index af05cc0..49d6ab2 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.30/unknown' --archlibexp='/usr/local/lib/perl5/5.30/unknown' +-archlib='/usr/local/lib/perl5/5.32/unknown' +-archlibexp='/usr/local/lib/perl5/5.32/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.30' --privlibexp='/usr/local/lib/perl5/5.30' +-privlib='/usr/local/lib/perl5/5.32' +-privlibexp='/usr/local/lib/perl5/5.32' procselfexe='' prototype='undef' @@ -700,8 +691,6 @@ @@ -60,7 +60,7 @@ @@ -4735,5 +4735,5 @@ /* Generated from: - * 6608de918c3c876975f74b684da2536ab1ee23459783d691ae02ce2526a497a7 config_h.SH -- * 2aaf18b9277e180fc5e5d60290ecb0c91fcac3531bd8825e5687a212daa586e9 uconfig.sh -+ * 700be6acc013e2e38111b8fd0c3029d9ca67436e6bb85c457050243683e30b92 uconfig.sh + * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH +- * 6e8898de349ca5bd5102aa12be91e6884110157cb9267e661f6fc797bbd54649 uconfig.sh ++ * 5d72b5bac11a4773e6490158d2275d9d933929c27b1a0728324e14addf64b9cb uconfig.sh * ex: set ro: */ -- 2.43.0