diff --git a/zip.spec b/zip.spec index 18c9569..efca204 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Applications/Archiving Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz @@ -14,6 +14,7 @@ Patch2: zip-3.0-currdir.patch # Not upstreamed. Patch3: zip-3.0-time.patch Patch4: man.patch +Patch5: zipnote.patch BuildRequires: bzip2-devel %description @@ -31,6 +32,7 @@ program. %patch2 -p1 -b .currdir %patch3 -p1 -b .time %patch4 -p1 -b .man +%patch5 -p1 -b .zipnote %build make -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc %{?_smp_mflags} @@ -57,6 +59,9 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \ %{_mandir}/man1/zipsplit.1* %changelog +* Wed Jan 28 2015 Petr Stodulka - 3.0-10 +- fix crashing zipnote when edit .zip files (#1179420) + * Sun Aug 04 2013 Fedora Release Engineering - 3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/zipnote.patch b/zipnote.patch new file mode 100644 index 0000000..4177a7d --- /dev/null +++ b/zipnote.patch @@ -0,0 +1,13 @@ +diff --git a/zipnote.c b/zipnote.c +index 5e02cb6..996f012 100644 +--- a/zipnote.c ++++ b/zipnote.c +@@ -661,7 +661,7 @@ char **argv; /* command line tokens */ + if ((r = zipcopy(z)) != ZE_OK) + ziperr(r, "was copying an entry"); + } +- fclose(x); ++ fclose(in_file); + + /* Write central directory and end of central directory with new comments */ + if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */