Compare commits

...

No commits in common. "c8-stream-5.3" and "c9s" have entirely different histories.

7 changed files with 142 additions and 7 deletions

57
.gitignore vendored
View File

@ -1 +1,56 @@
SOURCES/Encode-3.01.tar.gz /Encode-2.47.tar.gz
/Encode-2.48.tar.gz
/Encode-2.49.tar.gz
/Encode-2.50.tar.gz
/Encode-2.51.tar.gz
/Encode-2.52.tar.gz
/Encode-2.54.tar.gz
/Encode-2.55.tar.gz
/Encode-2.57.tar.gz
/Encode-2.58.tar.gz
/Encode-2.59.tar.gz
/Encode-2.60.tar.gz
/Encode-2.62.tar.gz
/Encode-2.63.tar.gz
/Encode-2.64.tar.gz
/Encode-2.66.tar.gz
/Encode-2.67.tar.gz
/Encode-2.68.tar.gz
/Encode-2.70.tar.gz
/Encode-2.71.tar.gz
/Encode-2.72.tar.gz
/Encode-2.73.tar.gz
/Encode-2.74.tar.gz
/Encode-2.75.tar.gz
/Encode-2.76.tar.gz
/Encode-2.77.tar.gz
/Encode-2.78.tar.gz
/Encode-2.79.tar.gz
/Encode-2.80.tar.gz
/Encode-2.82.tar.gz
/Encode-2.83.tar.gz
/Encode-2.84.tar.gz
/Encode-2.85.tar.gz
/Encode-2.86.tar.gz
/Encode-2.87.tar.gz
/Encode-2.88.tar.gz
/Encode-2.89.tar.gz
/Encode-2.90.tar.gz
/Encode-2.91.tar.gz
/Encode-2.92.tar.gz
/Encode-2.93.tar.gz
/Encode-2.94.tar.gz
/Encode-2.95.tar.gz
/Encode-2.96.tar.gz
/Encode-2.97.tar.gz
/Encode-2.98.tar.gz
/Encode-2.99.tar.gz
/Encode-3.00.tar.gz
/Encode-3.01.tar.gz
/Encode-3.02.tar.gz
/Encode-3.03.tar.gz
/Encode-3.04.tar.gz
/Encode-3.05.tar.gz
/Encode-3.06.tar.gz
/Encode-3.07.tar.gz
/Encode-3.08.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 an independent version, version macro gets
# redefined. # redefined.
%global cpan_version 3.01 %global cpan_version 3.08
Name: perl-Encode Name: perl-Encode
Epoch: 4 Epoch: 4
Version: %{cpan_version} Version: %{cpan_version}
@ -8,7 +8,7 @@ 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: 462%{?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
@ -16,6 +16,8 @@ Summary: Character encodings in Perl
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 URL: https://metacpan.org/release/Encode
Source0: https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz
# Encode.pm does not load code from outside expected @INC (rhbz#1984005, CVE-2021-36770)
Patch0: Encode-3.08-mitigate-INC-pollution-when-loading-ConfigLocal.patch
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
@ -52,6 +54,7 @@ BuildRequires: perl(vars)
BuildRequires: perl(XSLoader) BuildRequires: perl(XSLoader)
# Tests: # Tests:
# Benchmark not used # Benchmark not used
BuildRequires: perl(blib)
BuildRequires: perl(charnames) BuildRequires: perl(charnames)
BuildRequires: perl(File::Compare) BuildRequires: perl(File::Compare)
BuildRequires: perl(File::Copy) BuildRequires: perl(File::Copy)
@ -82,7 +85,7 @@ 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: 3.00
License: GPL+ or Artistic License: GPL+ or Artistic
# 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.
@ -126,6 +129,7 @@ your own encoding to perl. No knowledge of XS is necessary.
%prep %prep
%setup -q -n Encode-%{cpan_version} %setup -q -n Encode-%{cpan_version}
%patch0 -p1
%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
@ -140,8 +144,8 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
unset AUTHOR_TESTING ENC2XS_VERBOSE MAKEFLAGS PERL_CORE PERL_ENCODING \ unset AUTHOR_TESTING ENC2XS_NO_COMMENTS ENC2XS_VERBOSE MAKEFLAGS PERL_CORE \
PERL_ENCODE_DEBUG RELEASE_TESTING PERL_ENCODING PERL_ENCODE_DEBUG
make test make test
%files %files
@ -169,6 +173,47 @@ make test
%{perl_vendorarch}/Encode/encode.h %{perl_vendorarch}/Encode/encode.h
%changelog %changelog
* Tue Aug 10 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.08-462
- Resolves: rhbz#1984005, CVE-2021-36770 - mitigate @INC pollution when
loading ConfigLocal
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4:3.08-461
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4:3.08-460
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.08-459
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 02 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.08-458
- 3.08 bump
* Mon Jul 27 2020 Petr Pisar <ppisar@redhat.com> - 4:3.07-457
- 3.07 bump
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.06-456
- Increase release to favour standalone package
* Mon May 04 2020 Petr Pisar <ppisar@redhat.com> - 4:3.06-445
- 3.06 bump
* Thu Mar 19 2020 Petr Pisar <ppisar@redhat.com> - 4:3.05-444
- 3.05 bump
* Wed Mar 11 2020 Petr Pisar <ppisar@redhat.com> - 4:3.04-443
- 3.04 bump
* Mon Mar 02 2020 Petr Pisar <ppisar@redhat.com> - 4:3.03-442
- 3.03 bump
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.02-441
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 02 2020 Petr Pisar <ppisar@redhat.com> - 4:3.02-440
- 3.02 bump
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.01-439 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.01-439
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (Encode-3.08.tar.gz) = 70490040347a3cc673d23c74f26a7c825691066cc3bbd16d2f72f745dd100c36de6694c44d6f78564c6cb579e43822a040ad7f29ad571ab7b4f6233eef566fee