coreutils: update of the various deps

diff --git a/src/coreutils/debian/control b/src/coreutils/debian/control
index f76610ad9d2f900b2ceebb5967aa0e2e7699ec18..9748a8a3f1de5a38a08e83b8c46bdb64d6ba5aba 100644 (file)
--- a/src/coreutils/debian/control
+++ b/src/coreutils/debian/control
@@ -16,19 +16,19 @@ Build-Depends: debhelper (>= 12),
  librust-quick-error-dev (>= 2.0), librust-unix-socket-dev, librust-getopts-dev,
  librust-filetime-dev (>= 0.2.17),
  librust-walkdir-dev (>= 2.3.2), librust-xattr-dev, librust-number-prefix-dev,
- librust-rust-ini-dev, librust-failure-dev, librust-failure-derive-dev,
+ librust-rust-ini-dev (>= 0.18.0), librust-failure-dev, librust-failure-derive-dev,
  librust-glob-dev, librust-chrono-dev, librust-onig-dev (>= 6.3),
- librust-blake2-rfc-dev, librust-digest-dev, librust-hex-dev, librust-md5-dev,
+ librust-blake2-rfc-dev, librust-digest-dev (>= 0.10.5), librust-hex-dev, librust-md5-dev,
  librust-sha1-dev (>= 0.10.1), librust-sha2-dev, librust-sha3-dev,
  librust-atty-dev, librust-term-grid-dev, librust-termsize-dev,
- librust-tempfile-dev, librust-nix-dev (>= 0.23.1), librust-fs-extra-dev,
+ librust-tempfile-dev, librust-nix-dev (>= 0.25.0), librust-fs-extra-dev,
  librust-itertools-dev, librust-bit-set-dev, librust-dunce-dev,
- librust-data-encoding-dev, librust-platform-info-dev (>= 0.1),
- librust-num-traits-dev (>= 0.2.14), librust-smallvec-dev,
+ librust-data-encoding-dev, librust-platform-info-dev (>= 1.0),
+ librust-num-traits-dev (>= 0.2.14), librust-smallvec-dev (>= 1.9.0),
  librust-rand-pcg-dev, librust-thiserror-dev, librust-lazy-static-dev,
  librust-byteorder-dev, librust-hostname-dev (>= 0.3.1), librust-cpp-build-dev,
  librust-fnv-dev, librust-wild-dev, librust-cpp-dev, librust-thread-local-dev,
- librust-selinux-dev, librust-conv-dev, librust-pretty-assertions-dev (>= 1),
+ librust-selinux-dev (>= 0.3.0), librust-conv-dev, librust-pretty-assertions-dev (>= 1),
  librust-time-dev (>= 0.3.9), librust-unindent-dev, librust-rlimit-dev (>= 0.8.3),
  librust-data-encoding-macro-dev, librust-dns-lookup-dev, librust-os-display-dev,
  librust-z85-dev, librust-fts-sys-dev, librust-exacl-dev, librust-byte-unit-dev,
@@ -37,10 +37,11 @@ Build-Depends: debhelper (>= 12),
  librust-ouroboros-dev, librust-memmap2-dev (>= 0.5), librust-retain-mut-dev (>= 0.1.7),
  librust-strum-dev, librust-utf-8-dev, librust-phf-dev, librust-phf-codegen-dev,
  librust-zip-dev, librust-users-dev, librust-blake2b-simd-dev,
- librust-hex-literal-dev, librust-lscolors-dev, librust-blake3-dev,
+ librust-hex-literal-dev, librust-lscolors-dev (>= 0.12.0), librust-blake3-dev,
  librust-file-diff-dev, librust-ctrlc-dev, librust-flate2-dev,
  librust-bstr-dev, librust-md-5-dev, librust-bytecount-dev (>= 0.6.3),
  librust-regex-automata-dev, librust-notify-dev,
+ librust-procfs-dev, librust-terminal-size-dev (>= 0.2.1),
  librust-backtrace-sys-dev, python3-sphinx, help2man
 Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Uploaders:

diff --git a/src/coreutils/debian/patches/bump-crossterm.diff b/src/coreutils/debian/patches/bump-crossterm.diff
index c4a7c7c67b4c4332121ff5e853b6f32f1f9964cc..3f747cfc00ffe00acfa7a421e21178aa20ca021a 100644 (file)
--- a/src/coreutils/debian/patches/bump-crossterm.diff
+++ b/src/coreutils/debian/patches/bump-crossterm.diff
@@ -5,7 +5,7 @@ Index: coreutils/src/uu/more/Cargo.toml
 @@ -17,7 +17,7 @@ path = "src/more.rs"
  [dependencies]
  clap = { version = "3.2", features = ["wrap_help", "cargo"] }
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
 -crossterm = ">=0.19"
 +crossterm = "0.25"
  atty = "0.2"

diff --git a/src/coreutils/debian/patches/bump-textwrap.diff b/src/coreutils/debian/patches/bump-textwrap.diff
new file mode 100644 (file)
index 0000000..de05656
--- /dev/null
+++ b/src/coreutils/debian/patches/bump-textwrap.diff
@@ -0,0 +1,13 @@
+Index: coreutils/Cargo.toml
+===================================================================
+--- coreutils.orig/Cargo.toml
++++ coreutils/Cargo.toml
+@@ -266,7 +266,7 @@ clap_complete = "3.1"
+ once_cell = "1"
+ phf = "0.10.1"
+ selinux = { version="0.3", optional = true }
+-textwrap = { version="0.15", features=["terminal_size"] }
++textwrap = { version="0.16", features=["terminal_size"] }
+ uucore = { version=">=0.0.16", package="uucore", path="src/uucore" }
+ zip = { version = "0", optional=true, default_features=false, features=["deflate"] }
+ # * uutils

diff --git a/src/coreutils/debian/patches/disable-coz.diff b/src/coreutils/debian/patches/disable-coz.diff
index af6deb8080705498680cd9c1b055c64e0e422c85..94ac112db96dc5da3d4a799fdfacf934f7ee3860 100644 (file)
--- a/src/coreutils/debian/patches/disable-coz.diff
+++ b/src/coreutils/debian/patches/disable-coz.diff
@@ -10,4 +10,4 @@ Index: coreutils/src/uu/factor/Cargo.toml
 +#coz = { version = "0.1.3", optional = true }
  num-traits = "0.2.15" # Needs at least version 0.2.15 for "OverflowingAdd"
  rand = { version = "0.8", features = ["small_rng"] }
- smallvec = "1.9"  # TODO(nicoo): Use `union` feature, requires Rust 1.49 or later.
+ smallvec = { version = "1.9", features = ["union"] }

diff --git a/src/coreutils/debian/patches/lower-half.diff b/src/coreutils/debian/patches/lower-half.diff
new file mode 100644 (file)
index 0000000..8ed7e05
--- /dev/null
+++ b/src/coreutils/debian/patches/lower-half.diff
@@ -0,0 +1,13 @@
+Index: coreutils/src/uu/od/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/od/Cargo.toml
++++ coreutils/src/uu/od/Cargo.toml
+@@ -17,7 +17,7 @@ path = "src/od.rs"
+ [dependencies]
+ byteorder = "1.3.2"
+ clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+-half = "2.1"
++half = "1.6"
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
+ 
+ [[bin]]

diff --git a/src/coreutils/debian/patches/lower-onig.diff b/src/coreutils/debian/patches/lower-onig.diff
new file mode 100644 (file)
index 0000000..dd6598c
--- /dev/null
+++ b/src/coreutils/debian/patches/lower-onig.diff
@@ -0,0 +1,13 @@
+Index: coreutils/src/uu/expr/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/expr/Cargo.toml
++++ coreutils/src/uu/expr/Cargo.toml
+@@ -18,7 +18,7 @@ path = "src/expr.rs"
+ clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+ num-bigint = "0.4.0"
+ num-traits = "0.2.15"
+-onig = { version = "~6.4", default-features = false }
++onig = { version = "6", default-features = false }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
+ 
+ [[bin]]

diff --git a/src/coreutils/debian/patches/lower-rayon.diff b/src/coreutils/debian/patches/lower-rayon.diff
index 75becead873fe06aeb1f690964400e2207e7fc37..207d50313134643af111e2b092a02b0348835002 100644 (file)
--- a/src/coreutils/debian/patches/lower-rayon.diff
+++ b/src/coreutils/debian/patches/lower-rayon.diff
@@ -4,10 +4,10 @@ Index: coreutils/src/uu/sort/Cargo.toml
 +++ coreutils/src/uu/sort/Cargo.toml
 @@ -24,7 +24,7 @@ itertools = "0.10.0"
  memchr = "2.5.0"
- ouroboros = "0.15.2"
+ ouroboros = "0.15.5"
  rand = "0.8"
 -rayon = "1.5"
 +rayon = "1"
  tempfile = "3"
  unicode-width = "0.1.8"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features=["fs"] }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["fs"] }

diff --git a/src/coreutils/debian/patches/lower-zip.diff b/src/coreutils/debian/patches/lower-zip.diff
index 2d0d79537b3b23ae459995823965fb1c6b7bd452..efa843cb872a536fbd017b8141b53a055a8c28d8 100644 (file)
--- a/src/coreutils/debian/patches/lower-zip.diff
+++ b/src/coreutils/debian/patches/lower-zip.diff
@@ -2,12 +2,12 @@ Index: coreutils/Cargo.toml
 ===================================================================
 --- coreutils.orig/Cargo.toml
 +++ coreutils/Cargo.toml
-@@ -267,7 +267,7 @@ phf = "0.10.1"
- selinux = { version="0.2", optional = true }
+@@ -268,7 +268,7 @@ phf = "0.10.1"
+ selinux = { version="0.3", optional = true }
  textwrap = { version="0.15", features=["terminal_size"] }
- uucore = { version=">=0.0.15", package="uucore", path="src/uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="src/uucore" }
 -zip = { version = "0.6.0", optional=true, default_features=false, features=["deflate"] }
 +zip = { version = "0", optional=true, default_features=false, features=["deflate"] }
  # * uutils
- uu_test  = { optional=true, version="0.0.15", package="uu_test", path="src/uu/test" }
+ uu_test  = { optional=true, version="0.0.16", package="uu_test", path="src/uu/test" }
  #

diff --git a/src/coreutils/debian/patches/relax-cpp-build.diff b/src/coreutils/debian/patches/relax-cpp-build.diff
index 443a34c58329a5895bfcbf50e56a1543c27d4823..0feb608bc665d0f724a7e44a2ca79bb51248e1a5 100644 (file)
--- a/src/coreutils/debian/patches/relax-cpp-build.diff
+++ b/src/coreutils/debian/patches/relax-cpp-build.diff
@@ -3,8 +3,8 @@ Index: coreutils/src/uu/stdbuf/src/libstdbuf/Cargo.toml
 --- coreutils.orig/src/uu/stdbuf/src/libstdbuf/Cargo.toml
 +++ coreutils/src/uu/stdbuf/src/libstdbuf/Cargo.toml
 @@ -22,4 +22,4 @@ libc = "0.2"
- uucore = { version=">=0.0.15", package="uucore", path="../../../../uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="../../../../uucore" }
  
  [build-dependencies]
--cpp_build = "0.4"
+-cpp_build = "0.5"
 +cpp_build = "0"

diff --git a/src/coreutils/debian/patches/relax-notify.diff b/src/coreutils/debian/patches/relax-notify.diff
new file mode 100644 (file)
index 0000000..f6ddc05
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-notify.diff
@@ -0,0 +1,14 @@
+Index: coreutils/src/uu/tail/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/tail/Cargo.toml
++++ coreutils/src/uu/tail/Cargo.toml
+@@ -19,7 +19,8 @@ path = "src/tail.rs"
+ clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+ libc = "0.2.132"
+ memchr = "2.5.0"
+-notify = { version = "=5.0.0", features=["macos_kqueue"]}
++notify = "5.0.0"
++#notify = { version = "=5.0.0", features=["macos_kqueue"]}
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] }
+ same-file = "1.0.6"
+ 

diff --git a/src/coreutils/debian/patches/relax-once-cell.diff b/src/coreutils/debian/patches/relax-once-cell.diff
index 88ea1d08cbf65f190b31dc5b0711259d45f1c7fe..13160fdc854858b3c71224a4e22fe18a2f3eb05e 100644 (file)
--- a/src/coreutils/debian/patches/relax-once-cell.diff
+++ b/src/coreutils/debian/patches/relax-once-cell.diff
@@ -2,27 +2,27 @@ Index: coreutils/Cargo.toml
 ===================================================================
 --- coreutils.orig/Cargo.toml
 +++ coreutils/Cargo.toml
-@@ -262,7 +262,7 @@ uudoc = [ "zip" ]
+@@ -263,7 +263,7 @@ uudoc = [ "zip" ]
  [dependencies]
  clap = { version = "3.2", features = ["wrap_help", "cargo"] }
  clap_complete = "3.1"
 -once_cell = "1.13.1"
 +once_cell = "1"
  phf = "0.10.1"
- selinux = { version="0.2", optional = true }
+ selinux = { version="0.3", optional = true }
  textwrap = { version="0.15", features=["terminal_size"] }
 Index: coreutils/src/uu/ls/Cargo.toml
 ===================================================================
 --- coreutils.orig/src/uu/ls/Cargo.toml
 +++ coreutils/src/uu/ls/Cargo.toml
-@@ -24,7 +24,7 @@ termsize = "0.1.6"
+@@ -24,7 +24,7 @@ terminal_size = "0.2.1"
  glob = "0.3.0"
  lscolors = { version = "0.12.0", features = ["ansi_term"] }
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features = ["entries", "fs"] }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features = ["entries", "fs"] }
 -once_cell = "1.13.1"
 +once_cell = "1"
  atty = "0.2"
- selinux = { version="0.2", optional = true }
+ selinux = { version="0.3", optional = true }
  
 Index: coreutils/src/uucore/Cargo.toml
 ===================================================================

diff --git a/src/coreutils/debian/patches/relax-ouroboro.diff b/src/coreutils/debian/patches/relax-ouroboro.diff
new file mode 100644 (file)
index 0000000..dc286fb
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-ouroboro.diff
@@ -0,0 +1,13 @@
+Index: coreutils/src/uu/sort/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/sort/Cargo.toml
++++ coreutils/src/uu/sort/Cargo.toml
+@@ -22,7 +22,7 @@ ctrlc = { version = "3.0", features = ["
+ fnv = "1.0.7"
+ itertools = "0.10.0"
+ memchr = "2.5.0"
+-ouroboros = "0.15.5"
++ouroboros = "0.15"
+ rand = "0.8"
+ rayon = "1"
+ tempfile = "3"

diff --git a/src/coreutils/debian/patches/relax-regex.diff b/src/coreutils/debian/patches/relax-regex.diff
index 2141ba5b9b1a88244a26dacf2574b7a6db27c66a..3c7af629b282b6ead4256cd409db6ae7bc1907ec 100644 (file)
--- a/src/coreutils/debian/patches/relax-regex.diff
+++ b/src/coreutils/debian/patches/relax-regex.diff
@@ -2,7 +2,7 @@ Index: coreutils/Cargo.toml
 ===================================================================
 --- coreutils.orig/Cargo.toml
 +++ coreutils/Cargo.toml
-@@ -390,7 +390,7 @@ glob = "0.3.0"
+@@ -391,7 +391,7 @@ glob = "0.3.0"
  libc = "0.2"
  pretty_assertions = "1"
  rand = "0.8"
@@ -21,7 +21,7 @@ Index: coreutils/src/uu/csplit/Cargo.toml
  thiserror = "1.0"
 -regex = "1.6.0"
 +regex = "1"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features=["entries", "fs"] }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["entries", "fs"] }
  
  [[bin]]
 Index: coreutils/src/uu/hashsum/Cargo.toml
@@ -31,7 +31,7 @@ Index: coreutils/src/uu/hashsum/Cargo.toml
 @@ -20,7 +20,7 @@ clap = { version = "3.2", features = ["w
  hex = "0.4.3"
  memchr = "2"
- md-5 = "0.10.1"
+ md-5 = "0.10.5"
 -regex = "1.6.0"
 +regex = "1"
  sha1 = "0.10.1"
@@ -47,15 +47,15 @@ Index: coreutils/src/uu/nl/Cargo.toml
  clap = { version = "3.2", features = ["wrap_help", "cargo"] }
 -regex = "1.6.0"
 +regex = "1"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
  
  [[bin]]
 Index: coreutils/src/uu/pr/Cargo.toml
 ===================================================================
 --- coreutils.orig/src/uu/pr/Cargo.toml
 +++ coreutils/src/uu/pr/Cargo.toml
-@@ -20,7 +20,7 @@ uucore = { version=">=0.0.15", package="
- chrono = { version="^0.4.19", default-features=false, features=["std", "alloc", "clock"]}
+@@ -20,7 +20,7 @@ time = { version = "0.3", features = ["l
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["entries"] }
  quick-error = "2.0.1"
  itertools = "0.10.0"
 -regex = "1.6"
@@ -73,6 +73,6 @@ Index: coreutils/src/uu/ptx/Cargo.toml
  clap = { version = "3.2", features = ["wrap_help", "cargo"] }
 -regex = "1.6.0"
 +regex = "1"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
  
  [[bin]]

diff --git a/src/coreutils/debian/patches/relax-strum.diff b/src/coreutils/debian/patches/relax-strum.diff
index ee54780cfd7f8427d3bc39e990c07c52468b2248..a487bb1ed3a96f2d3b3c2f1de985af47ee295cec 100644 (file)
--- a/src/coreutils/debian/patches/relax-strum.diff
+++ b/src/coreutils/debian/patches/relax-strum.diff
@@ -10,6 +10,6 @@ Index: coreutils/src/uu/uniq/Cargo.toml
 -strum_macros = "0.24.2"
 +strum = "0"
 +strum_macros = "0"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
  
  [[bin]]

diff --git a/src/coreutils/debian/patches/relax-users.diff b/src/coreutils/debian/patches/relax-users.diff
index c81fa2de1a7b7c26b0be1ae97471ac80ffcc83b8..009a17ac3dd57973d7e864d7b1c55b45c7728e26 100644 (file)
--- a/src/coreutils/debian/patches/relax-users.diff
+++ b/src/coreutils/debian/patches/relax-users.diff
@@ -2,12 +2,12 @@ Index: coreutils/Cargo.toml
 ===================================================================
 --- coreutils.orig/Cargo.toml
 +++ coreutils/Cargo.toml
-@@ -405,7 +405,7 @@ rlimit = "0.8.3"
+@@ -407,7 +407,7 @@ rlimit = "0.8.3"
  
  [target.'cfg(unix)'.dev-dependencies]
  nix = { version = "0.25", default-features = false, features = ["process", "signal", "user"] }
 -rust-users = { version="0.11", package="users" }
 +rust-users = { version="0", package="users" }
- unix_socket = "0.5.0"
  
  [build-dependencies]
+ phf_codegen = "0.10.0"

diff --git a/src/coreutils/debian/patches/series b/src/coreutils/debian/patches/series
index 82b69703557fb97488abf1e34f3fcc52aa247cc9..ed299c3be35e98950d377463824db61c1ecf4de3 100644 (file)
--- a/src/coreutils/debian/patches/series
+++ b/src/coreutils/debian/patches/series
@@ -12,5 +12,10 @@ relax-once-cell.diff
 relax-regex.diff
 relax-z85.diff
 relax-unicode-segmentation.diff
-update-notify.diff
 bump-crossterm.diff
+bump-textwrap.diff
+lower-onig.diff
+relax-md-5.diff
+lower-half.diff
+relax-ouroboro.diff
+relax-notify.diff

diff --git a/src/coreutils/debian/patches/update-notify.diff b/src/coreutils/debian/patches/update-notify.diff
index 303c237f6649195bef755ed1571cd99310b77352..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/coreutils/debian/patches/update-notify.diff
+++ b/src/coreutils/debian/patches/update-notify.diff
@@ -1,13 +0,0 @@
-Index: coreutils/src/uu/tail/Cargo.toml
-===================================================================
---- coreutils.orig/src/uu/tail/Cargo.toml
-+++ coreutils/src/uu/tail/Cargo.toml
-@@ -18,7 +18,7 @@ path = "src/tail.rs"
- [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
- libc = "0.2.132"
--notify = { version = "=5.0.0-pre.16", features=["macos_kqueue"]}
-+notify = "5"
- uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] }
- 
- [target.'cfg(windows)'.dependencies]