Codebase list rust-stfu8 / 2cd4fbe
rebase of the patch Sylvestre Ledru 3 years ago
6 changed file(s) with 29 addition(s) and 98 deletion(s). Raw diff Collapse all Expand all
+0
-13
src/coreutils/debian/patches/bump-thread-local.diff less more
0 Index: rust-coreutils-0.0.3/Cargo.toml
1 ===================================================================
2 --- rust-coreutils-0.0.3.orig/Cargo.toml
3 +++ rust-coreutils-0.0.3/Cargo.toml
4 @@ -331,7 +331,7 @@ pin_rustc-demangle = { version="0.1.16,
5 pin_same-file = { version="1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinRustV v1.32.0, expects 1.34
6 #pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinRustV v1.32.0, expects 1.34
7 pin_byteorder = { version="1.3.4, < 1.4.0", package="byteorder" } ## byteorder v1.4 has compiler errors for MinRustV v1.32.0, requires 1.3 (for `use of unstable library feature 'try_from' (see issue #33417)`)
8 -pin_thread_local = { version="1.1.0, < 1.1.1", package="thread_local" } ## thread_local v1.1.2 has compiler errors for MinRustV v1.32.0, requires 1.36 (for `use of unstable library feature 'maybe_uninit'`)
9 +thread_local = "1.0.1"
10
11 [dev-dependencies]
12 conv = "0.3"
+1
-1
src/coreutils/debian/patches/cargo_registry.diff less more
1515 @@ -251,7 +251,7 @@ ifneq (${MULTICALL}, y)
1616 endif
1717
18 build-uutils:
18 build-coreutils:
1919 - ${CARGO} build ${CARGOFLAGS} --features "${EXES}" ${PROFILE_CMD} --no-default-features
2020 + ${CARGO_PRE_FLAGS} ${CARGO} build ${CARGOFLAGS} --features "${EXES}" ${PROFILE_CMD} --no-default-features
2121
+1
-1
src/coreutils/debian/patches/disable-advapi32-sys.diff less more
22 --- coreutils.orig/src/uu/whoami/Cargo.toml
33 +++ coreutils/src/uu/whoami/Cargo.toml
44 @@ -19,9 +19,9 @@ clap = "2.33"
5 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["entries", "wide"] }
5 uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "wide"] }
66 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
77
88 -[target.'cfg(target_os = "windows")'.dependencies]
+9
-47
src/coreutils/debian/patches/fix-dep-code.diff less more
11 ===================================================================
22 --- coreutils.orig/src/uu/shred/src/shred.rs
33 +++ coreutils/src/uu/shred/src/shred.rs
4 @@ -8,7 +8,8 @@
5
4 @@ -9,7 +9,8 @@
65 // spell-checker:ignore (ToDO) NAMESET FILESIZE fstab coeff journaling writeback REiser journaled
76
7 use clap::{App, Arg};
88 -use rand::{Rng, ThreadRng};
99 +use rand::{Rng, thread_rng};
1010 +use rand::prelude::SliceRandom;
1111 use std::cell::{Cell, RefCell};
1212 use std::fs;
1313 use std::fs::{File, OpenOptions};
14 @@ -118,7 +119,7 @@ struct BytesGenerator<'a> {
14 @@ -119,7 +120,7 @@ struct BytesGenerator<'a> {
1515 block_size: usize,
1616 exact: bool, // if false, every block's size is block_size
1717 gen_type: PassType<'a>,
2020 bytes: [u8; BLOCK_SIZE],
2121 }
2222
23 @@ -436,7 +437,8 @@ fn wipe_file(
23 @@ -473,7 +474,8 @@ fn wipe_file(
2424 for pattern in PATTERNS.iter().take(remainder) {
2525 pass_sequence.push(PassType::Pattern(pattern));
2626 }
3434 ===================================================================
3535 --- coreutils.orig/src/uu/shuf/src/shuf.rs
3636 +++ coreutils/src/uu/shuf/src/shuf.rs
37 @@ -210,7 +210,7 @@ fn shuf_bytes(
37 @@ -233,7 +233,7 @@ fn shuf_bytes(input: &mut Vec<&[u8]>, op
3838 });
3939
40 let mut rng = match random {
40 let mut rng = match opts.random_source {
4141 - Some(r) => WrappedRng::RngFile(rand::read::ReadRng::new(match File::open(&r[..]) {
4242 + Some(r) => WrappedRng::RngFile(rand::rngs::adapter::ReadRng::new(match File::open(&r[..]) {
4343 Ok(f) => f,
4444 Err(e) => crash!(1, "failed to open random source '{}': {}", &r[..], e),
4545 })),
46 @@ -271,8 +271,8 @@ fn parse_range(input_range: String) -> R
46 @@ -294,8 +294,8 @@ fn parse_range(input_range: &str) -> Res
4747 }
4848
4949 enum WrappedRng {
5858 ===================================================================
5959 --- coreutils.orig/src/uu/more/src/more.rs
6060 +++ coreutils/src/uu/more/src/more.rs
61 @@ -19,6 +19,8 @@ extern crate nix;
61 @@ -18,6 +18,8 @@ extern crate nix;
6262 #[cfg(all(unix, not(target_os = "fuchsia")))]
63 use nix::sys::termios;
63 use nix::sys::termios::{self, LocalFlags, SetArg};
6464
6565 +use nix::sys::termios::LocalFlags;
6666 +
6767 #[cfg(target_os = "redox")]
6868 extern crate redox_termios;
6969 #[cfg(target_os = "redox")]
70 @@ -92,10 +94,10 @@ fn help(usage: &str) {
71 fn setup_term() -> termios::Termios {
72 let mut term = termios::tcgetattr(0).unwrap();
73 // Unset canonical mode, so we get characters immediately
74 - term.c_lflag.remove(termios::ICANON);
75 + term.local_flags.remove(LocalFlags::ICANON);
76 // Disable local echo
77 - term.c_lflag.remove(termios::ECHO);
78 - termios::tcsetattr(0, termios::TCSADRAIN, &term).unwrap();
79 + term.local_flags.remove(LocalFlags::ECHO);
80 + termios::tcsetattr(0, termios::SetArg::TCSADRAIN, &term).unwrap();
81 term
82 }
83
84 @@ -110,8 +112,8 @@ fn setup_term() -> redox_termios::Termio
85 let mut term = redox_termios::Termios::default();
86 let fd = syscall::dup(0, b"termios").unwrap();
87 syscall::read(fd, &mut term).unwrap();
88 - term.c_lflag &= !redox_termios::ICANON;
89 - term.c_lflag &= !redox_termios::ECHO;
90 + term.c_lflag &= !redox_LocalFlags::ICANON;
91 + term.c_lflag &= !redox_LocalFlags::ECHO;
92 syscall::write(fd, &term).unwrap();
93 let _ = syscall::close(fd);
94 term
95 @@ -119,9 +121,9 @@ fn setup_term() -> redox_termios::Termio
96
97 #[cfg(all(unix, not(target_os = "fuchsia")))]
98 fn reset_term(term: &mut termios::Termios) {
99 - term.c_lflag.insert(termios::ICANON);
100 - term.c_lflag.insert(termios::ECHO);
101 - termios::tcsetattr(0, termios::TCSADRAIN, &term).unwrap();
102 + term.local_flags.insert(LocalFlags::ICANON);
103 + term.local_flags.insert(LocalFlags::ECHO);
104 + termios::tcsetattr(0, termios::SetArg::TCSADRAIN, &term).unwrap();
105 }
106
107 #[cfg(any(windows, target_os = "fuchsia"))]
10870 Index: coreutils/src/uu/env/src/env.rs
10971 ===================================================================
11072 --- coreutils.orig/src/uu/env/src/env.rs
+17
-35
src/coreutils/debian/patches/fix-dep.diff less more
0 Index: coreutils/Cargo.toml
1 ===================================================================
2 --- coreutils.orig/Cargo.toml
3 +++ coreutils/Cargo.toml
4 @@ -326,10 +326,10 @@ whoami = { optional=true, version="0.0
5 yes = { optional=true, version="0.0.4", package="uu_yes", path="src/uu/yes" }
6 #
7 # * pinned transitive dependencies
8 -pin_cc = { version="1.0.61, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)
9 +pin_cc = { version="1.0.59, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)
10 pin_rustc-demangle = { version="0.1.16, < 0.1.17", package="rustc-demangle" } ## rust-demangle v0.1.17 has compiler errors for MinRustV v1.32.0, expects 1.33
11 -pin_same-file = { version="1.0.4, < 1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinRustV v1.32.0, expects 1.34
12 -pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinRustV v1.32.0, expects 1.34
13 +pin_same-file = { version="1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinRustV v1.32.0, expects 1.34
14 +#pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinRustV v1.32.0, expects 1.34
15 pin_byteorder = { version="1.3.4, < 1.4.0", package="byteorder" } ## byteorder v1.4 has compiler errors for MinRustV v1.32.0, requires 1.3 (for `use of unstable library feature 'try_from' (see issue #33417)`)
16 pin_thread_local = { version="1.1.0, < 1.1.1", package="thread_local" } ## thread_local v1.1.2 has compiler errors for MinRustV v1.32.0, requires 1.36 (for `use of unstable library feature 'maybe_uninit'`)
17
180 Index: coreutils/src/uu/cp/Cargo.toml
191 ===================================================================
202 --- coreutils.orig/src/uu/cp/Cargo.toml
3315 --- coreutils.orig/src/uu/csplit/Cargo.toml
3416 +++ coreutils/src/uu/csplit/Cargo.toml
3517 @@ -18,7 +18,7 @@ path = "src/csplit.rs"
36 getopts = "0.2.17"
18 clap = "2.33"
3719 thiserror = "1.0"
3820 regex = "1.0.0"
3921 -glob = "0.2.11"
4022 +glob = "0.3"
41 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["entries", "fs"] }
23 uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "fs"] }
4224 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
4325
4426 Index: coreutils/src/uu/env/Cargo.toml
5133 libc = "0.2.42"
5234 -rust-ini = "0.13.0"
5335 +rust-ini = "0.16.0"
54 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
36 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
5537 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
5638
5739 Index: coreutils/src/uu/expr/Cargo.toml
6446 libc = "0.2.42"
6547 -onig = "~4.3.2"
6648 +onig = "6"
67 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
49 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
6850 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
6951
7052 Index: coreutils/src/uu/factor/Cargo.toml
7759 rand = { version="0.7", features=["small_rng"] }
7860 -smallvec = { version="0.6.14, < 1.0" }
7961 +smallvec = { version="1.4.2" }
80 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
62 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
8163 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
8264
8365 Index: coreutils/src/uu/hashsum/Cargo.toml
10587 +sha2 = "0.9"
10688 +sha3 = "0.9"
10789 blake2-rfc = "0.2.18"
108 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
90 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
10991 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
11092 Index: coreutils/src/uu/mktemp/Cargo.toml
11193 ===================================================================
118100 -rand = "0.5"
119101 +rand = "0.7"
120102 tempfile = "3.1"
121 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
103 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
122104 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
123105 Index: coreutils/src/uu/more/Cargo.toml
124106 ===================================================================
128110 redox_syscall = "0.1"
129111
130112 [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
131 -nix = "0.8.1"
113 -nix = "<=0.13"
132114 +nix = "0.19"
133115
134116 [[bin]]
143125 [dependencies]
144126 -itertools = "0.8.0"
145127 +itertools = "0.9.0"
146 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
128 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
147129 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
148130
149131 Index: coreutils/src/uu/shred/Cargo.toml
151133 --- coreutils.orig/src/uu/shred/Cargo.toml
152134 +++ coreutils/src/uu/shred/Cargo.toml
153135 @@ -18,7 +18,7 @@ path = "src/shred.rs"
136 clap = "2.33"
154137 filetime = "0.2.1"
155 getopts = "0.2.18"
156138 libc = "0.2.42"
157139 -rand = "0.5"
158140 +rand = "0.7"
159141 time = "0.1.40"
160 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
142 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
161143 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
162144 Index: coreutils/src/uu/shuf/Cargo.toml
163145 ===================================================================
166148 @@ -16,7 +16,7 @@ path = "src/shuf.rs"
167149
168150 [dependencies]
169 getopts = "0.2.18"
151 clap = "2.33"
170152 -rand = "0.5"
171153 +rand = "0.7"
172 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
154 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
173155 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
174156
175157 Index: coreutils/src/uu/sort/Cargo.toml
176158 ===================================================================
177159 --- coreutils.orig/src/uu/sort/Cargo.toml
178160 +++ coreutils/src/uu/sort/Cargo.toml
179 @@ -16,7 +16,7 @@ path = "src/sort.rs"
180
181 [dependencies]
161 @@ -18,7 +18,7 @@ path = "src/sort.rs"
162 rand = "0.7"
182163 clap = "2.33"
164 twox-hash = "1.6.0"
183165 -itertools = "0.8.0"
184166 +itertools = "0.9"
185167 semver = "0.9.0"
186 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["fs"] }
168 uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] }
187169 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
188170 Index: coreutils/src/uucore/Cargo.toml
189171 ===================================================================
+1
-1
src/coreutils/debian/patches/lower-libc-dep.diff less more
88 -libc = "0.2.85"
99 +libc = "0.2"
1010 quick-error = "1.2.3"
11 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["fs"] }
11 uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] }
1212 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }