Compare commits
10 Commits
c18cf4266a
...
0e8c93d640
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e8c93d640 | ||
|
|
4447b36d1c | ||
|
|
39afe843ec | ||
|
|
a6204af2ab | ||
|
|
e28c56690c | ||
|
|
fbf053d4d3 | ||
|
|
1ce9ee1e1e | ||
|
|
39ca845105 | ||
|
|
9d2ae95410 | ||
|
|
3825e89175 |
Binary file not shown.
BIN
Encode-3.06.tar.gz
Normal file
BIN
Encode-3.06.tar.gz
Normal file
Binary file not shown.
26
backport-CVE-2021-36770.patch
Normal file
26
backport-CVE-2021-36770.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 527e482dc70b035d0df4f8c77a00d81f8d775c74 Mon Sep 17 00:00:00 2001
|
||||||
|
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 | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Encode.pm b/Encode.pm
|
||||||
|
index de06ba1..4ec7d86 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.33.0
|
||||||
|
|
||||||
@ -1,19 +1,22 @@
|
|||||||
%global cpan_version 2.98
|
%global cpan_version 3.06
|
||||||
Name: perl-Encode
|
Name: perl-Encode
|
||||||
Epoch: 4
|
Epoch: 4
|
||||||
Version: %{cpan_version}
|
Version: %{cpan_version}
|
||||||
Release: 8
|
Release: 4
|
||||||
Summary: Character encodings in Perl
|
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
|
||||||
|
|
||||||
|
Patch6000: backport-CVE-2021-36770.patch
|
||||||
|
|
||||||
BuildRequires: findutils gcc make perl-devel perl-generators perl-interpreter perl(Config) perl(ExtUtils::MakeMaker) perl(File::Spec) perl(File::Spec::Functions) perl(strict) perl(warnings)
|
BuildRequires: findutils gcc make perl-devel perl-generators perl-interpreter perl(Config) perl(ExtUtils::MakeMaker) perl(File::Spec) perl(File::Spec::Functions) perl(strict) perl(warnings)
|
||||||
BuildRequires: perl(bytes) perl(Carp) perl(constant) perl(Exporter) perl(File::Basename) perl(File::Find) perl(Filter::Util::Call) perl(Getopt::Long) perl(Getopt::Std)
|
BuildRequires: perl(bytes) perl(Carp) perl(constant) perl(Exporter) perl(File::Basename) perl(File::Find) perl(Filter::Util::Call) perl(Getopt::Long) perl(Getopt::Std)
|
||||||
BuildRequires: perl(MIME::Base64) perl(overload) perl(parent) perl(re) perl(Storable) perl(utf8) perl(vars) perl(XSLoader)
|
BuildRequires: perl(MIME::Base64) perl(overload) perl(parent) perl(re) perl(Storable) perl(utf8) perl(vars) perl(XSLoader)
|
||||||
|
|
||||||
BuildRequires: perl(charnames) perl(File::Compare) perl(File::Copy) perl(FileHandle) perl(FindBin) perl(IO::Select) perl(IPC::Open3)
|
BuildRequires: perl(charnames) perl(File::Compare) perl(File::Copy) perl(FileHandle) perl(FindBin) perl(IO::Select) perl(IPC::Open3)
|
||||||
BuildRequires: perl(lib) perl(open) perl(Scalar::Util) perl(Symbol) perl(Test::More) perl(Tie::Scalar)
|
BuildRequires: perl(lib) perl(open) perl(Scalar::Util) perl(Symbol) perl(Test::More) perl(Tie::Scalar)
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) perl(parent) >= 0.221
|
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) perl(parent)
|
||||||
|
|
||||||
%{?perl_default_filter}
|
%{?perl_default_filter}
|
||||||
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((Encode::ConfigLocal|MY)\\)
|
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((Encode::ConfigLocal|MY)\\)
|
||||||
@ -55,8 +58,11 @@ The easiest and the best alternative is to write your script in UTF-8.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n Encode-%{cpan_version}
|
%setup -q -n Encode-%{cpan_version}
|
||||||
|
%patch6000 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
|
||||||
|
export RPM_OPT_FLAGS
|
||||||
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
|
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
|
||||||
%{make_build}
|
%{make_build}
|
||||||
|
|
||||||
@ -69,7 +75,8 @@ find %{buildroot} -type f -name '*.bs' -exec rm -f {} \;
|
|||||||
make test
|
make test
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS Changes README
|
%license AUTHORS
|
||||||
|
%doc Changes README
|
||||||
%{_bindir}/encguess
|
%{_bindir}/encguess
|
||||||
%{_bindir}/piconv
|
%{_bindir}/piconv
|
||||||
%{perl_vendorarch}/auto/*
|
%{perl_vendorarch}/auto/*
|
||||||
@ -78,7 +85,6 @@ make test
|
|||||||
%exclude %{perl_vendorarch}/Encode/encode.h
|
%exclude %{perl_vendorarch}/Encode/encode.h
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc AUTHORS Changes README
|
|
||||||
%{_bindir}/enc2xs
|
%{_bindir}/enc2xs
|
||||||
%{perl_vendorarch}/Encode/*.e2x
|
%{perl_vendorarch}/Encode/*.e2x
|
||||||
%{perl_vendorarch}/Encode/encode.h
|
%{perl_vendorarch}/Encode/encode.h
|
||||||
@ -93,6 +99,30 @@ make test
|
|||||||
%{_mandir}/man3/Encode::*
|
%{_mandir}/man3/Encode::*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 05 2022 xiewenhao <xiewenhao@kylinos.com.cn> - 4:3.06-4
|
||||||
|
- add arguments in %build to fix SP files situation
|
||||||
|
|
||||||
|
* Wed Jun 29 2022 shangyibin<shangyibin1@h-partners.com> - 4:3.06-3
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:add patch
|
||||||
|
|
||||||
|
* Fri Feb 25 2022 wangjiang<wangjiang37@h-partners.com> - 4:3.06-2
|
||||||
|
- Type:CVE
|
||||||
|
- ID:CVE-2021-36770
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix CVE-2021-36770
|
||||||
|
|
||||||
|
* Mon Aug 24 2020 SimpleUpdate Robot <tc@openeuler.org> - 4:3.06-1
|
||||||
|
- Upgrade to version 3.06
|
||||||
|
|
||||||
|
* Fri Oct 11 2019 yefei <yefei25@huawei.com> - 4:2.98-9
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:move author from doc to license
|
||||||
|
|
||||||
* Sun Sep 29 2019 yefei <yefei25@huawei.com> - 4:2.98-8
|
* Sun Sep 29 2019 yefei <yefei25@huawei.com> - 4:2.98-8
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user