Compare commits

...

No commits in common. "c8-stream-5.3" and "stream-perl-5.24-rhel-8.9.0" have entirely different histories.

7 changed files with 59 additions and 89 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/Encode-3.01.tar.gz SOURCES/Encode-2.88.tar.gz
/Encode-2.88.tar.gz

View File

@ -1 +0,0 @@
39db23dce79fda1c775099663d3ce59745847871 SOURCES/Encode-3.01.tar.gz

View File

@ -0,0 +1,27 @@
From 3772892b334a631b7bbf9a8ffbcb19e327d96e29 Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@semiotic.systems>
Date: Sat, 17 Jul 2021 14:46:10 -0400
Subject: [PATCH] mitigate @INC pollution when loading ConfigLocal
---
Encode.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Encode.pm b/Encode.pm
index a56a999..9691382 100644
--- a/Encode.pm
+++ b/Encode.pm
@@ -65,8 +65,8 @@ require Encode::Config;
eval {
local $SIG{__DIE__};
local $SIG{__WARN__};
- local @INC = @INC || ();
- pop @INC if $INC[-1] eq '.';
+ local @INC = @INC;
+ pop @INC if @INC && $INC[-1] eq '.';
require Encode::ConfigLocal;
};
--
2.30.1 (Apple Git-130)

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

2
perl-Encode.rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
from Config import *
addFilter("spelling-error .* (encodings|pragma|ucm)");

View File

@ -1,6 +1,6 @@
# Because encoding sub-package has an independent version, version macro gets # Because encoding sub-package has independent version, version macro gets
# redefined. # redefined.
%global cpan_version 3.01 %global cpan_version 2.88
Name: perl-Encode Name: perl-Encode
Epoch: 4 Epoch: 4
Version: %{cpan_version} Version: %{cpan_version}
@ -8,22 +8,24 @@ Version: %{cpan_version}
# perl-encoding sub-package has independent version which does not change # perl-encoding sub-package has independent version which does not change
# often and consecutive builds would clash on perl-encoding NEVRA. This is the # often and consecutive builds would clash on perl-encoding NEVRA. This is the
# same case as in perl.spec. # same case as in perl.spec.
Release: 439%{?dist} Release: 7%{?dist}
Summary: Character encodings in Perl Summary: Character encodings in Perl
# ucm: UCD # ucm: UCD
# bin/encguess: Artistic 2.0 # bin/encguess: Artistic 2.0
# other files: GPL+ or Artistic # other files: GPL+ or Artistic
License: (GPL+ or Artistic) and Artistic 2.0 and UCD License: (GPL+ or Artistic) and Artistic 2.0 and UCD
URL: https://metacpan.org/release/Encode Group: Development/Libraries
Source0: https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz URL: http://search.cpan.org/dist/Encode/
Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz
BuildRequires: coreutils
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
BuildRequires: perl
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(Config) BuildRequires: perl(Config)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Spec) BuildRequires: perl(File::Spec)
BuildRequires: perl(File::Spec::Functions) BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(strict) BuildRequires: perl(strict)
@ -46,7 +48,7 @@ BuildRequires: perl(parent) >= 0.221
# PerlIO::encoding is optional # PerlIO::encoding is optional
# POSIX is optional # POSIX is optional
BuildRequires: perl(re) BuildRequires: perl(re)
BuildRequires: perl(Storable) # Storable is optional
BuildRequires: perl(utf8) BuildRequires: perl(utf8)
BuildRequires: perl(vars) BuildRequires: perl(vars)
BuildRequires: perl(XSLoader) BuildRequires: perl(XSLoader)
@ -60,9 +62,7 @@ BuildRequires: perl(FindBin)
BuildRequires: perl(IO::Select) BuildRequires: perl(IO::Select)
BuildRequires: perl(IPC::Open3) BuildRequires: perl(IPC::Open3)
# IPC::Run not used # IPC::Run not used
# JSON::PP not used
BuildRequires: perl(lib) BuildRequires: perl(lib)
BuildRequires: perl(open)
BuildRequires: perl(Scalar::Util) BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Symbol) BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
@ -82,8 +82,9 @@ of the system. Perl strings are sequences of characters.
%package -n perl-encoding %package -n perl-encoding
Summary: Write your Perl script in non-ASCII or non-UTF-8 Summary: Write your Perl script in non-ASCII or non-UTF-8
Version: 2.22 Version: 2.19
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries
# Keeping this sub-package arch-specific because it installs files into # Keeping this sub-package arch-specific because it installs files into
# arch-specific directories. # arch-specific directories.
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@ -92,7 +93,7 @@ Requires: perl(Carp)
# Consider Filter::Util::Call as mandatory, bug #1165183, CPAN RT#100427 # Consider Filter::Util::Call as mandatory, bug #1165183, CPAN RT#100427
Requires: perl(Filter::Util::Call) Requires: perl(Filter::Util::Call)
# I18N::Langinfo is optional # I18N::Langinfo is optional
Suggests: perl(PerlIO::encoding) # PerlIO::encoding is optional
Requires: perl(utf8) Requires: perl(utf8)
Conflicts: perl-Encode < 2:2.64-2 Conflicts: perl-Encode < 2:2.64-2
@ -113,6 +114,7 @@ The easiest and the best alternative is to write your script in UTF-8.
Summary: Perl Encode Module Generator Summary: Perl Encode Module Generator
Version: %{cpan_version} Version: %{cpan_version}
License: (GPL+ or Artistic) and UCD License: (GPL+ or Artistic) and UCD
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Recommends: perl-devel%{?_isa} Recommends: perl-devel%{?_isa}
@ -130,18 +132,16 @@ your own encoding to perl. No knowledge of XS is necessary.
%build %build
# Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by # Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by
# INSTALL_UCM. # INSTALL_UCM.
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%{make_build}
%install %install
%{make_install} make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete find $RPM_BUILD_ROOT -type f -name .packlist -delete
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
unset AUTHOR_TESTING ENC2XS_VERBOSE MAKEFLAGS PERL_CORE PERL_ENCODING \
PERL_ENCODE_DEBUG RELEASE_TESTING
make test make test
%files %files
@ -169,74 +169,8 @@ make test
%{perl_vendorarch}/Encode/encode.h %{perl_vendorarch}/Encode/encode.h
%changelog %changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.01-439 * Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4:2.88-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuild with enable hardening (bug #1636329)
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.01-438
- Increase release to favour standalone package
* Wed Mar 13 2019 Petr Pisar <ppisar@redhat.com> - 4:3.01-10
- 3.01 bump
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.00-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jan 31 2019 Petr Pisar <ppisar@redhat.com> - 4:3.00-8
- 3.00 bump
* Mon Jan 21 2019 Petr Pisar <ppisar@redhat.com> - 4:2.99-7
- 2.99 bump
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4:2.98-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4:2.98-5
- Perl 5.28 rebuild
* Mon Apr 23 2018 Petr Pisar <ppisar@redhat.com> - 4:2.98-4
- 2.98 bump
* Wed Feb 21 2018 Petr Pisar <ppisar@redhat.com> - 4:2.97-3
- 2.97 bump
* Mon Feb 19 2018 Petr Pisar <ppisar@redhat.com> - 4:2.96-2
- Preserve a warning on Perl 5.26.1 (bug #1544345)
* Mon Feb 12 2018 Petr Pisar <ppisar@redhat.com> - 4:2.96-1
- 2.96 bump
* Thu Feb 08 2018 Petr Pisar <ppisar@redhat.com> - 4:2.95-1
- 2.95 bump
* Tue Jan 09 2018 Petr Pisar <ppisar@redhat.com> - 4:2.94-16
- 2.94 bump
* Mon Oct 09 2017 Petr Pisar <ppisar@redhat.com> - 4:2.93-15
- 2.93 bump
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4:2.92-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4:2.92-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 19 2017 Petr Pisar <ppisar@redhat.com> - 4:2.92-12
- 2.92 bump
* Thu Jun 22 2017 Petr Pisar <ppisar@redhat.com> - 4:2.91-11
- 2.91 bump
* Thu Jun 22 2017 Petr Pisar <ppisar@redhat.com> - 4:2.90-10
- Fix "use parent q{Encode::Encoding}" (CPAN RT#122167)
* Mon Jun 12 2017 Petr Pisar <ppisar@redhat.com> - 4:2.90-9
- 2.90 bump
* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4:2.89-8
- Perl 5.26 rebuild
* Fri Apr 21 2017 Petr Pisar <ppisar@redhat.com> - 4:2.89-7
- 2.89 bump
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4:2.88-6 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4:2.88-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (Encode-2.88.tar.gz) = 1261415abd9c2ad5f8d009441e1f2f541d7e94c570549d3b895df57d5c7480087ec646b2691724007a5797238cb7249347d9b97b7c46018973a7ef33274fe162