pyrox.dev
lol
Merge #222314: coreutils: 9.1 -> 9.3 and re-enable hole seeking
...into staging
+2
-50
+2
-7
pkgs/tools/misc/coreutils/default.nix
+2
-7
pkgs/tools/misc/coreutils/default.nix
···
32
32
in
33
33
stdenv.mkDerivation rec {
34
34
pname = "coreutils" + (optionalString (!minimal) "-full");
35
-
version = "9.1";
35
+
version = "9.3";
36
36
37
37
src = fetchurl {
38
38
url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
39
-
sha256 = "sha256-YaH0ENeLp+fzelpPUObRMgrKMzdUhKMlXt3xejhYBCM=";
39
+
hash = "sha256-rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o=";
40
40
};
41
-
42
-
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
43
-
# Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433
44
-
./disable-seek-hole.patch
45
-
];
46
41
47
42
postPatch = ''
48
43
# The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
-43
pkgs/tools/misc/coreutils/disable-seek-hole.patch
-43
pkgs/tools/misc/coreutils/disable-seek-hole.patch
···
1
-
diff --git a/src/copy.c b/src/copy.c
2
-
index cb9018f93..2a4ccc061 100644
3
-
--- a/src/copy.c
4
-
+++ b/src/copy.c
5
-
@@ -502,7 +502,7 @@ write_zeros (int fd, off_t n_bytes)
6
-
return true;
7
-
}
8
-
9
-
-#ifdef SEEK_HOLE
10
-
+#if 0
11
-
/* Perform an efficient extent copy, if possible. This avoids
12
-
the overhead of detecting holes in hole-introducing/preserving
13
-
copy, and thus makes copying sparse files much more efficient.
14
-
@@ -1095,7 +1095,7 @@ infer_scantype (int fd, struct stat const *sb,
15
-
&& ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE))
16
-
return PLAIN_SCANTYPE;
17
-
18
-
-#ifdef SEEK_HOLE
19
-
+#if 0
20
-
scan_inference->ext_start = lseek (fd, 0, SEEK_DATA);
21
-
if (0 <= scan_inference->ext_start)
22
-
return LSEEK_SCANTYPE;
23
-
@@ -1377,7 +1377,7 @@ copy_reg (char const *src_name, char const *dst_name,
24
-
off_t n_read;
25
-
bool wrote_hole_at_eof = false;
26
-
if (! (
27
-
-#ifdef SEEK_HOLE
28
-
+#if 0
29
-
scantype == LSEEK_SCANTYPE
30
-
? lseek_copy (source_desc, dest_desc, buf, buf_size, hole_size,
31
-
scan_inference.ext_start, src_open_sb.st_size,
32
-
diff --git a/tests/seek-data-capable b/tests/seek-data-capable
33
-
index cc6372214..6e7a9ec1e 100644
34
-
--- a/tests/seek-data-capable
35
-
+++ b/tests/seek-data-capable
36
-
@@ -1,5 +1,7 @@
37
-
import sys, os, errno, platform
38
-
39
-
+sys.exit(1)
40
-
+
41
-
# Pass an _empty_ file
42
-
if len(sys.argv) != 2:
43
-
sys.exit(1)