From 585abab2b7ab5f3418d429e4868d5593947bb746 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 25 Oct 2024 17:38:19 +0300 Subject: [PATCH] import perl-Carp-1.54-510.el10 --- .gitignore | 1 + .perl-Carp.metadata | 1 + SOURCES/Carp-1.50-Upgrade-to-1.52.patch | 187 ++++++++++++++++ SOURCES/Carp-1.52-Upgrade-to-1.54.patch | 77 +++++++ SPECS/perl-Carp.spec | 273 ++++++++++++++++++++++++ 5 files changed, 539 insertions(+) create mode 100644 .gitignore create mode 100644 .perl-Carp.metadata create mode 100644 SOURCES/Carp-1.50-Upgrade-to-1.52.patch create mode 100644 SOURCES/Carp-1.52-Upgrade-to-1.54.patch create mode 100644 SPECS/perl-Carp.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..437aa32 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/Carp-1.50.tar.gz diff --git a/.perl-Carp.metadata b/.perl-Carp.metadata new file mode 100644 index 0000000..91c622e --- /dev/null +++ b/.perl-Carp.metadata @@ -0,0 +1 @@ +309973bc0c27f7a186a307c0f243cac36101d229 SOURCES/Carp-1.50.tar.gz diff --git a/SOURCES/Carp-1.50-Upgrade-to-1.52.patch b/SOURCES/Carp-1.50-Upgrade-to-1.52.patch new file mode 100644 index 0000000..a2a5c3f --- /dev/null +++ b/SOURCES/Carp-1.50-Upgrade-to-1.52.patch @@ -0,0 +1,187 @@ +From a91baa4c8cb395568f4c55199e47ce4807e42bd2 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Wed, 5 May 2021 13:42:36 +0200 +Subject: [PATCH] Upgrade to 1.52 + +--- + lib/Carp.pm | 12 ++++++------ + lib/Carp/Heavy.pm | 2 +- + t/Carp.t | 6 ++++-- + t/Carp_overloadless.t | 6 ++++-- + t/broken_can.t | 5 ++++- + t/broken_univ_can.t | 12 +++++++++--- + t/vivify_stash.t | 6 +++++- + 7 files changed, 33 insertions(+), 16 deletions(-) + +diff --git a/lib/Carp.pm b/lib/Carp.pm +index 109b7fe..df563d0 100644 +--- a/lib/Carp.pm ++++ b/lib/Carp.pm +@@ -211,7 +211,7 @@ BEGIN { + } + + +-our $VERSION = '1.50'; ++our $VERSION = '1.52'; + $VERSION =~ tr/_//d; + + our $MaxEvalLen = 0; +@@ -284,7 +284,7 @@ sub shortmess { + my $cgc = _cgc(); + + # Icky backwards compatibility wrapper. :-( +- local @CARP_NOT = $cgc ? $cgc->() : caller(); ++ local @CARP_NOT = scalar( $cgc ? $cgc->() : caller() ); + shortmess_heavy(@_); + } + +@@ -944,10 +944,10 @@ This variable sets a general argument formatter to display references. + Plain scalars and objects that implement C will not go through + this formatter. Calling C from within this function is not supported. + +-local $Carp::RefArgFormatter = sub { +- require Data::Dumper; +- Data::Dumper::Dump($_[0]); # not necessarily safe +-}; ++ local $Carp::RefArgFormatter = sub { ++ require Data::Dumper; ++ Data::Dumper->Dump($_[0]); # not necessarily safe ++ }; + + =head2 @CARP_NOT + +diff --git a/lib/Carp/Heavy.pm b/lib/Carp/Heavy.pm +index a9b803c..fdb3e52 100644 +--- a/lib/Carp/Heavy.pm ++++ b/lib/Carp/Heavy.pm +@@ -2,7 +2,7 @@ package Carp::Heavy; + + use Carp (); + +-our $VERSION = '1.50'; ++our $VERSION = '1.52'; + $VERSION =~ tr/_//d; + + # Carp::Heavy was merged into Carp in version 1.12. Any mismatched versions +diff --git a/t/Carp.t b/t/Carp.t +index b1e399d..02c047e 100644 +--- a/t/Carp.t ++++ b/t/Carp.t +@@ -1,5 +1,6 @@ ++use strict; + use warnings; +-no warnings "once"; ++ + use Config; + + use IPC::Open3 1.0103 qw(open3); +@@ -353,6 +354,7 @@ for my $bodge_job ( 2, 1, 0 ) { SKIP: { + print "# required B\n"; + } + my $accum = ''; ++ no warnings 'once'; + local *CORE::GLOBAL::caller = sub { + local *__ANON__ = "fakecaller"; + my @c = CORE::caller(@_); +@@ -480,7 +482,7 @@ SKIP: + ); + + package Foo::No::Autovivify; +- $CARP_NOT = 1; ++ our $CARP_NOT = 1; + eval { Carp::croak(1) }; + ::ok( + !defined *{$Foo::No::Autovivify::{CARP_NOT}}{ARRAY}, +diff --git a/t/Carp_overloadless.t b/t/Carp_overloadless.t +index f4bda04..6b73601 100644 +--- a/t/Carp_overloadless.t ++++ b/t/Carp_overloadless.t +@@ -1,12 +1,14 @@ ++use strict; + use warnings; +-#no warnings 'once'; ++ + use Test::More tests => 1; + + use Carp; + + # test that enabling overload without loading overload.pm does not trigger infinite recursion + +-my $p = "OverloadedInXS"; ++no strict 'refs'; ++my $p = "OverloadedInXS"; + *{$p."::(("} = sub{}; + *{$p.q!::(""!} = sub { Carp::cluck "" }; + sub { Carp::longmess("longmess:") }->(bless {}, $p); +diff --git a/t/broken_can.t b/t/broken_can.t +index c32fa19..9232d68 100644 +--- a/t/broken_can.t ++++ b/t/broken_can.t +@@ -1,3 +1,6 @@ ++use strict; ++use warnings; ++ + use Test::More tests => 1; + + # [perl #132910] +@@ -10,6 +13,6 @@ package main; + use Carp; + + eval { +- sub { confess-sins }->(bless[], Foo); ++ sub { confess-sins }->(bless[], 'Foo'); + }; + like $@, qr/^-sins at /; +diff --git a/t/broken_univ_can.t b/t/broken_univ_can.t +index 0ec19d7..49c7720 100644 +--- a/t/broken_univ_can.t ++++ b/t/broken_univ_can.t +@@ -1,15 +1,21 @@ ++use strict; ++use warnings; ++ + # [perl #132910] + # This mock-up breaks Test::More. Don’t use Test::More. + +-sub UNIVERSAL::can { die; } ++{ ++ no warnings 'redefine'; ++ sub UNIVERSAL::can { die; } ++} + + # Carp depends on this to detect the override: +-BEGIN { $UNIVERSAL::can::VERSION = 0xbaff1ed_bee; } ++BEGIN { no warnings 'portable'; $UNIVERSAL::can::VERSION = 0xbaff1ed_bee; } + + use Carp; + + eval { +- sub { confess-sins }->(bless[], Foo); ++ sub { confess-sins }->(bless[], 'Foo'); + }; + print "1..1\n"; + if ($@ !~ qr/^-sins at /) { +diff --git a/t/vivify_stash.t b/t/vivify_stash.t +index 744d0d2..00181f3 100644 +--- a/t/vivify_stash.t ++++ b/t/vivify_stash.t +@@ -1,3 +1,6 @@ ++use strict; ++use warnings; ++ + BEGIN { print "1..5\n"; } + + our $has_utf8; BEGIN { $has_utf8 = exists($::{"utf8::"}); } +@@ -18,7 +21,8 @@ eval { sub { Carp::longmess() }->(\1) }; + print $@ eq '' ? "ok 4 # longmess check1\n" : "not ok 4 # longmess check1\n# $@"; + + # overload:: glob without hash +-undef *{"overload::"}; ++# Clear overload quoted so it happens to the runtime stash. ++{ no strict 'refs'; undef *{"overload::"} } + eval { sub { Carp::longmess() }->(\1) }; + print $@ eq '' ? "ok 5 # longmess check2\n" : "not ok 5 # longmess check2\n# $@"; + +-- +2.30.2 + diff --git a/SOURCES/Carp-1.52-Upgrade-to-1.54.patch b/SOURCES/Carp-1.52-Upgrade-to-1.54.patch new file mode 100644 index 0000000..a13b617 --- /dev/null +++ b/SOURCES/Carp-1.52-Upgrade-to-1.54.patch @@ -0,0 +1,77 @@ +From 7b5bfc02532e5a275fadc43beb1d7f9a0ef3fdb8 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Tue, 16 May 2023 12:41:10 +0200 +Subject: [PATCH] Upgrade to 1.54 + +--- + lib/Carp.pm | 12 ++++++------ + lib/Carp/Heavy.pm | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/Carp.pm b/lib/Carp.pm +index df563d0..20b9708 100644 +--- a/lib/Carp.pm ++++ b/lib/Carp.pm +@@ -179,7 +179,7 @@ BEGIN { + ? do { require "overload.pm"; _fetch_sub overload => 'mycan' } + : \&UNIVERSAL::can; + +- # _blessed is either UNIVERAL::isa(...), or, in the presence of an ++ # _blessed is either UNIVERSAL::isa(...), or, in the presence of an + # override, a hideous, but fairly reliable, workaround. + *_blessed = $isa + ? sub { &$isa($_[0], "UNIVERSAL") } +@@ -211,7 +211,7 @@ BEGIN { + } + + +-our $VERSION = '1.52'; ++our $VERSION = '1.54'; + $VERSION =~ tr/_//d; + + our $MaxEvalLen = 0; +@@ -776,8 +776,8 @@ Carp - alternative warn and die for modules + # cluck, longmess and shortmess not exported by default + use Carp qw(cluck longmess shortmess); + cluck "This is how we got here!"; # warn with stack backtrace +- $long_message = longmess( "message from cluck() or confess()" ); +- $short_message = shortmess( "message from carp() or croak()" ); ++ my $long_message = longmess( "message from cluck() or confess()" ); ++ my $short_message = shortmess( "message from carp() or croak()" ); + + =head1 DESCRIPTION + +@@ -802,7 +802,7 @@ Of course, C can't guarantee the latter. + + You can also alter the way the output and logic of C works, by + changing some global variables in the C namespace. See the +-section on C below. ++section on L below. + + Here is a more complete description of how C and C work. + What they do is search the call-stack for a function call stack where +@@ -868,7 +868,7 @@ or by including the string C<-MCarp=verbose> in the PERL5OPT + environment variable. + + Alternately, you can set the global variable C<$Carp::Verbose> to true. +-See the C section below. ++See the L section below. + + =head2 Stack Trace formatting + +diff --git a/lib/Carp/Heavy.pm b/lib/Carp/Heavy.pm +index fdb3e52..043e345 100644 +--- a/lib/Carp/Heavy.pm ++++ b/lib/Carp/Heavy.pm +@@ -2,7 +2,7 @@ package Carp::Heavy; + + use Carp (); + +-our $VERSION = '1.52'; ++our $VERSION = '1.54'; + $VERSION =~ tr/_//d; + + # Carp::Heavy was merged into Carp in version 1.12. Any mismatched versions +-- +2.40.1 + diff --git a/SPECS/perl-Carp.spec b/SPECS/perl-Carp.spec new file mode 100644 index 0000000..5002159 --- /dev/null +++ b/SPECS/perl-Carp.spec @@ -0,0 +1,273 @@ +%global base_version 1.50 +Name: perl-Carp +Version: 1.54 +Release: 510%{?dist} +Summary: Alternative warn and die for modules +License: GPL-1.0-or-later OR Artistic-1.0-Perl +URL: https://metacpan.org/release/Carp +Source0: https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/Carp-%{base_version}.tar.gz +# Unbundled from perl 5.34.0 +Patch0: Carp-1.50-Upgrade-to-1.52.patch +# Unbundled from perl 5.37.11 +Patch1: Carp-1.52-Upgrade-to-1.54.patch +BuildArch: noarch +BuildRequires: coreutils +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(warnings) +BuildRequires: perl(strict) +# Run-time: +BuildRequires: perl(Exporter) +# Tests: +BuildRequires: perl(B) +BuildRequires: perl(Config) +BuildRequires: perl(Data::Dumper) +# IPC::Open3 >= 1.0103 in reality, but the provides is 2-digit number only +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(overload) +BuildRequires: perl(Test::More) >= 0.47 + +# Do not export private DB module stub +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(DB\\) +# Filter versioned tests require IPC::Open3 >= 1.0103, because provides is +# 2-digit number only +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(IPC::Open3\\) + +%description +The Carp routines are useful in your own modules because they act like +die() or warn(), but with a message which is more likely to be useful to a +user of your module. In the case of cluck, confess, and longmess that +context is a summary of every call in the call-stack. For a shorter message +you can use carp or croak which report the error as being from where your +module was called. There is no guarantee that that is where the error was, +but it is a good educated guess. + +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl(IPC::Open3) +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + +%prep +%setup -q -n Carp-%{base_version} +%patch -P0 -p1 +%patch -P1 -p1 + +# Help file to recognise the Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done + +%build +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} + +%install +%{make_install} +%{_fixperms} %{buildroot}/* + +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test + +%check +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') +make test + +%files +%doc Changes README +%{perl_vendorlib}/* +%{_mandir}/man3/* + +%files tests +%{_libexecdir}/%{name} + +%changelog +* Fri Oct 25 2024 MSVSphere Packaging Team - 1.54-510 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Jitka Plesnikova - 1.54-510 +- Increase release to favour standalone package + +* Mon Jun 24 2024 Troy Dawson - 1.54-503 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.54-502 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.54-501 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.54-500 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 1.54-499 +- Increase release to favour standalone package + +* Tue May 16 2023 Jitka Plesnikova - 1.54-1 +- Upgrade to 1.54 as provided in perl-5.37.11 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.52-490 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.52-489 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 1.52-488 +- Increase release to favour standalone package + +* Thu Jan 20 2022 Fedora Release Engineering - 1.52-479 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.52-478 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.52-477 +- Increase release to favour standalone package + +* Wed May 05 2021 Jitka Plesnikova - 1.52-459 +- Upgrade to 1.52 as provided in perl-5.34.0 +- Package tests + +* Tue Jan 26 2021 Fedora Release Engineering - 1.50-458 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.50-457 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.50-456 +- Increase release to favour standalone package + +* Wed Jan 29 2020 Fedora Release Engineering - 1.50-440 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 1.50-439 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 1.50-438 +- Increase release to favour standalone package + +* Fri Feb 01 2019 Fedora Release Engineering - 1.50-418 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.50-417 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 26 2018 Jitka Plesnikova - 1.50-416 +- Increase release to favour standalone package + +* Wed May 23 2018 Jitka Plesnikova - 1.50-1 +- Upgrade to 1.50 as provided in perl-5.28.0 + +* Fri Apr 20 2018 Petr Pisar - 1.42-396 +- Prevent from some stack-not-ref-counted crashes in Carp (RT#52610) + +* Thu Feb 08 2018 Fedora Release Engineering - 1.42-395 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.42-394 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jun 03 2017 Jitka Plesnikova - 1.42-393 +- Perl 5.26 rebuild + +* Thu May 11 2017 Petr Pisar - 1.42-1 +- Upgrade to 1.42 as provided in perl-5.25.12 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.40-366 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat May 14 2016 Jitka Plesnikova - 1.40-365 +- Increase release to favour standalone package + +* Wed May 11 2016 Jitka Plesnikova - 1.40-1 +- 1.40 bump in order to dual-live with perl 5.24 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.38-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Petr Pisar - 1.38-1 +- 1.38 bump + +* Thu Jun 18 2015 Fedora Release Engineering - 1.36-346 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 04 2015 Jitka Plesnikova - 1.36-345 +- Increase release to favour standalone package + +* Wed Jun 03 2015 Jitka Plesnikova - 1.36-2 +- Perl 5.22 rebuild + +* Fri Mar 20 2015 Petr Pisar - 1.36-1 +- 1.36 bump + +* Mon Mar 16 2015 Petr Pisar - 1.35-1 +- 1.35 bump + +* Wed Sep 03 2014 Jitka Plesnikova - 1.33.01-310 +- Increase release to favour standalone package + +* Tue Aug 26 2014 Jitka Plesnikova - 1.33.01-3 +- Perl 5.20 rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.33.01-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Apr 04 2014 Petr Pisar - 1.33.01-1 +- 1.3301 bump + +* Wed Mar 26 2014 Petr Pisar - 1.33-1 +- 1.33 bump + +* Tue Sep 10 2013 Petr Pisar - 1.32-1 +- 1.32 bump + +* Sat Aug 03 2013 Fedora Release Engineering - 1.26-245 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 12 2013 Petr Pisar - 1.26-244 +- Link minimal build-root packages against libperl.so explicitly + +* Tue Apr 30 2013 Petr Pisar - 1.26-243 +- Increase release number to supersede perl sub-package (bug #957931) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.26-241 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Aug 13 2012 Marcela Mašláňová - 1.26-240 +- Bump release to override sub-package from perl.spec + +* Fri Jul 20 2012 Fedora Release Engineering - 1.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Petr Pisar - 1.26-2 +- Perl 5.16 rebuild + +* Tue Jun 19 2012 Petr Pisar - 1.26-1 +- 1.26 bump + +* Wed Jun 06 2012 Petr Pisar - 1.25-2 +- Perl 5.16 rebuild + +* Thu Mar 15 2012 Petr Pisar - 1.25-1 +- 1.25 bump + +* Fri Jan 13 2012 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Sep 07 2011 Petr Pisar 1.22-1 +- Specfile autogenerated by cpanspec 1.78. +- Remove BuildRoot and defattr code from spec +- Do not export private module DB