diff --git a/tar-wildcards.patch b/tar-wildcards.patch new file mode 100644 index 0000000..2e1dcc8 --- /dev/null +++ b/tar-wildcards.patch @@ -0,0 +1,19 @@ +Index: src/names.c +=================================================================== +RCS file: /cvsroot/tar/tar/src/names.c,v +retrieving revision 1.60 +diff -p -u -r1.60 names.c +--- a/src/names.c 20 Jun 2006 15:14:19 -0000 1.60 ++++ b/src/names.c 6 Feb 2007 23:02:39 -0000 +@@ -813,10 +813,6 @@ collect_and_sort_names (void) + next_name = name->next; + if (name->found_count || name->dir_contents) + continue; +- if (name->matching_flags & EXCLUDE_WILDCARDS) +- /* NOTE: EXCLUDE_ANCHORED is not relevant here */ +- /* FIXME: just skip regexps for now */ +- continue; + chdir_do (name->change_dir); + if (name->name[0] == 0) + continue; + diff --git a/tar.changes b/tar.changes index 99cfa96..d9f6e9f 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 19 12:30:35 CET 2008 - mkoenig@suse.de + +- fix incremental backup with wildcard option [bnc#445411] + ------------------------------------------------------------------- Mon Jun 23 17:16:19 CEST 2008 - mkoenig@suse.de diff --git a/tar.spec b/tar.spec index a4ffd5e..9589307 100644 --- a/tar.spec +++ b/tar.spec @@ -2,9 +2,16 @@ # spec file for package tar (Version 1.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on Version: 1.20 -Release: 1 +Release: 23 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 # merged @@ -30,6 +37,7 @@ Source0: %name-%version.tar.bz2 Patch0: tar-disable_languages.patch Patch1: tar-disable-listed02-test.diff Patch2: tar-manpage.patch +Patch3: tar-wildcards.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: lzma %define _bindir /bin @@ -69,6 +77,7 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build rm -f po/no.* po/ky.* @@ -109,6 +118,8 @@ rm -r %buildroot/usr/libexec rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 19 2008 mkoenig@suse.de +- fix incremental backup with wildcard option [bnc#445411] * Mon Jun 23 2008 mkoenig@suse.de - update to version 1.20: * new options: --auto-compress, --lzma, --hard-dereference, @@ -293,7 +304,7 @@ rm -rf $RPM_BUILD_ROOT o When attempting to delete a non-existing member from the archive, previous versions of tar used to overwrite last archive block with zeroes. -* Tue Aug 10 2004 mmj@suse.de +* Mon Aug 09 2004 mmj@suse.de - Add patch from snwint with long filename fix [#43538] * Sun May 30 2004 mmj@suse.de - Update to 1.14 which is the first stable release of tar