update to 1.35

tar-1.28-atime-rofs.patch

@@ -1,34 +0,0 @@
-From 71769b9ea3c12b7fbb39fee2e9f4a4c1c36c0d0b Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 28 Jul 2014 08:13:31 +0200
-Subject: [PATCH 4/9] utime & read-only FS
-
-Ignore errors from setting utime() for source file on read-only
-file-system.
-
-Resolves: #500742
-
-Upstream bugreport (still downstream):
-http://lists.gnu.org/archive/html/bug-tar/2009-06/msg00016.html
-
----
- src/create.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/create.c b/src/create.c
-index 6c99c74..4ee8334 100644
---- a/src/create.c
-+++ b/src/create.c
-@@ -1840,7 +1840,8 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p)
- 	    }
- 	  else if (atime_preserve_option == replace_atime_preserve
- 		   && fd && (is_dir || original_size != 0)
--		   && set_file_atime (fd, parentfd, name, st->atime) != 0)
-+		   && set_file_atime (fd, parentfd, name, st->atime) != 0
-+		   && errno != EROFS )
- 	    utime_error (p);
- 	}
- 
--- 
-1.8.3.1
-

tar-1.29-wildcards.patch

@@ -1,107 +0,0 @@
-From ae0730a98f7269a7bf7adb6047aa421939b290b7 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 28 Jul 2014 08:12:14 +0200
-Subject: [PATCH] wildcard defaults (downstram; compatibility)
-
-Change inclusion defaults of tar to "wildcards --anchored
---wildcards-match-slash" for compatibility reasons.
-
-Resolves: #206841
----
- doc/tar.texi       |  5 ++++-
- src/names.c        | 15 +++++----------
- tests/exclude01.at |  1 +
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/doc/tar.texi b/doc/tar.texi
-index fba10ae..ff002a9 100644
---- a/doc/tar.texi
-+++ b/doc/tar.texi
-@@ -8437,7 +8437,7 @@ The following table summarizes pattern-matching default values:
- 
- @multitable @columnfractions .3 .7
- @headitem Members @tab Default settings
--@item Inclusion @tab @option{--no-wildcards --anchored --no-wildcards-match-slash}
-+@item Inclusion @tab @option{--wildcards --anchored --wildcards-match-slash}
- @item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash}
- @end multitable
- 
-@@ -12948,6 +12948,9 @@ is available at
- @table @asis
- @item Use of globbing patterns when listing and extracting.
- 
-+Note: Following is true for original unpatched GNU tar.
-+For compatibility reasons, the old behavior was preserved.
-+
- Previous versions of GNU tar assumed shell-style globbing when
- extracting from or listing an archive.  For example:
- 
-diff --git a/src/names.c b/src/names.c
-index 272653d..a592faa 100644
---- a/src/names.c
-+++ b/src/names.c
-@@ -142,7 +142,7 @@ static struct argp_option names_options[] = {
-   {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
-    N_("case sensitive matching (default)"), GRID_MATCH },
-   {"wildcards", WILDCARDS_OPTION, 0, 0,
--   N_("use wildcards (default for exclusion)"), GRID_MATCH },
-+   N_("use wildcards (default)"), GRID_MATCH },
-   {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
-    N_("verbatim string matching"), GRID_MATCH },
-   {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
-@@ -225,8 +225,7 @@ names_parse_opt (int key, char *arg, struct argp_state *state)
- /* Wildcard matching settings */
- enum wildcards
-   {
--    default_wildcards, /* For exclusion == enable_wildcards,
--			  for inclusion == disable_wildcards */
-+    default_wildcards, /* enable_wildcards */
-     disable_wildcards,
-     enable_wildcards
-   };
-@@ -244,7 +243,7 @@ static int include_anchored = EXCLUDE_ANCHORED;
-   | recursion_option)
- 
- #define INCLUDE_OPTIONS						    \
--  (((wildcards == enable_wildcards) ? EXCLUDE_WILDCARDS : 0)	    \
-+  (((wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0)	    \
-   | include_anchored						    \
-   | matching_flags						    \
-   | recursion_option)
-@@ -1393,8 +1392,7 @@ regex_usage_warning (const char *name)
- 
-   /* Warn about implicit use of the wildcards in command line arguments.
-      (Default for tar prior to 1.15.91, but changed afterwards) */
--  if (wildcards == default_wildcards
--      && fnmatch_pattern_has_wildcards (name, 0))
-+  if (0 && fnmatch_pattern_has_wildcards (name, 0))
-     {
-       warned_once = 1;
-       WARN ((0, 0,
-@@ -1768,10 +1766,7 @@ collect_and_sort_names (void)
- 
-       if (name->found_count || name->directory)
- 	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)
-diff --git a/tests/exclude01.at b/tests/exclude01.at
-index a813c6e..3a546fc 100644
---- a/tests/exclude01.at
-+++ b/tests/exclude01.at
-@@ -61,6 +61,7 @@ testdir/dir2/file2
- testdir/dir3/
- NEXT
- testdir/dir1/*
-+testdir/dir1/file1
- NEXT
- testdir/dir1/*
- NEXT
--- 
-1.8.3.1
-

tar-1.34.tar.xz.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAmAnuBMACgkQNgKwf1XQxzJIVgCfR5Z7coRkU2+aOW4KNhumGl/1
-jn4AoI9OuQPpyzZN1CIwejDYxbV7u59P
-=mfma
------END PGP SIGNATURE-----

tar.spec

@@ -1,6 +1,6 @@
 Name:          tar
-Version:       1.34
+Version:       1.35
-Release:       4
+Release:       1
 Epoch:         2
 Summary:       An organized and systematic method of controlling a large amount of data
 License:       GPLv3+
@@ -16,8 +16,6 @@ Patch6000:     backport-CVE-2022-48303.patch
 
 Patch0001:     tar-1.28-loneZeroWarning.patch
 Patch0002:     tar-1.28-vfatTruncate.patch
-Patch0003:     tar-1.29-wildcards.patch
-Patch0004:     tar-1.28-atime-rofs.patch
 Patch0005:     tar-1.28-document-exclude-mistakes.patch
 Patch0006:     tar-Add-sw64-architecture.patch
 
@@ -78,6 +76,9 @@ make check
 %{_infodir}/tar.info*
 
 %changelog
+* Wed Jul 19 2023 dillon chen <dillon.chen@gmail.com>  2: 1.35-1
+- update to 1.35-1
+
 * Wed Feb 08 2023 wangjiang <wangjiang37@h-partners.com> 2:1.34-4
 - fix CVE-2022-48303