From e6846f29ff11be265a33a1651e1609753fc9a219 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Tue, 8 Dec 2020 15:19:13 +0800 Subject: [PATCH] add openEuler-Cleanup-residual-temporary-file.patch --- ...uler-Cleanup-residual-temporary-file.patch | 20 +++++++++++++++++++ zip.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 openEuler-Cleanup-residual-temporary-file.patch diff --git a/openEuler-Cleanup-residual-temporary-file.patch b/openEuler-Cleanup-residual-temporary-file.patch new file mode 100644 index 0000000..41238bc --- /dev/null +++ b/openEuler-Cleanup-residual-temporary-file.patch @@ -0,0 +1,20 @@ +diff -Naur a/zip.c b/zip.c +--- a/zip.c 2020-10-14 14:46:09.809000000 +0800 ++++ b/zip.c 2020-10-15 14:17:17.884000000 +0800 +@@ -450,6 +450,15 @@ + /* Upon getting a user interrupt, turn echo back on for tty and abort + cleanly using ziperr(). */ + { ++/* Cleanup residual temporary file */ ++if ( s == SIGABRT ) ++ { ++ if (tempzip != NULL) ++ { ++ destroy(tempzip); ++ } ++ } ++ + #if defined(AMIGA) && defined(__SASC) + _abort(); + #else + diff --git a/zip.spec b/zip.spec index fcfc0d5..1a386a0 100644 --- a/zip.spec +++ b/zip.spec @@ -1,6 +1,6 @@ Name: zip Version: 3.0 -Release: 25 +Release: 26 Summary: A compression and file packaging/archive utility License: Info-ZIP URL: http://www.info-zip.org/Zip.html @@ -16,6 +16,8 @@ Patch6: zipnote.patch Patch6000: CVE-2018-13410.patch +Patch9000: openEuler-Cleanup-residual-temporary-file.patch + BuildRequires: bzip2-devel gcc Requires: unzip @@ -54,6 +56,9 @@ mkdir -p %{buildroot}%{_mandir}/man1 %{_mandir}/man1/zip* %changelog +* Dec Thu 8 2020 wuchaochao - 3.0-26 +- Add openEuler-Cleanup-residual-temporary-file.patch + * Fri Feb 14 2020 chengquan - 3.0-25 - Add gcc BuildRequire -- Gitee