pool/zip
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229000 from Archiving

Browse Source 
- Fix bnc#785305
  * Add patch zip-3.0-nomutilation.patch (forwarded request 228999 from netsroth)

OBS-URL: https://build.opensuse.org/request/show/229000
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zip?expand=0&rev=20
This commit is contained in:
Stephan Kulow 2014-04-06 07:56:03 +00:00 committed by Git OBS Bridge
commit 905d740838
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
zip-3.0-nomutilation.patch Normal file
View File

@ -0,0 +1,47 @@
Date: Thu Apr 3 23:00:00 UTC 2014
From: tbehrens@suse.com
Don't clobber include/exclude pattern lists by in2ex/ex2in's chopping
off path prefixes.
--- zip.c~ 2008-07-05 18:34:06.000000000 +0200
+++ zip.c 2014-04-03 22:38:36.855065116 +0200
@@ -3217,9 +3217,14 @@
/* if nothing matches include list then still create an empty archive */
allow_empty_archive = 1;
case 'x': /* Exclude following files */
+ {
+ int old_pathput = pathput;
+ pathput = 1;
add_filter((int) option, value);
+ pathput = old_pathput;
free(value);
break;
+ }
#ifdef S_IFLNK
case 'y': /* Store symbolic links as such */
linkput = 1; break;
@@ -3322,8 +3327,11 @@
/* just ignore as just marks what follows as non-option arguments */
} else if (kk == 6) {
+ int old_pathput = pathput;
+ pathput = 1;
/* value is R pattern */
add_filter((int)'R', value);
+ pathput = old_pathput;
free(value);
if (first_listarg == 0) {
first_listarg = argnum;
@@ -3387,8 +3395,11 @@
{
kk = 4;
if (recurse == 2) {
+ int old_pathput = pathput;
+ pathput = 1;
/* reading patterns from stdin */
add_filter((int)'R', pp);
+ pathput = old_pathput;
} else {
/* file argument now processed later */
add_name(pp);

6
zip.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 3 23:00:00 UTC 2014 - tbehrens@suse.com
- Fix bnc#785305
* Add patch zip-3.0-nomutilation.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 07:31:51 UTC 2013 - idonmez@suse.com Fri Apr 5 07:31:51 UTC 2013 - idonmez@suse.com

4
zip.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package zip # spec file for package zip
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,7 @@ Patch4: zip-3.0-nonexec-stack.patch
Patch5: zip-3.0-optflags.patch Patch5: zip-3.0-optflags.patch
Patch6: zip-3.0-tempfile.patch Patch6: zip-3.0-tempfile.patch
Patch7: zip-notimestamp.patch Patch7: zip-notimestamp.patch
Patch8: zip-3.0-nomutilation.patch
Provides: crzip = %{version} Provides: crzip = %{version}
Obsoletes: crzip < %{version} Obsoletes: crzip < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -47,6 +48,7 @@ PKZIP(tm) 2.04g (Phil Katz ZIP) for MS-DOS systems.
%patch5 %patch5
%patch6 %patch6
%patch7 %patch7
%patch8
%build %build
make %{?_smp_mflags} -f unix/Makefile prefix=/usr CC="gcc %{optflags} -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc make %{?_smp_mflags} -f unix/Makefile prefix=/usr CC="gcc %{optflags} -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc