packages/tar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to 1.34

Browse Source
This commit is contained in:
shixuantong 2021-11-13 14:58:03 +08:00
parent 56fc384cb4
commit 3cabbb155b
10 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tar-1.28-atime-rofs.patch
View File

@ -16,10 +16,10 @@ http://lists.gnu.org/archive/html/bug-tar/2009-06/msg00016.html
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/create.c b/src/create.c diff --git a/src/create.c b/src/create.c
index e2f4ede..f644f23 100644 index 6c99c74..4ee8334 100644
--- a/src/create.c --- a/src/create.c
+++ b/src/create.c +++ b/src/create.c
@@ -1824,7 +1824,8 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) @@ -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 else if (atime_preserve_option == replace_atime_preserve
&& fd && (is_dir || original_size != 0) && fd && (is_dir || original_size != 0)
@ -30,5 +30,5 @@ index e2f4ede..f644f23 100644
} }
-- --
1.9.3 1.8.3.1

6
tar-1.28-document-exclude-mistakes.patch
View File

@ -15,10 +15,10 @@ Related: #903666
1 file changed, 67 insertions(+) 1 file changed, 67 insertions(+)
diff --git a/doc/tar.texi b/doc/tar.texi diff --git a/doc/tar.texi b/doc/tar.texi
index a000f3f..2695d22 100644 index ff002a9..b66b163 100644
--- a/doc/tar.texi --- a/doc/tar.texi
+++ b/doc/tar.texi +++ b/doc/tar.texi
@@ -8051,6 +8051,73 @@ The following table summarizes pattern-matching default values: @@ -8441,6 +8441,73 @@ The following table summarizes pattern-matching default values:
@item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash} @item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash}
@end multitable @end multitable
@ -93,5 +93,5 @@ index a000f3f..2695d22 100644
@section Quoting Member Names @section Quoting Member Names
-- --
1.9.3 1.8.3.1

8
tar-1.28-loneZeroWarning.patch
View File

@ -10,10 +10,10 @@ Resolves: #135601
1 file changed, 11 insertions(+) 1 file changed, 11 insertions(+)
diff --git a/src/list.c b/src/list.c diff --git a/src/list.c b/src/list.c
index b4277e0..0c7a740 100644 index d7ef441..0bf1ef8 100644
--- a/src/list.c --- a/src/list.c
+++ b/src/list.c +++ b/src/list.c
@@ -240,6 +240,14 @@ read_and (void (*do_something) (void)) @@ -241,6 +241,14 @@ read_and (void (*do_something) (void))
if (!ignore_zeros_option) if (!ignore_zeros_option)
{ {
@ -28,7 +28,7 @@ index b4277e0..0c7a740 100644
char buf[UINTMAX_STRSIZE_BOUND]; char buf[UINTMAX_STRSIZE_BOUND];
status = read_header (&current_header, &current_stat_info, status = read_header (&current_header, &current_stat_info,
@@ -249,6 +257,9 @@ read_and (void (*do_something) (void)) @@ -250,6 +258,9 @@ read_and (void (*do_something) (void))
WARNOPT (WARN_ALONE_ZERO_BLOCK, WARNOPT (WARN_ALONE_ZERO_BLOCK,
(0, 0, _("A lone zero block at %s"), (0, 0, _("A lone zero block at %s"),
STRINGIFY_BIGINT (current_block_ordinal (), buf))); STRINGIFY_BIGINT (current_block_ordinal (), buf)));
@ -39,5 +39,5 @@ index b4277e0..0c7a740 100644
} }
status = prev_status; status = prev_status;
-- --
1.9.3 1.8.3.1

6
tar-1.28-vfatTruncate.patch
View File

@ -17,10 +17,10 @@ http://lists.gnu.org/archive/html/bug-tar/2006-02/msg00000.html
1 file changed, 18 insertions(+), 1 deletion(-) 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/system.c b/src/system.c diff --git a/src/system.c b/src/system.c
index 9414233..37e9a3e 100644 index 9e273bc..e62edd8 100644
--- a/src/system.c --- a/src/system.c
+++ b/src/system.c +++ b/src/system.c
@@ -243,8 +243,25 @@ sys_compare_links (struct stat *link_data, struct stat *stat_data) @@ -244,8 +244,25 @@ sys_compare_links (struct stat *link_data, struct stat *stat_data)
int int
sys_truncate (int fd) sys_truncate (int fd)
{ {
@ -48,5 +48,5 @@ index 9414233..37e9a3e 100644
/* Return nonzero if NAME is the name of a regular file, or if the file /* Return nonzero if NAME is the name of a regular file, or if the file
-- --
1.9.3 1.8.3.1

30
tar-1.29-wildcards.patch
View File

@ -14,10 +14,10 @@ Resolves: #206841
3 files changed, 10 insertions(+), 11 deletions(-) 3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/doc/tar.texi b/doc/tar.texi diff --git a/doc/tar.texi b/doc/tar.texi
index a8969e0..0185157 100644 index fba10ae..ff002a9 100644
--- a/doc/tar.texi --- a/doc/tar.texi
+++ b/doc/tar.texi +++ b/doc/tar.texi
@@ -8439,7 +8439,7 @@ The following table summarizes pattern-matching default values: @@ -8437,7 +8437,7 @@ The following table summarizes pattern-matching default values:
@multitable @columnfractions .3 .7 @multitable @columnfractions .3 .7
@headitem Members @tab Default settings @headitem Members @tab Default settings
@ -26,7 +26,7 @@ index a8969e0..0185157 100644
@item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash} @item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash}
@end multitable @end multitable
@@ -12915,6 +12915,9 @@ version of this document is available at @@ -12948,6 +12948,9 @@ is available at
@table @asis @table @asis
@item Use of globbing patterns when listing and extracting. @item Use of globbing patterns when listing and extracting.
@ -37,19 +37,19 @@ index a8969e0..0185157 100644
extracting from or listing an archive. For example: extracting from or listing an archive. For example:
diff --git a/src/names.c b/src/names.c diff --git a/src/names.c b/src/names.c
index 037b869..d96ad71 100644 index 272653d..a592faa 100644
--- a/src/names.c --- a/src/names.c
+++ b/src/names.c +++ b/src/names.c
@@ -137,7 +137,7 @@ static struct argp_option names_options[] = { @@ -142,7 +142,7 @@ static struct argp_option names_options[] = {
{"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
N_("case sensitive matching (default)"), GRID+1 }, N_("case sensitive matching (default)"), GRID_MATCH },
{"wildcards", WILDCARDS_OPTION, 0, 0, {"wildcards", WILDCARDS_OPTION, 0, 0,
- N_("use wildcards (default for exclusion)"), GRID+1 }, - N_("use wildcards (default for exclusion)"), GRID_MATCH },
+ N_("use wildcards (default)"), GRID+1 }, + N_("use wildcards (default)"), GRID_MATCH },
{"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
N_("verbatim string matching"), GRID+1 }, N_("verbatim string matching"), GRID_MATCH },
{"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0, {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
@@ -195,8 +195,7 @@ names_parse_opt (int key, char *arg, struct argp_state *state) @@ -225,8 +225,7 @@ names_parse_opt (int key, char *arg, struct argp_state *state)
/* Wildcard matching settings */ /* Wildcard matching settings */
enum wildcards enum wildcards
{ {
@ -59,7 +59,7 @@ index 037b869..d96ad71 100644
disable_wildcards, disable_wildcards,
enable_wildcards enable_wildcards
}; };
@@ -214,7 +213,7 @@ static int include_anchored = EXCLUDE_ANCHORED; @@ -244,7 +243,7 @@ static int include_anchored = EXCLUDE_ANCHORED;
| recursion_option) | recursion_option)
#define INCLUDE_OPTIONS \ #define INCLUDE_OPTIONS \
@ -68,7 +68,7 @@ index 037b869..d96ad71 100644
| include_anchored \ | include_anchored \
| matching_flags \ | matching_flags \
| recursion_option) | recursion_option)
@@ -1234,8 +1233,7 @@ regex_usage_warning (const char *name) @@ -1393,8 +1392,7 @@ regex_usage_warning (const char *name)
/* Warn about implicit use of the wildcards in command line arguments. /* Warn about implicit use of the wildcards in command line arguments.
(Default for tar prior to 1.15.91, but changed afterwards) */ (Default for tar prior to 1.15.91, but changed afterwards) */
@ -78,7 +78,7 @@ index 037b869..d96ad71 100644
{ {
warned_once = 1; warned_once = 1;
WARN ((0, 0, WARN ((0, 0,
@@ -1618,10 +1616,7 @@ collect_and_sort_names (void) @@ -1768,10 +1766,7 @@ collect_and_sort_names (void)
if (name->found_count || name->directory) if (name->found_count || name->directory)
continue; continue;
@ -91,7 +91,7 @@ index 037b869..d96ad71 100644
if (name->name[0] == 0) if (name->name[0] == 0)
diff --git a/tests/exclude01.at b/tests/exclude01.at diff --git a/tests/exclude01.at b/tests/exclude01.at
index c3cd10b..c590047 100644 index a813c6e..3a546fc 100644
--- a/tests/exclude01.at --- a/tests/exclude01.at
+++ b/tests/exclude01.at +++ b/tests/exclude01.at
@@ -61,6 +61,7 @@ testdir/dir2/file2 @@ -61,6 +61,7 @@ testdir/dir2/file2
@ -103,5 +103,5 @@ index c3cd10b..c590047 100644
testdir/dir1/* testdir/dir1/*
NEXT NEXT
-- --
2.5.5 1.8.3.1

BIN
tar-1.32.tar.xz
View File

Binary file not shown.

7
tar-1.32.tar.xz.sig
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iG4EABECAC4WIQQyX2UMTCtq1YgHMno2ArB/VdDHMgUCXHFHdhAcZ3JheUBnbnUu
b3JnLnVhAAoJEDYCsH9V0Mcy61oAni2Gwnao+qzsebDfH3ePo4FWdHKEAJ9IP8h7
f96xDOstDrfKQjY/tqUrWg==
=eh8f
-----END PGP SIGNATURE-----

BIN
tar-1.34.tar.xz Normal file
View File

Binary file not shown.

7
tar-1.34.tar.xz.sig Normal file
View File

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

9
tar.spec
View File

@ -1,6 +1,6 @@
Name: tar Name: tar
Version: 1.32 Version: 1.34
Release: 3 Release: 1
Epoch: 2 Epoch: 2
Summary: An organized and systematic method of controlling a large amount of data Summary: An organized and systematic method of controlling a large amount of data
License: GPLv3+ License: GPLv3+
@ -8,8 +8,6 @@ URL: http://www.gnu.org/software/tar/
Source0: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz.sig Source1: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz.sig
Patch6000: backport-CVE-2021-20193.patch
BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils
BuildRequires: gcc BuildRequires: gcc
Provides: bundled(gnulib) /bin/tar /bin/gtar Provides: bundled(gnulib) /bin/tar /bin/gtar
@ -77,6 +75,9 @@ make check
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Sat Nov 13 2021 shixuantong <shixuantong> - 1.34-1
- update version to 1.34
* Thu Jun 10 2021 shixuantong <shixuantong> - 1.32-3 * Thu Jun 10 2021 shixuantong <shixuantong> - 1.32-3
- add gcc to BuildRequires - add gcc to BuildRequires