Disable copy_file_range optimisation for now, see upstream #78979

diff --git a/debian/changelog b/debian/changelog
index 6ccd63695a5522604513da4217852664da54e1d2..6c6be8d4e29f1f9ffa5c562b9931aa11680b29f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.48.0~beta.8+dfsg1-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable copy_file_range optimisation for now, see upstream #78979.
+
+ -- Ximin Luo <infinity0@debian.org>  Thu, 12 Nov 2020 22:27:07 +0000
+
 rustc (1.48.0~beta.8+dfsg1-1~exp1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/debian/patches/series b/debian/patches/series
index 7f8b2ae753f290f1c9aea2061dc9c4fe8343af61..dd37fe613af8ce74dbd80a0e6b582f3c2367a0f9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Patches for upstream
 
 # pending, or forwarded
+u-disable-copy-file-range.patch
 u-backtrace-373.patch
 u-reproducible-build.patch
 u-make-tests-work-without-rpath.patch

diff --git a/debian/patches/u-disable-copy-file-range.patch b/debian/patches/u-disable-copy-file-range.patch
new file mode 100644 (file)
index 0000000..aaa9f44
--- /dev/null
+++ b/debian/patches/u-disable-copy-file-range.patch
@@ -0,0 +1,13 @@
+Bug: https://github.com/rust-lang/rust/issues/78979
+
+--- a/library/std/src/sys/unix/fs.rs
++++ b/library/std/src/sys/unix/fs.rs
+@@ -1126,7 +1126,7 @@
+ 
+     // Kernel prior to 4.5 don't have copy_file_range
+     // We store the availability in a global to avoid unnecessary syscalls
+-    static HAS_COPY_FILE_RANGE: AtomicBool = AtomicBool::new(true);
++    static HAS_COPY_FILE_RANGE: AtomicBool = AtomicBool::new(false);
+ 
+     unsafe fn copy_file_range(
+         fd_in: libc::c_int,