Codebase list rust-libslirp / 4b35390
rebase of the patch Sylvestre Ledru 3 years ago
4 changed file(s) with 20 addition(s) and 33 deletion(s). Raw diff Collapse all Expand all
+1
-8
src/coreutils/debian/patches/bump-cpp.diff less more
11 ===================================================================
22 --- coreutils.orig/src/uu/stdbuf/src/libstdbuf/Cargo.toml
33 +++ coreutils/src/uu/stdbuf/src/libstdbuf/Cargo.toml
4 @@ -17,10 +17,10 @@ path = "src/libstdbuf.rs"
5 crate-type = ["cdylib", "rlib"] # XXX: note: the rlib is just to prevent Cargo from spitting out a warning
6
7 [dependencies]
8 -cpp = "0.4"
9 +cpp = "0.5"
10 libc = "0.2"
11 uucore = { version=">=0.0.6", package="uucore", path="../../../../uucore" }
4 @@ -23,4 +23,4 @@ uucore = { version=">=0.0.7", package="u
125 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../../../uucore_procs" }
136
147 [build-dependencies]
+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.6", package="uucore", path="../../uucore", features=["entries", "wide"] }
5 uucore = { version=">=0.0.7", 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]
+4
-4
src/coreutils/debian/patches/fix-dep-code.diff less more
1717 gen_type: PassType<'a>,
1818 - rng: Option<RefCell<ThreadRng>>,
1919 + rng: Option<RefCell<rand::rngs::ThreadRng>>,
20 }
21
22 impl<'a> BytesGenerator<'a> {
23 @@ -421,7 +422,8 @@ fn wipe_file(
20 bytes: [u8; BLOCK_SIZE],
21 }
22
23 @@ -436,7 +437,8 @@ fn wipe_file(
2424 for pattern in PATTERNS.iter().take(remainder) {
2525 pass_sequence.push(PassType::Pattern(pattern));
2626 }
+14
-20
src/coreutils/debian/patches/fix-dep.diff less more
22 --- coreutils.orig/Cargo.toml
33 +++ coreutils/Cargo.toml
44 @@ -326,10 +326,10 @@ whoami = { optional=true, version="0.0
5 yes = { optional=true, version="0.0.3", package="uu_yes", path="src/uu/yes" }
5 yes = { optional=true, version="0.0.4", package="uu_yes", path="src/uu/yes" }
66 #
77 # * pinned transitive dependencies
88 -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()`)
3838 regex = "1.0.0"
3939 -glob = "0.2.11"
4040 +glob = "0.3"
41 uucore = { version=">=0.0.6", package="uucore", path="../../uucore", features=["entries", "fs"] }
41 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["entries", "fs"] }
4242 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
4343
4444 Index: coreutils/src/uu/env/Cargo.toml
5151 libc = "0.2.42"
5252 -rust-ini = "0.13.0"
5353 +rust-ini = "0.16.0"
54 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
54 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
5555 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
5656
5757 Index: coreutils/src/uu/expr/Cargo.toml
6464 libc = "0.2.42"
6565 -onig = "~4.3.2"
6666 +onig = "6"
67 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
67 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
6868 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
6969
7070 Index: coreutils/src/uu/factor/Cargo.toml
7575 [dependencies]
7676 num-traits = "0.2.13" # Needs at least version 0.2.13 for "OverflowingAdd"
7777 rand = { version="0.7", features=["small_rng"] }
78 -smallvec = { version="0.6.13, < 1.0" }
78 -smallvec = { version="0.6.14, < 1.0" }
7979 +smallvec = { version="1.4.2" }
80 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
80 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
8181 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
8282
8383 Index: coreutils/src/uu/hashsum/Cargo.toml
105105 +sha2 = "0.9"
106106 +sha3 = "0.9"
107107 blake2-rfc = "0.2.18"
108 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
108 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
109109 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
110110 Index: coreutils/src/uu/mktemp/Cargo.toml
111111 ===================================================================
118118 -rand = "0.5"
119119 +rand = "0.7"
120120 tempfile = "3.1"
121 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
121 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
122122 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
123123 Index: coreutils/src/uu/more/Cargo.toml
124124 ===================================================================
143143 [dependencies]
144144 -itertools = "0.8.0"
145145 +itertools = "0.9.0"
146 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
146 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
147147 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
148148
149149 Index: coreutils/src/uu/shred/Cargo.toml
157157 -rand = "0.5"
158158 +rand = "0.7"
159159 time = "0.1.40"
160 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
160 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
161161 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
162162 Index: coreutils/src/uu/shuf/Cargo.toml
163163 ===================================================================
169169 getopts = "0.2.18"
170170 -rand = "0.5"
171171 +rand = "0.7"
172 uucore = { version=">=0.0.6", package="uucore", path="../../uucore" }
172 uucore = { version=">=0.0.7", package="uucore", path="../../uucore" }
173173 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
174174
175175 Index: coreutils/src/uu/sort/Cargo.toml
183183 -itertools = "0.8.0"
184184 +itertools = "0.9"
185185 semver = "0.9.0"
186 uucore = { version=">=0.0.6", package="uucore", path="../../uucore", features=["fs"] }
186 uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["fs"] }
187187 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
188188 Index: coreutils/src/uucore/Cargo.toml
189189 ===================================================================
190190 --- coreutils.orig/src/uucore/Cargo.toml
191191 +++ coreutils/src/uucore/Cargo.toml
192 @@ -18,16 +18,16 @@ path="src/lib/lib.rs"
192 @@ -18,11 +18,11 @@ path="src/lib/lib.rs"
193193 [dependencies]
194194 dunce = "1.0.0"
195195 getopts = "<= 0.2.21"
200200 lazy_static = { version="1.3", optional=true }
201201 -nix = { version="<= 0.13", optional=true }
202202 +nix = { version="<= 0.19", optional=true }
203 platform-info = { version="<= 0.0.1", optional=true }
203 platform-info = { version="<= 0.1", optional=true }
204204 time = { version="<= 0.1.42", optional=true }
205205 # * "problem" dependencies (pinned)
206 data-encoding = { version="~2.1", optional=true } ## data-encoding: require v2.1; but v2.2.0 breaks the build for MinSRV v1.31.0
207 -libc = { version="0.2.15, <= 0.2.66", optional=true } ## libc: initial utmp support added in v0.2.15; but v0.2.68 breaks the build for MinSRV v1.31.0
208 +libc = { version="0.2.15, <= 0.2.80", optional=true } ## libc: initial utmp support added in v0.2.15; but v0.2.68 breaks the build for MinSRV v1.31.0
209
210 [target.'cfg(target_os = "redox")'.dependencies]
211 termion = "1.5"