Compare commits
No commits in common. "c8-stream-5.3" and "c9s" have entirely different histories.
c8-stream-
...
c9s
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
11
.gitignore
vendored
11
.gitignore
vendored
@ -1 +1,10 @@
|
||||
SOURCES/CPAN-2.27.tar.gz
|
||||
/CPAN-2.05.tar.gz
|
||||
/CPAN-2.10.tar.gz
|
||||
/CPAN-2.14.tar.gz
|
||||
/CPAN-2.16.tar.gz
|
||||
/CPAN-2.22.tar.gz
|
||||
/CPAN-2.25.tar.gz
|
||||
/CPAN-2.26.tar.gz
|
||||
/CPAN-2.27.tar.gz
|
||||
/CPAN-2.28.tar.gz
|
||||
/CPAN-2.29.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
f14e6be485bff20faa2028a73ee73429c32f0bea SOURCES/CPAN-2.27.tar.gz
|
||||
@ -33,7 +33,7 @@ index 531c115..8d82795 100644
|
||||
+ $CPAN::Frontend->mywarn(sprintf(
|
||||
+ qq{Perl site library directory "%s" does not exist.\n},
|
||||
+ $_));
|
||||
+ File::Path::make_path($_, { error => \my $failure });
|
||||
+ File::Path::make_path($_, { error => \my $failure, chmod => 0755 });
|
||||
+ if (@$failure) {
|
||||
+ $CPAN::Frontend->mywarn(sprintf(
|
||||
+ qq{Perl site library directory "%s" } .
|
||||
22
CPAN-2.29-Add-notes-about-first-configuration.patch
Normal file
22
CPAN-2.29-Add-notes-about-first-configuration.patch
Normal file
@ -0,0 +1,22 @@
|
||||
Add notes about the first configuration and about creating site repository
|
||||
which is specific for Fedora/RHEL.
|
||||
|
||||
diff -up CPAN-2.29/scripts/cpan.orig CPAN-2.29/scripts/cpan
|
||||
--- CPAN-2.29/scripts/cpan.orig 2025-03-03 07:54:40.491966844 +0100
|
||||
+++ CPAN-2.29/scripts/cpan 2025-03-03 07:54:40.495448509 +0100
|
||||
@@ -302,6 +302,15 @@ not control. For now, the exit codes are
|
||||
|
||||
8 A module failed to install
|
||||
|
||||
+=head1 NOTES
|
||||
+
|
||||
+If the configuration is not defined when C<cpan> is used for the first
|
||||
+time, CPAN::Config initialization is triggered using L<CPAN::FirstTime>.
|
||||
+This step is skipped only when using the C<-h> option.
|
||||
+
|
||||
+If the user has write permissions to /usr/local, site library repositories
|
||||
+may also be created.
|
||||
+
|
||||
=head1 TO DO
|
||||
|
||||
* one shot configuration values from the command line
|
||||
26
CPAN-2.32-s-dev-null-devnull.patch
Normal file
26
CPAN-2.32-s-dev-null-devnull.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 89b13baf1d46e4fb10023af30ef305efec4fd603 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Koenig <andk@cpan.org>
|
||||
Date: Wed, 12 Jan 2022 21:53:35 +0100
|
||||
Subject: [PATCH 2/2] s,/dev/null,$devnull,
|
||||
|
||||
- another thanks to Tomas Hoger for spotting that
|
||||
---
|
||||
lib/CPAN/Distribution.pm | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/CPAN/Distribution.pm b/lib/CPAN/Distribution.pm
|
||||
index d837b8ad..6ca1b434 100644
|
||||
--- a/lib/CPAN/Distribution.pm
|
||||
+++ b/lib/CPAN/Distribution.pm
|
||||
@@ -1554,7 +1554,7 @@ sub CHECKSUM_check_file {
|
||||
my $devnull = File::Spec->devnull;
|
||||
my $gpg = $CPAN::Config->{gpg} or
|
||||
$CPAN::Frontend->mydie("Your configuration suggests that you do not have 'gpg' installed. This is needed to verify checksums with the config variable 'check_sigs' on. Please configure it with 'o conf init gpg'");
|
||||
- my $system = qq{"$gpg" --verify --batch --no-tty --output "$tempfile" "$chk_file" 2> "/dev/null"};
|
||||
+ my $system = qq{"$gpg" --verify --batch --no-tty --output "$tempfile" "$chk_file" 2> "$devnull"};
|
||||
0 == system $system or $CPAN::Frontend->mydie("gpg run was failing, cannot continue: $system");
|
||||
open $fh, $tempfile or $CPAN::Frontend->mydie("Could not open $tempfile: $!");
|
||||
local $/;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
29
CPAN-2.32-s-gpg-gpg-in-system-add-quotes-where-needed.patch
Normal file
29
CPAN-2.32-s-gpg-gpg-in-system-add-quotes-where-needed.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 7d4d5e32bcd9b75f7bf70a395938a48ca4a06d25 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Koenig <andk@cpan.org>
|
||||
Date: Mon, 10 Jan 2022 21:47:30 +0100
|
||||
Subject: [PATCH 1/2] s/gpg/$gpg/ in system, add quotes where needed
|
||||
|
||||
- thanks to Tomas Hoger for spotting the missing sigil
|
||||
---
|
||||
lib/CPAN/Distribution.pm | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/CPAN/Distribution.pm b/lib/CPAN/Distribution.pm
|
||||
index b262b6f6..d837b8ad 100644
|
||||
--- a/lib/CPAN/Distribution.pm
|
||||
+++ b/lib/CPAN/Distribution.pm
|
||||
@@ -1551,9 +1551,10 @@ sub CHECKSUM_check_file {
|
||||
}
|
||||
my $tempfile = File::Spec->catfile($tempdir, "CHECKSUMS.$$");
|
||||
unlink $tempfile; # ignore missing file
|
||||
+ my $devnull = File::Spec->devnull;
|
||||
my $gpg = $CPAN::Config->{gpg} or
|
||||
$CPAN::Frontend->mydie("Your configuration suggests that you do not have 'gpg' installed. This is needed to verify checksums with the config variable 'check_sigs' on. Please configure it with 'o conf init gpg'");
|
||||
- my $system = "gpg --verify --batch --no-tty --output $tempfile $chk_file 2> /dev/null";
|
||||
+ my $system = qq{"$gpg" --verify --batch --no-tty --output "$tempfile" "$chk_file" 2> "/dev/null"};
|
||||
0 == system $system or $CPAN::Frontend->mydie("gpg run was failing, cannot continue: $system");
|
||||
open $fh, $tempfile or $CPAN::Frontend->mydie("Could not open $tempfile: $!");
|
||||
local $/;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
13
CPAN-2.35-Add-verify-SSL.patch
Normal file
13
CPAN-2.35-Add-verify-SSL.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Add verify_SSL=>1 to HTTP::Tiny to verify https server identity (Stig Palmquist)
|
||||
|
||||
diff -u -r CPAN-2.29.orig/lib/CPAN/HTTP/Client.pm CPAN-2.29/lib/CPAN/HTTP/Client.pm
|
||||
--- CPAN-2.29.orig/lib/CPAN/HTTP/Client.pm 2023-08-01 16:19:19.216625710 +0200
|
||||
+++ CPAN-2.29/lib/CPAN/HTTP/Client.pm 2023-08-01 16:28:29.323221118 +0200
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
my $want_proxy = $self->_want_proxy($uri);
|
||||
my $http = HTTP::Tiny->new(
|
||||
+ verify_SSL => 1,
|
||||
$want_proxy ? (proxy => $self->{proxy}) : ()
|
||||
);
|
||||
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
@ -9,8 +9,8 @@
|
||||
%endif
|
||||
|
||||
Name: perl-CPAN
|
||||
Version: 2.27
|
||||
Release: 2%{?dist}
|
||||
Version: 2.29
|
||||
Release: 5%{?dist}
|
||||
Summary: Query, download and build perl modules from CPAN sites
|
||||
License: GPL+ or Artistic
|
||||
URL: https://metacpan.org/release/CPAN
|
||||
@ -19,6 +19,13 @@ Source0: https://cpan.metacpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.t
|
||||
Patch0: CPAN-2.18-Attemp-to-create-site-library-directories-on-first-t.patch
|
||||
# Change configuration directory name
|
||||
Patch1: CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
|
||||
# Some syntax fixes
|
||||
Patch2: CPAN-2.32-s-gpg-gpg-in-system-add-quotes-where-needed.patch
|
||||
Patch3: CPAN-2.32-s-dev-null-devnull.patch
|
||||
# CVE-2023-31484 - Add verify_SSL => 1
|
||||
Patch4: CPAN-2.35-Add-verify-SSL.patch
|
||||
# Update man page to provide notes about first run
|
||||
Patch5: CPAN-2.29-Add-notes-about-first-configuration.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
@ -32,7 +39,6 @@ BuildRequires: perl(File::Path)
|
||||
# Module::Signature not used
|
||||
BuildRequires: perl(strict)
|
||||
BuildRequires: perl(vars)
|
||||
BuildRequires: sed
|
||||
# Optional:
|
||||
BuildRequires: perl(File::Spec)
|
||||
# YAML::Syck is not used because @ST_PREFS is empty in Makefile.PL
|
||||
@ -70,6 +76,7 @@ BuildRequires: perl(Getopt::Std)
|
||||
# HTTP::Request is optional
|
||||
BuildRequires: perl(HTTP::Tiny) >= 0.005
|
||||
BuildRequires: perl(if)
|
||||
# IO::Socket::SSL 1.56 is optional
|
||||
# YAML::XS or YAML::Syck or JSON::PP, we already use YAML::Syck at a different
|
||||
# place, keep JSON::PP optional
|
||||
BuildRequires: perl(lib)
|
||||
@ -82,6 +89,7 @@ BuildRequires: perl(lib)
|
||||
# Net::Config not used at tests
|
||||
# Net::FTP not used at tests
|
||||
# Net::Ping is required but >= 2.13 version is a soft dependency
|
||||
# Net::SSLeay 1.49 is optional
|
||||
BuildRequires: perl(Net::Ping)
|
||||
BuildRequires: perl(overload)
|
||||
# Pod::Perldoc is optional
|
||||
@ -154,6 +162,14 @@ BuildRequires: perl(YAML) >= 0.60
|
||||
|
||||
Requires: make
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
||||
# Some subpackages modules are not dual-lived. E.g. "open". If a distribution
|
||||
# on CPAN declares a dependency on such a module, CPAN client will fail
|
||||
# because the only provider is perl distribution.
|
||||
# Another issue is with dual-lived modules whose distribution actually does
|
||||
# not declare all needed core dependencies and the installation would also
|
||||
# fail.
|
||||
# As a result, any CPAN client must run-require the complete perl.
|
||||
Requires: perl
|
||||
Requires: perl(Archive::Tar) >= 1.50
|
||||
%if !%{defined perl_bootstrap}
|
||||
Recommends: perl(CPAN::DistnameInfo)
|
||||
@ -198,6 +214,11 @@ Requires: perl(Digest::SHA)
|
||||
Requires: perl(Dumpvalue)
|
||||
Requires: perl(ExtUtils::CBuilder)
|
||||
%if ! %{defined perl_bootstrap}
|
||||
Requires: perl(IO::Socket::SSL) >= 1.56
|
||||
Requires: perl(Net::SSLeay) >= 1.49
|
||||
Requires: perl(Module::Signature)
|
||||
%endif
|
||||
%if ! %{defined perl_bootstrap}
|
||||
# Avoid circular deps local::lib -> Module::Install -> CPAN when bootstraping
|
||||
# local::lib recommended by CPAN::FirstTime default choice, bug #1122498
|
||||
Requires: perl(local::lib)
|
||||
@ -221,7 +242,10 @@ Provides: cpan = %{version}
|
||||
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mac::BuildTools\\)
|
||||
# Filter under-specified dependencies
|
||||
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(CPAN::Meta::Requirements\\)
|
||||
|
||||
# Filter modules bundled for tests
|
||||
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
|
||||
%global __requires_exclude %{__requires_exclude}|^perl\\(CPAN::MyConfig\\)
|
||||
%global __requires_exclude %{__requires_exclude}|^perl\\(local_utils\\)
|
||||
|
||||
%description
|
||||
The CPAN module automates or at least simplifies the make and install of
|
||||
@ -229,15 +253,34 @@ perl modules and extensions. It includes some primitive searching
|
||||
capabilities and knows how to use LWP, HTTP::Tiny, Net::FTP and certain
|
||||
external download clients to fetch distributions from the net.
|
||||
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: perl-Test-Harness
|
||||
|
||||
%description tests
|
||||
Tests from %{name}. Execute them
|
||||
with "%{_libexecdir}/%{name}/test".
|
||||
|
||||
%prep
|
||||
%setup -q -n CPAN-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p1
|
||||
%patch -P2 -p1
|
||||
%patch -P3 -p1
|
||||
%patch -P4 -p1
|
||||
%patch -P5 -p1
|
||||
# Change configuration name
|
||||
find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \;
|
||||
find -type f -exec perl -i -pe 's/XCPANCONFIGNAMEX/cpan/g' {} \;
|
||||
# Remove bundled modules
|
||||
rm -r ./inc/*
|
||||
sed -i -e '/inc\//d' MANIFEST
|
||||
perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
|
||||
|
||||
# Help generators to recognize 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
|
||||
@ -247,6 +290,38 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||
%{make_install}
|
||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
||||
|
||||
# Install tests
|
||||
mkdir -p %{buildroot}%{_libexecdir}/%{name}
|
||||
cp -a t distroprefs %{buildroot}%{_libexecdir}/%{name}
|
||||
# Does not work with system module
|
||||
rm %{buildroot}%{_libexecdir}/%{name}/t/51pod.t
|
||||
# Remove the tests which need ./lib and ./blib
|
||||
rm %{buildroot}%{_libexecdir}/%{name}/t/03pkgs.t
|
||||
rm %{buildroot}%{_libexecdir}/%{name}/t/04clean_load.t
|
||||
# Needed internet connection
|
||||
rm %{buildroot}%{_libexecdir}/%{name}/t/31sessions.t
|
||||
# Use system modules for tests
|
||||
perl -i -ple 's{-Mblib}{}' %{buildroot}%{_libexecdir}/%{name}/t/97-run.t
|
||||
perl -i -ple 's{-Mblib}{}' %{buildroot}%{_libexecdir}/%{name}/t/97-return_values.t
|
||||
mkdir -p %{buildroot}%{_libexecdir}/%{name}/blib/script
|
||||
ln -s %{_bindir}/cpan %{buildroot}%{_libexecdir}/%{name}/blib/script
|
||||
cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
unset AUTHOR_TEST CPAN_EXPECT_TIMEOUT CPAN_RUN_SHELL_TEST_WITHOUT_EXPECT \
|
||||
ftp_proxy http_proxy no_proxy \
|
||||
PERL5_CPAN_IS_RUNNING PERL5_CPAN_IS_RUNNING_IN_RECURSION PERL_CORE VERBOSE
|
||||
# Some tests write into temporary files/directories. The easiest solution
|
||||
# is to copy the tests into a writable directory and execute them from there.
|
||||
DIR=$(mktemp -d)
|
||||
pushd "$DIR"
|
||||
cp -a %{_libexecdir}/%{name}/* ./
|
||||
prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
|
||||
popd
|
||||
rm -rf "$DIR"
|
||||
EOF
|
||||
chmod +x %{buildroot}%{_libexecdir}/%{name}/test
|
||||
|
||||
%check
|
||||
unset AUTHOR_TEST CPAN_EXPECT_TIMEOUT CPAN_RUN_SHELL_TEST_WITHOUT_EXPECT \
|
||||
ftp_proxy http_proxy no_proxy \
|
||||
@ -260,7 +335,58 @@ make test
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files tests
|
||||
%{_libexecdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Mar 03 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-5
|
||||
- Resolves: RHEL-77187 - Update man page
|
||||
|
||||
* Thu Feb 13 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-4
|
||||
- Resolves: RHEL-77187
|
||||
- Fix permission for creating site directories
|
||||
|
||||
* Tue Aug 01 2023 Michal Josef Špaček <mspacek@redhat.com> - 2.29-3
|
||||
- Resolves: rhbz#2218907 - Fix CVE-2023-31484
|
||||
|
||||
* Wed Feb 16 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-2
|
||||
- Resolves: rhbz#2037211 - Enable gating
|
||||
|
||||
* Mon Feb 07 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-1
|
||||
- 2.29 bump; Package tests
|
||||
- Resolves: rhbz#2037211
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.28-8
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.28-7
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.28-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Sep 23 2020 Petr Pisar <ppisar@redhat.com> - 2.28-5
|
||||
- Run-require complete perl
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.28-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-3
|
||||
- Perl 5.32 re-rebuild of bootstrapped packages
|
||||
|
||||
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-2
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Mon Jun 15 2020 Petr Pisar <ppisar@redhat.com> - 2.28-1
|
||||
- 2.28 bump
|
||||
|
||||
* Fri Jan 31 2020 Petr Pisar <ppisar@redhat.com> - 2.27-4
|
||||
- Enable loading objects from session YAML files (CPAN RT#131615)
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
5
plans/sanity.fmf
Normal file
5
plans/sanity.fmf
Normal file
@ -0,0 +1,5 @@
|
||||
summary: Sanity tests
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (CPAN-2.29.tar.gz) = ef25f4575e41d11064e516739af95808d5d425fefb2693db1f91733e6d3064650273712325a0b862e8d88105c79d323e1f6f14430608effe0f2a04534d7213a1
|
||||
9
tests/upstream-tests.fmf
Normal file
9
tests/upstream-tests.fmf
Normal file
@ -0,0 +1,9 @@
|
||||
summary: Upstream tests
|
||||
component: perl-CPAN
|
||||
require: perl-CPAN-tests
|
||||
test: /usr/libexec/perl-CPAN/test
|
||||
extra-nitrate: TC#0615621
|
||||
id: cccba9e5-afb8-4aa3-afc3-a085167bee04
|
||||
tag:
|
||||
- Tier2
|
||||
- rhel-buildroot
|
||||
Loading…
Reference in New Issue
Block a user