Hello community, here is the log from the commit of package zip for openSUSE:Factory checked in at 2014-04-06 09:56:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zip (Old) and /work/SRC/openSUSE:Factory/.zip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zip" Changes: -------- --- /work/SRC/openSUSE:Factory/zip/zip.changes 2013-04-05 13:17:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zip.new/zip.changes 2014-04-06 09:56:04.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 3 23:00:00 UTC 2014 - [email protected] + +- Fix bnc#785305 + * Add patch zip-3.0-nomutilation.patch + +------------------------------------------------------------------- New: ---- zip-3.0-nomutilation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zip.spec ++++++ --- /var/tmp/diff_new_pack.ZGML0i/_old 2014-04-06 09:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ZGML0i/_new 2014-04-06 09:56:04.000000000 +0200 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Patch5: zip-3.0-optflags.patch Patch6: zip-3.0-tempfile.patch Patch7: zip-notimestamp.patch +Patch8: zip-3.0-nomutilation.patch Provides: crzip = %{version} Obsoletes: crzip < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +48,7 @@ %patch5 %patch6 %patch7 +%patch8 %build make %{?_smp_mflags} -f unix/Makefile prefix=/usr CC="gcc %{optflags} -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc ++++++ zip-3.0-nomutilation.patch ++++++ Date: Thu Apr 3 23:00:00 UTC 2014 From: [email protected] 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
