!21 使补丁生效

From: @shangyibin 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong

backport-CVE-2021-36770.patch

@@ -1,25 +1,15 @@
 From 527e482dc70b035d0df4f8c77a00d81f8d775c74 Mon Sep 17 00:00:00 2001
-From: Dan Kogai <dankogai+github@github.com>
+From: Dan Kogai <dankogai+github@gmail.com>
 Date: Mon, 9 Aug 2021 23:19:25 +0900
 Subject: [PATCH] version 3.12 to address CVE-2021-36770
-
 ---
- Encode.pm | 6 +++---
+ Encode.pm | 4 ++--
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Encode.pm b/Encode.pm
-index de06ba1..0bb44dd 100644
+index de06ba1..4ec7d86 100644
 --- a/Encode.pm
 +++ b/Encode.pm
-@@ -7,7 +7,7 @@ use warnings;
- use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
- our $VERSION;
- BEGIN {
--    $VERSION = sprintf "%d.%02d", q$Revision: 3.06 $ =~ /(\d+)/g;
-+    $VERSION = sprintf "%d.%02d", q$Revision: 3.12 $ =~ /(\d+)/g;
-     require XSLoader;
-     XSLoader::load( __PACKAGE__, $VERSION );
- }
 @@ -65,8 +65,8 @@ require Encode::Config;
  eval {
      local $SIG{__DIE__};
@@ -32,5 +22,5 @@ index de06ba1..0bb44dd 100644
  };
  
 -- 
-2.27.0
+2.33.0
 

perl-Encode.spec

@@ -2,7 +2,7 @@
 Name:           perl-Encode
 Epoch:          4
 Version:        %{cpan_version}
-Release:        2
+Release:        3
 Summary:        Character encodings in Perl
 License:        (GPL+ or Artistic) and Artistic 2.0 and UCD
 URL:            https://metacpan.org/release/Encode
@@ -58,6 +58,7 @@ The easiest and the best alternative is to write your script in UTF-8.
 
 %prep
 %setup -q -n Encode-%{cpan_version}
+%patch6000 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
@@ -96,6 +97,12 @@ make test
 %{_mandir}/man3/Encode::*
 
 %changelog
+* Wed Jun 29 2022 shangyibin<shangyibin1@h-partners.com> - 3.06-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add patch
+
 * Fri Feb 25 2022 wangjiang<wangjiang37@h-partners.com> - 3.06-2
 - Type:CVE
 - ID:CVE-2021-36770