.gitignore

@@ -1 +1 @@
-SOURCES/Encode-2.88.tar.gz
+SOURCES/Encode-3.08.tar.gz

.perl-Encode.metadata

@@ -1 +1 @@
-d074105a1a69614cd7c3efc1f390d63c7226bac8 SOURCES/Encode-2.88.tar.gz
+733b698bdb0c77e597eba1e87fda958d31c93b55 SOURCES/Encode-3.08.tar.gz

SOURCES/Encode-3.08-mitigate-INC-pollution-when-loading-ConfigLocal.patch

@@ -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)
+

SPECS/perl-Encode.spec

@@ -1,6 +1,6 @@
-# Because encoding sub-package has independent version, version macro gets
+# Because encoding sub-package has an independent version, version macro gets
 # redefined.
-%global cpan_version 2.88
+%global cpan_version 3.08
 Name:           perl-Encode
 Epoch:          4
 Version:        %{cpan_version}
@@ -8,24 +8,24 @@ Version:        %{cpan_version}
 # perl-encoding sub-package has independent version which does not change
 # often and consecutive builds would clash on perl-encoding NEVRA. This is the
 # same case as in perl.spec.
-Release:        6%{?dist}
+Release:        462%{?dist}
 Summary:        Character encodings in Perl
 # ucm:          UCD
 # bin/encguess: Artistic 2.0
 # other files:  GPL+ or Artistic
 License:        (GPL+ or Artistic) and Artistic 2.0 and UCD
-Group:          Development/Libraries
+URL:            https://metacpan.org/release/Encode
-URL:            http://search.cpan.org/dist/Encode/
+Source0:        https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz
-Source0:        http://www.cpan.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)
-BuildRequires:  coreutils
+Patch0:         Encode-3.08-mitigate-INC-pollution-when-loading-ConfigLocal.patch
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  perl
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(Config)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(strict)
@@ -48,12 +48,13 @@ BuildRequires:  perl(parent) >= 0.221
 # PerlIO::encoding is optional
 # POSIX is optional
 BuildRequires:  perl(re)
-# Storable is optional
+BuildRequires:  perl(Storable)
 BuildRequires:  perl(utf8)
 BuildRequires:  perl(vars)
 BuildRequires:  perl(XSLoader)
 # Tests:
 # Benchmark not used
+BuildRequires:  perl(blib)
 BuildRequires:  perl(charnames)
 BuildRequires:  perl(File::Compare)
 BuildRequires:  perl(File::Copy)
@@ -62,7 +63,9 @@ BuildRequires:  perl(FindBin)
 BuildRequires:  perl(IO::Select)
 BuildRequires:  perl(IPC::Open3)
 # IPC::Run not used
+# JSON::PP not used
 BuildRequires:  perl(lib)
+BuildRequires:  perl(open)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Symbol)
 BuildRequires:  perl(Test::More)
@@ -82,9 +85,8 @@ of the system. Perl strings are sequences of characters.
 
 %package -n perl-encoding
 Summary:        Write your Perl script in non-ASCII or non-UTF-8
-Version:        2.19
+Version:        3.00
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 # Keeping this sub-package arch-specific because it installs files into
 # arch-specific directories.
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -93,7 +95,7 @@ Requires:       perl(Carp)
 # Consider Filter::Util::Call as mandatory, bug #1165183, CPAN RT#100427
 Requires:       perl(Filter::Util::Call)
 # I18N::Langinfo is optional
-# PerlIO::encoding is optional
+Suggests:       perl(PerlIO::encoding)
 Requires:       perl(utf8)
 Conflicts:      perl-Encode < 2:2.64-2
 
@@ -114,7 +116,6 @@ The easiest and the best alternative is to write your script in UTF-8.
 Summary:        Perl Encode Module Generator
 Version:        %{cpan_version}
 License:        (GPL+ or Artistic) and UCD
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release}
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Recommends:     perl-devel%{?_isa}
@@ -128,20 +129,23 @@ your own encoding to perl. No knowledge of XS is necessary.
 
 %prep
 %setup -q -n Encode-%{cpan_version}
+%patch0 -p1
 
 %build
 # Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by
 # INSTALL_UCM.
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \
-make %{?_smp_mflags}
+    OPTIMIZE="$RPM_OPT_FLAGS"
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
-find $RPM_BUILD_ROOT -type f -name .packlist -delete
+find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
+unset AUTHOR_TESTING ENC2XS_NO_COMMENTS ENC2XS_VERBOSE MAKEFLAGS PERL_CORE \
+    PERL_ENCODING PERL_ENCODE_DEBUG
 make test
 
 %files
@@ -169,6 +173,116 @@ make test
 %{perl_vendorarch}/Encode/encode.h
 
 %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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild