tar, bump version (#9140)

This commit is contained in:
Schrijvers Luc
2023-08-03 16:01:08 +00:00
committed by GitHub
parent 407c85ae1e
commit f2614c1a08
2 changed files with 16 additions and 18 deletions

View File

@@ -1,14 +1,14 @@
From a691dbde5db1ae1cb1c000be7e399e95737b061a Mon Sep 17 00:00:00 2001
From 9ac9f4206e5c8bd66789ea53e77fb0bd9479d85c Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Thu, 20 Mar 2014 14:52:58 +0100
Subject: Implement replace-hardlinks option
diff --git a/src/common.h b/src/common.h
index 5d07956..c70608f 100644
index 9451e13..af21882 100644
--- a/src/common.h
+++ b/src/common.h
@@ -197,6 +197,8 @@ GLOBAL enum old_files old_files_option;
@@ -195,6 +195,8 @@ GLOBAL enum old_files old_files_option;
GLOBAL bool keep_directory_symlink_option;
@@ -18,10 +18,10 @@ index 5d07956..c70608f 100644
GLOBAL const char *listed_incremental_option;
/* Incremental dump level */
diff --git a/src/extract.c b/src/extract.c
index d6d98cb..f63ee68 100644
index 314d8bc..d90c85f 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -32,6 +32,8 @@ static bool we_are_root; /* true if our effective uid == 0 */
@@ -34,6 +34,8 @@ static bool we_are_root; /* true if our effective uid == 0 */
static mode_t newdir_umask; /* umask when creating new directories */
static mode_t current_umask; /* current umask (which is set to 0 if -p) */
@@ -30,12 +30,10 @@ index d6d98cb..f63ee68 100644
#define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
#if ! HAVE_FCHMOD && ! defined fchmod
@@ -1458,7 +1460,39 @@ extract_link (char *file_name, int typeflag)
@@ -1497,6 +1499,38 @@ extract_link (char *file_name, MAYBE_UNUSED int typeflag)
char const *link_name;
int rc;
struct delayed_link *dl;
-
+
+ if (simulate_hardlinks_option)
+ {
+ /* symlinks have to be normalized */
@@ -70,8 +68,8 @@ index d6d98cb..f63ee68 100644
+
link_name = current_stat_info.link_name;
if (! absolute_names_option && contains_dot_dot (link_name))
@@ -1551,6 +1585,13 @@ extract_symlink (char *file_name, int typeflag)
if ((! absolute_names_option && contains_dot_dot (link_name))
@@ -1589,6 +1623,13 @@ extract_symlink (char *file_name, MAYBE_UNUSED int typeflag)
#else
static int warned_once;
@@ -86,10 +84,10 @@ index d6d98cb..f63ee68 100644
{
warned_once = 1;
diff --git a/src/tar.c b/src/tar.c
index 728e38b..21098df 100644
index 7efb003..2a183c1 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -501,6 +501,9 @@ static struct argp_option options[] = {
@@ -502,6 +502,9 @@ static struct argp_option options[] = {
{"check-device", CHECK_DEVICE_OPTION, NULL, 0,
N_("check device numbers when creating incremental archives (default)"),
GRID_MODIFIER },
@@ -99,7 +97,7 @@ index 728e38b..21098df 100644
{NULL, 0, NULL, 0,
N_("Overwrite control:"), GRH_OVERWRITE },
@@ -1837,6 +1840,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
@@ -1854,6 +1857,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
set_archive_format (arg);
break;
@@ -110,7 +108,7 @@ index 728e38b..21098df 100644
case INDEX_FILE_OPTION:
index_file_name = arg;
break;
@@ -2288,6 +2295,7 @@ decode_options (int argc, char **argv)
@@ -2305,6 +2312,7 @@ decode_options (int argc, char **argv)
unquote_option = true;
tar_sparse_major = 1;
tar_sparse_minor = 0;
@@ -119,5 +117,5 @@ index 728e38b..21098df 100644
savedir_sort_order = SAVEDIR_SORT_NONE;
--
2.30.0
2.37.3

View File

@@ -15,7 +15,7 @@ LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
https://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
CHECKSUM_SHA256="b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff"
CHECKSUM_SHA256="7edb8886a3dc69420a1446e1e2d061922b642f1cf632d2cd0f9ee7e690775985"
PATCHES="tar-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -87,6 +87,6 @@ INSTALL()
TEST()
{
#x86_64
#testsuite: 23 24 25 55 98 100 105 106 110 111 113 116 121 124 127 128 133 134 135 138 142 143 155 157 184 failed
#testsuite: 23 24 25 55 101 103 108 109 110 114 115 117 120 125 128 131 132 137 138 139 142 146 147 159 161 189 failed
make check
}