diff --git a/unzip-6.0-test_compr_eb.patch b/unzip-6.0-test_compr_eb.patch index 7e8c297..b6d1316 100644 --- a/unzip-6.0-test_compr_eb.patch +++ b/unzip-6.0-test_compr_eb.patch @@ -1,6 +1,6 @@ ---- extract.c 2009-03-14 02:32:52.000000000 +0100 -+++ extract.c 2014-12-05 22:43:13.000000000 +0100 -@@ -2221,10 +2234,17 @@ static int test_compr_eb(__G__ eb, eb_si +--- unzip60.orig/extract.c 2021-05-14 22:48:17.270523174 +0200 ++++ unzip60/extract.c 2021-05-14 22:48:32.802719601 +0200 +@@ -2244,10 +2244,17 @@ if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ @@ -19,5 +19,5 @@ + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ - if ( - #ifdef INT_16BIT + method = makeword(eb + (EB_HEADSIZE + compr_offset)); + if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) diff --git a/unzip.spec b/unzip.spec index fabe6dc..68d32db 100644 --- a/unzip.spec +++ b/unzip.spec @@ -2,13 +2,13 @@ Name: unzip Version: 6.0 -Release: 3mamba +Release: 4mamba Summary: A file compression and packaging utility compatible with PKZIP Group: Applications/Archiving Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.info-zip.org/pub/infozip/ +URL: http://infozip.sourceforge.net/ Source: https://downloads.sourceforge.net/infozip/unzip%{src_ver}.tar.gz Patch0: %{name}-5.51-rpmoptflags.patch Patch1: %{name}-5.51-link-segv.patch @@ -42,7 +42,7 @@ Install the zip package if you need to compress files using the zip program. %patch4 -p1 %patch5 -p1 %patch6 -p1 -#%patch7 -p0 +%patch7 -p1 %patch8 -p0 %patch9 -p1 %patch10 -p1 @@ -82,6 +82,9 @@ DEFINES='-DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \ %doc README BUGS LICENSE %changelog +* Fri May 14 2021 Silvan Calarco 6.0-4mamba +- also fix and apply test_compr_eb patch + * Wed May 12 2021 Silvan Calarco 6.0-3mamba - applied patches from Arch Linux