.gitignore

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

.perl-Encode.metadata

@@ -1 +1 @@
-733b698bdb0c77e597eba1e87fda958d31c93b55 SOURCES/Encode-3.08.tar.gz
+ee9540508e5539e854baa2da5be30bef63864a2b SOURCES/Encode-3.21.tar.gz

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

@@ -1,27 +0,0 @@
-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 an independent version, version macro gets
 # redefined.
-%global cpan_version 3.08
+%global cpan_version 3.21
 Name:           perl-Encode
 Epoch:          4
 Version:        %{cpan_version}
@@ -8,16 +8,16 @@ 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:        462%{?dist}
+Release:        511%{?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
+# ucm:          license in this repository can be ingored based on
+# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/30#note_1435176617
+# bin/encguess: Artistic-2.0
+# other files:  GPL-1.0-or-later OR Artistic-1.0-Perl
+License:        (GPL-1.0-or-later OR Artistic-1.0-Perl) AND Artistic-2.0
 URL:            https://metacpan.org/release/Encode
 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:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
@@ -56,8 +56,10 @@ BuildRequires:  perl(XSLoader)
 # Benchmark not used
 BuildRequires:  perl(blib)
 BuildRequires:  perl(charnames)
+BuildRequires:  perl(Devel::Peek)
 BuildRequires:  perl(File::Compare)
 BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(FileHandle)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(IO::Select)
@@ -66,11 +68,11 @@ BuildRequires:  perl(IPC::Open3)
 # JSON::PP not used
 BuildRequires:  perl(lib)
 BuildRequires:  perl(open)
+BuildRequires:  perl(PerlIO::encoding)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Symbol)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Tie::Scalar)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(parent) >= 0.221
 
 %{?perl_default_filter}
@@ -86,10 +88,9 @@ 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:        3.00
-License:        GPL+ or Artistic
+License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 # Keeping this sub-package arch-specific because it installs files into
 # arch-specific directories.
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
 # Config not needed on perl ≥ 5.008
 # Consider Filter::Util::Call as mandatory, bug #1165183, CPAN RT#100427
@@ -115,9 +116,8 @@ The easiest and the best alternative is to write your script in UTF-8.
 %package devel
 Summary:        Perl Encode Module Generator
 Version:        %{cpan_version}
-License:        (GPL+ or Artistic) and UCD
+License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 Requires:       %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release}
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Recommends:     perl-devel%{?_isa}
 Requires:       perl(Encode)
 
@@ -126,26 +126,66 @@ enc2xs builds a Perl extension for use by Encode from either Unicode Character
 Mapping files (.ucm) or Tcl Encoding Files (.enc). You can use enc2xs to add
 your own encoding to perl. No knowledge of XS is necessary.
 
+%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".
+
+# Filter modules bundled for tests
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mod_EUCJP\\)
 
 %prep
 %setup -q -n Encode-%{cpan_version}
-%patch0 -p1
+
+# Help generators to recognize Perl scripts
+for F in t/*.t t/*.pl; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
 
 %build
 # Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by
 # INSTALL_UCM.
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \
-    OPTIMIZE="$RPM_OPT_FLAGS"
+    OPTIMIZE="%{optflags}"
 %{make_build}
 
 %install
 %{make_install}
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete
-%{_fixperms} $RPM_BUILD_ROOT/*
+find %{buildroot} -type f -name '*.bs' -empty -delete
+%{_fixperms} %{buildroot}/*
+
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+# Remove blib code
+perl -i -pe 's{catdir\(\$blib, }{catdir("/usr", }' %{buildroot}%{_libexecdir}/%{name}/t/piconv.t
+perl -i -pe 's{, "-Mblib=\$blib"}{}' %{buildroot}%{_libexecdir}/%{name}/t/piconv.t
+mkdir -p %{buildroot}%{_libexecdir}/%{name}/bin
+ln -s %{_bindir}/piconv %{buildroot}%{_libexecdir}/%{name}/bin
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/bash
+set -e
+# 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_TESTING ENC2XS_NO_COMMENTS ENC2XS_VERBOSE MAKEFLAGS PERL_CORE \
     PERL_ENCODING PERL_ENCODE_DEBUG
+export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
 make test
 
 %files
@@ -172,17 +212,94 @@ make test
 %{perl_vendorarch}/Encode/*.e2x
 %{perl_vendorarch}/Encode/encode.h
 
+%files tests
+%{_libexecdir}/%{name}
+
 %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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4:3.21-511
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Jul 18 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.21-510
+- Increase release to favour standalone package
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4:3.21-505
+- Bump release for June 2024 mass rebuild
+
+* Tue Jun 18 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.21-504
+- Resolves: RHEL-43260 - Update to 3.21
+- Update License tag
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.20-503
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.20-502
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Nov 10 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.20-501
+- 3.20 bump (rhbz#2248987)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.19-500
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.19-499
+- Increase release to favour standalone package
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.19-493
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Aug 15 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.19-492
+- Increase release to solve conflicts with sub-package perl-encoding in the
+  module perl-bootstrap
+
+* Fri Aug 05 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.19-491
+- 3.19 bump
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.18-490
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 27 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.18-489
+- 3.18 bump
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.17-488
+- Increase release to favour standalone package
+
+* Thu Apr 07 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.17-485
+- 3.17 bump
+- Package tests
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.16-484
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 25 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.16-483
+- 3.16 bump
+
+* Sun Oct 10 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.15-482
+- 3.15 bump
+
+* Wed Oct 06 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.13-481
+- 3.13 bump
+
+* Mon Aug 09 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.12-480
+- 3.12 bump
+
+* Fri Jul 23 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.11-479
+- 3.11 bump
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.10-478
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.10-477
+- Increase release to favour standalone package
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.10-461
+- Perl 5.34 rebuild
 
-* 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
+* Tue May 18 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.10-460
+- 3.10 bump
 
-* 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
+* Fri May 14 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4:3.09-1
+- 3.09 bump
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:3.08-459
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild