packages/perl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!117 fix test case failure caused by zlib

Browse Source 
From: @hongjinghao 
Reviewed-by: @openeuler-basic 
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2024-06-04 13:19:18 +00:00 committed by Gitee
commit 087840e7bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fix-test-case-failure-caused-by-zlib.patch Normal file
View File

@ -0,0 +1,53 @@
From 2425a39797fcc694082a4f6f0be27a2ec736c6b3 Mon Sep 17 00:00:00 2001
From: hongjinghao <hongjinghao@huawei.com>
Date: Tue, 4 Jun 2024 17:26:43 +0800
Subject: [PATCH] fix test case failure caused by zlib
The patching of zlib in openEuler with upstream bug fixes aligns its functionality with newer versions of zlib. However, the version number of zlib within openEuler remains unchanged, indicating the older version. Consequently, the test cases for perl-IO-Compress, which rely on the zlib version number to determine expected outcomes, will fail. To address this, perl-IO-Compress must be updated to accommodate the changes in zlib and remove the versioning-based checks from its test suite.
This bugfix commit for zlib in openEuler resulted in a change in its function behavior:
https://gitee.com/src-openeuler/zlib/pulls/46
---
cpan/Compress-Raw-Zlib/t/02zlib.t | 4 ++--
cpan/IO-Compress/t/cz-03zlib-v1.t | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cpan/Compress-Raw-Zlib/t/02zlib.t b/cpan/Compress-Raw-Zlib/t/02zlib.t
index 64c8944..4c445c9 100644
--- a/cpan/Compress-Raw-Zlib/t/02zlib.t
+++ b/cpan/Compress-Raw-Zlib/t/02zlib.t
@@ -490,7 +490,7 @@ SKIP:
last if $status == Z_STREAM_END or $status != Z_OK ;
}
- cmp_ok $status, '==', Z_DATA_ERROR ;
+ cmp_ok $status, '==', Z_STREAM_END ;
is $GOT, $goodbye ;
@@ -514,7 +514,7 @@ SKIP:
is length($rest), $len2, "expected compressed output";
$GOT = '';
- cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR, "inflate returns Z_DATA_ERROR";
+ cmp_ok $k->inflate($rest, $GOT), '==', Z_STREAM_END, "inflate returns Z_DATA_ERROR";
is $GOT, $goodbye ;
}
diff --git a/cpan/IO-Compress/t/cz-03zlib-v1.t b/cpan/IO-Compress/t/cz-03zlib-v1.t
index 9b75f9b..f2757c0 100644
--- a/cpan/IO-Compress/t/cz-03zlib-v1.t
+++ b/cpan/IO-Compress/t/cz-03zlib-v1.t
@@ -700,7 +700,7 @@ EOM
($GOT, $status) = $k->inflate($rest) ;
- ok $status == Z_DATA_ERROR ;
+ ok $status == Z_STREAM_END ;
ok $Z . $GOT eq $goodbye ;
}
--
2.33.0

6
perl.spec
View File

@ -22,7 +22,7 @@ Name: perl
License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT and UCD and Public Domain and BSD
Epoch: 4
Version: %{perl_version}
Release: 11
Release: 12
Summary: A highly capable, feature-rich programming language
Url: https://www.perl.org/
Source0: https://www.cpan.org/src/5.0/%{name}-%{version}.tar.xz
@ -43,6 +43,7 @@ Patch6002: backport-CVE-2023-31486.patch
Patch6003: backport-CVE-2022-48522.patch
Patch6004: backport-CVE-2023-47100-CVE-2023-47038.patch
Patch6005: backport-CVE-2023-47039.patch
Patch6006: fix-test-case-failure-caused-by-zlib.patch
BuildRequires: gcc bash findutils coreutils make tar procps bzip2-devel gdbm-devel perl-File-Compare perl-File-Find
BuildRequires: zlib-devel systemtap-sdt-devel perl-interpreter perl-generators
@ -493,6 +494,9 @@ make test_harness
%{_mandir}/man3/*
%changelog
* Tue Jun 4 2024 hongjinghao <hongjinghao@huawei.com> - 4:5.34.0-12
- fix test case failure caused by zlib
* Mon Dec 11 2023 huyubiao <huyubiao@huawei.com> - 4:5.34.0-11
- Fix CVE-2023-47038, CVE-2023-47100, CVE-2023-47039