开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:extract_file:unzip.spec Deleted

@@ -1,102 +0,0 @@
-Name:           unzip
-Version:        6.0
-Release:        49
-Summary:        A utility for unpacking zip files
-License:        Info-ZIP,Public Domain
-URL:            http://www.info-zip.org/UnZip.html
-Source:         http://downloads.sourceforge.net/infozip/unzip60.tar.gz
-
-Patch0001:      unzip-6.0-bzip2-configure.patch
-Patch0002:      unzip-6.0-exec-shield.patch
-Patch0003:      unzip-6.0-close.patch
-Patch0004:      unzip-6.0-attribs-overflow.patch
-Patch0005:      unzip-6.0-configure.patch
-Patch0006:      unzip-6.0-manpage-fix.patch
-Patch0007:      unzip-6.0-fix-recmatch.patch
-Patch0008:      unzip-6.0-symlink.patch
-Patch0009:      unzip-6.0-caseinsensitive.patch
-Patch0010:      unzip-6.0-format-secure.patch
-Patch0011:      unzip-6.0-valgrind.patch
-Patch0012:      unzip-6.0-x-option.patch
-Patch0013:      unzip-6.0-overflow.patch
-Patch0014:      unzip-6.0-cve-2014-8139.patch
-Patch0015:      unzip-6.0-cve-2014-8140.patch
-Patch0016:      unzip-6.0-cve-2014-8141.patch
-Patch0017:      unzip-6.0-overflow-long-fsize.patch
-Patch0018:      unzip-6.0-heap-overflow-infloop.patch
-Patch0019:      unzip-6.0-alt-iconv-utf8.patch
-Patch0020:      unzip-6.0-alt-iconv-utf8-print.patch
-Patch0021:      0001-Fix-CVE-2016-9844-rhbz-1404283.patch
-Patch0022:      unzip-6.0-timestamp.patch
-Patch0023:      unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
-
-Patch6000:      CVE-2018-18384.patch
-Patch6001:      CVE-2019-13232-pre.patch
-Patch6002:      CVE-2019-13232.patch
-Patch6003:      CVE-2019-13232-fur1.patch
-Patch9000:      CVE-2019-13232-fur2.patch
-Patch9001:      CVE-2022-0530.patch
-Patch9002:      CVE-2022-0529.patch
-
-BuildRequires:  bzip2-devel gcc
-
-%description
-UnZip is an extraction utility for archives compressed in .zip format.
-UnZip will list, test, or extract files from a .zip archive, commonly found on MS-DOS systems.
-The default behavior (with no options) is to extract all files into the current directory
-(and subdirectorie below it) from the specified zipfile.
-
-%package help
-Summary: Man pages for unzip
-
-%description help
-Package help includes man pages for unzip.
-
-%prep
-%autosetup -n %{name}60 -p1
-
-%build
-%make_build -f unix/Makefile CF_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS -DNOMEMCPY -DIZ_HAVE_UXUIDGID -DNO_LCHMOD" \
-                      LFLAGS2="-Wl,-z,relro" generic_gcc
-
-%install
-%make_install -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 INSTALL="cp -p"
-
-%check
-make check -f unix/Makefile
-
-%files
-%license LICENSE COPYING.OLD
-%doc README BUGS
-%{_bindir}/*
-
-%files help
-%{_mandir}/man1/*
-
-%changelog
-* Tue May 10 2022 shixuantong <shixuantong@h-partners.com> - 6.0-49
-- enable check test suite
-
-* Wed Feb 23 2022 tianwei <tianwei@h-partners.com> - 6.0-48
-- fix CVE-2022-0529 CVE-2022-0530
-
-* Thu Jun 10 2021 shixuantong <shixuantong@huawei.com> - 6.0-47
-- add gcc to BuildRequires and revert unzip-6.0-crc-builtin.patch
-
-* Tues May 12 2021 openEuler hanzhelii <18221254@bjtu.edu.cn> - 6.0-46
-- add unzip-6.0-crc-builtin.patch
-
-* Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.0-45
-- delete garbled characters
-
-* Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.0-44
-- fix CVE-2019-13232
-
-* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.0-43
-- Delete unneeded patch
-
-* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.0-42
-- Revert CVE-2019-13232
-
-* Fri Sep 20 2019 Zaiwang Li<lizaiwang1@huawei.com> - 6.0-41
-- Init Package

_service:tar_scm:unzip.spec Added

@@ -0,0 +1,106 @@
+Name:           unzip
+Version:        6.0
+Release:        50
+Summary:        A utility for unpacking zip files
+License:        Info-ZIP,Public Domain
+URL:            http://www.info-zip.org/UnZip.html
+Source:         http://downloads.sourceforge.net/infozip/unzip60.tar.gz
+
+Patch0001:      unzip-6.0-bzip2-configure.patch
+Patch0002:      unzip-6.0-exec-shield.patch
+Patch0003:      unzip-6.0-close.patch
+Patch0004:      unzip-6.0-attribs-overflow.patch
+Patch0005:      unzip-6.0-configure.patch
+Patch0006:      unzip-6.0-manpage-fix.patch
+Patch0007:      unzip-6.0-fix-recmatch.patch
+Patch0008:      unzip-6.0-symlink.patch
+Patch0009:      unzip-6.0-caseinsensitive.patch
+Patch0010:      unzip-6.0-format-secure.patch
+Patch0011:      unzip-6.0-valgrind.patch
+Patch0012:      unzip-6.0-x-option.patch
+Patch0013:      unzip-6.0-overflow.patch
+Patch0014:      unzip-6.0-cve-2014-8139.patch
+Patch0015:      unzip-6.0-cve-2014-8140.patch
+Patch0016:      unzip-6.0-cve-2014-8141.patch
+Patch0017:      unzip-6.0-overflow-long-fsize.patch
+Patch0018:      unzip-6.0-heap-overflow-infloop.patch
+Patch0019:      unzip-6.0-alt-iconv-utf8.patch
+Patch0020:      unzip-6.0-alt-iconv-utf8-print.patch
+Patch0021:      0001-Fix-CVE-2016-9844-rhbz-1404283.patch
+Patch0022:      unzip-6.0-timestamp.patch
+Patch0023:      unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
+
+Patch6000:      CVE-2018-18384.patch
+Patch6001:      CVE-2019-13232-pre.patch
+Patch6002:      CVE-2019-13232.patch
+Patch6003:      CVE-2019-13232-fur1.patch
+Patch6004:      backport-CVE-2021-4217.patch
+Patch9000:      CVE-2019-13232-fur2.patch
+Patch9001:      CVE-2022-0530.patch
+Patch9002:      CVE-2022-0529.patch
+
+BuildRequires:  bzip2-devel gcc
+
+%description
+UnZip is an extraction utility for archives compressed in .zip format.
+UnZip will list, test, or extract files from a .zip archive, commonly found on MS-DOS systems.
+The default behavior (with no options) is to extract all files into the current directory
+(and subdirectorie below it) from the specified zipfile.
+
+%package help
+Summary: Man pages for unzip
+
+%description help
+Package help includes man pages for unzip.
+
+%prep
+%autosetup -n %{name}60 -p1
+
+%build
+%make_build -f unix/Makefile CF_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS -DNOMEMCPY -DIZ_HAVE_UXUIDGID -DNO_LCHMOD" \
+                      LFLAGS2="-Wl,-z,relro" generic_gcc
+
+%install
+%make_install -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 INSTALL="cp -p"
+
+%check
+make check -f unix/Makefile
+
+%files
+%license LICENSE COPYING.OLD
+%doc README BUGS
+%{_bindir}/*
+
+%files help
+%{_mandir}/man1/*
+
+%changelog
+* Tue Sep 6 2022 dongyuzhen <dongyuzhen@h-partners.com> - 6.0-50
+- fix CVE-2021-4217
+
+* Tue May 10 2022 shixuantong <shixuantong@h-partners.com> - 6.0-49
+- enable check test suite
+
+* Wed Feb 23 2022 tianwei <tianwei@h-partners.com> - 6.0-48
+- fix CVE-2022-0529 CVE-2022-0530
+
+* Thu Jun 10 2021 shixuantong <shixuantong@huawei.com> - 6.0-47
+- add gcc to BuildRequires and revert unzip-6.0-crc-builtin.patch
+
+* Tue May 12 2021 openEuler hanzhelii <18221254@bjtu.edu.cn> - 6.0-46
+- add unzip-6.0-crc-builtin.patch
+
+* Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.0-45
+- delete garbled characters
+
+* Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.0-44
+- fix CVE-2019-13232
+
+* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.0-43
+- Delete unneeded patch
+
+* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.0-42
+- Revert CVE-2019-13232
+
+* Fri Sep 20 2019 Zaiwang Li<lizaiwang1@huawei.com> - 6.0-41
+- Init Package

_service:extract_file:0001-Fix-CVE-2016-9844-rhbz-1404283.patch Deleted

@@ -1,39 +0,0 @@
-From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
-From: Petr Stodulka <pstodulk@redhat.com>
-Date: Wed, 14 Dec 2016 16:30:36 +0100
-Subject: PATCH Fix CVE-2016-9844 (rhbz#1404283)
-
-Fixes buffer overflow in zipinfo in similar way like fix for
-CVE-2014-9913 provided by upstream.
----
- zipinfo.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/zipinfo.c b/zipinfo.c
-index c03620e..accca2a 100644
---- a/zipinfo.c
-+++ b/zipinfo.c
-@@ -1984,7 +1984,19 @@ static int zi_short(__G)   /* return PK-type error code */
-         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
-         methbuf3 = dtypednum;
-     } else if (methnum >= NUM_METHODS) {   /* unknown */
--        sprintf(&methbuf1, "%03u", G.crec.compression_method);
-+        /* 2016-12-05 SMS.
-+         * https://launchpad.net/bugs/1643750
-+         * Unexpectedly large compression methods overflow
-+         * &methbuf.  Use the old, three-digit decimal format
-+         * for values which fit.  Otherwise, sacrifice the "u",
-+         * and use four-digit hexadecimal.
-+         */
-+        if (G.crec.compression_method <= 999) {
-+              sprintf( &methbuf 1, "%03u", G.crec.compression_method);
-+        } else {
-+              sprintf( &methbuf 0, "%04X", G.crec.compression_method);
-+        }
-+
-     }
- 
-     for (k = 0;  k < 15;  ++k)
--- 
-2.5.5
-

_service:extract_file:CVE-2018-18384.patch Deleted

@@ -1,35 +0,0 @@
---- a/list.c	2019-06-25 21:57:03.208000000 -0400
-+++ b/list_1.c	2019-06-25 22:18:17.012000000 -0400
-@@ -97,7 +97,7 @@ int list_files(__G)    /* return PK-type
- {
-     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
- #ifndef WINDLL
--    char sgn, cfactorstr13;
-+    char sgn, cfactorstr1+11+1+1;	/* <sgn><int>%NUL */
-     int longhdr=(uO.vflag>1);
- #endif
-     int date_format;
-@@ -390,9 +390,9 @@ int list_files(__G)    /* return PK-type
-             }
- #else /* !WINDLL */
-             if (cfactor == 100)
--                sprintf(cfactorstr, LoadFarString(CompFactor100));
-+                snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
-             else
--                sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
-+                snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
-             if (longhdr)
-                 Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats),
-                   FmZofft(G.crec.ucsize, "8", "u"), methbuf,
-@@ -472,9 +472,9 @@ int list_files(__G)    /* return PK-type
- 
- #else /* !WINDLL */
-         if (cfactor == 100)
--            sprintf(cfactorstr, LoadFarString(CompFactor100));
-+            snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
-         else
--            sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
-+            snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
-         if (longhdr) {
-             Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer),
-               FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"),

_service:extract_file:CVE-2019-13232-fur1.patch Deleted

@@ -1,112 +0,0 @@
-From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Thu, 25 Jul 2019 20:43:17 -0700
-Subject: PATCH Do not raise a zip bomb alert for a misplaced central
- directory.
-
-There is a zip-like file in the Firefox distribution, omni.ja,
-which is a zip container with the central directory placed at the
-start of the file instead of after the local entries as required
-by the zip standard. This commit marks the actual location of the
-central directory, as well as the end of central directory records,
-as disallowed locations. This now permits such containers to not
-raise a zip bomb alert, where in fact there are no overlaps.
----
- extract.c | 25 +++++++++++++++++++------
- process.c |  6 ++++++
- unzpriv.h | 10 ++++++++++
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/extract.c b/extract.c
-index 0973a33..1b73cb0 100644
---- a/extract.c
-+++ b/extract.c
-@@ -493,8 +493,11 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-     }
- #endif /* !SFX || SFX_EXDIR */
- 
--    /* One more: initialize cover structure for bomb detection. Start with a
--       span that covers the central directory though the end of the file. */
-+    /* One more: initialize cover structure for bomb detection. Start with
-+       spans that cover any extra bytes at the start, the central directory,
-+       the end of central directory record (including the Zip64 end of central
-+       directory locator, if present), and the Zip64 end of central directory
-+       record, if present. */
-     if (G.cover == NULL) {
-         G.cover = malloc(sizeof(cover_t));
-         if (G.cover == NULL) {
-@@ -506,15 +509,25 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-         ((cover_t *)G.cover)->max = 0;
-     }
-     ((cover_t *)G.cover)->num = 0;
--    if ((G.extra_bytes != 0 &&
--         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
--        cover_add((cover_t *)G.cover,
-+    if (cover_add((cover_t *)G.cover,
-                   G.extra_bytes + G.ecrec.offset_start_central_directory,
--                  G.ziplen) != 0) {
-+                  G.extra_bytes + G.ecrec.offset_start_central_directory +
-+                  G.ecrec.size_central_directory) != 0) {
-         Info(slide, 0x401, ((char *)slide,
-           LoadFarString(NotEnoughMemCover)));
-         return PK_MEM;
-     }
-+    if ((G.extra_bytes != 0 &&
-+         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
-+        (G.ecrec.have_ecr64 &&
-+         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
-+                   G.ecrec.ec64_end) != 0) ||
-+        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
-+                  G.ecrec.ec_end) != 0) {
-+        Info(slide, 0x401, ((char *)slide,
-+          LoadFarString(OverlappedComponents)));
-+        return PK_BOMB;
-+    }
- 
- /*---------------------------------------------------------------------------
-     The basic idea of this function is as follows.  Since the central di-
-diff --git a/process.c b/process.c
-index d2e4dc3..d75d405 100644
---- a/process.c
-+++ b/process.c
-@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen)         /* return PK-class error */
- 
-     /* Now, we are (almost) sure that we have a Zip64 archive. */
-     G.ecrec.have_ecr64 = 1;
-+    G.ecrec.ec_start -= ECLOC64_SIZE+4;
-+    G.ecrec.ec64_start = ecrec64_start_offset;
-+    G.ecrec.ec64_end = ecrec64_start_offset +
-+                       12 + makeint64(&byterecECREC64_LENGTH);
- 
-     /* Update the "end-of-central-dir offset" for later checks. */
-     G.real_ecrec_offset = ecrec64_start_offset;
-@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen)          /* return PK-class error */
-       makelong(&byterecOFFSET_START_CENTRAL_DIRECTORY);
-     G.ecrec.zipfile_comment_length =
-       makeword(&byterecZIPFILE_COMMENT_LENGTH);
-+    G.ecrec.ec_start = G.real_ecrec_offset;
-+    G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length;
- 
-     /* Now, we have to read the archive comment, BEFORE the file pointer
-        is moved away backwards to seek for a Zip64 ECLOC64 structure.
-diff --git a/unzpriv.h b/unzpriv.h
-index dc9eff5..297b3c7 100644
---- a/unzpriv.h
-+++ b/unzpriv.h
-@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf {
-        int have_ecr64;                  /* valid Zip64 ecdir-record exists */
-        int is_zip64_archive;            /* Zip64 ecdir-record is mandatory */
-        ush zipfile_comment_length;
-+       zusz_t ec_start, ec_end;         /* offsets of start and end of the
-+                                           end of central directory record,
-+                                           including if present the Zip64
-+                                           end of central directory locator,
-+                                           which immediately precedes the
-+                                           end of central directory record */
-+       zusz_t ec64_start, ec64_end;     /* if have_ecr64 is true, then these
-+                                           are the offsets of the start and
-+                                           end of the Zip64 end of central
-+                                           directory record */
-    } ecdir_rec;
- 
-

_service:extract_file:CVE-2019-13232-fur2.patch Deleted

@@ -1,338 +0,0 @@
-From b701988480151e6693343ecdb246092824604c61 Mon Sep 17 00:00:00 2001
-From: wangshouping <wangshouping@huawei.com>
-Date: Tue, 11 Feb 2020 19:07:28 -0500
-Subject: PATCH add param to limit the number of overlap files
-
-Signed-off-by: wangshouping <wangshouping@huawei.com>
----
- extract.c   | 114 ++++++++++++++++++++++++++++++++++++++++++++++--------------
- man/unzip.1 |   8 +++--
- unzip.c     |  84 +++++++++++++++++++++++++++++++++++++++-----
- unzip.h     |   1 +
- unzip.txt   |   6 +++-
- 5 files changed, 176 insertions(+), 37 deletions(-)
-
-diff --git a/extract.c b/extract.c
-index 3a01d13..031efdb 100644
---- a/extract.c
-+++ b/extract.c
-@@ -340,23 +340,32 @@ typedef struct {
-     span_t *span;       /* allocated, distinct, and sorted list of spans */
-     size_t num;         /* number of spans in the list */
-     size_t max;         /* allocated number of spans (num <= max) */
-+    unsigned long count;
- } cover_t;
- 
- /*
-  * Return the index of the first span in cover whose beg is greater than val.
-  * If there is no such span, then cover->num is returned.
-  */
--static size_t cover_find(cover, val)
-+static size_t cover_find(cover, val, op)
-     cover_t *cover;
-     bound_t val;
-+    int op;
- {
-     size_t lo = 0, hi = cover->num;
-+    bound_t tmp_val;
-     while (lo < hi) {
-         size_t mid = (lo + hi) >> 1;
--        if (val < cover->spanmid.beg)
--            hi = mid;
--        else
--            lo = mid + 1;
-+        if (!op) {
-+            tmp_val = cover->spanmid.beg;
-+        } else {
-+            tmp_val = cover->spanmid.end;
-+        }
-+        if (val < tmp_val) {
-+            hi = mid;
-+        } else {
-+            lo = mid + 1;
-+        }
-     }
-     return hi;
- }
-@@ -366,10 +375,16 @@ static int cover_within(cover, val)
-     cover_t *cover;
-     bound_t val;
- {
--    size_t pos = cover_find(cover, val);
-+    size_t pos = cover_find(cover, val, 0);
-     return pos > 0 && val < cover->spanpos - 1.end;
- }
- 
-+static int is_exceed_max_overlaps(cover, val)
-+    cover_t *cover;
-+{
-+    return cover->count >= G.UzO.max_overlaps;
-+}
-+
- /*
-  * Add a new span to the list, but only if the new span does not overlap any
-  * spans already in the list. The new span covers the values beg..end-1. beg
-@@ -387,7 +402,8 @@ static int cover_add(cover, beg, end)
-     bound_t beg;
-     bound_t end;
- {
--    size_t pos;
-+    size_t pos_beg;
-+    size_t pos_end;
-     int prec, foll;
- 
-     if (beg >= end)
-@@ -396,31 +412,76 @@ static int cover_add(cover, beg, end)
- 
-     /* Find where the new span should go, and make sure that it does not
-        overlap with any existing spans. */
--    pos = cover_find(cover, beg);
--    if ((pos > 0 && beg < cover->spanpos - 1.end) ||
--        (pos < cover->num && end > cover->spanpos.beg))
--        return 1;
-+    pos_beg = cover_find(cover, beg, 0);
-+    pos_end = cover_find(cover, end, 1);
- 
-     /* Check for adjacencies. */
--    prec = pos > 0 && beg == cover->spanpos - 1.end;
--    foll = pos < cover->num && end == cover->spanpos.beg;
-+    prec = pos_beg > 0 && beg <= cover->spanpos_beg - 1.end;
-+    foll = pos_beg < cover->num && end >= cover->spanpos_beg.beg;
-     if (prec && foll) {
-+        if (beg < cover->spanpos_beg - 1.end || end > cover->spanpos_beg.beg) {
-+            cover->count++;
-+        }
-+
-         /* The new span connects the preceding and following spans. Merge the
-            following span into the preceding span, and delete the following
-            span. */
--        cover->spanpos - 1.end = cover->spanpos.end;
--        cover->num--;
--        memmove(cover->span + pos, cover->span + pos + 1,
--                (cover->num - pos) * sizeof(span_t));
-+        if (end <= cover->spanpos_beg.end) {
-+            cover->spanpos_beg - 1.end = cover->spanpos_beg.end;
-+            cover->num--;
-+            memmove(cover->span + pos_beg, cover->span + pos_beg + 1,
-+                    (cover->num - pos_beg) * sizeof(span_t));
-+        } else {
-+            if (pos_end == cover->num) {
-+                cover->spanpos_beg - 1.end = end;
-+                cover->num = cover->num - (pos_end - pos_beg);
-+            } else if (end >= cover->spanpos_end.beg) {
-+                cover->spanpos_beg - 1.end = cover->spanpos_end.end;
-+                memmove(cover->span + pos_beg, cover->span + pos_end + 1,
-+                        (cover->num - 1 - pos_end) * sizeof(span_t));
-+                cover->num = cover->num - (pos_end - pos_beg) - 1;
-+            } else {
-+                cover->spanpos_beg - 1.end = end;
-+                memmove(cover->span + pos_beg, cover->span + pos_end,
-+                        (cover->num - 1 - pos_end + 1) * sizeof(span_t));
-+                cover->num = cover->num - (pos_end - pos_beg);
-+            }
-+        }
-     }
--    else if (prec)
-+    else if (prec) {
-         /* The new span is adjacent only to the preceding span. Extend the end
-            of the preceding span. */
--        cover->spanpos - 1.end = end;
--    else if (foll)
-+        if (beg < cover->spanpos_beg - 1.end) {
-+            cover->count++;
-+        }
-+        if (end > cover->spanpos_beg - 1.end) {
-+            cover->spanpos_beg - 1.end = end;
-+        }
-+    }
-+    else if (foll) {
-+        if (end > cover->spanpos_beg.beg) {
-+                cover->count++;
-+        }
-         /* The new span is adjacent only to the following span. Extend the
-            beginning of the following span. */
--        cover->spanpos.beg = beg;
-+        cover->spanpos_beg.beg = beg;
-+        if (end > cover->spanpos_beg.end) {
-+            if (pos_end == cover->num) {
-+                cover->spanpos_beg.end = end;
-+                cover->num = cover->num - (pos_end - pos_beg) + 1;
-+            } else if (end >= cover->spanpos_end.beg) {
-+                cover->spanpos_beg.end = cover->spanpos_end.end;
-+                memmove(cover->span + pos_beg + 1, cover->span + pos_end + 1,
-+                        (cover->num - 1 - pos_end) * sizeof(span_t));
-+                cover->num = cover->num - (pos_end - pos_beg);
-+            } else {
-+               cover->spanpos_beg.end = end;
-+                memmove(cover->span + pos_beg + 1, cover->span + pos_end,
-+                        (cover->num - 1 - pos_end + 1) * sizeof(span_t));
-+                cover->num = cover->num - (pos_end - pos_beg) + 1;
-+            }
-+        }
-+    }
-     else {
-         /* The new span has gaps between both the preceding and the following
-            spans. Assure that there is room and insert the span.  */
-@@ -432,11 +493,11 @@ static int cover_add(cover, beg, end)
-             cover->span = span;
-             cover->max = max;
-         }
--        memmove(cover->span + pos + 1, cover->span + pos,
--                (cover->num - pos) * sizeof(span_t));
-+        memmove(cover->span + pos_beg + 1, cover->span + pos_beg,
-+                (cover->num - pos_beg) * sizeof(span_t));
-         cover->num++;
--        cover->spanpos.beg = beg;
--        cover->spanpos.end = end;
-+        cover->spanpos_beg.beg = beg;
-+        cover->spanpos_beg.end = end;
-     }
-     return 0;
- }
-@@ -511,6 +572,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-         ((cover_t *)G.cover)->max = 0;
-     }
-     ((cover_t *)G.cover)->num = 0;
-+    ((cover_t *)G.cover)->count = 0;
-     if (cover_add((cover_t *)G.cover,
-                   G.extra_bytes + G.ecrec.offset_start_central_directory,
-                   G.extra_bytes + G.ecrec.offset_start_central_directory +

_service:extract_file:CVE-2019-13232-pre.patch Deleted

@@ -1,27 +0,0 @@
-From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Mon, 27 May 2019 08:20:32 -0700
-Subject: PATCH Fix bug in undefer_input() that misplaced the input state.
-
----
- fileio.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fileio.c b/fileio.c
-index c042987..bc00d74 100644
---- a/fileio.c
-+++ b/fileio.c
-@@ -530,8 +530,10 @@ void undefer_input(__G)
-          * This condition was checked when G.incnt_leftover was set > 0 in
-          * defer_leftover_input(), and it is NOT allowed to touch G.csize
-          * before calling undefer_input() when (G.incnt_leftover > 0)
--         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
-+         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
-          */
-+        if (G.csize < 0L)
-+            G.csize = 0L;
-         G.incnt = G.incnt_leftover + (int)G.csize;
-         G.inptr = G.inptr_leftover - (int)G.csize;
-         G.incnt_leftover = 0;

_service:extract_file:CVE-2019-13232.patch Deleted

@@ -1,349 +0,0 @@
-From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 11 Jun 2019 22:01:18 -0700
-Subject: PATCH Detect and reject a zip bomb using overlapped entries.
-
-This detects an invalid zip file that has at least one entry that
-overlaps with another entry or with the central directory to the
-end of the file. A Fifield zip bomb uses overlapped local entries
-to vastly increase the potential inflation ratio. Such an invalid
-zip file is rejected.
-
-See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's
-analysis, construction, and examples of such zip bombs.
-
-The detection maintains a list of covered spans of the zip files
-so far, where the central directory to the end of the file and any
-bytes preceding the first entry at zip file offset zero are
-considered covered initially. Then as each entry is decompressed
-or tested, it is considered covered. When a new entry is about to
-be processed, its initial offset is checked to see if it is
-contained by a covered span. If so, the zip file is rejected as
-invalid.
-
-This commit depends on a preceding commit: "Fix bug in
-undefer_input() that misplaced the input state."
----
- extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- globals.c |   1 +
- globals.h |   3 +
- process.c |  11 ++++
- unzip.h   |   1 +
- 5 files changed, 205 insertions(+), 1 deletion(-)
-
-diff --git a/extract.c b/extract.c
-index 1acd769..0973a33 100644
---- a/extract.c
-+++ b/extract.c
-@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField =
-   "\nerror:  unsupported extra-field compression type (%u)--skipping\n";
- static ZCONST char Far BadExtraFieldCRC =
-   "error %s:  bad extra-field CRC %08lx (should be %08lx)\n";
-+static ZCONST char Far NotEnoughMemCover =
-+  "error: not enough memory for bomb detection\n";
-+static ZCONST char Far OverlappedComponents =
-+  "error: invalid zip file with overlapped components (possible zip bomb)\n";
-+
-+
-+
-+
-+
-+/* A growable list of spans. */
-+typedef zoff_t bound_t;
-+typedef struct {
-+    bound_t beg;        /* start of the span */
-+    bound_t end;        /* one past the end of the span */
-+} span_t;
-+typedef struct {
-+    span_t *span;       /* allocated, distinct, and sorted list of spans */
-+    size_t num;         /* number of spans in the list */
-+    size_t max;         /* allocated number of spans (num <= max) */
-+} cover_t;
-+
-+/*
-+ * Return the index of the first span in cover whose beg is greater than val.
-+ * If there is no such span, then cover->num is returned.
-+ */
-+static size_t cover_find(cover, val)
-+    cover_t *cover;
-+    bound_t val;
-+{
-+    size_t lo = 0, hi = cover->num;
-+    while (lo < hi) {
-+        size_t mid = (lo + hi) >> 1;
-+        if (val < cover->spanmid.beg)
-+            hi = mid;
-+        else
-+            lo = mid + 1;
-+    }
-+    return hi;
-+}
-+
-+/* Return true if val lies within any one of the spans in cover. */
-+static int cover_within(cover, val)
-+    cover_t *cover;
-+    bound_t val;
-+{
-+    size_t pos = cover_find(cover, val);
-+    return pos > 0 && val < cover->spanpos - 1.end;
-+}
-+
-+/*
-+ * Add a new span to the list, but only if the new span does not overlap any
-+ * spans already in the list. The new span covers the values beg..end-1. beg
-+ * must be less than end.
-+ *
-+ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
-+ * the list as needed. On success, 0 is returned. If the new span overlaps any
-+ * existing spans, then 1 is returned and the new span is not added to the
-+ * list. If the new span is invalid because beg is greater than or equal to
-+ * end, then -1 is returned. If the list needs to be grown but the memory
-+ * allocation fails, then -2 is returned.
-+ */
-+static int cover_add(cover, beg, end)
-+    cover_t *cover;
-+    bound_t beg;
-+    bound_t end;
-+{
-+    size_t pos;
-+    int prec, foll;
-+
-+    if (beg >= end)
-+    /* The new span is invalid. */
-+        return -1;
-+
-+    /* Find where the new span should go, and make sure that it does not
-+       overlap with any existing spans. */
-+    pos = cover_find(cover, beg);
-+    if ((pos > 0 && beg < cover->spanpos - 1.end) ||
-+        (pos < cover->num && end > cover->spanpos.beg))
-+        return 1;
-+
-+    /* Check for adjacencies. */
-+    prec = pos > 0 && beg == cover->spanpos - 1.end;
-+    foll = pos < cover->num && end == cover->spanpos.beg;
-+    if (prec && foll) {
-+        /* The new span connects the preceding and following spans. Merge the
-+           following span into the preceding span, and delete the following
-+           span. */
-+        cover->spanpos - 1.end = cover->spanpos.end;
-+        cover->num--;
-+        memmove(cover->span + pos, cover->span + pos + 1,
-+                (cover->num - pos) * sizeof(span_t));
-+    }
-+    else if (prec)
-+        /* The new span is adjacent only to the preceding span. Extend the end
-+           of the preceding span. */
-+        cover->spanpos - 1.end = end;
-+    else if (foll)
-+        /* The new span is adjacent only to the following span. Extend the
-+           beginning of the following span. */
-+        cover->spanpos.beg = beg;
-+    else {
-+        /* The new span has gaps between both the preceding and the following
-+           spans. Assure that there is room and insert the span.  */
-+        if (cover->num == cover->max) {
-+            size_t max = cover->max == 0 ? 16 : cover->max << 1;
-+            span_t *span = realloc(cover->span, max * sizeof(span_t));
-+            if (span == NULL)
-+                return -2;
-+            cover->span = span;
-+            cover->max = max;
-+        }
-+        memmove(cover->span + pos + 1, cover->span + pos,
-+                (cover->num - pos) * sizeof(span_t));
-+        cover->num++;
-+        cover->spanpos.beg = beg;
-+        cover->spanpos.end = end;
-+    }
-+    return 0;
-+}
- 
- 
- 
-@@ -374,6 +493,29 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-     }
- #endif /* !SFX || SFX_EXDIR */
- 
-+    /* One more: initialize cover structure for bomb detection. Start with a
-+       span that covers the central directory though the end of the file. */
-+    if (G.cover == NULL) {
-+        G.cover = malloc(sizeof(cover_t));
-+        if (G.cover == NULL) {
-+            Info(slide, 0x401, ((char *)slide,
-+              LoadFarString(NotEnoughMemCover)));
-+            return PK_MEM;
-+        }
-+        ((cover_t *)G.cover)->span = NULL;
-+        ((cover_t *)G.cover)->max = 0;
-+    }
-+    ((cover_t *)G.cover)->num = 0;
-+    if ((G.extra_bytes != 0 &&
-+         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
-+        cover_add((cover_t *)G.cover,
-+                  G.extra_bytes + G.ecrec.offset_start_central_directory,
-+                  G.ziplen) != 0) {
-+        Info(slide, 0x401, ((char *)slide,
-+          LoadFarString(NotEnoughMemCover)));
-+        return PK_MEM;
-+    }
-+
- /*---------------------------------------------------------------------------
-     The basic idea of this function is as follows.  Since the central di-
-     rectory lies at the end of the zipfile and the member files lie at the
-@@ -591,7 +733,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-             if (error > error_in_archive)
-                 error_in_archive = error;
-             /* ...and keep going (unless disk full or user break) */
--            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) {
-+            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC ||

_service:extract_file:CVE-2022-0529.patch Deleted

@@ -1,104 +0,0 @@
-From 8b40e8021a98728b5889516af308dd52378c964c Mon Sep 17 00:00:00 2001
-From: Lv Ying <lvying6@huawei.com>
-Date: Wed, 23 Feb 2022 09:32:21 +0800
-Subject: PATCH 2/2 fix CVE-2022-0529 Heap out-of-bound writes and reads
- during conversion of wide string to local string
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2022-0529 discussed in https://bugzilla.redhat.com/show_bug.cgi?id=2051402
-CVE can be reproduced:
-$ unset LANG
-$ valgrind ./unzip ./unzip_03/testcase
-valgrind will detect Heap out-of-bound writes and reads just as bugzilla discussed
-
-This is because wide_to_escape_string returns a string that represents a wide char
-not in local char set, is longer than MAX_ESCAPE_BYTES(8). Actually, MAX_ESCAPE_BYTES
-max is 10, for example, 4-byte wide character '#L02020276' is 10 bytes long, not
-including the terminating null character. So strcat(buffer, escape_string) will cause
-Heap out-of-bound writes.
-
-By default, the OS vendor sets the LANG environment variable. valgrind tests this POC
-will get another memory error.
-$ export | grep LANG
-declare -x LANG="en_US.UTF-8"
-$ valgrind ./unzip ./unzip_03/testcase
-
-Archive:  unzip_03/testcase
-warning unzip_03/testcase:  303 extra bytes at beginning or within zipfile
-  (attempting to process anyway)
-error unzip_03/testcase:  reported length of central directory is
-  -303 bytes too long (Atari STZip zipfile?  J.H.Holm ZIPSPLIT 1.1
-  zipfile?).  Compensating...
-==15725== Conditional jump or move depends on uninitialised value(s)
-==15725==    at 0x4903169: __wcsnlen_sse4_1 (strlen.S:186)
-==15725==    by 0x48F3D61: wcsrtombs (wcsrtombs.c:104)
-==15725==    by 0x488B9A0: wcstombs (wcstombs.c:34)
-==15725==    by 0x407279: wcstombs (stdlib.h:154)
-==15725==    by 0x407279: fnfilter.constprop.2 (extract.c:2946)
-==15725==    by 0x4076A5: store_info (extract.c:1155)
-==15725==    by 0x40AFF4: extract_or_test_files (extract.c:782)
-==15725==    by 0x41586C: do_seekable (process.c:994)
-==15725==    by 0x4167EE: process_zipfiles (process.c:401)
-==15725==    by 0x40449B: unzip (unzip.c:1280)
-==15725==    by 0x4874B26: (below main) (libc-start.c:308)
-==15725==
-   skipping: ??????????????????????????????????????????????????????????????????????????ı  need PK compat. v4.6 (can do v4.5)
-==15725==
-==15725== HEAP SUMMARY:
-==15725==     in use at exit: 0 bytes in 0 blocks
-==15725==   total heap usage: 37 allocs, 37 frees, 90,739 bytes allocated
-==15725==
-==15725== All heap blocks were freed -- no leaks are possible
-==15725==
-==15725== For counts of detected and suppressed errors, rerun with: -v
-==15725== Use --track-origins=yes to see where uninitialised values come from
-==15725== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-
-This is because wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1) in fnfilter
-use wrong n parameter which stands for At most n bytes are written to dest.
-When LANG environment variable is set, MB_CUR_MAX = 6, so wcstombs will writes more
-bytes over dest(newraw).
-
-Signed-off-by: Lv Ying <lvying6@huawei.com>
----
- extract.c | 4 ++--
- process.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/extract.c b/extract.c
-index f0e8217..3f6e14d 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2856,12 +2856,12 @@ char *fnfilter(raw, space, size)   /* convert name to safely printable form */
-     if (wslen != (size_t)-1)
-     {
-         /* Apparently valid Unicode.  Allocate wide-char storage. */
--        wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t));
-+        wstring = (wchar_t *)calloc((wslen + 1), sizeof(wchar_t));
-         if (wstring == NULL) {
-             strcpy( (char *)space, raw);
-             return (char *)space;
-         }
--        wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t));
-+        wostring = (wchar_t *)calloc(2 * (wslen + 1), sizeof(wchar_t));
-         if (wostring == NULL) {
-             free(wstring);
-             strcpy( (char *)space, raw);
-diff --git a/process.c b/process.c
-index 5cba073..3e7fcb3 100644
---- a/process.c
-+++ b/process.c
-@@ -2395,7 +2395,7 @@ char *local_to_utf8_string(local_string)
-   */
- 
-  /* set this to the max bytes an escape can be */
--#define MAX_ESCAPE_BYTES 8
-+#define MAX_ESCAPE_BYTES 10
- 
- char *wide_to_escape_string(wide_char)
-   zwchar wide_char;
--- 
-2.27.0
-

_service:extract_file:CVE-2022-0530.patch Deleted

@@ -1,61 +0,0 @@
-From 4d9e8cd35d59f05f75cb2d8f05c6e4c9277dcf9c Mon Sep 17 00:00:00 2001
-From: Zhipeng Xie <xiezhipeng1@huawei.com>
-Date: Tue, 22 Feb 2022 21:04:25 +0000
-Subject: PATCH 1/2 Fix CVE-2022-0530
-
-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
----
- fileio.c  | 20 +++++++++++++-------
- process.c |  2 ++
- 2 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/fileio.c b/fileio.c
-index cf995a9..e237272 100644
---- a/fileio.c
-+++ b/fileio.c
-@@ -2360,16 +2360,22 @@ int do_string(__G__ length, option)   /* return PK-type error code */
-                   /* convert UTF-8 to local character set */
-                   fn = utf8_to_local_string(G.unipath_filename,
-                                             G.unicode_escape_all);
--                  /* make sure filename is short enough */
--                  if (strlen(fn) >= FILNAMSIZ) {
--                    fnFILNAMSIZ - 1 = '\0';
-+                  if (!fn) {
-                     Info(slide, 0x401, ((char *)slide,
--                      LoadFarString(UFilenameTooLongTrunc)));
-+                      LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
-                     error = PK_WARN;
-+                  } else {
-+                    /* make sure filename is short enough */
-+                    if (strlen(fn) >= FILNAMSIZ) {
-+                      fnFILNAMSIZ - 1 = '\0';
-+                      Info(slide, 0x401, ((char *)slide,
-+                        LoadFarString(UFilenameTooLongTrunc)));
-+                      error = PK_WARN;
-+                    }
-+                    /* replace filename with converted UTF-8 */
-+                    strcpy(G.filename, fn);
-+                    free(fn);
-                   }
--                  /* replace filename with converted UTF-8 */
--                  strcpy(G.filename, fn);
--                  free(fn);
-                 }
- # endif /* UNICODE_WCHAR */
-                 if (G.unipath_filename != G.filename_full)
-diff --git a/process.c b/process.c
-index 46abce2..5cba073 100644
---- a/process.c
-+++ b/process.c
-@@ -2597,6 +2597,8 @@ char *utf8_to_local_string(utf8_string, escape_all)
-   int escape_all;
- {
-   zwchar *wide = utf8_to_wide_string(utf8_string);
-+  if (!wide)
-+    return NULL;
-   char *loc = wide_to_local_string(wide, escape_all);
-   free(wide);
-   return loc;
--- 
-2.27.0
-

_service:extract_file:unzip-6.0-alt-iconv-utf8-print.patch Deleted

@@ -1,381 +0,0 @@
-From ca0212ba19b64488b9e8459a762c11ecd6e7d0bd Mon Sep 17 00:00:00 2001
-From: Petr Stodulka <pstodulk@redhat.com>
-Date: Tue, 24 Nov 2015 17:56:11 +0100
-Subject: PATCH print correctly non-ascii filenames
-
----
- extract.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
- unzpriv.h |   7 ++
- 2 files changed, 233 insertions(+), 63 deletions(-)
-
-diff --git a/extract.c b/extract.c
-index 0ee4e93..741b7e0 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2648,8 +2648,21 @@ static void set_deferred_symlink(__G__ slnk_entry)
- } /* end function set_deferred_symlink() */
- #endif /* SYMLINKS */
- 
-+/*
-+ * If Unicode is supported, assume we have what we need to do this
-+ * check using wide characters, avoiding MBCS issues.
-+ */
- 
--
-+#ifndef UZ_FNFILTER_REPLACECHAR
-+        /* A convenient choice for the replacement of unprintable char codes is
-+         * the "single char wildcard", as this character is quite unlikely to
-+         * appear in filenames by itself.  The following default definition
-+         * sets the replacement char to a question mark as the most common
-+         * "single char wildcard"; this setting should be overridden in the
-+         * appropiate system-specific configuration header when needed.
-+         */
-+# define UZ_FNFILTER_REPLACECHAR      '?'
-+#endif
- 
- /*************************/
- /*  Function fnfilter()  */        /* here instead of in list.c for SFX */
-@@ -2661,48 +2674,168 @@ char *fnfilter(raw, space, size)   /* convert name to safely printable form */
-     extent size;
- {
- #ifndef NATIVE   /* ASCII:  filter ANSI escape codes, etc. */
--    ZCONST uch *r=(ZCONST uch *)raw;
-+    ZCONST uch *r; // =(ZCONST uch *)raw;
-     uch *s=space;
-     uch *slim=NULL;
-     uch *se=NULL;
-     int have_overflow = FALSE;
- 
--    if (size > 0) {
--        slim = space + size
--#ifdef _MBCS
--                     - (MB_CUR_MAX - 1)
--#endif
--                     - 4;
-+# if defined( UNICODE_SUPPORT) && defined( _MBCS)
-+/* If Unicode support is enabled, and we have multi-byte characters,
-+ * then do the isprint() checks by first converting to wide characters
-+ * and checking those.  This avoids our having to parse multi-byte
-+ * characters for ourselves.  After the wide-char replacements have been
-+ * made, the wide string is converted back to the local character set.
-+ */
-+    wchar_t *wstring;    /* wchar_t version of raw */
-+    size_t wslen;        /* length of wstring */
-+    wchar_t *wostring;   /* wchar_t version of output string */
-+    size_t woslen;       /* length of wostring */
-+    char *newraw;        /* new raw */
-+
-+    /* 2012-11-06 SMS.
-+     * Changed to check the value returned by mbstowcs(), and bypass the
-+     * Unicode processing if it fails.  This seems to fix a problem
-+     * reported in the SourceForge forum, but it's not clear that we
-+     * should be doing any Unicode processing without some evidence that
-+     * the name actually is Unicode.  (Check bit 11 in the flags before
-+     * coming here?)
-+     * http://sourceforge.net/p/infozip/bugs/40/
-+     */
-+
-+    if (MB_CUR_MAX <= 1)
-+    {
-+        /* There's no point to converting multi-byte chars if there are
-+         * no multi-byte chars.
-+         */
-+        wslen = (size_t)-1;
-     }
--    while (*r) {
--        if (size > 0 && s >= slim && se == NULL) {
--            se = s;
-+    else
-+    {
-+        /* Get Unicode wide character count (for storage allocation). */
-+        wslen = mbstowcs( NULL, raw, 0);
-+    }
-+
-+    if (wslen != (size_t)-1)
-+    {
-+        /* Apparently valid Unicode.  Allocate wide-char storage. */
-+        wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t));
-+        if (wstring == NULL) {
-+            strcpy( (char *)space, raw);
-+            return (char *)space;
-         }
--#ifdef QDOS
--        if (qlflag & 2) {
--            if (*r == '/' || *r == '.') {
-+        wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t));
-+        if (wostring == NULL) {
-+            free(wstring);
-+            strcpy( (char *)space, raw);
-+            return (char *)space;
-+        }
-+
-+        /* Convert the multi-byte Unicode to wide chars. */
-+        wslen = mbstowcs(wstring, raw, wslen + 1);
-+
-+        /* Filter the wide-character string. */
-+        fnfilterw( wstring, wostring, (2 * (wslen + 1) * sizeof(wchar_t)));
-+
-+        /* Convert filtered wide chars back to multi-byte. */
-+        woslen = wcstombs( NULL, wostring, 0);
-+        if ((newraw = malloc(woslen + 1)) == NULL) {
-+            free(wstring);
-+            free(wostring);
-+            strcpy( (char *)space, raw);
-+            return (char *)space;
-+        }
-+        woslen = wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1);
-+
-+        if (size > 0) {
-+            slim = space + size - 4;
-+        }
-+        r = (ZCONST uch *)newraw;
-+        while (*r) {
-+            if (size > 0 && s >= slim && se == NULL) {
-+                se = s;
-+            }
-+#  ifdef QDOS
-+            if (qlflag & 2) {
-+                if (*r == '/' || *r == '.') {
-+                    if (se != NULL && (s > (space + (size-3)))) {
-+                        have_overflow = TRUE;
-+                        break;
-+                    }
-+                    ++r;
-+                    *s++ = '_';
-+                    continue;
-+                }
-+            } else
-+#  endif
-+            {
-                 if (se != NULL && (s > (space + (size-3)))) {
-                     have_overflow = TRUE;
-                     break;
-                 }
--                ++r;
--                *s++ = '_';
--                continue;
-+                *s++ = *r++;
-             }
--        } else
-+        }
-+        if (have_overflow) {
-+            strcpy((char *)se, "...");
-+        } else {
-+            *s = '\0';
-+        }
-+
-+        free(wstring);
-+        free(wostring);
-+        free(newraw);
-+    }
-+    else
-+# endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */
-+    {
-+        /* No Unicode support, or apparently invalid Unicode. */
-+        r = (ZCONST uch *)raw;
-+
-+        if (size > 0) {
-+            slim = space + size
-+#ifdef _MBCS
-+                         - (MB_CUR_MAX - 1)
-+#endif
-+                         - 4;
-+        }
-+        while (*r) {
-+            if (size > 0 && s >= slim && se == NULL) {
-+                se = s;
-+            }
-+#ifdef QDOS
-+            if (qlflag & 2) {
-+                if (*r == '/' || *r == '.') {
-+                    if (se != NULL && (s > (space + (size-3)))) {
-+                        have_overflow = TRUE;
-+                        break;
-+                    }
-+                    ++r;
-+                    *s++ = '_';
-+                    continue;
-+                }
-+            } else

_service:extract_file:unzip-6.0-alt-iconv-utf8.patch Deleted

@@ -1,398 +0,0 @@
-From: Giovanni Scafora <giovanni.archlinux.org>
-Subject: unzip files encoded with non-latin, non-unicode file names
-Last-Update: 2015-02-11
-
-Updated 2015-02-11 by Marc Deslauriers <marc.deslauriers@canonical.com>
-to fix buffer overflow in charset_to_intern()
-
-Index: unzip-6.0/unix/unix.c
-===================================================================
---- unzip-6.0.orig/unix/unix.c	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unix/unix.c	2015-02-11 09:18:04.902081319 -0500
-@@ -30,6 +30,9 @@
- #define UNZIP_INTERNAL
- #include "unzip.h"
- 
-+#include <iconv.h>
-+#include <langinfo.h>
-+
- #ifdef SCO_XENIX
- #  define SYSNDIR
- #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,102 @@
-     }
- }
- #endif /* QLZIP */
-+
-+
-+typedef struct {
-+    char *local_charset;
-+    char *archive_charset;
-+} CHARSET_MAP;
-+
-+/* A mapping of local <-> archive charsets used by default to convert filenames
-+ * of DOS/Windows Zip archives. Currently very basic. */
-+static CHARSET_MAP dos_charset_map = {
-+    { "ANSI_X3.4-1968", "CP850" },
-+    { "ISO-8859-1", "CP850" },
-+    { "CP1252", "CP850" },
-+    { "UTF-8", "CP866" },
-+    { "KOI8-R", "CP866" },
-+    { "KOI8-U", "CP866" },
-+    { "ISO-8859-5", "CP866" }
-+};
-+
-+char OEM_CPMAX_CP_NAME = "";
-+char ISO_CPMAX_CP_NAME = "";
-+
-+/* Try to guess the default value of OEM_CP based on the current locale.
-+ * ISO_CP is left alone for now. */
-+void init_conversion_charsets()
-+{
-+    const char *local_charset;
-+    int i;
-+
-+    /* Make a guess only if OEM_CP not already set. */ 
-+    if(*OEM_CP == '\0') {
-+    	local_charset = nl_langinfo(CODESET);
-+    	for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
-+    		if(!strcasecmp(local_charset, dos_charset_mapi.local_charset)) {
-+    			strncpy(OEM_CP, dos_charset_mapi.archive_charset,
-+    					sizeof(OEM_CP));
-+    			break;
-+    		}
-+    }
-+}
-+
-+/* Convert a string from one encoding to the current locale using iconv().
-+ * Be as non-intrusive as possible. If error is encountered during covertion
-+ * just leave the string intact. */
-+static void charset_to_intern(char *string, char *from_charset)
-+{
-+    iconv_t cd;
-+    char *s,*d, *buf;
-+    size_t slen, dlen, buflen;
-+    const char *local_charset;
-+
-+    if(*from_charset == '\0')
-+    	return;
-+
-+    buf = NULL;
-+    local_charset = nl_langinfo(CODESET);
-+
-+    if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
-+        return;
-+
-+    slen = strlen(string);
-+    s = string;
-+
-+    /*  Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
-+     *  as this function also gets called with G.outbuf in fileio.c
-+     */
-+    buflen = FILNAMSIZ;
-+    if (OUTBUFSIZ + 1 < FILNAMSIZ)
-+    {
-+        buflen = OUTBUFSIZ + 1;
-+    }
-+
-+    d = buf = malloc(buflen);
-+    if(!d)
-+    	goto cleanup;
-+
-+    bzero(buf,buflen);
-+    dlen = buflen - 1;
-+
-+    if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
-+    	goto cleanup;
-+    strncpy(string, buf, buflen);
-+
-+    cleanup:
-+    free(buf);
-+    iconv_close(cd);
-+}
-+
-+/* Convert a string from OEM_CP to the current locale charset. */
-+inline void oem_intern(char *string)
-+{
-+    charset_to_intern(string, OEM_CP);
-+}
-+
-+/* Convert a string from ISO_CP to the current locale charset. */
-+inline void iso_intern(char *string)
-+{
-+    charset_to_intern(string, ISO_CP);
-+}
-Index: unzip-6.0/unix/unxcfg.h
-===================================================================
---- unzip-6.0.orig/unix/unxcfg.h	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unix/unxcfg.h	2015-02-11 08:46:43.671324260 -0500
-@@ -228,4 +228,30 @@
- /* wild_dir, dirname, wildname, matchname, dirnamelen, have_dirname, */
- /*    and notfirstcall are used by do_wild().                          */
- 
-+
-+#define MAX_CP_NAME 25 
-+   
-+#ifdef SETLOCALE
-+#  undef SETLOCALE
-+#endif
-+#define SETLOCALE(category, locale) setlocale(category, locale)
-+#include <locale.h>
-+   
-+#ifdef _ISO_INTERN
-+#  undef _ISO_INTERN
-+#endif
-+#define _ISO_INTERN(str1) iso_intern(str1)
-+
-+#ifdef _OEM_INTERN
-+#  undef _OEM_INTERN
-+#endif
-+#ifndef IZ_OEM2ISO_ARRAY
-+#  define IZ_OEM2ISO_ARRAY
-+#endif
-+#define _OEM_INTERN(str1) oem_intern(str1)
-+
-+void iso_intern(char *);
-+void oem_intern(char *);
-+void init_conversion_charsets(void);
-+   
- #endif /* !__unxcfg_h */
-Index: unzip-6.0/unzip.c
-===================================================================
---- unzip-6.0.orig/unzip.c	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unzip.c	2015-02-11 08:46:43.675324290 -0500
-@@ -327,11 +327,21 @@
-   -2  just filenames but allow -h/-t/-z  -l  long Unix \"ls -l\" format\n\
-                                          -v  verbose, multi-page format\n";
- 
-+#ifndef UNIX
- static ZCONST char Far ZipInfoUsageLine3 = "miscellaneous options:\n\
-   -h  print header line       -t  print totals for listed files or for all\n\
-   -z  print zipfile comment   -T  print file times in sortable decimal format\
- \n  -C  be case-insensitive   %s\
-   -x  exclude filenames that follow from listing\n";
-+#else /* UNIX */
-+static ZCONST char Far ZipInfoUsageLine3 = "miscellaneous options:\n\
-+  -h  print header line       -t  print totals for listed files or for all\n\
-+  -z  print zipfile comment   -T  print file times in sortable decimal format\
-+\n %c-C%c be case-insensitive   %s\
-+  -x  exclude filenames that follow from listing\n\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
-+#endif /* !UNIX */
- #ifdef MORE
-    static ZCONST char Far ZipInfoUsageLine4 =
-      "  -M  page output through built-in \"more\"\n";
-@@ -664,6 +674,17 @@
-   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
- lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+#elif (defined UNIX)
-+static ZCONST char Far UnzipUsageLine4 = "\
-+modifiers:\n\
-+  -n  never overwrite existing files         -q  quiet mode (-qq => quieter)\n\
-+  -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
-+  -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-+  -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-+  -C  match filenames case-insensitively     -L  make (some) names \
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\

_service:extract_file:unzip-6.0-attribs-overflow.patch Deleted

_service:extract_file:unzip-6.0-bzip2-configure.patch Deleted

_service:extract_file:unzip-6.0-caseinsensitive.patch Deleted

@@ -1,131 +0,0 @@
-diff --git a/match.c b/match.c
-index 6cd656f..4e569f5 100644
---- a/match.c
-+++ b/match.c
-@@ -190,10 +190,10 @@ char *___tmp_ptr;
- 
- #endif
- 
--static int recmatch(p, s, cs)
-+static int recmatch(p, s, ci)
- ZCONST char *p;         /* sh pattern to match */
- ZCONST char *s;         /* string to match it to */
--int cs;                 /* flag: force case-sensitive matching */
-+int ci;                 /* flag: force case-insensitive matching */
- /* Recursively compare the sh pattern p with the string s and return 1 if
-    they match, and 0 or 2 if they don't or if there is a syntax error in the
-    pattern.  This routine recurses on itself no deeper than the number of
-@@ -214,7 +214,7 @@ int cs;                 /* flag: force case-sensitive matching */
-   if (CLEN(p) == 2) {
-     if (CLEN(s) == 2) {
-       return (*p == *s && *(p+1) == *(s+1)) ?
--        recmatch(p + 2, s + 2, cs) : 0;
-+        recmatch(p + 2, s + 2, ci) : 0;
-     } else {
-       return 0;
-     }
-@@ -230,9 +230,9 @@ int cs;                 /* flag: force case-sensitive matching */
-   /* '?' (or '%' or '#') matches any character (but not an empty string) */
-   if (c == WILDCHR_SINGLE) {
-     if (wild_stop_at_dir)
--      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
-+      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0;
-     else
--      return *s ? recmatch(p, s + CLEN(s), cs) : 0;
-+      return *s ? recmatch(p, s + CLEN(s), ci) : 0;
-   }
- 
-   /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
-@@ -253,14 +253,14 @@ int cs;                 /* flag: force case-sensitive matching */
- # endif /* ?AMIGA */
-         /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */
-         for (; *s && *s != DIRSEP_CHR; INCSTR(s))
--          if ((c = recmatch(p, s, cs)) != 0)
-+          if ((c = recmatch(p, s, ci)) != 0)
-             return c;
-         /* end of pattern: matched if at end of string, else continue */
-         if (*p == 0)
-           return (*s == 0);
-         /* continue to match if at DIRSEP_CHR in pattern, else give up */
-         return (*p == DIRSEP_CHR || (*p == '\\' && p1 == DIRSEP_CHR))
--               ? recmatch(p, s, cs) : 2;
-+               ? recmatch(p, s, ci) : 2;
-       }
-       /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */
-       p++;        /* move p past the second WILDCHR_MULTI */
-@@ -308,17 +308,17 @@ int cs;                 /* flag: force case-sensitive matching */
-          */
-         if (q != srest)
-           return 0;
--        return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0);
-+        return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0);
-       }
- #else /* !_MBCS */
--        return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0);
-+        return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0);
- #endif /* ?_MBCS */
-     }
-     else
-     {
-       /* pattern contains more wildcards, continue with recursion... */
-       for (; *s; INCSTR(s))
--        if ((c = recmatch(p, s, cs)) != 0)
-+        if ((c = recmatch(p, s, ci)) != 0)
-           return c;
-       return 2;           /* 2 means give up--shmatch will return false */
-     }
-@@ -353,17 +353,17 @@ int cs;                 /* flag: force case-sensitive matching */
-         c = *(p-1);
-       else
-       {
--        uch cc = (cs ? (uch)*s : case_map((uch)*s));
-+        uch cc = (!ci ? (uch)*s : to_up((uch)*s));
-         uch uc = (uch) c;
-         if (*(p+1) != '-')
-           for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++)
-             /* compare range */
--            if ((cs ? uc : case_map(uc)) == cc)
--              return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs);
-+            if ((!ci ? uc : to_up(uc)) == cc)
-+              return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci);
-         c = e = 0;                      /* clear range, escape flags */
-       }
-     }
--    return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0;
-+    return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0;
-                                         /* bracket match failed */
-   }
- #endif /* !VMS */
-@@ -382,18 +382,18 @@ int cs;                 /* flag: force case-sensitive matching */
-   {
-     /* Match "..." with "".  Continue after "" in both. */
-     if ((*(p+ 2* CLEN( p)) == '') && (*s == ''))
--      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
-+      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
- 
-     /* Else, look for a reduced match in s, until "" in or end of s. */
-     for (; *s && (*s != ''); INCSTR(s))
-       if (*s == '.')
-         /* If reduced match, then continue after "..." in p, "." in s. */
--        if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0)
-+        if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0)
-           return (int)c;
- 
-     /* Match "..." with "".  Continue after "" in both. */
-     if ((*(p+ 2* CLEN( p)) == '') && (*s == ''))
--      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
-+      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
- 
-     /* No reduced match.  Quit. */
-     return 2;
-@@ -402,8 +402,8 @@ int cs;                 /* flag: force case-sensitive matching */
- #endif /* def VMS */
- 
-   /* Just a character--compare it */
--  return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ?
--          recmatch(p, s + CLEN(s), cs) : 0;
-+  return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ?
-+          recmatch(p, s + CLEN(s), ci) : 0;
- }
- 
-

_service:extract_file:unzip-6.0-close.patch Deleted

@@ -1,176 +0,0 @@
-diff -up unzip60/extract.c.close unzip60/extract.c
---- unzip60/extract.c.close	2009-03-14 02:32:52.000000000 +0100
-+++ unzip60/extract.c	2009-11-19 08:17:23.481263496 +0100
-@@ -1924,24 +1924,21 @@ static int extract_or_test_member(__G)  
- 
- #ifdef VMS                  /* VMS:  required even for stdout! (final flush) */
-     if (!uO.tflag)           /* don't close NULL file */
--        close_outfile(__G);
-+        error = close_outfile(__G);
- #else
- #ifdef DLL
-     if (!uO.tflag && (!uO.cflag || G.redirect_data)) {
-         if (G.redirect_data)
-             FINISH_REDIRECT();
-         else
--            close_outfile(__G);
-+            error = close_outfile(__G);
-     }
- #else
-     if (!uO.tflag && !uO.cflag)   /* don't close NULL file or stdout */
--        close_outfile(__G);
-+        error = close_outfile(__G);
- #endif
- #endif /* VMS */
- 
--            /* GRR: CONVERT close_outfile() TO NON-VOID:  CHECK FOR ERRORS! */
--
--
-     if (G.disk_full) {            /* set by flush() */
-         if (G.disk_full > 1) {
- #if (defined(DELETE_IF_FULL) && defined(HAVE_UNLINK))
-diff -up unzip60/unix/unix.c.close unzip60/unix/unix.c
---- unzip60/unix/unix.c.close	2009-01-24 00:31:26.000000000 +0100
-+++ unzip60/unix/unix.c	2009-11-19 08:33:25.568389171 +0100
-@@ -1096,10 +1096,41 @@ static int get_extattribs(__G__ pzt, z_u
- #ifndef MTS
- 
- /****************************/
-+/* Function CloseError()    */
-+/***************************/
-+
-+int CloseError(__G)
-+    __GDEF
-+{
-+    int errval = PK_OK;
-+    
-+    if (fclose(G.outfile) < 0) {
-+          switch (errno) {
-+                case ENOSPC:
-+                    /* Do we need this on fileio.c? */
-+                    Info(slide, 0x4a1, ((char *)slide, "%s: write error (disk full?).   Continue? (y/n/^C) ",
-+                          FnFilter1(G.filename)));
-+                    fgets(G.answerbuf, 9, stdin);
-+                    if (*G.answerbuf == 'y')     /* stop writing to this file */
-+                        G.disk_full = 1;         /* pass to next */
-+                    else
-+                        G.disk_full = 2;         /* no: exit program */
-+          
-+                    errval = PK_DISK;
-+                    break;
-+
-+                default:
-+                    errval = PK_WARN;
-+          }
-+     }
-+     return errval;
-+} /* End of CloseError() */
-+
-+/****************************/
- /* Function close_outfile() */
- /****************************/
- 
--void close_outfile(__G)    /* GRR: change to return PK-style warning level */
-+int close_outfile(__G) 
-     __GDEF
- {
-     union {
-@@ -1108,6 +1139,7 @@ void close_outfile(__G)    /* GRR: chang
-     } zt;
-     ulg z_uidgid2;
-     int have_uidgid_flg;
-+    int errval = PK_OK;
- 
-     have_uidgid_flg = get_extattribs(__G__ &(zt.t3), z_uidgid);
- 
-@@ -1141,16 +1173,16 @@ void close_outfile(__G)    /* GRR: chang
-             Info(slide, 0x201, ((char *)slide,
-               "warning:  symbolic link (%s) failed: mem alloc overflow\n",
-               FnFilter1(G.filename)));
--            fclose(G.outfile);
--            return;
-+            errval = CloseError(G.outfile, G.filename);
-+            return errval ? errval : PK_WARN;
-         }
- 
-         if ((slnk_entry = (slinkentry *)malloc(slnk_entrysize)) == NULL) {
-             Info(slide, 0x201, ((char *)slide,
-               "warning:  symbolic link (%s) failed: no mem\n",
-               FnFilter1(G.filename)));
--            fclose(G.outfile);
--            return;
-+            errval = CloseError(G.outfile, G.filename);
-+            return errval ? errval : PK_WARN;
-         }
-         slnk_entry->next = NULL;
-         slnk_entry->targetlen = ucsize;
-@@ -1174,10 +1206,10 @@ void close_outfile(__G)    /* GRR: chang
-               "warning:  symbolic link (%s) failed\n",
-               FnFilter1(G.filename)));
-             free(slnk_entry);
--            fclose(G.outfile);
--            return;
-+            errval = CloseError(G.outfile, G.filename);
-+            return errval ? errval : PK_WARN;
-         }
--        fclose(G.outfile);                  /* close "link" file for good... */
-+        errval = CloseError(G.outfile, G.filename); /* close "link" file for good... */
-         slnk_entry->targetucsize = '\0';
-         if (QCOND2)
-             Info(slide, 0, ((char *)slide, "-> %s ",
-@@ -1188,7 +1220,7 @@ void close_outfile(__G)    /* GRR: chang
-         else
-             G.slink_head = slnk_entry;
-         G.slink_last = slnk_entry;
--        return;
-+        return errval;
-     }
- #endif /* SYMLINKS */
- 
-@@ -1201,7 +1233,7 @@ void close_outfile(__G)    /* GRR: chang
- #endif
- 
- #if (defined(NO_FCHOWN))
--    fclose(G.outfile);
-+    errval = CloseError(G.outfile, G.filename);
- #endif
- 
-     /* if -X option was specified and we have UID/GID info, restore it */
-@@ -1227,7 +1259,7 @@ void close_outfile(__G)    /* GRR: chang
-     }
- 
- #if (!defined(NO_FCHOWN) && defined(NO_FCHMOD))
--    fclose(G.outfile);
-+    errval = CloseError(G.outfile, G.filename);
- #endif
- 
- #if (!defined(NO_FCHOWN) && !defined(NO_FCHMOD))
-@@ -1239,7 +1271,7 @@ void close_outfile(__G)    /* GRR: chang
-     if (fchmod(fileno(G.outfile), filtattr(__G__ G.pInfo->file_attr)))
-         perror("fchmod (file attributes) error");
- 
--    fclose(G.outfile);
-+    errval = CloseError(G.outfile, G.filename);
- #endif /* !NO_FCHOWN && !NO_FCHMOD */
- 
-     /* skip restoring time stamps on user's request */
-@@ -1267,6 +1299,7 @@ void close_outfile(__G)    /* GRR: chang
- #endif
- #endif /* NO_FCHOWN || NO_FCHMOD */
- 
-+    return errval;
- } /* end function close_outfile() */
- 
- #endif /* !MTS */
-diff -up unzip60/unzpriv.h.close unzip60/unzpriv.h
---- unzip60/unzpriv.h.close	2009-04-20 01:59:26.000000000 +0200
-+++ unzip60/unzpriv.h	2009-11-19 08:19:08.610388618 +0100
-@@ -2604,7 +2604,7 @@ char    *GetLoadPath     OF((__GPRO));  
-    int   SetFileSize     OF((FILE *file, zusz_t filesize));         /* local */
- #endif
- #ifndef MTS /* macro in MTS */
--   void  close_outfile   OF((__GPRO));                              /* local */
-+   int  close_outfile   OF((__GPRO));                              /* local */
- #endif
- #ifdef SET_SYMLINK_ATTRIBS
-    int  set_symlnk_attribs  OF((__GPRO__ slinkentry *slnk_entry));  /* local */

_service:extract_file:unzip-6.0-configure.patch Deleted

_service:extract_file:unzip-6.0-cve-2014-8139.patch Deleted

@@ -1,79 +0,0 @@
-diff --git a/extract.c b/extract.c
-index 9ef80b3..c741b5f 100644
---- a/extract.c
-+++ b/extract.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD =
- #ifndef SFX
-    static ZCONST char Far InconsistEFlength = "bad extra-field entry:\n \
-      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
-+   static ZCONST char Far TooSmallEBlength = "bad extra-field entry:\n \
-+     EF block length (%u bytes) invalid (< %d)\n";
-    static ZCONST char Far InvalidComprDataEAs =
-      " invalid compressed data for EAs\n";
- #  if (defined(WIN32) && defined(NTSD_EAS))
-@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len)
-         ebID = makeword(ef);
-         ebLen = (unsigned)makeword(ef+EB_LEN);
- 
--        if (ebLen > (ef_len - EB_HEADSIZE)) {
-+        if (ebLen > (ef_len - EB_HEADSIZE))
-+        {
-            /* Discovered some extra field inconsistency! */
-             if (uO.qflag)
-                 Info(slide, 1, ((char *)slide, "%-22s ",
-@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len)
-                 }
-                 break;
-             case EF_PKVMS:
--                if (makelong(ef+EB_HEADSIZE) !=
--                    crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
--                          (extent)(ebLen-4)))
--                    Info(slide, 1, ((char *)slide,
--                      LoadFarString(BadCRC_EAs)));
-+                /* 2015-01-30 SMS.  Added sufficient-bytes test/message
-+                 * here.  (Removed defective ebLen test above.)
-+                 *
-+                 * If sufficient bytes (EB_PKVMS_MINLEN) are available,
-+                 * then compare the stored CRC value with the calculated
-+                 * CRC for the remainder of the data (and complain about
-+                 * a mismatch).
-+                 */
-+                if (ebLen < EB_PKVMS_MINLEN)
-+                {
-+                    /* Insufficient bytes available. */
-+                    Info( slide, 1,
-+                     ((char *)slide, LoadFarString( TooSmallEBlength),
-+                     ebLen, EB_PKVMS_MINLEN));
-+                }
-+                else if (makelong(ef+ EB_HEADSIZE) !=
-+                 crc32(CRCVAL_INITIAL,
-+                 (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN),
-+                 (extent)(ebLen- EB_PKVMS_MINLEN)))
-+                {
-+                     Info(slide, 1, ((char *)slide,
-+                       LoadFarString(BadCRC_EAs)));
-+                }
-                 break;
-             case EF_PKW32:
-             case EF_PKUNIX:
-diff --git a/unzpriv.h b/unzpriv.h
-index 005cee0..5c83a6e 100644
---- a/unzpriv.h
-+++ b/unzpriv.h
-@@ -1806,6 +1806,8 @@
- #define EB_NTSD_VERSION   4    /* offset of NTSD version byte */
- #define EB_NTSD_MAX_VER   (0)  /* maximum version # we know how to handle */
- 
-+#define EB_PKVMS_MINLEN   4    /* minimum data length of PKVMS extra block */
-+
- #define EB_ASI_CRC32      0    /* offset of ASI Unix field's crc32 checksum */
- #define EB_ASI_MODE       4    /* offset of ASI Unix permission mode field */
- 
-

_service:extract_file:unzip-6.0-cve-2014-8140.patch Deleted

@@ -1,25 +0,0 @@
-diff --git a/extract.c b/extract.c
-index c741b5f..e4a4c7b 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
- 
-+    /* Return no/bad-data error status if any problem is found:
-+     *    1. eb_size is too small to hold the uncompressed size
-+     *       (eb_ucsize).  (Else extract eb_ucsize.)
-+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
-+     *    3. eb_ucsize is positive, but eb_size is too small to hold
-+     *       the compressed data header.
-+     */
-     if ((eb_size < (EB_UCSIZE_P + 4)) ||
--        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
--         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
--        return IZ_EF_TRUNC;               /* no compressed data! */
-+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
-+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
-+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
- 
-     method = makeword(eb + (EB_HEADSIZE + compr_offset));
-     if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))

_service:extract_file:unzip-6.0-cve-2014-8141.patch Deleted

@@ -1,138 +0,0 @@
-diff --git a/fileio.c b/fileio.c
-index 03fc4be..2a61a30 100644
---- a/fileio.c
-+++ b/fileio.c
-@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc =
- #endif
- static ZCONST char Far ExtraFieldTooLong =
-   "warning:  extra field too long (%d).  Ignoring...\n";
-+static ZCONST char Far ExtraFieldCorrupt =
-+  "warning:  extra field (type: 0x%04x) corrupt.  Continuing...\n";
- 
- #ifdef WINDLL
-    static ZCONST char Far DiskFullQuery =
-@@ -2300,7 +2302,13 @@ int do_string(__G__ length, option)   /* return PK-type error code */
-               length = length2;
-             }
-             /* Looks like here is where extra fields are read */
--            getZip64Data(__G__ G.extra_field, length);
-+            if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
-+            {
-+                Info(slide, 0x401, ((char *)slide,
-+                 LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
-+                error = PK_WARN;
-+            }
-+
- #ifdef UNICODE_SUPPORT
-             G.unipath_filename = NULL;
-             if (G.UzO.U_flag < 2) {
-diff --git a/process.c b/process.c
-index be6e006..0d57ab4 100644
---- a/process.c
-+++ b/process.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -1894,48 +1894,83 @@ int getZip64Data(__G__ ef_buf, ef_len)
-     and a 4-byte version of disk start number.
-     Sets both local header and central header fields.  Not terribly clever,
-     but it means that this procedure is only called in one place.
-+
-+    2014-12-05 SMS.
-+    Added checks to ensure that enough data are available before calling
-+    makeint64() or makelong().  Replaced various sizeof() values with
-+    simple ("4" or "8") constants.  (The Zip64 structures do not depend
-+    on our variable sizes.)  Error handling is crude, but we should now
-+    stay within the buffer.
-   ---------------------------------------------------------------------------*/
- 
-+#define Z64FLGS 0xffff
-+#define Z64FLGL 0xffffffff
-+
-     if (ef_len == 0 || ef_buf == NULL)
-         return PK_COOL;
- 
-     Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n",
-       ef_len));
- 
--    while (ef_len >= EB_HEADSIZE) {
-+    while (ef_len >= EB_HEADSIZE)
-+    {
-         eb_id = makeword(EB_ID + ef_buf);
-         eb_len = makeword(EB_LEN + ef_buf);
- 
--        if (eb_len > (ef_len - EB_HEADSIZE)) {
--            /* discovered some extra field inconsistency! */
-+        if (eb_len > (ef_len - EB_HEADSIZE))
-+        {
-+            /* Extra block length exceeds remaining extra field length. */
-             Trace((stderr,
-               "getZip64Data: block length %u > rest ef_size %u\n", eb_len,
-               ef_len - EB_HEADSIZE));
-             break;
-         }
--        if (eb_id == EF_PKSZ64) {
- 
-+        if (eb_id == EF_PKSZ64)
-+        {
-           int offset = EB_HEADSIZE;
- 
--          if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){
--            G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.ucsize);
-+          if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){
--            G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.csize);
-+
-+          if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.relative_offset_local_header == 0xffffffff){
-+
-+          if (G.crec.relative_offset_local_header == Z64FLGL)
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.relative_offset_local_header = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.relative_offset_local_header);
-+            offset += 8;
-           }
--          if (G.crec.disk_number_start == 0xffff){
-+
-+          if (G.crec.disk_number_start == Z64FLGS)
-+          {
-+            if (offset+ 4 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf);
--            offset += sizeof(G.crec.disk_number_start);
-+            offset += 4;
-           }
-+#if 0
-+          break;                /* Expect only one EF_PKSZ64 block. */
-+#endif /* 0 */
-         }
- 
--        /* Skip this extra field block */
-+        /* Skip this extra field block. */
-         ef_buf += (eb_len + EB_HEADSIZE);
-         ef_len -= (eb_len + EB_HEADSIZE);
-     }

_service:extract_file:unzip-6.0-cve-2018-1000035-heap-based-overflow.patch Deleted

@@ -1,34 +0,0 @@
---- a/fileio.c	2014-12-05 05:06:05 -0600
-+++ b/fileio.c	2017-11-14 01:06:28 -0600
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2017 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -1582,6 +1582,8 @@
-     int r = IZ_PW_ENTERED;
-     char *m;
-     char *prompt;
-+    char *ep;
-+    char *zp;
- 
- #ifndef REENTRANT
-     /* tell picky compilers to shut up about "unused variable" warnings */
-@@ -1590,9 +1592,12 @@
- 
-     if (*rcnt == 0) {           /* First call for current entry */
-         *rcnt = 2;
--        if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) {
--            sprintf(prompt, LoadFarString(PasswPrompt),
--                    FnFilter1(zfn), FnFilter2(efn));
-+        zp = FnFilter1( zfn);
-+        ep = FnFilter2( efn);
-+        prompt = (char *)malloc(        /* Slightly too long (2* "%s"). */
-+         sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep));
-+        if (prompt != (char *)NULL) {
-+            sprintf(prompt, LoadFarString(PasswPrompt), zp, ep);
-             m = prompt;
-         } else
-             m = (char *)LoadFarString(PasswPrompt2);

_service:extract_file:unzip-6.0-exec-shield.patch Deleted

_service:extract_file:unzip-6.0-fix-recmatch.patch Deleted

@@ -1,477 +0,0 @@
-diff -up unzip60/match.c.recmatch unzip60/match.c
---- unzip60/match.c.recmatch	2005-08-14 13:00:36.000000000 -0400
-+++ unzip60/match.c	2013-05-28 10:29:57.949077543 -0400
-@@ -27,16 +27,14 @@
- 
-   ---------------------------------------------------------------------------
- 
--  Copyright on recmatch() from Zip's util.c (although recmatch() was almost
--  certainly written by Mark Adler...ask me how I can tell :-) ):
-+  Copyright on recmatch() from Zip's util.c
-+	 Copyright (c) 1990-2005 Info-ZIP.  All rights reserved.
- 
--     Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly,
--     Kai Uwe Rommel and Igor Mandrichenko.
-+	 See the accompanying file LICENSE, version 2004-May-22 or later
-+	 for terms of use.
-+	 If, for some reason, both of these files are missing, the Info-ZIP license
-+	 also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html  
- 
--     Permission is granted to any individual or institution to use, copy,
--     or redistribute this software so long as all of the original files are
--     included unmodified, that it is not sold for profit, and that this copy-
--     right notice is retained.
- 
-   ---------------------------------------------------------------------------
- 
-@@ -53,7 +51,7 @@
- 
-   A set is composed of characters or ranges; a range looks like ``character
-   hyphen character'' (as in 0-9 or A-Z).  0-9a-zA-Z_ is the minimal set of
--  characters allowed in the .. pattern construct.  Other characters are
-+  characters ALlowed in the .. pattern construct.  Other characters are
-   allowed (i.e., 8-bit characters) if your system will support them.
- 
-   To suppress the special syntactic significance of any of ``*?!^-\'', in-
-@@ -101,8 +99,32 @@
- #  define WILDCHAR   '?'
- #  define BEG_RANGE  ''
- #  define END_RANGE  ''
-+#  define WILDCHR_SINGLE '?'
-+#  define DIRSEP_CHR '/'
-+#  define WILDCHR_MULTI '*'
- #endif
- 
-+#ifdef WILD_STOP_AT_DIR
-+   int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */
-+#else
-+   int wild_stop_at_dir = 0; /* default wildcards do include / in matches */
-+#endif
-+
-+
-+
-+/*
-+ * case mapping functions. case_map is used to ignore case in comparisons,
-+ * to_up is used to force upper case even on Unix (for dosify option).
-+ */
-+#ifdef USE_CASE_MAP
-+#  define case_map(c) upper(c) & 0xff
-+#  define to_up(c)    upper(c) & 0xff
-+#else
-+#  define case_map(c) (c)
-+#  define to_up(c)    ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c))
-+#endif /* USE_CASE_MAP */
-+
-+
- #if 0                /* GRR:  add this to unzip.h someday... */
- #if !(defined(MSDOS) && defined(DOSWILD))
- #ifdef WILD_STOP_AT_DIR
-@@ -114,8 +136,8 @@ int recmatch OF((ZCONST uch *pattern, ZC
-                  int ignore_case __WDLPRO));
- #endif
- #endif /* 0 */
--static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string,
--                        int ignore_case __WDLPRO));
-+static int recmatch OF((ZCONST char *, ZCONST char *, 
-+                        int));
- static char *isshexp OF((ZCONST char *p));
- static int namecmp OF((ZCONST char *s1, ZCONST char *s2));
- 
-@@ -154,192 +176,240 @@ int match(string, pattern, ignore_case _
-             }
-             dospatternj-1 = '\0';                    /* nuke the end "." */
-         }
--        j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL);
-+        j = recmatch(dospattern, string, ignore_case);
-         free(dospattern);
-         return j == 1;
-     } else
- #endif /* MSDOS && DOSWILD */
--    return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1;
-+    return recmatch(pattern, string, ignore_case) == 1;
- }
- 
-+#ifdef _MBCS
-+
-+char *___tmp_ptr;
- 
-+#endif
- 
--static int recmatch(p, s, ic __WDL)
--    ZCONST uch *p;        /* sh pattern to match */
--    ZCONST uch *s;        /* string to which to match it */
--    int ic;               /* true for case insensitivity */
--    __WDLDEF              /* directory sepchar for WildStopAtDir mode, or 0 */
-+static int recmatch(p, s, cs)
-+ZCONST char *p;         /* sh pattern to match */
-+ZCONST char *s;         /* string to match it to */
-+int cs;                 /* flag: force case-sensitive matching */
- /* Recursively compare the sh pattern p with the string s and return 1 if
-- * they match, and 0 or 2 if they don't or if there is a syntax error in the
-- * pattern.  This routine recurses on itself no more deeply than the number
-- * of characters in the pattern. */
-+   they match, and 0 or 2 if they don't or if there is a syntax error in the
-+   pattern.  This routine recurses on itself no deeper than the number of
-+   characters in the pattern. */
- {
--    unsigned int c;       /* pattern char or start of range in - loop */
-+  int c;                /* pattern char or start of range in - loop */
-+  /* Get first character, the pattern for new recmatch calls follows */
-+ /* borrowed from Zip's global.c */
-+ int no_wild = 0; 
-+ int allow_regex=1;
-+  /* This fix provided by akt@m5.dion.ne.jp for Japanese.
-+     See 21 July 2006 mail.
-+     It only applies when p is pointing to a doublebyte character and
-+     things like / and wildcards are not doublebyte.  This probably
-+     should not be needed. */
- 
--    /* Get first character, the pattern for new recmatch calls follows */
--    c = *p; INCSTR(p);
-+#ifdef _MBCS
-+  if (CLEN(p) == 2) {
-+    if (CLEN(s) == 2) {
-+      return (*p == *s && *(p+1) == *(s+1)) ?
-+        recmatch(p + 2, s + 2, cs) : 0;
-+    } else {
-+      return 0;
-+    }
-+  }
-+#endif /* ?_MBCS */
- 
--    /* If that was the end of the pattern, match if string empty too */
--    if (c == 0)
--        return *s == 0;
-+  c = *POSTINCSTR(p);
- 
--    /* '?' (or '%') matches any character (but not an empty string). */
--    if (c == WILDCHAR)
--#ifdef WILD_STOP_AT_DIR
--        /* If uO.W_flag is non-zero, it won't match '/' */
--        return (*s && (!sepc || *s != (uch)sepc))
--               ? recmatch(p, s + CLEN(s), ic, sepc) : 0;
--#else
--        return *s ? recmatch(p, s + CLEN(s), ic) : 0;
--#endif
-+  /* If that was the end of the pattern, match if string empty too */
-+  if (c == 0)
-+    return *s == 0;
-+
-+  /* '?' (or '%' or '#') matches any character (but not an empty string) */
-+  if (c == WILDCHR_SINGLE) {
-+    if (wild_stop_at_dir)
-+      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
-+    else
-+      return *s ? recmatch(p, s + CLEN(s), cs) : 0;
-+  }
- 
--    /* '*' matches any number of characters, including zero */
-+  /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
- #ifdef AMIGA
--    if (c == '#' && *p == '?')     /* "#?" is Amiga-ese for "*" */
--        c = '*', p++;
-+  if (!no_wild && c == '#' && *p == '?')            /* "#?" is Amiga-ese for "*" */
-+    c = WILDCHR_MULTI, p++;
- #endif /* AMIGA */
--    if (c == '*') {
--#ifdef WILD_STOP_AT_DIR
--        if (sepc) {
--          /* check for single "*" or double "**" */
--#  ifdef AMIGA
--          if ((c = p0) == '#' && p1 == '?') /* "#?" is Amiga-ese for "*" */
--            c = '*', p++;
--          if (c != '*') {
--#  else /* !AMIGA */
--          if (*p != '*') {
--#  endif /* ?AMIGA */
--            /* single "*": this doesn't match the dirsep character */
--            for (; *s && *s != (uch)sepc; INCSTR(s))
--                if ((c = recmatch(p, s, ic, sepc)) != 0)
--                    return (int)c;
--            /* end of pattern: matched if at end of string, else continue */
--            if (*p == '\0')
--                return (*s == 0);
--            /* continue to match if at sepc in pattern, else give up */
--            return (*p == (uch)sepc || (*p == '\\' && p1 == (uch)sepc))
--                   ? recmatch(p, s, ic, sepc) : 2;
--          }
--          /* "**": this matches slashes */
--          ++p;        /* move p behind the second '*' */

_service:extract_file:unzip-6.0-format-secure.patch Deleted

@@ -1,90 +0,0 @@
-diff --git a/extract.c b/extract.c
-index eeb2f57..a0a4929 100644
---- a/extract.c
-+++ b/extract.c
-@@ -472,8 +472,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-                      */
-                     Info(slide, 0x401, ((char *)slide,
-                       LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
--                    Info(slide, 0x401, ((char *)slide,
--                      LoadFarString(ReportMsg)));
-+                    Info(slide, 0x401,
-+                         ((char *)slide,"%s", LoadFarString(ReportMsg)));
-                     error_in_archive = PK_BADERR;
-                 }
-                 reached_end = TRUE;     /* ...so no more left to do */
-@@ -752,8 +752,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
- 
- #ifndef SFX
-     if (no_endsig_found) {                      /* just to make sure */
--        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
--        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
-+        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
-+        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg)));
-         if (!error_in_archive)       /* don't overwrite stronger error */
-             error_in_archive = PK_WARN;
-     }
-diff --git a/list.c b/list.c
-index 15e0011..f7359c3 100644
---- a/list.c
-+++ b/list.c
-@@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
-                 return PK_BADERR;   /* sig not found */
-             }
-         }
-@@ -507,7 +507,8 @@ int list_files(__G)    /* return PK-type error code */
-             && (!G.ecrec.is_zip64_archive)
-             && (memcmp(G.sig, end_central_sig, 4) != 0)
-            ) {          /* just to make sure again */
--            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+            Info(slide, 0x401, 
-+                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
-             error_in_archive = PK_WARN;   /* didn't find sig */
-         }
- 
-@@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
-                 return PK_BADERR;   /* sig not found */
-             }
-         }
-@@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
-   ---------------------------------------------------------------------------*/
- 
-     if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
--        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
-         error_in_archive = PK_WARN;
-     }
-     if (*nmember == 0L && error_in_archive <= PK_WARN)
-diff --git a/zipinfo.c b/zipinfo.c
-index 6e22cc8..ac5c61b 100644
---- a/zipinfo.c
-+++ b/zipinfo.c
-@@ -771,7 +771,7 @@ int zipinfo(__G)   /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
-                 error_in_archive = PK_BADERR;   /* sig not found */
-                 break;
-             }
-@@ -960,7 +960,8 @@ int zipinfo(__G)   /* return PK-type error code */
-             && (!G.ecrec.is_zip64_archive)
-             && (memcmp(G.sig, end_central_sig, 4) != 0)
-            ) {          /* just to make sure again */
--            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+            Info(slide, 0x401, 
-+                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
-             error_in_archive = PK_WARN;   /* didn't find sig */
-         }
-

_service:extract_file:unzip-6.0-heap-overflow-infloop.patch Deleted

@@ -1,104 +0,0 @@
-From bdd4a0cecd745cb4825e4508b5bdf2579731086a Mon Sep 17 00:00:00 2001
-From: Petr Stodulka <pstodulk@redhat.com>
-Date: Mon, 14 Sep 2015 18:23:17 +0200
-Subject: PATCH 1/3 upstream fix for heap overflow
-
-https://bugzilla.redhat.com/attachment.cgi?id=1073002
----
- crypt.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/crypt.c b/crypt.c
-index 784e411..a8975f2 100644
---- a/crypt.c
-+++ b/crypt.c
-@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
-     GLOBAL(pInfo->encrypted) = FALSE;
-     defer_leftover_input(__G);
-     for (n = 0; n < RAND_HEAD_LEN; n++) {
--        b = NEXTBYTE;
-+        /* 2012-11-23 SMS.  (OUSPG report.)
-+         * Quit early if compressed size < HEAD_LEN.  The resulting
-+         * error message ("unable to get password") could be improved,
-+         * but it's better than trying to read nonexistent data, and
-+         * then continuing with a negative G.csize.  (See
-+         * fileio.c:readbyte()).
-+         */
-+        if ((b = NEXTBYTE) == (ush)EOF)
-+        {
-+            return PK_ERR;
-+        }
-         hn = (uch)b;
-         Trace((stdout, " (%02x)", hn));
-     }
--- 
-2.4.6
-
-
-From 4b48844661ff9569f2ecf582a387d46a5775b5d8 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 14 Sep 2015 18:24:56 +0200
-Subject: PATCH 2/3 fix infinite loop when extracting empty bzip2 data
-
-Bug: https://sourceforge.net/p/infozip/patches/23/
----
- extract.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/extract.c b/extract.c
-index 7134bfe..29db027 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2733,6 +2733,12 @@ __GDEF
-     int repeated_buf_err;
-     bz_stream bstrm;
- 
-+    if (G.incnt <= 0 && G.csize <= 0L) {
-+        /* avoid an infinite loop */
-+        Trace((stderr, "UZbunzip2() got empty input\n"));
-+        return 2;
-+    }
-+
- #if (defined(DLL) && !defined(NO_SLIDE_REDIR))
-     if (G.redirect_slide)
-         wsize = G.redirect_size, redirSlide = G.redirect_buffer;
--- 
-2.4.6
-
-
-From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Tue, 22 Sep 2015 18:52:23 +0200
-Subject: PATCH 3/3 extract: prevent unsigned overflow on invalid input
-
-Suggested-by: Stefan Cornelius
----
- extract.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/extract.c b/extract.c
-index 29db027..b9ae667 100644
---- a/extract.c
-+++ b/extract.c
-@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk,
-         if (G.lrec.compression_method == STORED) {
-             zusz_t csiz_decrypted = G.lrec.csize;
- 
--            if (G.pInfo->encrypted)
-+            if (G.pInfo->encrypted) {
-+                if (csiz_decrypted < 12) {
-+                    /* handle the error now to prevent unsigned overflow */
-+                    Info(slide, 0x401, ((char *)slide,
-+                      LoadFarStringSmall(ErrUnzipNoFile),
-+                      LoadFarString(InvalidComprData),
-+                      LoadFarStringSmall2(Inflate)));
-+                    return PK_ERR;
-+                }
-                 csiz_decrypted -= 12;
-+            }
-             if (G.lrec.ucsize != csiz_decrypted) {
-                 Info(slide, 0x401, ((char *)slide,
-                   LoadFarStringSmall2(WrnStorUCSizCSizDiff),
--- 
-2.5.2
-

_service:extract_file:unzip-6.0-manpage-fix.patch Deleted

_service:extract_file:unzip-6.0-overflow-long-fsize.patch Deleted

@@ -1,34 +0,0 @@
-diff --git a/list.c b/list.c
-index f7359c3..4c3d703 100644
---- a/list.c
-+++ b/list.c
-@@ -97,7 +97,7 @@ int list_files(__G)    /* return PK-type error code */
- {
-     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
- #ifndef WINDLL
--    char sgn, cfactorstr10;
-+    char sgn, cfactorstr13;
-     int longhdr=(uO.vflag>1);
- #endif
-     int date_format;
-@@ -339,7 +339,19 @@ int list_files(__G)    /* return PK-type error code */
-                 G.crec.compression_method == ENHDEFLATED) {
-                 methbuf5 = dtype(G.crec.general_purpose_bit_flag>>1) & 3;
-             } else if (methnum >= NUM_METHODS) {
--                sprintf(&methbuf4, "%03u", G.crec.compression_method);
-+                /* 2013-02-26 SMS.
-+                 * http://sourceforge.net/tracker/?func=detail
-+                 *  &aid=2861648&group_id=118012&atid=679786
-+                 * Unexpectedly large compression methods overflow
-+                 * &methbuf.  Use the old, three-digit decimal format
-+                 * for values which fit.  Otherwise, sacrifice the
-+                 * colon, and use four-digit hexadecimal.
-+                 */
-+                if (G.crec.compression_method <= 999) {
-+                    sprintf( &methbuf 4, "%03u", G.crec.compression_method);
-+                } else {
-+                    sprintf( &methbuf 3, "%04X", G.crec.compression_method);
-+                }
-             }
- 
- #if 0       /* GRR/Euro:  add this? */

_service:extract_file:unzip-6.0-overflow.patch Deleted

@@ -1,25 +0,0 @@
-diff --git a/extract.c b/extract.c
-index a0a4929..9ef80b3 100644
---- a/extract.c
-+++ b/extract.c
-@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
-     ulg eb_ucsize;
-     uch *eb_ucptr;
-     int r;
-+    ush method;
- 
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
-@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
-          eb_size <= (compr_offset + EB_CMPRHEADLEN)))
-         return IZ_EF_TRUNC;               /* no compressed data! */
- 
-+    method = makeword(eb + (EB_HEADSIZE + compr_offset));
-+    if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
-+        return PK_ERR;            /* compressed & uncompressed
-+                                   * should match in STORED
-+                                   * method */
-+
-     if (
- #ifdef INT_16BIT
-         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||

_service:extract_file:unzip-6.0-symlink.patch Deleted

_service:extract_file:unzip-6.0-timestamp.patch Deleted

@@ -1,41 +0,0 @@
-From: "Steven M. Schweda" <sms@antinode.info>
-Subject: Do not ignore extra fields containing Unix Timestamps
-Bug-Debian: https://bugs.debian.org/842993
-X-Debian-version: 6.0-21
-
---- a/process.c
-+++ b/process.c
-@@ -2914,10 +2914,13 @@
-             break;
- 
-           case EF_IZUNIX2:
--            if (have_new_type_eb == 0) {
--                flags &= ~0x0ff;        /* ignore any previous IZUNIX field */
-+            if (have_new_type_eb == 0) {        /* (< 1) */
-                 have_new_type_eb = 1;
-             }
-+            if (have_new_type_eb <= 1) {
-+                /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */
-+                flags &= 0x0ff;
-+            }
- #ifdef IZ_HAVE_UXUIDGID
-             if (have_new_type_eb > 1)
-                 break;          /* IZUNIX3 overrides IZUNIX2 e.f. block ! */
-@@ -2933,6 +2936,8 @@
-             /* new 3rd generation Unix ef */
-             have_new_type_eb = 2;
- 
-+            /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */
-+            flags &= 0x0ff;
-         /*
-           Version       1 byte      version of this extra field, currently 1
-           UIDSize       1 byte      Size of UID field
-@@ -2953,8 +2958,6 @@
-                 uid_size = *((EB_HEADSIZE + 1) + ef_buf);
-                 gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf);
- 
--                flags &= ~0x0ff;      /* ignore any previous UNIX field */
--
-                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
-                                     uid_size, &z_uidgid0)
-                     &&

_service:extract_file:unzip-6.0-valgrind.patch Deleted

@@ -1,26 +0,0 @@
-diff --git a/fileio.c b/fileio.c
-index ba0a1d0..03fc4be 100644
---- a/fileio.c
-+++ b/fileio.c
-@@ -2006,6 +2006,7 @@ int do_string(__G__ length, option)   /* return PK-type error code */
-     unsigned comment_bytes_left;
-     unsigned int block_len;
-     int error=PK_OK;
-+    unsigned int length2;
- #ifdef AMIGA
-     char tmp_fnote2 * AMIGA_FILENOTELEN;   /* extra room for squozen chars */
- #endif
-@@ -2292,8 +2293,12 @@ int do_string(__G__ length, option)   /* return PK-type error code */
-             seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes +
-                       (G.inptr-G.inbuf) + length);
-         } else {
--            if (readbuf(__G__ (char *)G.extra_field, length) == 0)
-+            if ((length2 = readbuf(__G__ (char *)G.extra_field, length)) == 0)
-                 return PK_EOF;
-+            if(length2 < length) {
-+              memset (__G__ (char *)G.extra_field+length2, 0 , length-length2);
-+              length = length2;
-+            }
-             /* Looks like here is where extra fields are read */
-             getZip64Data(__G__ G.extra_field, length);
- #ifdef UNICODE_SUPPORT

_service:extract_file:unzip-6.0-x-option.patch Deleted

@@ -1,28 +0,0 @@
---- ./process.c.orig    2009-03-06 02:25:10.000000000 +0100
-+++ ./process.c 2013-09-12 10:51:16.000000000 +0200
-@@ -2901,9 +2901,9 @@
-         */
- 
- #ifdef IZ_HAVE_UXUIDGID
--            if (eb_len >= EB_UX3_MINLEN
--                && z_uidgid != NULL
--                && (*((EB_HEADSIZE + 0) + ef_buf) == 1)
-+            if ((eb_len >= EB_UX3_MINLEN)
-+                && (z_uidgid != NULL)
-+                && ((*((EB_HEADSIZE + 0) + ef_buf) == 1)))
-                     /* only know about version 1 */
-             {
-                 uch uid_size;
-@@ -2915,10 +2915,10 @@
-                 flags &= ~0x0ff;      /* ignore any previous UNIX field */
- 
-                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
--                                    uid_size, z_uidgid0)
-+                                    uid_size, &z_uidgid0)
-                     &&
-                      read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf,
--                                    gid_size, z_uidgid1) )
-+                                    gid_size, &z_uidgid1) )
-                 {
-                     flags |= EB_UX2_VALID;   /* signal success */
-                 }

_service:tar_scm:0001-Fix-CVE-2016-9844-rhbz-1404283.patch Added

@@ -0,0 +1,39 @@
+From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk@redhat.com>
+Date: Wed, 14 Dec 2016 16:30:36 +0100
+Subject: PATCH Fix CVE-2016-9844 (rhbz#1404283)
+
+Fixes buffer overflow in zipinfo in similar way like fix for
+CVE-2014-9913 provided by upstream.
+---
+ zipinfo.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/zipinfo.c b/zipinfo.c
+index c03620e..accca2a 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -1984,7 +1984,19 @@ static int zi_short(__G)   /* return PK-type error code */
+         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
+         methbuf3 = dtypednum;
+     } else if (methnum >= NUM_METHODS) {   /* unknown */
+-        sprintf(&methbuf1, "%03u", G.crec.compression_method);
++        /* 2016-12-05 SMS.
++         * https://launchpad.net/bugs/1643750
++         * Unexpectedly large compression methods overflow
++         * &methbuf.  Use the old, three-digit decimal format
++         * for values which fit.  Otherwise, sacrifice the "u",
++         * and use four-digit hexadecimal.
++         */
++        if (G.crec.compression_method <= 999) {
++              sprintf( &methbuf 1, "%03u", G.crec.compression_method);
++        } else {
++              sprintf( &methbuf 0, "%04X", G.crec.compression_method);
++        }
++
+     }
+ 
+     for (k = 0;  k < 15;  ++k)
+-- 
+2.5.5
+

_service:tar_scm:CVE-2018-18384.patch Added

@@ -0,0 +1,35 @@
+--- a/list.c	2019-06-25 21:57:03.208000000 -0400
++++ b/list_1.c	2019-06-25 22:18:17.012000000 -0400
+@@ -97,7 +97,7 @@ int list_files(__G)    /* return PK-type
+ {
+     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+-    char sgn, cfactorstr13;
++    char sgn, cfactorstr1+11+1+1;	/* <sgn><int>%NUL */
+     int longhdr=(uO.vflag>1);
+ #endif
+     int date_format;
+@@ -390,9 +390,9 @@ int list_files(__G)    /* return PK-type
+             }
+ #else /* !WINDLL */
+             if (cfactor == 100)
+-                sprintf(cfactorstr, LoadFarString(CompFactor100));
++                snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
+             else
+-                sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
++                snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
+             if (longhdr)
+                 Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats),
+                   FmZofft(G.crec.ucsize, "8", "u"), methbuf,
+@@ -472,9 +472,9 @@ int list_files(__G)    /* return PK-type
+ 
+ #else /* !WINDLL */
+         if (cfactor == 100)
+-            sprintf(cfactorstr, LoadFarString(CompFactor100));
++            snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
+         else
+-            sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
++            snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
+         if (longhdr) {
+             Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer),
+               FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"),

_service:tar_scm:CVE-2019-13232-fur1.patch Added

@@ -0,0 +1,112 @@
+From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Thu, 25 Jul 2019 20:43:17 -0700
+Subject: PATCH Do not raise a zip bomb alert for a misplaced central
+ directory.
+
+There is a zip-like file in the Firefox distribution, omni.ja,
+which is a zip container with the central directory placed at the
+start of the file instead of after the local entries as required
+by the zip standard. This commit marks the actual location of the
+central directory, as well as the end of central directory records,
+as disallowed locations. This now permits such containers to not
+raise a zip bomb alert, where in fact there are no overlaps.
+---
+ extract.c | 25 +++++++++++++++++++------
+ process.c |  6 ++++++
+ unzpriv.h | 10 ++++++++++
+ 3 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 0973a33..1b73cb0 100644
+--- a/extract.c
++++ b/extract.c
+@@ -493,8 +493,11 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+     }
+ #endif /* !SFX || SFX_EXDIR */
+ 
+-    /* One more: initialize cover structure for bomb detection. Start with a
+-       span that covers the central directory though the end of the file. */
++    /* One more: initialize cover structure for bomb detection. Start with
++       spans that cover any extra bytes at the start, the central directory,
++       the end of central directory record (including the Zip64 end of central
++       directory locator, if present), and the Zip64 end of central directory
++       record, if present. */
+     if (G.cover == NULL) {
+         G.cover = malloc(sizeof(cover_t));
+         if (G.cover == NULL) {
+@@ -506,15 +509,25 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         ((cover_t *)G.cover)->max = 0;
+     }
+     ((cover_t *)G.cover)->num = 0;
+-    if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
+-        cover_add((cover_t *)G.cover,
++    if (cover_add((cover_t *)G.cover,
+                   G.extra_bytes + G.ecrec.offset_start_central_directory,
+-                  G.ziplen) != 0) {
++                  G.extra_bytes + G.ecrec.offset_start_central_directory +
++                  G.ecrec.size_central_directory) != 0) {
+         Info(slide, 0x401, ((char *)slide,
+           LoadFarString(NotEnoughMemCover)));
+         return PK_MEM;
+     }
++    if ((G.extra_bytes != 0 &&
++         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++        (G.ecrec.have_ecr64 &&
++         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
++                   G.ecrec.ec64_end) != 0) ||
++        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
++                  G.ecrec.ec_end) != 0) {
++        Info(slide, 0x401, ((char *)slide,
++          LoadFarString(OverlappedComponents)));
++        return PK_BOMB;
++    }
+ 
+ /*---------------------------------------------------------------------------
+     The basic idea of this function is as follows.  Since the central di-
+diff --git a/process.c b/process.c
+index d2e4dc3..d75d405 100644
+--- a/process.c
++++ b/process.c
+@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen)         /* return PK-class error */
+ 
+     /* Now, we are (almost) sure that we have a Zip64 archive. */
+     G.ecrec.have_ecr64 = 1;
++    G.ecrec.ec_start -= ECLOC64_SIZE+4;
++    G.ecrec.ec64_start = ecrec64_start_offset;
++    G.ecrec.ec64_end = ecrec64_start_offset +
++                       12 + makeint64(&byterecECREC64_LENGTH);
+ 
+     /* Update the "end-of-central-dir offset" for later checks. */
+     G.real_ecrec_offset = ecrec64_start_offset;
+@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen)          /* return PK-class error */
+       makelong(&byterecOFFSET_START_CENTRAL_DIRECTORY);
+     G.ecrec.zipfile_comment_length =
+       makeword(&byterecZIPFILE_COMMENT_LENGTH);
++    G.ecrec.ec_start = G.real_ecrec_offset;
++    G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length;
+ 
+     /* Now, we have to read the archive comment, BEFORE the file pointer
+        is moved away backwards to seek for a Zip64 ECLOC64 structure.
+diff --git a/unzpriv.h b/unzpriv.h
+index dc9eff5..297b3c7 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf {
+        int have_ecr64;                  /* valid Zip64 ecdir-record exists */
+        int is_zip64_archive;            /* Zip64 ecdir-record is mandatory */
+        ush zipfile_comment_length;
++       zusz_t ec_start, ec_end;         /* offsets of start and end of the
++                                           end of central directory record,
++                                           including if present the Zip64
++                                           end of central directory locator,
++                                           which immediately precedes the
++                                           end of central directory record */
++       zusz_t ec64_start, ec64_end;     /* if have_ecr64 is true, then these
++                                           are the offsets of the start and
++                                           end of the Zip64 end of central
++                                           directory record */
+    } ecdir_rec;
+ 
+

_service:tar_scm:CVE-2019-13232-fur2.patch Added

@@ -0,0 +1,338 @@
+From b701988480151e6693343ecdb246092824604c61 Mon Sep 17 00:00:00 2001
+From: wangshouping <wangshouping@huawei.com>
+Date: Tue, 11 Feb 2020 19:07:28 -0500
+Subject: PATCH add param to limit the number of overlap files
+
+Signed-off-by: wangshouping <wangshouping@huawei.com>
+---
+ extract.c   | 114 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ man/unzip.1 |   8 +++--
+ unzip.c     |  84 +++++++++++++++++++++++++++++++++++++++-----
+ unzip.h     |   1 +
+ unzip.txt   |   6 +++-
+ 5 files changed, 176 insertions(+), 37 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 3a01d13..031efdb 100644
+--- a/extract.c
++++ b/extract.c
+@@ -340,23 +340,32 @@ typedef struct {
+     span_t *span;       /* allocated, distinct, and sorted list of spans */
+     size_t num;         /* number of spans in the list */
+     size_t max;         /* allocated number of spans (num <= max) */
++    unsigned long count;
+ } cover_t;
+ 
+ /*
+  * Return the index of the first span in cover whose beg is greater than val.
+  * If there is no such span, then cover->num is returned.
+  */
+-static size_t cover_find(cover, val)
++static size_t cover_find(cover, val, op)
+     cover_t *cover;
+     bound_t val;
++    int op;
+ {
+     size_t lo = 0, hi = cover->num;
++    bound_t tmp_val;
+     while (lo < hi) {
+         size_t mid = (lo + hi) >> 1;
+-        if (val < cover->spanmid.beg)
+-            hi = mid;
+-        else
+-            lo = mid + 1;
++        if (!op) {
++            tmp_val = cover->spanmid.beg;
++        } else {
++            tmp_val = cover->spanmid.end;
++        }
++        if (val < tmp_val) {
++            hi = mid;
++        } else {
++            lo = mid + 1;
++        }
+     }
+     return hi;
+ }
+@@ -366,10 +375,16 @@ static int cover_within(cover, val)
+     cover_t *cover;
+     bound_t val;
+ {
+-    size_t pos = cover_find(cover, val);
++    size_t pos = cover_find(cover, val, 0);
+     return pos > 0 && val < cover->spanpos - 1.end;
+ }
+ 
++static int is_exceed_max_overlaps(cover, val)
++    cover_t *cover;
++{
++    return cover->count >= G.UzO.max_overlaps;
++}
++
+ /*
+  * Add a new span to the list, but only if the new span does not overlap any
+  * spans already in the list. The new span covers the values beg..end-1. beg
+@@ -387,7 +402,8 @@ static int cover_add(cover, beg, end)
+     bound_t beg;
+     bound_t end;
+ {
+-    size_t pos;
++    size_t pos_beg;
++    size_t pos_end;
+     int prec, foll;
+ 
+     if (beg >= end)
+@@ -396,31 +412,76 @@ static int cover_add(cover, beg, end)
+ 
+     /* Find where the new span should go, and make sure that it does not
+        overlap with any existing spans. */
+-    pos = cover_find(cover, beg);
+-    if ((pos > 0 && beg < cover->spanpos - 1.end) ||
+-        (pos < cover->num && end > cover->spanpos.beg))
+-        return 1;
++    pos_beg = cover_find(cover, beg, 0);
++    pos_end = cover_find(cover, end, 1);
+ 
+     /* Check for adjacencies. */
+-    prec = pos > 0 && beg == cover->spanpos - 1.end;
+-    foll = pos < cover->num && end == cover->spanpos.beg;
++    prec = pos_beg > 0 && beg <= cover->spanpos_beg - 1.end;
++    foll = pos_beg < cover->num && end >= cover->spanpos_beg.beg;
+     if (prec && foll) {
++        if (beg < cover->spanpos_beg - 1.end || end > cover->spanpos_beg.beg) {
++            cover->count++;
++        }
++
+         /* The new span connects the preceding and following spans. Merge the
+            following span into the preceding span, and delete the following
+            span. */
+-        cover->spanpos - 1.end = cover->spanpos.end;
+-        cover->num--;
+-        memmove(cover->span + pos, cover->span + pos + 1,
+-                (cover->num - pos) * sizeof(span_t));
++        if (end <= cover->spanpos_beg.end) {
++            cover->spanpos_beg - 1.end = cover->spanpos_beg.end;
++            cover->num--;
++            memmove(cover->span + pos_beg, cover->span + pos_beg + 1,
++                    (cover->num - pos_beg) * sizeof(span_t));
++        } else {
++            if (pos_end == cover->num) {
++                cover->spanpos_beg - 1.end = end;
++                cover->num = cover->num - (pos_end - pos_beg);
++            } else if (end >= cover->spanpos_end.beg) {
++                cover->spanpos_beg - 1.end = cover->spanpos_end.end;
++                memmove(cover->span + pos_beg, cover->span + pos_end + 1,
++                        (cover->num - 1 - pos_end) * sizeof(span_t));
++                cover->num = cover->num - (pos_end - pos_beg) - 1;
++            } else {
++                cover->spanpos_beg - 1.end = end;
++                memmove(cover->span + pos_beg, cover->span + pos_end,
++                        (cover->num - 1 - pos_end + 1) * sizeof(span_t));
++                cover->num = cover->num - (pos_end - pos_beg);
++            }
++        }
+     }
+-    else if (prec)
++    else if (prec) {
+         /* The new span is adjacent only to the preceding span. Extend the end
+            of the preceding span. */
+-        cover->spanpos - 1.end = end;
+-    else if (foll)
++        if (beg < cover->spanpos_beg - 1.end) {
++            cover->count++;
++        }
++        if (end > cover->spanpos_beg - 1.end) {
++            cover->spanpos_beg - 1.end = end;
++        }
++    }
++    else if (foll) {
++        if (end > cover->spanpos_beg.beg) {
++                cover->count++;
++        }
+         /* The new span is adjacent only to the following span. Extend the
+            beginning of the following span. */
+-        cover->spanpos.beg = beg;
++        cover->spanpos_beg.beg = beg;
++        if (end > cover->spanpos_beg.end) {
++            if (pos_end == cover->num) {
++                cover->spanpos_beg.end = end;
++                cover->num = cover->num - (pos_end - pos_beg) + 1;
++            } else if (end >= cover->spanpos_end.beg) {
++                cover->spanpos_beg.end = cover->spanpos_end.end;
++                memmove(cover->span + pos_beg + 1, cover->span + pos_end + 1,
++                        (cover->num - 1 - pos_end) * sizeof(span_t));
++                cover->num = cover->num - (pos_end - pos_beg);
++            } else {
++               cover->spanpos_beg.end = end;
++                memmove(cover->span + pos_beg + 1, cover->span + pos_end,
++                        (cover->num - 1 - pos_end + 1) * sizeof(span_t));
++                cover->num = cover->num - (pos_end - pos_beg) + 1;
++            }
++        }
++    }
+     else {
+         /* The new span has gaps between both the preceding and the following
+            spans. Assure that there is room and insert the span.  */
+@@ -432,11 +493,11 @@ static int cover_add(cover, beg, end)
+             cover->span = span;
+             cover->max = max;
+         }
+-        memmove(cover->span + pos + 1, cover->span + pos,
+-                (cover->num - pos) * sizeof(span_t));
++        memmove(cover->span + pos_beg + 1, cover->span + pos_beg,
++                (cover->num - pos_beg) * sizeof(span_t));
+         cover->num++;
+-        cover->spanpos.beg = beg;
+-        cover->spanpos.end = end;
++        cover->spanpos_beg.beg = beg;
++        cover->spanpos_beg.end = end;
+     }
+     return 0;
+ }
+@@ -511,6 +572,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         ((cover_t *)G.cover)->max = 0;
+     }
+     ((cover_t *)G.cover)->num = 0;
++    ((cover_t *)G.cover)->count = 0;
+     if (cover_add((cover_t *)G.cover,
+                   G.extra_bytes + G.ecrec.offset_start_central_directory,
+                   G.extra_bytes + G.ecrec.offset_start_central_directory +

_service:tar_scm:CVE-2019-13232-pre.patch Added

@@ -0,0 +1,27 @@
+From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 27 May 2019 08:20:32 -0700
+Subject: PATCH Fix bug in undefer_input() that misplaced the input state.
+
+---
+ fileio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fileio.c b/fileio.c
+index c042987..bc00d74 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -530,8 +530,10 @@ void undefer_input(__G)
+          * This condition was checked when G.incnt_leftover was set > 0 in
+          * defer_leftover_input(), and it is NOT allowed to touch G.csize
+          * before calling undefer_input() when (G.incnt_leftover > 0)
+-         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
++         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
+          */
++        if (G.csize < 0L)
++            G.csize = 0L;
+         G.incnt = G.incnt_leftover + (int)G.csize;
+         G.inptr = G.inptr_leftover - (int)G.csize;
+         G.incnt_leftover = 0;

_service:tar_scm:CVE-2019-13232.patch Added

@@ -0,0 +1,349 @@
+From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 11 Jun 2019 22:01:18 -0700
+Subject: PATCH Detect and reject a zip bomb using overlapped entries.
+
+This detects an invalid zip file that has at least one entry that
+overlaps with another entry or with the central directory to the
+end of the file. A Fifield zip bomb uses overlapped local entries
+to vastly increase the potential inflation ratio. Such an invalid
+zip file is rejected.
+
+See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's
+analysis, construction, and examples of such zip bombs.
+
+The detection maintains a list of covered spans of the zip files
+so far, where the central directory to the end of the file and any
+bytes preceding the first entry at zip file offset zero are
+considered covered initially. Then as each entry is decompressed
+or tested, it is considered covered. When a new entry is about to
+be processed, its initial offset is checked to see if it is
+contained by a covered span. If so, the zip file is rejected as
+invalid.
+
+This commit depends on a preceding commit: "Fix bug in
+undefer_input() that misplaced the input state."
+---
+ extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ globals.c |   1 +
+ globals.h |   3 +
+ process.c |  11 ++++
+ unzip.h   |   1 +
+ 5 files changed, 205 insertions(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index 1acd769..0973a33 100644
+--- a/extract.c
++++ b/extract.c
+@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField =
+   "\nerror:  unsupported extra-field compression type (%u)--skipping\n";
+ static ZCONST char Far BadExtraFieldCRC =
+   "error %s:  bad extra-field CRC %08lx (should be %08lx)\n";
++static ZCONST char Far NotEnoughMemCover =
++  "error: not enough memory for bomb detection\n";
++static ZCONST char Far OverlappedComponents =
++  "error: invalid zip file with overlapped components (possible zip bomb)\n";
++
++
++
++
++
++/* A growable list of spans. */
++typedef zoff_t bound_t;
++typedef struct {
++    bound_t beg;        /* start of the span */
++    bound_t end;        /* one past the end of the span */
++} span_t;
++typedef struct {
++    span_t *span;       /* allocated, distinct, and sorted list of spans */
++    size_t num;         /* number of spans in the list */
++    size_t max;         /* allocated number of spans (num <= max) */
++} cover_t;
++
++/*
++ * Return the index of the first span in cover whose beg is greater than val.
++ * If there is no such span, then cover->num is returned.
++ */
++static size_t cover_find(cover, val)
++    cover_t *cover;
++    bound_t val;
++{
++    size_t lo = 0, hi = cover->num;
++    while (lo < hi) {
++        size_t mid = (lo + hi) >> 1;
++        if (val < cover->spanmid.beg)
++            hi = mid;
++        else
++            lo = mid + 1;
++    }
++    return hi;
++}
++
++/* Return true if val lies within any one of the spans in cover. */
++static int cover_within(cover, val)
++    cover_t *cover;
++    bound_t val;
++{
++    size_t pos = cover_find(cover, val);
++    return pos > 0 && val < cover->spanpos - 1.end;
++}
++
++/*
++ * Add a new span to the list, but only if the new span does not overlap any
++ * spans already in the list. The new span covers the values beg..end-1. beg
++ * must be less than end.
++ *
++ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
++ * the list as needed. On success, 0 is returned. If the new span overlaps any
++ * existing spans, then 1 is returned and the new span is not added to the
++ * list. If the new span is invalid because beg is greater than or equal to
++ * end, then -1 is returned. If the list needs to be grown but the memory
++ * allocation fails, then -2 is returned.
++ */
++static int cover_add(cover, beg, end)
++    cover_t *cover;
++    bound_t beg;
++    bound_t end;
++{
++    size_t pos;
++    int prec, foll;
++
++    if (beg >= end)
++    /* The new span is invalid. */
++        return -1;
++
++    /* Find where the new span should go, and make sure that it does not
++       overlap with any existing spans. */
++    pos = cover_find(cover, beg);
++    if ((pos > 0 && beg < cover->spanpos - 1.end) ||
++        (pos < cover->num && end > cover->spanpos.beg))
++        return 1;
++
++    /* Check for adjacencies. */
++    prec = pos > 0 && beg == cover->spanpos - 1.end;
++    foll = pos < cover->num && end == cover->spanpos.beg;
++    if (prec && foll) {
++        /* The new span connects the preceding and following spans. Merge the
++           following span into the preceding span, and delete the following
++           span. */
++        cover->spanpos - 1.end = cover->spanpos.end;
++        cover->num--;
++        memmove(cover->span + pos, cover->span + pos + 1,
++                (cover->num - pos) * sizeof(span_t));
++    }
++    else if (prec)
++        /* The new span is adjacent only to the preceding span. Extend the end
++           of the preceding span. */
++        cover->spanpos - 1.end = end;
++    else if (foll)
++        /* The new span is adjacent only to the following span. Extend the
++           beginning of the following span. */
++        cover->spanpos.beg = beg;
++    else {
++        /* The new span has gaps between both the preceding and the following
++           spans. Assure that there is room and insert the span.  */
++        if (cover->num == cover->max) {
++            size_t max = cover->max == 0 ? 16 : cover->max << 1;
++            span_t *span = realloc(cover->span, max * sizeof(span_t));
++            if (span == NULL)
++                return -2;
++            cover->span = span;
++            cover->max = max;
++        }
++        memmove(cover->span + pos + 1, cover->span + pos,
++                (cover->num - pos) * sizeof(span_t));
++        cover->num++;
++        cover->spanpos.beg = beg;
++        cover->spanpos.end = end;
++    }
++    return 0;
++}
+ 
+ 
+ 
+@@ -374,6 +493,29 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+     }
+ #endif /* !SFX || SFX_EXDIR */
+ 
++    /* One more: initialize cover structure for bomb detection. Start with a
++       span that covers the central directory though the end of the file. */
++    if (G.cover == NULL) {
++        G.cover = malloc(sizeof(cover_t));
++        if (G.cover == NULL) {
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(NotEnoughMemCover)));
++            return PK_MEM;
++        }
++        ((cover_t *)G.cover)->span = NULL;
++        ((cover_t *)G.cover)->max = 0;
++    }
++    ((cover_t *)G.cover)->num = 0;
++    if ((G.extra_bytes != 0 &&
++         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++        cover_add((cover_t *)G.cover,
++                  G.extra_bytes + G.ecrec.offset_start_central_directory,
++                  G.ziplen) != 0) {
++        Info(slide, 0x401, ((char *)slide,
++          LoadFarString(NotEnoughMemCover)));
++        return PK_MEM;
++    }
++
+ /*---------------------------------------------------------------------------
+     The basic idea of this function is as follows.  Since the central di-
+     rectory lies at the end of the zipfile and the member files lie at the
+@@ -591,7 +733,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+             if (error > error_in_archive)
+                 error_in_archive = error;
+             /* ...and keep going (unless disk full or user break) */
+-            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) {
++            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC ||

_service:tar_scm:CVE-2022-0529.patch Added

@@ -0,0 +1,104 @@
+From 8b40e8021a98728b5889516af308dd52378c964c Mon Sep 17 00:00:00 2001
+From: Lv Ying <lvying6@huawei.com>
+Date: Wed, 23 Feb 2022 09:32:21 +0800
+Subject: PATCH 2/2 fix CVE-2022-0529 Heap out-of-bound writes and reads
+ during conversion of wide string to local string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE-2022-0529 discussed in https://bugzilla.redhat.com/show_bug.cgi?id=2051402
+CVE can be reproduced:
+$ unset LANG
+$ valgrind ./unzip ./unzip_03/testcase
+valgrind will detect Heap out-of-bound writes and reads just as bugzilla discussed
+
+This is because wide_to_escape_string returns a string that represents a wide char
+not in local char set, is longer than MAX_ESCAPE_BYTES(8). Actually, MAX_ESCAPE_BYTES
+max is 10, for example, 4-byte wide character '#L02020276' is 10 bytes long, not
+including the terminating null character. So strcat(buffer, escape_string) will cause
+Heap out-of-bound writes.
+
+By default, the OS vendor sets the LANG environment variable. valgrind tests this POC
+will get another memory error.
+$ export | grep LANG
+declare -x LANG="en_US.UTF-8"
+$ valgrind ./unzip ./unzip_03/testcase
+
+Archive:  unzip_03/testcase
+warning unzip_03/testcase:  303 extra bytes at beginning or within zipfile
+  (attempting to process anyway)
+error unzip_03/testcase:  reported length of central directory is
+  -303 bytes too long (Atari STZip zipfile?  J.H.Holm ZIPSPLIT 1.1
+  zipfile?).  Compensating...
+==15725== Conditional jump or move depends on uninitialised value(s)
+==15725==    at 0x4903169: __wcsnlen_sse4_1 (strlen.S:186)
+==15725==    by 0x48F3D61: wcsrtombs (wcsrtombs.c:104)
+==15725==    by 0x488B9A0: wcstombs (wcstombs.c:34)
+==15725==    by 0x407279: wcstombs (stdlib.h:154)
+==15725==    by 0x407279: fnfilter.constprop.2 (extract.c:2946)
+==15725==    by 0x4076A5: store_info (extract.c:1155)
+==15725==    by 0x40AFF4: extract_or_test_files (extract.c:782)
+==15725==    by 0x41586C: do_seekable (process.c:994)
+==15725==    by 0x4167EE: process_zipfiles (process.c:401)
+==15725==    by 0x40449B: unzip (unzip.c:1280)
+==15725==    by 0x4874B26: (below main) (libc-start.c:308)
+==15725==
+   skipping: ??????????????????????????????????????????????????????????????????????????ı  need PK compat. v4.6 (can do v4.5)
+==15725==
+==15725== HEAP SUMMARY:
+==15725==     in use at exit: 0 bytes in 0 blocks
+==15725==   total heap usage: 37 allocs, 37 frees, 90,739 bytes allocated
+==15725==
+==15725== All heap blocks were freed -- no leaks are possible
+==15725==
+==15725== For counts of detected and suppressed errors, rerun with: -v
+==15725== Use --track-origins=yes to see where uninitialised values come from
+==15725== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
+
+This is because wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1) in fnfilter
+use wrong n parameter which stands for At most n bytes are written to dest.
+When LANG environment variable is set, MB_CUR_MAX = 6, so wcstombs will writes more
+bytes over dest(newraw).
+
+Signed-off-by: Lv Ying <lvying6@huawei.com>
+---
+ extract.c | 4 ++--
+ process.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index f0e8217..3f6e14d 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2856,12 +2856,12 @@ char *fnfilter(raw, space, size)   /* convert name to safely printable form */
+     if (wslen != (size_t)-1)
+     {
+         /* Apparently valid Unicode.  Allocate wide-char storage. */
+-        wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t));
++        wstring = (wchar_t *)calloc((wslen + 1), sizeof(wchar_t));
+         if (wstring == NULL) {
+             strcpy( (char *)space, raw);
+             return (char *)space;
+         }
+-        wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t));
++        wostring = (wchar_t *)calloc(2 * (wslen + 1), sizeof(wchar_t));
+         if (wostring == NULL) {
+             free(wstring);
+             strcpy( (char *)space, raw);
+diff --git a/process.c b/process.c
+index 5cba073..3e7fcb3 100644
+--- a/process.c
++++ b/process.c
+@@ -2395,7 +2395,7 @@ char *local_to_utf8_string(local_string)
+   */
+ 
+  /* set this to the max bytes an escape can be */
+-#define MAX_ESCAPE_BYTES 8
++#define MAX_ESCAPE_BYTES 10
+ 
+ char *wide_to_escape_string(wide_char)
+   zwchar wide_char;
+-- 
+2.27.0
+

_service:tar_scm:CVE-2022-0530.patch Added

@@ -0,0 +1,61 @@
+From 4d9e8cd35d59f05f75cb2d8f05c6e4c9277dcf9c Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <xiezhipeng1@huawei.com>
+Date: Tue, 22 Feb 2022 21:04:25 +0000
+Subject: PATCH 1/2 Fix CVE-2022-0530
+
+Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
+---
+ fileio.c  | 20 +++++++++++++-------
+ process.c |  2 ++
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/fileio.c b/fileio.c
+index cf995a9..e237272 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -2360,16 +2360,22 @@ int do_string(__G__ length, option)   /* return PK-type error code */
+                   /* convert UTF-8 to local character set */
+                   fn = utf8_to_local_string(G.unipath_filename,
+                                             G.unicode_escape_all);
+-                  /* make sure filename is short enough */
+-                  if (strlen(fn) >= FILNAMSIZ) {
+-                    fnFILNAMSIZ - 1 = '\0';
++                  if (!fn) {
+                     Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(UFilenameTooLongTrunc)));
++                      LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
+                     error = PK_WARN;
++                  } else {
++                    /* make sure filename is short enough */
++                    if (strlen(fn) >= FILNAMSIZ) {
++                      fnFILNAMSIZ - 1 = '\0';
++                      Info(slide, 0x401, ((char *)slide,
++                        LoadFarString(UFilenameTooLongTrunc)));
++                      error = PK_WARN;
++                    }
++                    /* replace filename with converted UTF-8 */
++                    strcpy(G.filename, fn);
++                    free(fn);
+                   }
+-                  /* replace filename with converted UTF-8 */
+-                  strcpy(G.filename, fn);
+-                  free(fn);
+                 }
+ # endif /* UNICODE_WCHAR */
+                 if (G.unipath_filename != G.filename_full)
+diff --git a/process.c b/process.c
+index 46abce2..5cba073 100644
+--- a/process.c
++++ b/process.c
+@@ -2597,6 +2597,8 @@ char *utf8_to_local_string(utf8_string, escape_all)
+   int escape_all;
+ {
+   zwchar *wide = utf8_to_wide_string(utf8_string);
++  if (!wide)
++    return NULL;
+   char *loc = wide_to_local_string(wide, escape_all);
+   free(wide);
+   return loc;
+-- 
+2.27.0
+

_service:tar_scm:backport-CVE-2021-4217.patch Added

@@ -0,0 +1,39 @@
+From 731d698377dbd1f5b1b90efeb8094602ed59fc40 Mon Sep 17 00:00:00 2001
+From: Nils Bars <nils.bars@t-online.de>
+Date: Mon, 17 Jan 2022 16:53:16 +0000
+Subject: PATCH Fix null pointer dereference and use of uninitialized data
+
+This fixes a bug that causes use of uninitialized heap data if `readbuf` fails
+to read as many bytes as indicated by the extra field length attribute.
+Furthermore, this fixes a null pointer dereference if an archive contains an
+`EF_UNIPATH` extra field but does not have a filename set.
+
+Reference:https://bugs.launchpad.net/ubuntu/+source/unzip/+bug/1957077
+Conflict: fileio.c file not change.
+---
+ process.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/process.c b/process.c
+index abe938b..f573ee4 100644
+--- a/process.c
++++ b/process.c
+@@ -2060,10 +2060,14 @@ int getUnicodeData(__G__ ef_buf, ef_len)
+           G.unipath_checksum = makelong(offset + ef_buf);
+           offset += 4;
+ 
++          if (!G.filename_full) {
++            /* Check if we have a unicode extra section but no filename set */
++            return PK_ERR;
++          }
++
+           /*
+            * Compute 32-bit crc
+            */
+-
+           chksum = crc32(chksum, (uch *)(G.filename_full),
+                          strlen(G.filename_full));
+ 
+-- 
+2.33.0
+

_service:tar_scm:unzip-6.0-alt-iconv-utf8-print.patch Added

@@ -0,0 +1,381 @@
+From ca0212ba19b64488b9e8459a762c11ecd6e7d0bd Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk@redhat.com>
+Date: Tue, 24 Nov 2015 17:56:11 +0100
+Subject: PATCH print correctly non-ascii filenames
+
+---
+ extract.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
+ unzpriv.h |   7 ++
+ 2 files changed, 233 insertions(+), 63 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 0ee4e93..741b7e0 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2648,8 +2648,21 @@ static void set_deferred_symlink(__G__ slnk_entry)
+ } /* end function set_deferred_symlink() */
+ #endif /* SYMLINKS */
+ 
++/*
++ * If Unicode is supported, assume we have what we need to do this
++ * check using wide characters, avoiding MBCS issues.
++ */
+ 
+-
++#ifndef UZ_FNFILTER_REPLACECHAR
++        /* A convenient choice for the replacement of unprintable char codes is
++         * the "single char wildcard", as this character is quite unlikely to
++         * appear in filenames by itself.  The following default definition
++         * sets the replacement char to a question mark as the most common
++         * "single char wildcard"; this setting should be overridden in the
++         * appropiate system-specific configuration header when needed.
++         */
++# define UZ_FNFILTER_REPLACECHAR      '?'
++#endif
+ 
+ /*************************/
+ /*  Function fnfilter()  */        /* here instead of in list.c for SFX */
+@@ -2661,48 +2674,168 @@ char *fnfilter(raw, space, size)   /* convert name to safely printable form */
+     extent size;
+ {
+ #ifndef NATIVE   /* ASCII:  filter ANSI escape codes, etc. */
+-    ZCONST uch *r=(ZCONST uch *)raw;
++    ZCONST uch *r; // =(ZCONST uch *)raw;
+     uch *s=space;
+     uch *slim=NULL;
+     uch *se=NULL;
+     int have_overflow = FALSE;
+ 
+-    if (size > 0) {
+-        slim = space + size
+-#ifdef _MBCS
+-                     - (MB_CUR_MAX - 1)
+-#endif
+-                     - 4;
++# if defined( UNICODE_SUPPORT) && defined( _MBCS)
++/* If Unicode support is enabled, and we have multi-byte characters,
++ * then do the isprint() checks by first converting to wide characters
++ * and checking those.  This avoids our having to parse multi-byte
++ * characters for ourselves.  After the wide-char replacements have been
++ * made, the wide string is converted back to the local character set.
++ */
++    wchar_t *wstring;    /* wchar_t version of raw */
++    size_t wslen;        /* length of wstring */
++    wchar_t *wostring;   /* wchar_t version of output string */
++    size_t woslen;       /* length of wostring */
++    char *newraw;        /* new raw */
++
++    /* 2012-11-06 SMS.
++     * Changed to check the value returned by mbstowcs(), and bypass the
++     * Unicode processing if it fails.  This seems to fix a problem
++     * reported in the SourceForge forum, but it's not clear that we
++     * should be doing any Unicode processing without some evidence that
++     * the name actually is Unicode.  (Check bit 11 in the flags before
++     * coming here?)
++     * http://sourceforge.net/p/infozip/bugs/40/
++     */
++
++    if (MB_CUR_MAX <= 1)
++    {
++        /* There's no point to converting multi-byte chars if there are
++         * no multi-byte chars.
++         */
++        wslen = (size_t)-1;
+     }
+-    while (*r) {
+-        if (size > 0 && s >= slim && se == NULL) {
+-            se = s;
++    else
++    {
++        /* Get Unicode wide character count (for storage allocation). */
++        wslen = mbstowcs( NULL, raw, 0);
++    }
++
++    if (wslen != (size_t)-1)
++    {
++        /* Apparently valid Unicode.  Allocate wide-char storage. */
++        wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t));
++        if (wstring == NULL) {
++            strcpy( (char *)space, raw);
++            return (char *)space;
+         }
+-#ifdef QDOS
+-        if (qlflag & 2) {
+-            if (*r == '/' || *r == '.') {
++        wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t));
++        if (wostring == NULL) {
++            free(wstring);
++            strcpy( (char *)space, raw);
++            return (char *)space;
++        }
++
++        /* Convert the multi-byte Unicode to wide chars. */
++        wslen = mbstowcs(wstring, raw, wslen + 1);
++
++        /* Filter the wide-character string. */
++        fnfilterw( wstring, wostring, (2 * (wslen + 1) * sizeof(wchar_t)));
++
++        /* Convert filtered wide chars back to multi-byte. */
++        woslen = wcstombs( NULL, wostring, 0);
++        if ((newraw = malloc(woslen + 1)) == NULL) {
++            free(wstring);
++            free(wostring);
++            strcpy( (char *)space, raw);
++            return (char *)space;
++        }
++        woslen = wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1);
++
++        if (size > 0) {
++            slim = space + size - 4;
++        }
++        r = (ZCONST uch *)newraw;
++        while (*r) {
++            if (size > 0 && s >= slim && se == NULL) {
++                se = s;
++            }
++#  ifdef QDOS
++            if (qlflag & 2) {
++                if (*r == '/' || *r == '.') {
++                    if (se != NULL && (s > (space + (size-3)))) {
++                        have_overflow = TRUE;
++                        break;
++                    }
++                    ++r;
++                    *s++ = '_';
++                    continue;
++                }
++            } else
++#  endif
++            {
+                 if (se != NULL && (s > (space + (size-3)))) {
+                     have_overflow = TRUE;
+                     break;
+                 }
+-                ++r;
+-                *s++ = '_';
+-                continue;
++                *s++ = *r++;
+             }
+-        } else
++        }
++        if (have_overflow) {
++            strcpy((char *)se, "...");
++        } else {
++            *s = '\0';
++        }
++
++        free(wstring);
++        free(wostring);
++        free(newraw);
++    }
++    else
++# endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */
++    {
++        /* No Unicode support, or apparently invalid Unicode. */
++        r = (ZCONST uch *)raw;
++
++        if (size > 0) {
++            slim = space + size
++#ifdef _MBCS
++                         - (MB_CUR_MAX - 1)
++#endif
++                         - 4;
++        }
++        while (*r) {
++            if (size > 0 && s >= slim && se == NULL) {
++                se = s;
++            }
++#ifdef QDOS
++            if (qlflag & 2) {
++                if (*r == '/' || *r == '.') {
++                    if (se != NULL && (s > (space + (size-3)))) {
++                        have_overflow = TRUE;
++                        break;
++                    }
++                    ++r;
++                    *s++ = '_';
++                    continue;
++                }
++            } else

_service:tar_scm:unzip-6.0-alt-iconv-utf8.patch Added

@@ -0,0 +1,398 @@
+From: Giovanni Scafora <giovanni.archlinux.org>
+Subject: unzip files encoded with non-latin, non-unicode file names
+Last-Update: 2015-02-11
+
+Updated 2015-02-11 by Marc Deslauriers <marc.deslauriers@canonical.com>
+to fix buffer overflow in charset_to_intern()
+
+Index: unzip-6.0/unix/unix.c
+===================================================================
+--- unzip-6.0.orig/unix/unix.c	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unix.c	2015-02-11 09:18:04.902081319 -0500
+@@ -30,6 +30,9 @@
+ #define UNZIP_INTERNAL
+ #include "unzip.h"
+ 
++#include <iconv.h>
++#include <langinfo.h>
++
+ #ifdef SCO_XENIX
+ #  define SYSNDIR
+ #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
+@@ -1874,3 +1877,102 @@
+     }
+ }
+ #endif /* QLZIP */
++
++
++typedef struct {
++    char *local_charset;
++    char *archive_charset;
++} CHARSET_MAP;
++
++/* A mapping of local <-> archive charsets used by default to convert filenames
++ * of DOS/Windows Zip archives. Currently very basic. */
++static CHARSET_MAP dos_charset_map = {
++    { "ANSI_X3.4-1968", "CP850" },
++    { "ISO-8859-1", "CP850" },
++    { "CP1252", "CP850" },
++    { "UTF-8", "CP866" },
++    { "KOI8-R", "CP866" },
++    { "KOI8-U", "CP866" },
++    { "ISO-8859-5", "CP866" }
++};
++
++char OEM_CPMAX_CP_NAME = "";
++char ISO_CPMAX_CP_NAME = "";
++
++/* Try to guess the default value of OEM_CP based on the current locale.
++ * ISO_CP is left alone for now. */
++void init_conversion_charsets()
++{
++    const char *local_charset;
++    int i;
++
++    /* Make a guess only if OEM_CP not already set. */ 
++    if(*OEM_CP == '\0') {
++    	local_charset = nl_langinfo(CODESET);
++    	for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
++    		if(!strcasecmp(local_charset, dos_charset_mapi.local_charset)) {
++    			strncpy(OEM_CP, dos_charset_mapi.archive_charset,
++    					sizeof(OEM_CP));
++    			break;
++    		}
++    }
++}
++
++/* Convert a string from one encoding to the current locale using iconv().
++ * Be as non-intrusive as possible. If error is encountered during covertion
++ * just leave the string intact. */
++static void charset_to_intern(char *string, char *from_charset)
++{
++    iconv_t cd;
++    char *s,*d, *buf;
++    size_t slen, dlen, buflen;
++    const char *local_charset;
++
++    if(*from_charset == '\0')
++    	return;
++
++    buf = NULL;
++    local_charset = nl_langinfo(CODESET);
++
++    if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
++        return;
++
++    slen = strlen(string);
++    s = string;
++
++    /*  Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
++     *  as this function also gets called with G.outbuf in fileio.c
++     */
++    buflen = FILNAMSIZ;
++    if (OUTBUFSIZ + 1 < FILNAMSIZ)
++    {
++        buflen = OUTBUFSIZ + 1;
++    }
++
++    d = buf = malloc(buflen);
++    if(!d)
++    	goto cleanup;
++
++    bzero(buf,buflen);
++    dlen = buflen - 1;
++
++    if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
++    	goto cleanup;
++    strncpy(string, buf, buflen);
++
++    cleanup:
++    free(buf);
++    iconv_close(cd);
++}
++
++/* Convert a string from OEM_CP to the current locale charset. */
++inline void oem_intern(char *string)
++{
++    charset_to_intern(string, OEM_CP);
++}
++
++/* Convert a string from ISO_CP to the current locale charset. */
++inline void iso_intern(char *string)
++{
++    charset_to_intern(string, ISO_CP);
++}
+Index: unzip-6.0/unix/unxcfg.h
+===================================================================
+--- unzip-6.0.orig/unix/unxcfg.h	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unxcfg.h	2015-02-11 08:46:43.671324260 -0500
+@@ -228,4 +228,30 @@
+ /* wild_dir, dirname, wildname, matchname, dirnamelen, have_dirname, */
+ /*    and notfirstcall are used by do_wild().                          */
+ 
++
++#define MAX_CP_NAME 25 
++   
++#ifdef SETLOCALE
++#  undef SETLOCALE
++#endif
++#define SETLOCALE(category, locale) setlocale(category, locale)
++#include <locale.h>
++   
++#ifdef _ISO_INTERN
++#  undef _ISO_INTERN
++#endif
++#define _ISO_INTERN(str1) iso_intern(str1)
++
++#ifdef _OEM_INTERN
++#  undef _OEM_INTERN
++#endif
++#ifndef IZ_OEM2ISO_ARRAY
++#  define IZ_OEM2ISO_ARRAY
++#endif
++#define _OEM_INTERN(str1) oem_intern(str1)
++
++void iso_intern(char *);
++void oem_intern(char *);
++void init_conversion_charsets(void);
++   
+ #endif /* !__unxcfg_h */
+Index: unzip-6.0/unzip.c
+===================================================================
+--- unzip-6.0.orig/unzip.c	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unzip.c	2015-02-11 08:46:43.675324290 -0500
+@@ -327,11 +327,21 @@
+   -2  just filenames but allow -h/-t/-z  -l  long Unix \"ls -l\" format\n\
+                                          -v  verbose, multi-page format\n";
+ 
++#ifndef UNIX
+ static ZCONST char Far ZipInfoUsageLine3 = "miscellaneous options:\n\
+   -h  print header line       -t  print totals for listed files or for all\n\
+   -z  print zipfile comment   -T  print file times in sortable decimal format\
+ \n  -C  be case-insensitive   %s\
+   -x  exclude filenames that follow from listing\n";
++#else /* UNIX */
++static ZCONST char Far ZipInfoUsageLine3 = "miscellaneous options:\n\
++  -h  print header line       -t  print totals for listed files or for all\n\
++  -z  print zipfile comment   -T  print file times in sortable decimal format\
++\n %c-C%c be case-insensitive   %s\
++  -x  exclude filenames that follow from listing\n\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n";
++#endif /* !UNIX */
+ #ifdef MORE
+    static ZCONST char Far ZipInfoUsageLine4 =
+      "  -M  page output through built-in \"more\"\n";
+@@ -664,6 +674,17 @@
+   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
+   -C  match filenames case-insensitively     -L  make (some) names \
+ lowercase\n %-42s  -V  retain VMS version numbers\n%s";
++#elif (defined UNIX)
++static ZCONST char Far UnzipUsageLine4 = "\
++modifiers:\n\
++  -n  never overwrite existing files         -q  quiet mode (-qq => quieter)\n\
++  -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
++  -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
++  -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
++  -C  match filenames case-insensitively     -L  make (some) names \
++lowercase\n %-42s  -V  retain VMS version numbers\n%s\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\

_service:tar_scm:unzip-6.0-attribs-overflow.patch Added

_service:tar_scm:unzip-6.0-bzip2-configure.patch Added

_service:tar_scm:unzip-6.0-caseinsensitive.patch Added

@@ -0,0 +1,131 @@
+diff --git a/match.c b/match.c
+index 6cd656f..4e569f5 100644
+--- a/match.c
++++ b/match.c
+@@ -190,10 +190,10 @@ char *___tmp_ptr;
+ 
+ #endif
+ 
+-static int recmatch(p, s, cs)
++static int recmatch(p, s, ci)
+ ZCONST char *p;         /* sh pattern to match */
+ ZCONST char *s;         /* string to match it to */
+-int cs;                 /* flag: force case-sensitive matching */
++int ci;                 /* flag: force case-insensitive matching */
+ /* Recursively compare the sh pattern p with the string s and return 1 if
+    they match, and 0 or 2 if they don't or if there is a syntax error in the
+    pattern.  This routine recurses on itself no deeper than the number of
+@@ -214,7 +214,7 @@ int cs;                 /* flag: force case-sensitive matching */
+   if (CLEN(p) == 2) {
+     if (CLEN(s) == 2) {
+       return (*p == *s && *(p+1) == *(s+1)) ?
+-        recmatch(p + 2, s + 2, cs) : 0;
++        recmatch(p + 2, s + 2, ci) : 0;
+     } else {
+       return 0;
+     }
+@@ -230,9 +230,9 @@ int cs;                 /* flag: force case-sensitive matching */
+   /* '?' (or '%' or '#') matches any character (but not an empty string) */
+   if (c == WILDCHR_SINGLE) {
+     if (wild_stop_at_dir)
+-      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
++      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0;
+     else
+-      return *s ? recmatch(p, s + CLEN(s), cs) : 0;
++      return *s ? recmatch(p, s + CLEN(s), ci) : 0;
+   }
+ 
+   /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
+@@ -253,14 +253,14 @@ int cs;                 /* flag: force case-sensitive matching */
+ # endif /* ?AMIGA */
+         /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */
+         for (; *s && *s != DIRSEP_CHR; INCSTR(s))
+-          if ((c = recmatch(p, s, cs)) != 0)
++          if ((c = recmatch(p, s, ci)) != 0)
+             return c;
+         /* end of pattern: matched if at end of string, else continue */
+         if (*p == 0)
+           return (*s == 0);
+         /* continue to match if at DIRSEP_CHR in pattern, else give up */
+         return (*p == DIRSEP_CHR || (*p == '\\' && p1 == DIRSEP_CHR))
+-               ? recmatch(p, s, cs) : 2;
++               ? recmatch(p, s, ci) : 2;
+       }
+       /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */
+       p++;        /* move p past the second WILDCHR_MULTI */
+@@ -308,17 +308,17 @@ int cs;                 /* flag: force case-sensitive matching */
+          */
+         if (q != srest)
+           return 0;
+-        return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0);
++        return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0);
+       }
+ #else /* !_MBCS */
+-        return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0);
++        return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0);
+ #endif /* ?_MBCS */
+     }
+     else
+     {
+       /* pattern contains more wildcards, continue with recursion... */
+       for (; *s; INCSTR(s))
+-        if ((c = recmatch(p, s, cs)) != 0)
++        if ((c = recmatch(p, s, ci)) != 0)
+           return c;
+       return 2;           /* 2 means give up--shmatch will return false */
+     }
+@@ -353,17 +353,17 @@ int cs;                 /* flag: force case-sensitive matching */
+         c = *(p-1);
+       else
+       {
+-        uch cc = (cs ? (uch)*s : case_map((uch)*s));
++        uch cc = (!ci ? (uch)*s : to_up((uch)*s));
+         uch uc = (uch) c;
+         if (*(p+1) != '-')
+           for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++)
+             /* compare range */
+-            if ((cs ? uc : case_map(uc)) == cc)
+-              return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs);
++            if ((!ci ? uc : to_up(uc)) == cc)
++              return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci);
+         c = e = 0;                      /* clear range, escape flags */
+       }
+     }
+-    return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0;
++    return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0;
+                                         /* bracket match failed */
+   }
+ #endif /* !VMS */
+@@ -382,18 +382,18 @@ int cs;                 /* flag: force case-sensitive matching */
+   {
+     /* Match "..." with "".  Continue after "" in both. */
+     if ((*(p+ 2* CLEN( p)) == '') && (*s == ''))
+-      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
+ 
+     /* Else, look for a reduced match in s, until "" in or end of s. */
+     for (; *s && (*s != ''); INCSTR(s))
+       if (*s == '.')
+         /* If reduced match, then continue after "..." in p, "." in s. */
+-        if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0)
++        if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0)
+           return (int)c;
+ 
+     /* Match "..." with "".  Continue after "" in both. */
+     if ((*(p+ 2* CLEN( p)) == '') && (*s == ''))
+-      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
+ 
+     /* No reduced match.  Quit. */
+     return 2;
+@@ -402,8 +402,8 @@ int cs;                 /* flag: force case-sensitive matching */
+ #endif /* def VMS */
+ 
+   /* Just a character--compare it */
+-  return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ?
+-          recmatch(p, s + CLEN(s), cs) : 0;
++  return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ?
++          recmatch(p, s + CLEN(s), ci) : 0;
+ }
+ 
+

_service:tar_scm:unzip-6.0-close.patch Added

@@ -0,0 +1,176 @@
+diff -up unzip60/extract.c.close unzip60/extract.c
+--- unzip60/extract.c.close	2009-03-14 02:32:52.000000000 +0100
++++ unzip60/extract.c	2009-11-19 08:17:23.481263496 +0100
+@@ -1924,24 +1924,21 @@ static int extract_or_test_member(__G)  
+ 
+ #ifdef VMS                  /* VMS:  required even for stdout! (final flush) */
+     if (!uO.tflag)           /* don't close NULL file */
+-        close_outfile(__G);
++        error = close_outfile(__G);
+ #else
+ #ifdef DLL
+     if (!uO.tflag && (!uO.cflag || G.redirect_data)) {
+         if (G.redirect_data)
+             FINISH_REDIRECT();
+         else
+-            close_outfile(__G);
++            error = close_outfile(__G);
+     }
+ #else
+     if (!uO.tflag && !uO.cflag)   /* don't close NULL file or stdout */
+-        close_outfile(__G);
++        error = close_outfile(__G);
+ #endif
+ #endif /* VMS */
+ 
+-            /* GRR: CONVERT close_outfile() TO NON-VOID:  CHECK FOR ERRORS! */
+-
+-
+     if (G.disk_full) {            /* set by flush() */
+         if (G.disk_full > 1) {
+ #if (defined(DELETE_IF_FULL) && defined(HAVE_UNLINK))
+diff -up unzip60/unix/unix.c.close unzip60/unix/unix.c
+--- unzip60/unix/unix.c.close	2009-01-24 00:31:26.000000000 +0100
++++ unzip60/unix/unix.c	2009-11-19 08:33:25.568389171 +0100
+@@ -1096,10 +1096,41 @@ static int get_extattribs(__G__ pzt, z_u
+ #ifndef MTS
+ 
+ /****************************/
++/* Function CloseError()    */
++/***************************/
++
++int CloseError(__G)
++    __GDEF
++{
++    int errval = PK_OK;
++    
++    if (fclose(G.outfile) < 0) {
++          switch (errno) {
++                case ENOSPC:
++                    /* Do we need this on fileio.c? */
++                    Info(slide, 0x4a1, ((char *)slide, "%s: write error (disk full?).   Continue? (y/n/^C) ",
++                          FnFilter1(G.filename)));
++                    fgets(G.answerbuf, 9, stdin);
++                    if (*G.answerbuf == 'y')     /* stop writing to this file */
++                        G.disk_full = 1;         /* pass to next */
++                    else
++                        G.disk_full = 2;         /* no: exit program */
++          
++                    errval = PK_DISK;
++                    break;
++
++                default:
++                    errval = PK_WARN;
++          }
++     }
++     return errval;
++} /* End of CloseError() */
++
++/****************************/
+ /* Function close_outfile() */
+ /****************************/
+ 
+-void close_outfile(__G)    /* GRR: change to return PK-style warning level */
++int close_outfile(__G) 
+     __GDEF
+ {
+     union {
+@@ -1108,6 +1139,7 @@ void close_outfile(__G)    /* GRR: chang
+     } zt;
+     ulg z_uidgid2;
+     int have_uidgid_flg;
++    int errval = PK_OK;
+ 
+     have_uidgid_flg = get_extattribs(__G__ &(zt.t3), z_uidgid);
+ 
+@@ -1141,16 +1173,16 @@ void close_outfile(__G)    /* GRR: chang
+             Info(slide, 0x201, ((char *)slide,
+               "warning:  symbolic link (%s) failed: mem alloc overflow\n",
+               FnFilter1(G.filename)));
+-            fclose(G.outfile);
+-            return;
++            errval = CloseError(G.outfile, G.filename);
++            return errval ? errval : PK_WARN;
+         }
+ 
+         if ((slnk_entry = (slinkentry *)malloc(slnk_entrysize)) == NULL) {
+             Info(slide, 0x201, ((char *)slide,
+               "warning:  symbolic link (%s) failed: no mem\n",
+               FnFilter1(G.filename)));
+-            fclose(G.outfile);
+-            return;
++            errval = CloseError(G.outfile, G.filename);
++            return errval ? errval : PK_WARN;
+         }
+         slnk_entry->next = NULL;
+         slnk_entry->targetlen = ucsize;
+@@ -1174,10 +1206,10 @@ void close_outfile(__G)    /* GRR: chang
+               "warning:  symbolic link (%s) failed\n",
+               FnFilter1(G.filename)));
+             free(slnk_entry);
+-            fclose(G.outfile);
+-            return;
++            errval = CloseError(G.outfile, G.filename);
++            return errval ? errval : PK_WARN;
+         }
+-        fclose(G.outfile);                  /* close "link" file for good... */
++        errval = CloseError(G.outfile, G.filename); /* close "link" file for good... */
+         slnk_entry->targetucsize = '\0';
+         if (QCOND2)
+             Info(slide, 0, ((char *)slide, "-> %s ",
+@@ -1188,7 +1220,7 @@ void close_outfile(__G)    /* GRR: chang
+         else
+             G.slink_head = slnk_entry;
+         G.slink_last = slnk_entry;
+-        return;
++        return errval;
+     }
+ #endif /* SYMLINKS */
+ 
+@@ -1201,7 +1233,7 @@ void close_outfile(__G)    /* GRR: chang
+ #endif
+ 
+ #if (defined(NO_FCHOWN))
+-    fclose(G.outfile);
++    errval = CloseError(G.outfile, G.filename);
+ #endif
+ 
+     /* if -X option was specified and we have UID/GID info, restore it */
+@@ -1227,7 +1259,7 @@ void close_outfile(__G)    /* GRR: chang
+     }
+ 
+ #if (!defined(NO_FCHOWN) && defined(NO_FCHMOD))
+-    fclose(G.outfile);
++    errval = CloseError(G.outfile, G.filename);
+ #endif
+ 
+ #if (!defined(NO_FCHOWN) && !defined(NO_FCHMOD))
+@@ -1239,7 +1271,7 @@ void close_outfile(__G)    /* GRR: chang
+     if (fchmod(fileno(G.outfile), filtattr(__G__ G.pInfo->file_attr)))
+         perror("fchmod (file attributes) error");
+ 
+-    fclose(G.outfile);
++    errval = CloseError(G.outfile, G.filename);
+ #endif /* !NO_FCHOWN && !NO_FCHMOD */
+ 
+     /* skip restoring time stamps on user's request */
+@@ -1267,6 +1299,7 @@ void close_outfile(__G)    /* GRR: chang
+ #endif
+ #endif /* NO_FCHOWN || NO_FCHMOD */
+ 
++    return errval;
+ } /* end function close_outfile() */
+ 
+ #endif /* !MTS */
+diff -up unzip60/unzpriv.h.close unzip60/unzpriv.h
+--- unzip60/unzpriv.h.close	2009-04-20 01:59:26.000000000 +0200
++++ unzip60/unzpriv.h	2009-11-19 08:19:08.610388618 +0100
+@@ -2604,7 +2604,7 @@ char    *GetLoadPath     OF((__GPRO));  
+    int   SetFileSize     OF((FILE *file, zusz_t filesize));         /* local */
+ #endif
+ #ifndef MTS /* macro in MTS */
+-   void  close_outfile   OF((__GPRO));                              /* local */
++   int  close_outfile   OF((__GPRO));                              /* local */
+ #endif
+ #ifdef SET_SYMLINK_ATTRIBS
+    int  set_symlnk_attribs  OF((__GPRO__ slinkentry *slnk_entry));  /* local */

_service:tar_scm:unzip-6.0-configure.patch Added

_service:tar_scm:unzip-6.0-cve-2014-8139.patch Added

@@ -0,0 +1,79 @@
+diff --git a/extract.c b/extract.c
+index 9ef80b3..c741b5f 100644
+--- a/extract.c
++++ b/extract.c
+@@ -1,5 +1,5 @@
+ /*
+-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
++  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
+ 
+   See the accompanying file LICENSE, version 2009-Jan-02 or later
+   (the contents of which are also included in unzip.h) for terms of use.
+@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD =
+ #ifndef SFX
+    static ZCONST char Far InconsistEFlength = "bad extra-field entry:\n \
+      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
++   static ZCONST char Far TooSmallEBlength = "bad extra-field entry:\n \
++     EF block length (%u bytes) invalid (< %d)\n";
+    static ZCONST char Far InvalidComprDataEAs =
+      " invalid compressed data for EAs\n";
+ #  if (defined(WIN32) && defined(NTSD_EAS))
+@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len)
+         ebID = makeword(ef);
+         ebLen = (unsigned)makeword(ef+EB_LEN);
+ 
+-        if (ebLen > (ef_len - EB_HEADSIZE)) {
++        if (ebLen > (ef_len - EB_HEADSIZE))
++        {
+            /* Discovered some extra field inconsistency! */
+             if (uO.qflag)
+                 Info(slide, 1, ((char *)slide, "%-22s ",
+@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len)
+                 }
+                 break;
+             case EF_PKVMS:
+-                if (makelong(ef+EB_HEADSIZE) !=
+-                    crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
+-                          (extent)(ebLen-4)))
+-                    Info(slide, 1, ((char *)slide,
+-                      LoadFarString(BadCRC_EAs)));
++                /* 2015-01-30 SMS.  Added sufficient-bytes test/message
++                 * here.  (Removed defective ebLen test above.)
++                 *
++                 * If sufficient bytes (EB_PKVMS_MINLEN) are available,
++                 * then compare the stored CRC value with the calculated
++                 * CRC for the remainder of the data (and complain about
++                 * a mismatch).
++                 */
++                if (ebLen < EB_PKVMS_MINLEN)
++                {
++                    /* Insufficient bytes available. */
++                    Info( slide, 1,
++                     ((char *)slide, LoadFarString( TooSmallEBlength),
++                     ebLen, EB_PKVMS_MINLEN));
++                }
++                else if (makelong(ef+ EB_HEADSIZE) !=
++                 crc32(CRCVAL_INITIAL,
++                 (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN),
++                 (extent)(ebLen- EB_PKVMS_MINLEN)))
++                {
++                     Info(slide, 1, ((char *)slide,
++                       LoadFarString(BadCRC_EAs)));
++                }
+                 break;
+             case EF_PKW32:
+             case EF_PKUNIX:
+diff --git a/unzpriv.h b/unzpriv.h
+index 005cee0..5c83a6e 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -1806,6 +1806,8 @@
+ #define EB_NTSD_VERSION   4    /* offset of NTSD version byte */
+ #define EB_NTSD_MAX_VER   (0)  /* maximum version # we know how to handle */
+ 
++#define EB_PKVMS_MINLEN   4    /* minimum data length of PKVMS extra block */
++
+ #define EB_ASI_CRC32      0    /* offset of ASI Unix field's crc32 checksum */
+ #define EB_ASI_MODE       4    /* offset of ASI Unix permission mode field */
+ 
+

_service:tar_scm:unzip-6.0-cve-2014-8140.patch Added

@@ -0,0 +1,25 @@
+diff --git a/extract.c b/extract.c
+index c741b5f..e4a4c7b 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+     if (compr_offset < 4)                /* field is not compressed: */
+         return PK_OK;                    /* do nothing and signal OK */
+ 
++    /* Return no/bad-data error status if any problem is found:
++     *    1. eb_size is too small to hold the uncompressed size
++     *       (eb_ucsize).  (Else extract eb_ucsize.)
++     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
++     *    3. eb_ucsize is positive, but eb_size is too small to hold
++     *       the compressed data header.
++     */
+     if ((eb_size < (EB_UCSIZE_P + 4)) ||
+-        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
+-         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+-        return IZ_EF_TRUNC;               /* no compressed data! */
++     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
++     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
++        return IZ_EF_TRUNC;             /* no/bad compressed data! */
+ 
+     method = makeword(eb + (EB_HEADSIZE + compr_offset));
+     if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))

_service:tar_scm:unzip-6.0-cve-2014-8141.patch Added

@@ -0,0 +1,138 @@
+diff --git a/fileio.c b/fileio.c
+index 03fc4be..2a61a30 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc =
+ #endif
+ static ZCONST char Far ExtraFieldTooLong =
+   "warning:  extra field too long (%d).  Ignoring...\n";
++static ZCONST char Far ExtraFieldCorrupt =
++  "warning:  extra field (type: 0x%04x) corrupt.  Continuing...\n";
+ 
+ #ifdef WINDLL
+    static ZCONST char Far DiskFullQuery =
+@@ -2300,7 +2302,13 @@ int do_string(__G__ length, option)   /* return PK-type error code */
+               length = length2;
+             }
+             /* Looks like here is where extra fields are read */
+-            getZip64Data(__G__ G.extra_field, length);
++            if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
++            {
++                Info(slide, 0x401, ((char *)slide,
++                 LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
++                error = PK_WARN;
++            }
++
+ #ifdef UNICODE_SUPPORT
+             G.unipath_filename = NULL;
+             if (G.UzO.U_flag < 2) {
+diff --git a/process.c b/process.c
+index be6e006..0d57ab4 100644
+--- a/process.c
++++ b/process.c
+@@ -1,5 +1,5 @@
+ /*
+-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
++  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
+ 
+   See the accompanying file LICENSE, version 2009-Jan-02 or later
+   (the contents of which are also included in unzip.h) for terms of use.
+@@ -1894,48 +1894,83 @@ int getZip64Data(__G__ ef_buf, ef_len)
+     and a 4-byte version of disk start number.
+     Sets both local header and central header fields.  Not terribly clever,
+     but it means that this procedure is only called in one place.
++
++    2014-12-05 SMS.
++    Added checks to ensure that enough data are available before calling
++    makeint64() or makelong().  Replaced various sizeof() values with
++    simple ("4" or "8") constants.  (The Zip64 structures do not depend
++    on our variable sizes.)  Error handling is crude, but we should now
++    stay within the buffer.
+   ---------------------------------------------------------------------------*/
+ 
++#define Z64FLGS 0xffff
++#define Z64FLGL 0xffffffff
++
+     if (ef_len == 0 || ef_buf == NULL)
+         return PK_COOL;
+ 
+     Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n",
+       ef_len));
+ 
+-    while (ef_len >= EB_HEADSIZE) {
++    while (ef_len >= EB_HEADSIZE)
++    {
+         eb_id = makeword(EB_ID + ef_buf);
+         eb_len = makeword(EB_LEN + ef_buf);
+ 
+-        if (eb_len > (ef_len - EB_HEADSIZE)) {
+-            /* discovered some extra field inconsistency! */
++        if (eb_len > (ef_len - EB_HEADSIZE))
++        {
++            /* Extra block length exceeds remaining extra field length. */
+             Trace((stderr,
+               "getZip64Data: block length %u > rest ef_size %u\n", eb_len,
+               ef_len - EB_HEADSIZE));
+             break;
+         }
+-        if (eb_id == EF_PKSZ64) {
+ 
++        if (eb_id == EF_PKSZ64)
++        {
+           int offset = EB_HEADSIZE;
+ 
+-          if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){
+-            G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf);
+-            offset += sizeof(G.crec.ucsize);
++          if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
++          {
++            if (offset+ 8 > ef_len)
++              return PK_ERR;
++
++            G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf);
++            offset += 8;
+           }
+-          if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){
+-            G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf);
+-            offset += sizeof(G.crec.csize);
++
++          if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL))
++          {
++            if (offset+ 8 > ef_len)
++              return PK_ERR;
++
++            G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf);
++            offset += 8;
+           }
+-          if (G.crec.relative_offset_local_header == 0xffffffff){
++
++          if (G.crec.relative_offset_local_header == Z64FLGL)
++          {
++            if (offset+ 8 > ef_len)
++              return PK_ERR;
++
+             G.crec.relative_offset_local_header = makeint64(offset + ef_buf);
+-            offset += sizeof(G.crec.relative_offset_local_header);
++            offset += 8;
+           }
+-          if (G.crec.disk_number_start == 0xffff){
++
++          if (G.crec.disk_number_start == Z64FLGS)
++          {
++            if (offset+ 4 > ef_len)
++              return PK_ERR;
++
+             G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf);
+-            offset += sizeof(G.crec.disk_number_start);
++            offset += 4;
+           }
++#if 0
++          break;                /* Expect only one EF_PKSZ64 block. */
++#endif /* 0 */
+         }
+ 
+-        /* Skip this extra field block */
++        /* Skip this extra field block. */
+         ef_buf += (eb_len + EB_HEADSIZE);
+         ef_len -= (eb_len + EB_HEADSIZE);
+     }

_service:tar_scm:unzip-6.0-cve-2018-1000035-heap-based-overflow.patch Added

@@ -0,0 +1,34 @@
+--- a/fileio.c	2014-12-05 05:06:05 -0600
++++ b/fileio.c	2017-11-14 01:06:28 -0600
+@@ -1,5 +1,5 @@
+ /*
+-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
++  Copyright (c) 1990-2017 Info-ZIP.  All rights reserved.
+ 
+   See the accompanying file LICENSE, version 2009-Jan-02 or later
+   (the contents of which are also included in unzip.h) for terms of use.
+@@ -1582,6 +1582,8 @@
+     int r = IZ_PW_ENTERED;
+     char *m;
+     char *prompt;
++    char *ep;
++    char *zp;
+ 
+ #ifndef REENTRANT
+     /* tell picky compilers to shut up about "unused variable" warnings */
+@@ -1590,9 +1592,12 @@
+ 
+     if (*rcnt == 0) {           /* First call for current entry */
+         *rcnt = 2;
+-        if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) {
+-            sprintf(prompt, LoadFarString(PasswPrompt),
+-                    FnFilter1(zfn), FnFilter2(efn));
++        zp = FnFilter1( zfn);
++        ep = FnFilter2( efn);
++        prompt = (char *)malloc(        /* Slightly too long (2* "%s"). */
++         sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep));
++        if (prompt != (char *)NULL) {
++            sprintf(prompt, LoadFarString(PasswPrompt), zp, ep);
+             m = prompt;
+         } else
+             m = (char *)LoadFarString(PasswPrompt2);

_service:tar_scm:unzip-6.0-exec-shield.patch Added

_service:tar_scm:unzip-6.0-fix-recmatch.patch Added

@@ -0,0 +1,477 @@
+diff -up unzip60/match.c.recmatch unzip60/match.c
+--- unzip60/match.c.recmatch	2005-08-14 13:00:36.000000000 -0400
++++ unzip60/match.c	2013-05-28 10:29:57.949077543 -0400
+@@ -27,16 +27,14 @@
+ 
+   ---------------------------------------------------------------------------
+ 
+-  Copyright on recmatch() from Zip's util.c (although recmatch() was almost
+-  certainly written by Mark Adler...ask me how I can tell :-) ):
++  Copyright on recmatch() from Zip's util.c
++	 Copyright (c) 1990-2005 Info-ZIP.  All rights reserved.
+ 
+-     Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly,
+-     Kai Uwe Rommel and Igor Mandrichenko.
++	 See the accompanying file LICENSE, version 2004-May-22 or later
++	 for terms of use.
++	 If, for some reason, both of these files are missing, the Info-ZIP license
++	 also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html  
+ 
+-     Permission is granted to any individual or institution to use, copy,
+-     or redistribute this software so long as all of the original files are
+-     included unmodified, that it is not sold for profit, and that this copy-
+-     right notice is retained.
+ 
+   ---------------------------------------------------------------------------
+ 
+@@ -53,7 +51,7 @@
+ 
+   A set is composed of characters or ranges; a range looks like ``character
+   hyphen character'' (as in 0-9 or A-Z).  0-9a-zA-Z_ is the minimal set of
+-  characters allowed in the .. pattern construct.  Other characters are
++  characters ALlowed in the .. pattern construct.  Other characters are
+   allowed (i.e., 8-bit characters) if your system will support them.
+ 
+   To suppress the special syntactic significance of any of ``*?!^-\'', in-
+@@ -101,8 +99,32 @@
+ #  define WILDCHAR   '?'
+ #  define BEG_RANGE  ''
+ #  define END_RANGE  ''
++#  define WILDCHR_SINGLE '?'
++#  define DIRSEP_CHR '/'
++#  define WILDCHR_MULTI '*'
+ #endif
+ 
++#ifdef WILD_STOP_AT_DIR
++   int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */
++#else
++   int wild_stop_at_dir = 0; /* default wildcards do include / in matches */
++#endif
++
++
++
++/*
++ * case mapping functions. case_map is used to ignore case in comparisons,
++ * to_up is used to force upper case even on Unix (for dosify option).
++ */
++#ifdef USE_CASE_MAP
++#  define case_map(c) upper(c) & 0xff
++#  define to_up(c)    upper(c) & 0xff
++#else
++#  define case_map(c) (c)
++#  define to_up(c)    ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c))
++#endif /* USE_CASE_MAP */
++
++
+ #if 0                /* GRR:  add this to unzip.h someday... */
+ #if !(defined(MSDOS) && defined(DOSWILD))
+ #ifdef WILD_STOP_AT_DIR
+@@ -114,8 +136,8 @@ int recmatch OF((ZCONST uch *pattern, ZC
+                  int ignore_case __WDLPRO));
+ #endif
+ #endif /* 0 */
+-static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string,
+-                        int ignore_case __WDLPRO));
++static int recmatch OF((ZCONST char *, ZCONST char *, 
++                        int));
+ static char *isshexp OF((ZCONST char *p));
+ static int namecmp OF((ZCONST char *s1, ZCONST char *s2));
+ 
+@@ -154,192 +176,240 @@ int match(string, pattern, ignore_case _
+             }
+             dospatternj-1 = '\0';                    /* nuke the end "." */
+         }
+-        j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL);
++        j = recmatch(dospattern, string, ignore_case);
+         free(dospattern);
+         return j == 1;
+     } else
+ #endif /* MSDOS && DOSWILD */
+-    return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1;
++    return recmatch(pattern, string, ignore_case) == 1;
+ }
+ 
++#ifdef _MBCS
++
++char *___tmp_ptr;
+ 
++#endif
+ 
+-static int recmatch(p, s, ic __WDL)
+-    ZCONST uch *p;        /* sh pattern to match */
+-    ZCONST uch *s;        /* string to which to match it */
+-    int ic;               /* true for case insensitivity */
+-    __WDLDEF              /* directory sepchar for WildStopAtDir mode, or 0 */
++static int recmatch(p, s, cs)
++ZCONST char *p;         /* sh pattern to match */
++ZCONST char *s;         /* string to match it to */
++int cs;                 /* flag: force case-sensitive matching */
+ /* Recursively compare the sh pattern p with the string s and return 1 if
+- * they match, and 0 or 2 if they don't or if there is a syntax error in the
+- * pattern.  This routine recurses on itself no more deeply than the number
+- * of characters in the pattern. */
++   they match, and 0 or 2 if they don't or if there is a syntax error in the
++   pattern.  This routine recurses on itself no deeper than the number of
++   characters in the pattern. */
+ {
+-    unsigned int c;       /* pattern char or start of range in - loop */
++  int c;                /* pattern char or start of range in - loop */
++  /* Get first character, the pattern for new recmatch calls follows */
++ /* borrowed from Zip's global.c */
++ int no_wild = 0; 
++ int allow_regex=1;
++  /* This fix provided by akt@m5.dion.ne.jp for Japanese.
++     See 21 July 2006 mail.
++     It only applies when p is pointing to a doublebyte character and
++     things like / and wildcards are not doublebyte.  This probably
++     should not be needed. */
+ 
+-    /* Get first character, the pattern for new recmatch calls follows */
+-    c = *p; INCSTR(p);
++#ifdef _MBCS
++  if (CLEN(p) == 2) {
++    if (CLEN(s) == 2) {
++      return (*p == *s && *(p+1) == *(s+1)) ?
++        recmatch(p + 2, s + 2, cs) : 0;
++    } else {
++      return 0;
++    }
++  }
++#endif /* ?_MBCS */
+ 
+-    /* If that was the end of the pattern, match if string empty too */
+-    if (c == 0)
+-        return *s == 0;
++  c = *POSTINCSTR(p);
+ 
+-    /* '?' (or '%') matches any character (but not an empty string). */
+-    if (c == WILDCHAR)
+-#ifdef WILD_STOP_AT_DIR
+-        /* If uO.W_flag is non-zero, it won't match '/' */
+-        return (*s && (!sepc || *s != (uch)sepc))
+-               ? recmatch(p, s + CLEN(s), ic, sepc) : 0;
+-#else
+-        return *s ? recmatch(p, s + CLEN(s), ic) : 0;
+-#endif
++  /* If that was the end of the pattern, match if string empty too */
++  if (c == 0)
++    return *s == 0;
++
++  /* '?' (or '%' or '#') matches any character (but not an empty string) */
++  if (c == WILDCHR_SINGLE) {
++    if (wild_stop_at_dir)
++      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
++    else
++      return *s ? recmatch(p, s + CLEN(s), cs) : 0;
++  }
+ 
+-    /* '*' matches any number of characters, including zero */
++  /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
+ #ifdef AMIGA
+-    if (c == '#' && *p == '?')     /* "#?" is Amiga-ese for "*" */
+-        c = '*', p++;
++  if (!no_wild && c == '#' && *p == '?')            /* "#?" is Amiga-ese for "*" */
++    c = WILDCHR_MULTI, p++;
+ #endif /* AMIGA */
+-    if (c == '*') {
+-#ifdef WILD_STOP_AT_DIR
+-        if (sepc) {
+-          /* check for single "*" or double "**" */
+-#  ifdef AMIGA
+-          if ((c = p0) == '#' && p1 == '?') /* "#?" is Amiga-ese for "*" */
+-            c = '*', p++;
+-          if (c != '*') {
+-#  else /* !AMIGA */
+-          if (*p != '*') {
+-#  endif /* ?AMIGA */
+-            /* single "*": this doesn't match the dirsep character */
+-            for (; *s && *s != (uch)sepc; INCSTR(s))
+-                if ((c = recmatch(p, s, ic, sepc)) != 0)
+-                    return (int)c;
+-            /* end of pattern: matched if at end of string, else continue */
+-            if (*p == '\0')
+-                return (*s == 0);
+-            /* continue to match if at sepc in pattern, else give up */
+-            return (*p == (uch)sepc || (*p == '\\' && p1 == (uch)sepc))
+-                   ? recmatch(p, s, ic, sepc) : 2;
+-          }
+-          /* "**": this matches slashes */
+-          ++p;        /* move p behind the second '*' */

_service:tar_scm:unzip-6.0-format-secure.patch Added

@@ -0,0 +1,90 @@
+diff --git a/extract.c b/extract.c
+index eeb2f57..a0a4929 100644
+--- a/extract.c
++++ b/extract.c
+@@ -472,8 +472,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+                      */
+                     Info(slide, 0x401, ((char *)slide,
+                       LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
+-                    Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(ReportMsg)));
++                    Info(slide, 0x401,
++                         ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                     error_in_archive = PK_BADERR;
+                 }
+                 reached_end = TRUE;     /* ...so no more left to do */
+@@ -752,8 +752,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+ 
+ #ifndef SFX
+     if (no_endsig_found) {                      /* just to make sure */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg)));
+         if (!error_in_archive)       /* don't overwrite stronger error */
+             error_in_archive = PK_WARN;
+     }
+diff --git a/list.c b/list.c
+index 15e0011..f7359c3 100644
+--- a/list.c
++++ b/list.c
+@@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -507,7 +507,8 @@ int list_files(__G)    /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, 
++                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+ 
+@@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+   ---------------------------------------------------------------------------*/
+ 
+     if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+         error_in_archive = PK_WARN;
+     }
+     if (*nmember == 0L && error_in_archive <= PK_WARN)
+diff --git a/zipinfo.c b/zipinfo.c
+index 6e22cc8..ac5c61b 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -771,7 +771,7 @@ int zipinfo(__G)   /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 error_in_archive = PK_BADERR;   /* sig not found */
+                 break;
+             }
+@@ -960,7 +960,8 @@ int zipinfo(__G)   /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, 
++                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+

_service:tar_scm:unzip-6.0-heap-overflow-infloop.patch Added

@@ -0,0 +1,104 @@
+From bdd4a0cecd745cb4825e4508b5bdf2579731086a Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk@redhat.com>
+Date: Mon, 14 Sep 2015 18:23:17 +0200
+Subject: PATCH 1/3 upstream fix for heap overflow
+
+https://bugzilla.redhat.com/attachment.cgi?id=1073002
+---
+ crypt.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/crypt.c b/crypt.c
+index 784e411..a8975f2 100644
+--- a/crypt.c
++++ b/crypt.c
+@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
+     GLOBAL(pInfo->encrypted) = FALSE;
+     defer_leftover_input(__G);
+     for (n = 0; n < RAND_HEAD_LEN; n++) {
+-        b = NEXTBYTE;
++        /* 2012-11-23 SMS.  (OUSPG report.)
++         * Quit early if compressed size < HEAD_LEN.  The resulting
++         * error message ("unable to get password") could be improved,
++         * but it's better than trying to read nonexistent data, and
++         * then continuing with a negative G.csize.  (See
++         * fileio.c:readbyte()).
++         */
++        if ((b = NEXTBYTE) == (ush)EOF)
++        {
++            return PK_ERR;
++        }
+         hn = (uch)b;
+         Trace((stdout, " (%02x)", hn));
+     }
+-- 
+2.4.6
+
+
+From 4b48844661ff9569f2ecf582a387d46a5775b5d8 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 14 Sep 2015 18:24:56 +0200
+Subject: PATCH 2/3 fix infinite loop when extracting empty bzip2 data
+
+Bug: https://sourceforge.net/p/infozip/patches/23/
+---
+ extract.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/extract.c b/extract.c
+index 7134bfe..29db027 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2733,6 +2733,12 @@ __GDEF
+     int repeated_buf_err;
+     bz_stream bstrm;
+ 
++    if (G.incnt <= 0 && G.csize <= 0L) {
++        /* avoid an infinite loop */
++        Trace((stderr, "UZbunzip2() got empty input\n"));
++        return 2;
++    }
++
+ #if (defined(DLL) && !defined(NO_SLIDE_REDIR))
+     if (G.redirect_slide)
+         wsize = G.redirect_size, redirSlide = G.redirect_buffer;
+-- 
+2.4.6
+
+
+From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 22 Sep 2015 18:52:23 +0200
+Subject: PATCH 3/3 extract: prevent unsigned overflow on invalid input
+
+Suggested-by: Stefan Cornelius
+---
+ extract.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index 29db027..b9ae667 100644
+--- a/extract.c
++++ b/extract.c
+@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk,
+         if (G.lrec.compression_method == STORED) {
+             zusz_t csiz_decrypted = G.lrec.csize;
+ 
+-            if (G.pInfo->encrypted)
++            if (G.pInfo->encrypted) {
++                if (csiz_decrypted < 12) {
++                    /* handle the error now to prevent unsigned overflow */
++                    Info(slide, 0x401, ((char *)slide,
++                      LoadFarStringSmall(ErrUnzipNoFile),
++                      LoadFarString(InvalidComprData),
++                      LoadFarStringSmall2(Inflate)));
++                    return PK_ERR;
++                }
+                 csiz_decrypted -= 12;
++            }
+             if (G.lrec.ucsize != csiz_decrypted) {
+                 Info(slide, 0x401, ((char *)slide,
+                   LoadFarStringSmall2(WrnStorUCSizCSizDiff),
+-- 
+2.5.2
+

_service:tar_scm:unzip-6.0-manpage-fix.patch Added

_service:tar_scm:unzip-6.0-overflow-long-fsize.patch Added

@@ -0,0 +1,34 @@
+diff --git a/list.c b/list.c
+index f7359c3..4c3d703 100644
+--- a/list.c
++++ b/list.c
+@@ -97,7 +97,7 @@ int list_files(__G)    /* return PK-type error code */
+ {
+     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+-    char sgn, cfactorstr10;
++    char sgn, cfactorstr13;
+     int longhdr=(uO.vflag>1);
+ #endif
+     int date_format;
+@@ -339,7 +339,19 @@ int list_files(__G)    /* return PK-type error code */
+                 G.crec.compression_method == ENHDEFLATED) {
+                 methbuf5 = dtype(G.crec.general_purpose_bit_flag>>1) & 3;
+             } else if (methnum >= NUM_METHODS) {
+-                sprintf(&methbuf4, "%03u", G.crec.compression_method);
++                /* 2013-02-26 SMS.
++                 * http://sourceforge.net/tracker/?func=detail
++                 *  &aid=2861648&group_id=118012&atid=679786
++                 * Unexpectedly large compression methods overflow
++                 * &methbuf.  Use the old, three-digit decimal format
++                 * for values which fit.  Otherwise, sacrifice the
++                 * colon, and use four-digit hexadecimal.
++                 */
++                if (G.crec.compression_method <= 999) {
++                    sprintf( &methbuf 4, "%03u", G.crec.compression_method);
++                } else {
++                    sprintf( &methbuf 3, "%04X", G.crec.compression_method);
++                }
+             }
+ 
+ #if 0       /* GRR/Euro:  add this? */

_service:tar_scm:unzip-6.0-overflow.patch Added

@@ -0,0 +1,25 @@
+diff --git a/extract.c b/extract.c
+index a0a4929..9ef80b3 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+     ulg eb_ucsize;
+     uch *eb_ucptr;
+     int r;
++    ush method;
+ 
+     if (compr_offset < 4)                /* field is not compressed: */
+         return PK_OK;                    /* do nothing and signal OK */
+@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+          eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+         return IZ_EF_TRUNC;               /* no compressed data! */
+ 
++    method = makeword(eb + (EB_HEADSIZE + compr_offset));
++    if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
++        return PK_ERR;            /* compressed & uncompressed
++                                   * should match in STORED
++                                   * method */
++
+     if (
+ #ifdef INT_16BIT
+         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||

_service:tar_scm:unzip-6.0-symlink.patch Added

_service:tar_scm:unzip-6.0-timestamp.patch Added

@@ -0,0 +1,41 @@
+From: "Steven M. Schweda" <sms@antinode.info>
+Subject: Do not ignore extra fields containing Unix Timestamps
+Bug-Debian: https://bugs.debian.org/842993
+X-Debian-version: 6.0-21
+
+--- a/process.c
++++ b/process.c
+@@ -2914,10 +2914,13 @@
+             break;
+ 
+           case EF_IZUNIX2:
+-            if (have_new_type_eb == 0) {
+-                flags &= ~0x0ff;        /* ignore any previous IZUNIX field */
++            if (have_new_type_eb == 0) {        /* (< 1) */
+                 have_new_type_eb = 1;
+             }
++            if (have_new_type_eb <= 1) {
++                /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */
++                flags &= 0x0ff;
++            }
+ #ifdef IZ_HAVE_UXUIDGID
+             if (have_new_type_eb > 1)
+                 break;          /* IZUNIX3 overrides IZUNIX2 e.f. block ! */
+@@ -2933,6 +2936,8 @@
+             /* new 3rd generation Unix ef */
+             have_new_type_eb = 2;
+ 
++            /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */
++            flags &= 0x0ff;
+         /*
+           Version       1 byte      version of this extra field, currently 1
+           UIDSize       1 byte      Size of UID field
+@@ -2953,8 +2958,6 @@
+                 uid_size = *((EB_HEADSIZE + 1) + ef_buf);
+                 gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf);
+ 
+-                flags &= ~0x0ff;      /* ignore any previous UNIX field */
+-
+                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
+                                     uid_size, &z_uidgid0)
+                     &&

_service:tar_scm:unzip-6.0-valgrind.patch Added

@@ -0,0 +1,26 @@
+diff --git a/fileio.c b/fileio.c
+index ba0a1d0..03fc4be 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -2006,6 +2006,7 @@ int do_string(__G__ length, option)   /* return PK-type error code */
+     unsigned comment_bytes_left;
+     unsigned int block_len;
+     int error=PK_OK;
++    unsigned int length2;
+ #ifdef AMIGA
+     char tmp_fnote2 * AMIGA_FILENOTELEN;   /* extra room for squozen chars */
+ #endif
+@@ -2292,8 +2293,12 @@ int do_string(__G__ length, option)   /* return PK-type error code */
+             seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes +
+                       (G.inptr-G.inbuf) + length);
+         } else {
+-            if (readbuf(__G__ (char *)G.extra_field, length) == 0)
++            if ((length2 = readbuf(__G__ (char *)G.extra_field, length)) == 0)
+                 return PK_EOF;
++            if(length2 < length) {
++              memset (__G__ (char *)G.extra_field+length2, 0 , length-length2);
++              length = length2;
++            }
+             /* Looks like here is where extra fields are read */
+             getZip64Data(__G__ G.extra_field, length);
+ #ifdef UNICODE_SUPPORT

_service:tar_scm:unzip-6.0-x-option.patch Added

@@ -0,0 +1,28 @@
+--- ./process.c.orig    2009-03-06 02:25:10.000000000 +0100
++++ ./process.c 2013-09-12 10:51:16.000000000 +0200
+@@ -2901,9 +2901,9 @@
+         */
+ 
+ #ifdef IZ_HAVE_UXUIDGID
+-            if (eb_len >= EB_UX3_MINLEN
+-                && z_uidgid != NULL
+-                && (*((EB_HEADSIZE + 0) + ef_buf) == 1)
++            if ((eb_len >= EB_UX3_MINLEN)
++                && (z_uidgid != NULL)
++                && ((*((EB_HEADSIZE + 0) + ef_buf) == 1)))
+                     /* only know about version 1 */
+             {
+                 uch uid_size;
+@@ -2915,10 +2915,10 @@
+                 flags &= ~0x0ff;      /* ignore any previous UNIX field */
+ 
+                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
+-                                    uid_size, z_uidgid0)
++                                    uid_size, &z_uidgid0)
+                     &&
+                      read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf,
+-                                    gid_size, z_uidgid1) )
++                                    gid_size, &z_uidgid1) )
+                 {
+                     flags |= EB_UX2_VALID;   /* signal success */
+                 }

_service Changed

_service:extract_file:unzip.yaml Deleted

_service:extract_file:unzip60.tar.gz Deleted

_service:tar_scm:unzip.yaml Added

_service:tar_scm:unzip-1652173970.8ac840c.tar -> _service:tar_scm:unzip60.tar.gz Changed