Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Petr Stodulka
81a359b5cf Added requirement for unzip (#1235956) 2015-06-26 10:23:54 +02:00
Petr Stodulka
0daf36322c fix chrashing zipnote when edit .zip files (#1179420) 2015-01-28 16:39:12 +01:00
2 changed files with 23 additions and 1 deletions

View file

@ -1,7 +1,7 @@
Summary: A file compression and packaging utility compatible with PKZIP
Name: zip
Version: 3.0
Release: 12%{?dist}
Release: 14%{?dist}
License: BSD
Group: Applications/Archiving
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
@ -16,7 +16,9 @@ Patch2: zip-3.0-currdir.patch
Patch3: zip-3.0-time.patch
Patch4: man.patch
Patch5: zip-3.0-format-security.patch
Patch6: zipnote.patch
BuildRequires: bzip2-devel
Requires: unzip
%description
The zip program is a compression and file packaging utility. Zip is
@ -34,6 +36,7 @@ program.
%patch3 -p1 -b .time
%patch4 -p1 -b .man
%patch5 -p1 -b .format-security
%patch6 -p1 -b .zipnote
%build
make -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc %{?_smp_mflags}
@ -58,6 +61,12 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
%{_mandir}/man1/zipsplit.1*
%changelog
* Fri Jun 26 2015 Petr Stodulka <pstodulk@redhat.com> - 3.0-14
- Added requirement for unzip (#1235956)
* Wed Jan 28 2015 Petr Stodulka <pstodulk@redhat.com> - 3.0-13
- fix crashing zipnote when edit .zip files (#1179420)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

13
zipnote.patch Normal file
View file

@ -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 */