Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
0e8c93d640
!24 add arguments in %build to fix SP files situation
From: @xie-wen-hao 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-12-07 01:20:03 +00:00
xiewenhao
4447b36d1c add epoch information in changelog 2022-12-06 10:03:37 +08:00
xiewenhao
39afe843ec add arguments in %build to fix SP files situation 2022-12-05 12:11:47 +08:00
openeuler-ci-bot
a6204af2ab
!21 使补丁生效
From: @shangyibin 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2022-06-30 01:42:19 +00:00
shangyibin
e28c56690c add patch 2022-06-29 17:35:27 +08:00
openeuler-ci-bot
fbf053d4d3
!9 [sync] PR-8: fix CVE-2021-36770
From: @openeuler-sync-bot 
Reviewed-by: @myeuler 
Signed-off-by: @myeuler
2022-02-28 09:48:02 +00:00
wangjiang
1ce9ee1e1e fix CVE-2021-36770
(cherry picked from commit 9c6bfb3b6501f6d34081e27598cf591a31aca880)
2022-02-28 17:10:18 +08:00
openeuler-ci-bot
39ca845105 !3 Upgrade perl-Encode to 3.06
Merge pull request !3 from LeoFang/openEuler-20.03-LTS
2020-08-24 15:57:28 +08:00
Leo Fang
9d2ae95410 upgrade perl-Encode to 3.06 2020-08-24 15:31:56 +08:00
zhuchunyi
3825e89175 update code 2019-11-06 19:45:52 +08:00
4 changed files with 61 additions and 5 deletions

Binary file not shown.

BIN
Encode-3.06.tar.gz Normal file

Binary file not shown.

View 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

View File

@ -1,19 +1,22 @@
%global cpan_version 2.98
%global cpan_version 3.06
Name: perl-Encode
Epoch: 4
Version: %{cpan_version}
Release: 8
Release: 4
Summary: Character encodings in Perl
License: (GPL+ or Artistic) and Artistic 2.0 and UCD
URL: https://metacpan.org/release/Encode
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: 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(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)
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}
%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
%setup -q -n Encode-%{cpan_version}
%patch6000 -p1
%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"
%{make_build}
@ -69,7 +75,8 @@ find %{buildroot} -type f -name '*.bs' -exec rm -f {} \;
make test
%files
%doc AUTHORS Changes README
%license AUTHORS
%doc Changes README
%{_bindir}/encguess
%{_bindir}/piconv
%{perl_vendorarch}/auto/*
@ -78,7 +85,6 @@ make test
%exclude %{perl_vendorarch}/Encode/encode.h
%files devel
%doc AUTHORS Changes README
%{_bindir}/enc2xs
%{perl_vendorarch}/Encode/*.e2x
%{perl_vendorarch}/Encode/encode.h
@ -93,6 +99,30 @@ make test
%{_mandir}/man3/Encode::*
%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
- Type:enhancement
- ID:NA