coreutils: add more patches to relax/update some versions

diff --git a/src/coreutils/debian/patches/add_path.diff b/src/coreutils/debian/patches/add_path.diff
new file mode 100644 (file)
index 0000000..fe02133
--- /dev/null
+++ b/src/coreutils/debian/patches/add_path.diff
@@ -0,0 +1,647 @@
+Index: coreutils/Cargo.toml
+===================================================================
+--- coreutils.orig/Cargo.toml
++++ coreutils/Cargo.toml
+@@ -44,61 +44,73 @@ required-features = ["uudoc"]
+ version = "0.0.17"
+ optional = true
+ package = "uu_arch"
++path = "src/uu/arch"
+ 
+ [dependencies.base32]
+ version = "0.0.17"
+ optional = true
+ package = "uu_base32"
++path = "src/uu/base32"
+ 
+ [dependencies.base64]
+ version = "0.0.17"
+ optional = true
+ package = "uu_base64"
++path = "src/uu/base64"
+ 
+ [dependencies.basename]
+ version = "0.0.17"
+ optional = true
+ package = "uu_basename"
++path = "src/uu/basename"
+ 
+ [dependencies.basenc]
+ version = "0.0.17"
+ optional = true
+ package = "uu_basenc"
++path = "src/uu/basenc"
+ 
+ [dependencies.cat]
+ version = "0.0.17"
+ optional = true
+ package = "uu_cat"
++path = "src/uu/cat"
+ 
+ [dependencies.chcon]
+ version = "0.0.17"
+ optional = true
+ package = "uu_chcon"
++path = "src/uu/chcon"
+ 
+ [dependencies.chgrp]
+ version = "0.0.17"
+ optional = true
+ package = "uu_chgrp"
++path = "src/uu/chgrp"
+ 
+ [dependencies.chmod]
+ version = "0.0.17"
+ optional = true
+ package = "uu_chmod"
++path = "src/uu/chmod"
+ 
+ [dependencies.chown]
+ version = "0.0.17"
+ optional = true
+ package = "uu_chown"
++path = "src/uu/chown"
+ 
+ [dependencies.chroot]
+ version = "0.0.17"
+ optional = true
+ package = "uu_chroot"
++path = "src/uu/chroot"
+ 
+ [dependencies.cksum]
+ version = "0.0.17"
+ optional = true
+ package = "uu_cksum"
++path = "src/uu/cksum"
+ 
+ [dependencies.clap]
+ version = "4.0"
+@@ -114,221 +126,265 @@ version = "4.0"
+ version = "0.0.17"
+ optional = true
+ package = "uu_comm"
++path = "src/uu/comm"
+ 
+ [dependencies.cp]
+ version = "0.0.17"
+ optional = true
+ package = "uu_cp"
++path = "src/uu/cp"
+ 
+ [dependencies.csplit]
+ version = "0.0.17"
+ optional = true
+ package = "uu_csplit"
++path = "src/uu/csplit"
+ 
+ [dependencies.cut]
+ version = "0.0.17"
+ optional = true
+ package = "uu_cut"
++path = "src/uu/cut"
+ 
+ [dependencies.date]
+ version = "0.0.17"
+ optional = true
+ package = "uu_date"
++path = "src/uu/date"
+ 
+ [dependencies.dd]
+ version = "0.0.17"
+ optional = true
+ package = "uu_dd"
++path = "src/uu/dd"
+ 
+ [dependencies.df]
+ version = "0.0.17"
+ optional = true
+ package = "uu_df"
++path = "src/uu/df"
+ 
+ [dependencies.dir]
+ version = "0.0.17"
+ optional = true
+ package = "uu_dir"
++path = "src/uu/dir"
+ 
+ [dependencies.dircolors]
+ version = "0.0.17"
+ optional = true
+ package = "uu_dircolors"
++path = "src/uu/dircolors"
+ 
+ [dependencies.dirname]
+ version = "0.0.17"
+ optional = true
+ package = "uu_dirname"
++path = "src/uu/dirname"
+ 
+ [dependencies.du]
+ version = "0.0.17"
+ optional = true
+ package = "uu_du"
++path = "src/uu/du"
+ 
+ [dependencies.echo]
+ version = "0.0.17"
+ optional = true
+ package = "uu_echo"
++path = "src/uu/echo"
+ 
+ [dependencies.env]
+ version = "0.0.17"
+ optional = true
+ package = "uu_env"
++path = "src/uu/env"
+ 
+ [dependencies.expand]
+ version = "0.0.17"
+ optional = true
+ package = "uu_expand"
++path = "src/uu/expand"
+ 
+ [dependencies.expr]
+ version = "0.0.17"
+ optional = true
+ package = "uu_expr"
++path = "src/uu/expr"
+ 
+ [dependencies.factor]
+ version = "0.0.17"
+ optional = true
+ package = "uu_factor"
++path = "src/uu/factor"
+ 
+ [dependencies.false]
+ version = "0.0.17"
+ optional = true
+ package = "uu_false"
++path = "src/uu/false"
+ 
+ [dependencies.fmt]
+ version = "0.0.17"
+ optional = true
+ package = "uu_fmt"
++path = "src/uu/fmt"
+ 
+ [dependencies.fold]
+ version = "0.0.17"
+ optional = true
+ package = "uu_fold"
++path = "src/uu/fold"
+ 
+ [dependencies.groups]
+ version = "0.0.17"
+ optional = true
+ package = "uu_groups"
++path = "src/uu/groups"
+ 
+ [dependencies.hashsum]
+ version = "0.0.17"
+ optional = true
+ package = "uu_hashsum"
++path = "src/uu/hashsum"
+ 
+ [dependencies.head]
+ version = "0.0.17"
+ optional = true
+ package = "uu_head"
++path = "src/uu/head"
+ 
+ [dependencies.hostid]
+ version = "0.0.17"
+ optional = true
+ package = "uu_hostid"
++path = "src/uu/hostid"
+ 
+ [dependencies.hostname]
+ version = "0.0.17"
+ optional = true
+ package = "uu_hostname"
++path = "src/uu/hostname"
+ 
+ [dependencies.id]
+ version = "0.0.17"
+ optional = true
+ package = "uu_id"
++path = "src/uu/id"
+ 
+ [dependencies.install]
+ version = "0.0.17"
+ optional = true
+ package = "uu_install"
++path = "src/uu/install"
+ 
+ [dependencies.join]
+ version = "0.0.17"
+ optional = true
+ package = "uu_join"
++path = "src/uu/join"
+ 
+ [dependencies.kill]
+ version = "0.0.17"
+ optional = true
+ package = "uu_kill"
++path = "src/uu/kill"
+ 
+ [dependencies.link]
+ version = "0.0.17"
+ optional = true
+ package = "uu_link"
++path = "src/uu/link"
+ 
+ [dependencies.ln]
+ version = "0.0.17"
+ optional = true
+ package = "uu_ln"
++path = "src/uu/ln"
+ 
+ [dependencies.logname]
+ version = "0.0.17"
+ optional = true
+ package = "uu_logname"
++path = "src/uu/logname"
+ 
+ [dependencies.ls]
+ version = "0.0.17"
+ optional = true
+ package = "uu_ls"
++path = "src/uu/ls"
+ 
+ [dependencies.mkdir]
+ version = "0.0.17"
+ optional = true
+ package = "uu_mkdir"
++path = "src/uu/mkdir"
+ 
+ [dependencies.mkfifo]
+ version = "0.0.17"
+ optional = true
+ package = "uu_mkfifo"
++path = "src/uu/mkfifo"
+ 
+ [dependencies.mknod]
+ version = "0.0.17"
+ optional = true
+ package = "uu_mknod"
++path = "src/uu/mknod"
+ 
+ [dependencies.mktemp]
+ version = "0.0.17"
+ optional = true
+ package = "uu_mktemp"
++path = "src/uu/mktemp"
+ 
+ [dependencies.more]
+ version = "0.0.17"
+ optional = true
+ package = "uu_more"
++path = "src/uu/more"
+ 
+ [dependencies.mv]
+ version = "0.0.17"
+ optional = true
+ package = "uu_mv"
++path = "src/uu/mv"
+ 
+ [dependencies.nice]
+ version = "0.0.17"
+ optional = true
+ package = "uu_nice"
++path = "src/uu/nice"
+ 
+ [dependencies.nl]
+ version = "0.0.17"
+ optional = true
+ package = "uu_nl"
++path = "src/uu/nl"
+ 
+ [dependencies.nohup]
+ version = "0.0.17"
+ optional = true
+ package = "uu_nohup"
++path = "src/uu/nohup"
+ 
+ [dependencies.nproc]
+ version = "0.0.17"
+ optional = true
+ package = "uu_nproc"
++path = "src/uu/nproc"
+ 
+ [dependencies.numfmt]
+ version = "0.0.17"
+ optional = true
+ package = "uu_numfmt"
++path = "src/uu/numfmt"
+ 
+ [dependencies.od]
+ version = "0.0.17"
+ optional = true
+ package = "uu_od"
++path = "src/uu/od"
+ 
+ [dependencies.once_cell]
+ version = "1"
+@@ -337,11 +393,13 @@ version = "1"
+ version = "0.0.17"
+ optional = true
+ package = "uu_paste"
++path = "src/uu/paste"
+ 
+ [dependencies.pathchk]
+ version = "0.0.17"
+ optional = true
+ package = "uu_pathchk"
++path = "src/uu/pathchk"
+ 
+ [dependencies.phf]
+ version = "0.11.1"
+@@ -350,61 +408,73 @@ version = "0.11.1"
+ version = "0.0.17"
+ optional = true
+ package = "uu_pinky"
++path = "src/uu/pinky"
+ 
+ [dependencies.pr]
+ version = "0.0.17"
+ optional = true
+ package = "uu_pr"
++path = "src/uu/pr"
+ 
+ [dependencies.printenv]
+ version = "0.0.17"
+ optional = true
+ package = "uu_printenv"
++path = "src/uu/printenv"
+ 
+ [dependencies.printf]
+ version = "0.0.17"
+ optional = true
+ package = "uu_printf"
++path = "src/uu/printf"
+ 
+ [dependencies.ptx]
+ version = "0.0.17"
+ optional = true
+ package = "uu_ptx"
++path = "src/uu/ptx"
+ 
+ [dependencies.pwd]
+ version = "0.0.17"
+ optional = true
+ package = "uu_pwd"
++path = "src/uu/pwd"
+ 
+ [dependencies.readlink]
+ version = "0.0.17"
+ optional = true
+ package = "uu_readlink"
++path = "src/uu/readlink"
+ 
+ [dependencies.realpath]
+ version = "0.0.17"
+ optional = true
+ package = "uu_realpath"
++path = "src/uu/realpath"
+ 
+ [dependencies.relpath]
+ version = "0.0.17"
+ optional = true
+ package = "uu_relpath"
++path = "src/uu/relpath"
+ 
+ [dependencies.rm]
+ version = "0.0.17"
+ optional = true
+ package = "uu_rm"
++path = "src/uu/rm"
+ 
+ [dependencies.rmdir]
+ version = "0.0.17"
+ optional = true
+ package = "uu_rmdir"
++path = "src/uu/rmdir"
+ 
+ [dependencies.runcon]
+ version = "0.0.17"
+ optional = true
+ package = "uu_runcon"
++path = "src/uu/runcon"
+ 
+ [dependencies.selinux]
+ version = "0.3"
+@@ -414,71 +484,85 @@ optional = true
+ version = "0.0.17"
+ optional = true
+ package = "uu_seq"
++path = "src/uu/seq"
+ 
+ [dependencies.shred]
+ version = "0.0.17"
+ optional = true
+ package = "uu_shred"
++path = "src/uu/shred"
+ 
+ [dependencies.shuf]
+ version = "0.0.17"
+ optional = true
+ package = "uu_shuf"
++path = "src/uu/shuf"
+ 
+ [dependencies.sleep]
+ version = "0.0.17"
+ optional = true
+ package = "uu_sleep"
++path = "src/uu/sleep"
+ 
+ [dependencies.sort]
+ version = "0.0.17"
+ optional = true
+ package = "uu_sort"
++path = "src/uu/sort"
+ 
+ [dependencies.split]
+ version = "0.0.17"
+ optional = true
+ package = "uu_split"
++path = "src/uu/split"
+ 
+ [dependencies.stat]
+ version = "0.0.17"
+ optional = true
+ package = "uu_stat"
++path = "src/uu/stat"
+ 
+ [dependencies.stdbuf]
+ version = "0.0.17"
+ optional = true
+ package = "uu_stdbuf"
++path = "src/uu/stdbuf"
+ 
+ [dependencies.stty]
+ version = "0.0.17"
+ optional = true
+ package = "uu_stty"
++path = "src/uu/stty"
+ 
+ [dependencies.sum]
+ version = "0.0.17"
+ optional = true
+ package = "uu_sum"
++path = "src/uu/sum"
+ 
+ [dependencies.sync]
+ version = "0.0.17"
+ optional = true
+ package = "uu_sync"
++path = "src/uu/sync"
+ 
+ [dependencies.tac]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tac"
++path = "src/uu/tac"
+ 
+ [dependencies.tail]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tail"
++path = "src/uu/tail"
+ 
+ [dependencies.tee]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tee"
++path = "src/uu/tee"
+ 
+ [dependencies.textwrap]
+ version = "0.16.0"
+@@ -488,100 +572,120 @@ features = ["terminal_size"]
+ version = "0.0.17"
+ optional = true
+ package = "uu_timeout"
++path = "src/uu/timeout"
+ 
+ [dependencies.touch]
+ version = "0.0.17"
+ optional = true
+ package = "uu_touch"
++path = "src/uu/touch"
+ 
+ [dependencies.tr]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tr"
++path = "src/uu/tr"
+ 
+ [dependencies.true]
+ version = "0.0.17"
+ optional = true
+ package = "uu_true"
++path = "src/uu/true"
+ 
+ [dependencies.truncate]
+ version = "0.0.17"
+ optional = true
+ package = "uu_truncate"
++path = "src/uu/truncate"
+ 
+ [dependencies.tsort]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tsort"
++path = "src/uu/tsort"
+ 
+ [dependencies.tty]
+ version = "0.0.17"
+ optional = true
+ package = "uu_tty"
++path = "src/uu/tty"
+ 
+ [dependencies.uname]
+ version = "0.0.17"
+ optional = true
+ package = "uu_uname"
++path = "src/uu/uname"
+ 
+ [dependencies.unexpand]
+ version = "0.0.17"
+ optional = true
+ package = "uu_unexpand"
++path = "src/uu/unexpand"
+ 
+ [dependencies.uniq]
+ version = "0.0.17"
+ optional = true
+ package = "uu_uniq"
++path = "src/uu/uniq"
+ 
+ [dependencies.unlink]
+ version = "0.0.17"
+ optional = true
+ package = "uu_unlink"
++path = "src/uu/unlink"
+ 
+ [dependencies.uptime]
+ version = "0.0.17"
+ optional = true
+ package = "uu_uptime"
++path = "src/uu/uptime"
+ 
+ [dependencies.users]
+ version = "0"
+ optional = true
+ package = "uu_users"
++path = "src/uu/users"
+ 
+ [dependencies.uu_test]
+ version = "0.0.17"
+ optional = true
+ package = "uu_test"
++path = "src/uu/test"
+ 
+ [dependencies.uucore]
+ version = ">=0.0.17"
+ package = "uucore"
++path = "src/uucore"
+ 
+ [dependencies.vdir]
+ version = "0.0.17"
+ optional = true
+ package = "uu_vdir"
++path = "src/uu/vdir"
+ 
+ [dependencies.wc]
+ version = "0.0.17"
+ optional = true
+ package = "uu_wc"
++path = "src/uu/wc"
+ 
+ [dependencies.who]
+ version = "0.0.17"
+ optional = true
+ package = "uu_who"
++path = "src/uu/who"
+ 
+ [dependencies.whoami]
+ version = "0.0.17"
+ optional = true
+ package = "uu_whoami"
++path = "src/uu/whoami"
+ 
+ [dependencies.yes]
+ version = "0.0.17"
+ optional = true
+ package = "uu_yes"
++path = "src/uu/yes"
+ 
+ [dependencies.zip]
+ version = "0"
+@@ -649,6 +753,7 @@ features = [
+     "process",
+ ]
+ package = "uucore"
++path = "src/uucore"
+ 
+ [dev-dependencies.walkdir]
+ version = "2.2"

diff --git a/src/coreutils/debian/patches/bump-lscolors.diff b/src/coreutils/debian/patches/bump-lscolors.diff
index 426bc0373c584c43a89d1a9e7712831a7525eea0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/coreutils/debian/patches/bump-lscolors.diff
+++ b/src/coreutils/debian/patches/bump-lscolors.diff
@@ -1,11 +0,0 @@
---- rust-coreutils-0.0.16.orig/src/uu/ls/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/ls/Cargo.toml
-@@ -22,7 +22,7 @@ number_prefix = "0.4"
- term_grid = "0.1.5"
- terminal_size = "0.2.1"
- glob = "0.3.0"
--lscolors = { version = "0.12.0", features = ["ansi_term"] }
-+lscolors = { version = "0.13.0", features = ["ansi_term"] }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features = ["entries", "fs"] }
- once_cell = "1"
- atty = "0.2"

diff --git a/src/coreutils/debian/patches/bump-textwrap.diff b/src/coreutils/debian/patches/bump-textwrap.diff
index de0565636f2fbf76139bee173b5a2e798c7bad94..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/coreutils/debian/patches/bump-textwrap.diff
+++ b/src/coreutils/debian/patches/bump-textwrap.diff
@@ -1,13 +0,0 @@
-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-windows.diff b/src/coreutils/debian/patches/disable-windows.diff
new file mode 100644 (file)
index 0000000..e31d63f
--- /dev/null
+++ b/src/coreutils/debian/patches/disable-windows.diff
@@ -0,0 +1,149 @@
+Index: coreutils/src/uu/date/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/date/Cargo.toml
++++ coreutils/src/uu/date/Cargo.toml
+@@ -22,8 +22,8 @@ uucore = { version=">=0.0.17", package="
+ [target.'cfg(unix)'.dependencies]
+ libc = "0.2"
+ 
+-[target.'cfg(windows)'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Foundation", "Win32_System_SystemInformation"] }
++#[target.'cfg(windows)'.dependencies]
++#windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Foundation", "Win32_System_SystemInformation"] }
+ 
+ [[bin]]
+ name = "date"
+Index: coreutils/src/uu/du/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/du/Cargo.toml
++++ coreutils/src/uu/du/Cargo.toml
+@@ -21,8 +21,8 @@ glob = "0.3.0"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
++#[target.'cfg(target_os = "windows")'.dependencies]
++#windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+ 
+ [[bin]]
+ name = "du"
+Index: coreutils/src/uu/hostname/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/hostname/Cargo.toml
++++ coreutils/src/uu/hostname/Cargo.toml
+@@ -19,8 +19,8 @@ clap = { version = "4.0", features = ["w
+ hostname = { version = "0.3", features = ["set"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["wide"] }
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
++#[target.'cfg(target_os = "windows")'.dependencies]
++#windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
+ 
+ [[bin]]
+ name = "hostname"
+Index: coreutils/src/uu/rm/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/rm/Cargo.toml
++++ coreutils/src/uu/rm/Cargo.toml
+@@ -23,8 +23,8 @@ uucore = { version=">=0.0.17", package="
+ [target.'cfg(unix)'.dependencies]
+ libc = "0.2.137"
+ 
+-[target.'cfg(windows)'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem"] }
++#[target.'cfg(windows)'.dependencies]
++#windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem"] }
+ 
+ [[bin]]
+ name = "rm"
+Index: coreutils/src/uu/sync/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/sync/Cargo.toml
++++ coreutils/src/uu/sync/Cargo.toml
+@@ -22,8 +22,8 @@ uucore = { version=">=0.0.17", package="
+ [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+ nix = "0"
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
++# [target.'cfg(target_os = "windows")'.dependencies]
++# windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+ 
+ [[bin]]
+ name = "sync"
+Index: coreutils/src/uu/tail/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/tail/Cargo.toml
++++ coreutils/src/uu/tail/Cargo.toml
+@@ -24,9 +24,9 @@ uucore = { version=">=0.0.17", package="
+ same-file = "1.0.6"
+ atty = "0.2"
+ 
+-[target.'cfg(windows)'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_System_Threading", "Win32_Foundation"] }
+-winapi-util = { version="0.1.5" }
++# [target.'cfg(windows)'.dependencies]
++# windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_System_Threading", "Win32_Foundation"] }
++# winapi-util = { version="0.1.5" }
+ 
+ [target.'cfg(unix)'.dependencies]
+ nix = { version = "0", features = ["fs"] }
+Index: coreutils/src/uu/touch/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/touch/Cargo.toml
++++ coreutils/src/uu/touch/Cargo.toml
+@@ -20,8 +20,8 @@ clap = { version = "4.0", features = ["w
+ time = { version = "0.3", features = ["parsing", "formatting", "local-offset", "macros"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["libc"] }
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
++# [target.'cfg(target_os = "windows")'.dependencies]
++# windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+ 
+ [[bin]]
+ name = "touch"
+Index: coreutils/src/uu/whoami/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/whoami/Cargo.toml
++++ coreutils/src/uu/whoami/Cargo.toml
+@@ -18,8 +18,8 @@ path = "src/whoami.rs"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["entries"] }
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_NetworkManagement_NetManagement", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
++# [target.'cfg(target_os = "windows")'.dependencies]
++# windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_NetworkManagement_NetManagement", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+ 
+ [target.'cfg(unix)'.dependencies]
+ libc = "0.2.137"
+Index: coreutils/src/uucore/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uucore/Cargo.toml
++++ coreutils/src/uucore/Cargo.toml
+@@ -44,17 +44,17 @@ nix = { version = "0", default-features
+ clap = "4.0"
+ once_cell = "1"
+ 
+-[target.'cfg(target_os = "windows")'.dependencies]
+-winapi-util = { version= "0.1.5", optional=true }
+-windows-sys = { version = "0.42.0", optional = true, default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_WindowsProgramming"] }
++# [target.'cfg(target_os = "windows")'.dependencies]
++# winapi-util = { version= "0.1.5", optional=true }
++# windows-sys = { version = "0.42.0", optional = true, default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_WindowsProgramming"] }
+ 
+ [features]
+ default = []
+ # * non-default features
+ encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
+ entries = ["libc"]
+-fs = ["libc", "winapi-util", "windows-sys"]
+-fsext = ["libc", "time", "windows-sys"]
++fs = ["libc"]
++fsext = ["libc", "time"]
+ lines = []
+ memo = ["itertools"]
+ mode = ["libc"]

diff --git a/src/coreutils/debian/patches/fix-hashsum.diff b/src/coreutils/debian/patches/fix-hashsum.diff
new file mode 100644 (file)
index 0000000..1b5bac6
--- /dev/null
+++ b/src/coreutils/debian/patches/fix-hashsum.diff
@@ -0,0 +1,24 @@
+Index: coreutils/src/uu/hashsum/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/hashsum/Cargo.toml
++++ coreutils/src/uu/hashsum/Cargo.toml
+@@ -15,15 +15,15 @@ edition = "2021"
+ path = "src/hashsum.rs"
+ 
+ [dependencies]
+-digest = "0.10.6"
++digest = "0.10"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ hex = "0.4.3"
+ memchr = "2"
+ md-5 = "0.10"
+ regex = "1"
+-sha1 = "0.10.1"
+-sha2 = "0.10.2"
+-sha3 = "0.10.6"
++sha1 = "0.10"
++sha2 = "0.10"
++sha3 = "0.10"
+ blake2b_simd = "1.0.0"
+ blake3 = "1.3.1"
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }

diff --git a/src/coreutils/debian/patches/lower-half.diff b/src/coreutils/debian/patches/lower-half.diff
index 8ed7e0584c28acc77cdd2c4b3d98f3b73147b7b3..1a6f23d9f5dad6ee23a9882b580be7e25db343f2 100644 (file)
--- a/src/coreutils/debian/patches/lower-half.diff
+++ b/src/coreutils/debian/patches/lower-half.diff
@@ -5,9 +5,9 @@ Index: 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"] }
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 -half = "2.1"
 +half = "1.6"
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
  
  [[bin]]

diff --git a/src/coreutils/debian/patches/lower-onig.diff b/src/coreutils/debian/patches/lower-onig.diff
index dd6598c342d77c409bffb3a5349c22afa059f0e2..967e587337b4282da0edc4d8d4d4d38d07301df4 100644 (file)
--- a/src/coreutils/debian/patches/lower-onig.diff
+++ b/src/coreutils/debian/patches/lower-onig.diff
@@ -3,11 +3,11 @@ 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"] }
+ clap = { version = "4.0", 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" }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
  
  [[bin]]

diff --git a/src/coreutils/debian/patches/lower-phf.diff b/src/coreutils/debian/patches/lower-phf.diff
new file mode 100644 (file)
index 0000000..31e1c8c
--- /dev/null
+++ b/src/coreutils/debian/patches/lower-phf.diff
@@ -0,0 +1,22 @@
+Index: coreutils/Cargo.toml
+===================================================================
+--- coreutils.orig/Cargo.toml
++++ coreutils/Cargo.toml
+@@ -402,7 +402,7 @@ package = "uu_pathchk"
+ path = "src/uu/pathchk"
+ 
+ [dependencies.phf]
+-version = "0.11.1"
++version = "0"
+ 
+ [dependencies.pinky]
+ version = "0.0.17"
+@@ -757,7 +757,7 @@ package = "uucore"
+ version = "2.2"
+ 
+ [build-dependencies.phf_codegen]
+-version = "0.11.1"
++version = "0"
+ 
+ [features]
+ default = ["feat_common_core"]

diff --git a/src/coreutils/debian/patches/relax-binary-heap-plus.diff b/src/coreutils/debian/patches/relax-binary-heap-plus.diff
new file mode 100644 (file)
index 0000000..e54e71b
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-binary-heap-plus.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
+@@ -15,7 +15,7 @@ edition = "2021"
+ path = "src/sort.rs"
+ 
+ [dependencies]
+-binary-heap-plus = "0.5.0"
++binary-heap-plus = "0"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ compare = "0.1.0"
+ ctrlc = { version = "3.0", features = ["termination"] }

diff --git a/src/coreutils/debian/patches/relax-bstr.diff b/src/coreutils/debian/patches/relax-bstr.diff
new file mode 100644 (file)
index 0000000..7c5061e
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-bstr.diff
@@ -0,0 +1,13 @@
+Index: coreutils/src/uu/cut/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/cut/Cargo.toml
++++ coreutils/src/uu/cut/Cargo.toml
+@@ -18,7 +18,7 @@ path = "src/cut.rs"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+ memchr = "2"
+-bstr = "1.0"
++bstr = "0"
+ atty = "0.2"
+ 
+ [[bin]]

diff --git a/src/coreutils/debian/patches/relax-md-5.diff b/src/coreutils/debian/patches/relax-md-5.diff
index 2f22bd79a2c1e4f5be0ab8f7e0d8dcafffb42a97..a8bd2f49d546e7fb060e9e0f6354ad0744cec1f5 100644 (file)
--- a/src/coreutils/debian/patches/relax-md-5.diff
+++ b/src/coreutils/debian/patches/relax-md-5.diff
@@ -2,8 +2,8 @@ Index: coreutils/src/uu/hashsum/Cargo.toml
 ===================================================================
 --- coreutils.orig/src/uu/hashsum/Cargo.toml
 +++ coreutils/src/uu/hashsum/Cargo.toml
-@@ -19,7 +19,7 @@ digest = "0.10.5"
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+@@ -19,7 +19,7 @@ digest = "0.10.6"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
  hex = "0.4.3"
  memchr = "2"
 -md-5 = "0.10.5"

diff --git a/src/coreutils/debian/patches/relax-nix.diff b/src/coreutils/debian/patches/relax-nix.diff
index 61b1300268a0a92e414a276300e157824e33b97a..d09c8e9e104f5bf10c6a4be5e1f6268448139078 100644 (file)
--- a/src/coreutils/debian/patches/relax-nix.diff
+++ b/src/coreutils/debian/patches/relax-nix.diff
@@ -1,22 +1,9 @@
-Index: rust-coreutils-0.0.16/Cargo.toml
+Index: coreutils/src/uu/cat/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/Cargo.toml
-+++ rust-coreutils-0.0.16/Cargo.toml
-@@ -406,7 +406,7 @@ procfs = { version = "0.14", default-fea
- rlimit = "0.8.3"
- 
- [target.'cfg(unix)'.dev-dependencies]
--nix = { version = "0.25", default-features = false, features = ["process", "signal", "user"] }
-+nix = { version = "0", default-features = false, features = ["process", "signal", "user"] }
- rust-users = { version="0", package="users" }
- 
- [build-dependencies]
-Index: rust-coreutils-0.0.16/src/uu/cat/Cargo.toml
-===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/cat/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/cat/Cargo.toml
+--- coreutils.orig/src/uu/cat/Cargo.toml
++++ coreutils/src/uu/cat/Cargo.toml
 @@ -21,7 +21,7 @@ atty = "0.2"
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["fs", "pipes"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "pipes"] }
  
  [target.'cfg(unix)'.dependencies]
 -nix = { version = "0.25", default-features = false }
@@ -24,31 +11,24 @@ Index: rust-coreutils-0.0.16/src/uu/cat/Cargo.toml
  
  [[bin]]
  name = "cat"
-Index: rust-coreutils-0.0.16/src/uu/kill/Cargo.toml
+Index: coreutils/src/uu/kill/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/kill/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/kill/Cargo.toml
+--- coreutils.orig/src/uu/kill/Cargo.toml
++++ coreutils/src/uu/kill/Cargo.toml
 @@ -16,7 +16,7 @@ path = "src/kill.rs"
  
  [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 -nix = { version = "0.25", features = ["signal"] }
 +nix = { version = "0", features = ["signal"] }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["signals"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"] }
  
  [[bin]]
-Index: rust-coreutils-0.0.16/src/uu/more/Cargo.toml
+Index: coreutils/src/uu/more/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/more/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/more/Cargo.toml
-@@ -17,13 +17,13 @@ path = "src/more.rs"
- [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
--crossterm = "0.25"
-+crossterm = "0"
- atty = "0.2"
- unicode-width = "0.1.7"
+--- coreutils.orig/src/uu/more/Cargo.toml
++++ coreutils/src/uu/more/Cargo.toml
+@@ -23,7 +23,7 @@ unicode-width = "0.1.7"
  unicode-segmentation = "1"
  
  [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
@@ -57,50 +37,50 @@ Index: rust-coreutils-0.0.16/src/uu/more/Cargo.toml
  
  [[bin]]
  name = "more"
-Index: rust-coreutils-0.0.16/src/uu/nice/Cargo.toml
+Index: coreutils/src/uu/nice/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/nice/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/nice/Cargo.toml
+--- coreutils.orig/src/uu/nice/Cargo.toml
++++ coreutils/src/uu/nice/Cargo.toml
 @@ -17,7 +17,7 @@ path = "src/nice.rs"
  [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
- libc = "0.2.132"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ libc = "0.2.137"
 -nix = { version = "0.25", default-features = false }
 +nix = { version = "0", default-features = false }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
  
  [[bin]]
-Index: rust-coreutils-0.0.16/src/uu/stty/Cargo.toml
+Index: coreutils/src/uu/stty/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/stty/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/stty/Cargo.toml
+--- coreutils.orig/src/uu/stty/Cargo.toml
++++ coreutils/src/uu/stty/Cargo.toml
 @@ -17,7 +17,7 @@ path = "src/stty.rs"
  [dependencies]
- clap = { version = "3.1", features = ["wrap_help", "cargo"] }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
 -nix = { version="0.25", features = ["term"] }
 +nix = { version="0", features = ["term"] }
  
  [[bin]]
  name = "stty"
-Index: rust-coreutils-0.0.16/src/uu/sync/Cargo.toml
+Index: coreutils/src/uu/sync/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/sync/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/sync/Cargo.toml
-@@ -20,7 +20,7 @@ libc = "0.2.132"
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["wide"] }
+--- coreutils.orig/src/uu/sync/Cargo.toml
++++ coreutils/src/uu/sync/Cargo.toml
+@@ -20,7 +20,7 @@ libc = "0.2.137"
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["wide"] }
  
  [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 -nix = "0.25"
 +nix = "0"
  
  [target.'cfg(target_os = "windows")'.dependencies]
- winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "std", "winbase", "winerror"] }
-Index: rust-coreutils-0.0.16/src/uu/tail/Cargo.toml
+ windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+Index: coreutils/src/uu/tail/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/tail/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/tail/Cargo.toml
-@@ -29,7 +29,7 @@ winapi = { version="0.3", features=["fil
+--- coreutils.orig/src/uu/tail/Cargo.toml
++++ coreutils/src/uu/tail/Cargo.toml
+@@ -29,7 +29,7 @@ windows-sys = { version = "0.42.0", defa
  winapi-util = { version="0.1.5" }
  
  [target.'cfg(unix)'.dependencies]
@@ -109,36 +89,36 @@ Index: rust-coreutils-0.0.16/src/uu/tail/Cargo.toml
  
  [[bin]]
  name = "tail"
-Index: rust-coreutils-0.0.16/src/uu/timeout/Cargo.toml
+Index: coreutils/src/uu/timeout/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/timeout/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/timeout/Cargo.toml
+--- coreutils.orig/src/uu/timeout/Cargo.toml
++++ coreutils/src/uu/timeout/Cargo.toml
 @@ -17,7 +17,7 @@ path = "src/timeout.rs"
  [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
- libc = "0.2.132"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ libc = "0.2.137"
 -nix = { version = "0.25", default-features = false, features = ["signal"] }
 +nix = { version = "0", default-features = false, features = ["signal"] }
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["process", "signals"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["process", "signals"] }
  
  [[bin]]
-Index: rust-coreutils-0.0.16/src/uu/tty/Cargo.toml
+Index: coreutils/src/uu/tty/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/tty/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/tty/Cargo.toml
+--- coreutils.orig/src/uu/tty/Cargo.toml
++++ coreutils/src/uu/tty/Cargo.toml
 @@ -16,7 +16,7 @@ path = "src/tty.rs"
  
  [dependencies]
- clap = { version = "3.2", features = ["wrap_help", "cargo"] }
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 -nix = "0.25"
 +nix = "0"
  atty = "0.2"
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["fs"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] }
  
-Index: rust-coreutils-0.0.16/src/uu/wc/Cargo.toml
+Index: coreutils/src/uu/wc/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/wc/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/wc/Cargo.toml
+--- coreutils.orig/src/uu/wc/Cargo.toml
++++ coreutils/src/uu/wc/Cargo.toml
 @@ -22,7 +22,7 @@ utf-8 = "0.7.6"
  unicode-width = "0.1.8"
  
@@ -148,12 +128,12 @@ Index: rust-coreutils-0.0.16/src/uu/wc/Cargo.toml
  libc = "0.2"
  
  [[bin]]
-Index: rust-coreutils-0.0.16/src/uu/yes/Cargo.toml
+Index: coreutils/src/uu/yes/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uu/yes/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uu/yes/Cargo.toml
-@@ -20,7 +20,7 @@ libc = "0.2.132"
- uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["pipes"] }
+--- coreutils.orig/src/uu/yes/Cargo.toml
++++ coreutils/src/uu/yes/Cargo.toml
+@@ -20,7 +20,7 @@ libc = "0.2.137"
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["pipes"] }
  
  [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 -nix = { version = "0.25", default-features = false }
@@ -161,16 +141,42 @@ Index: rust-coreutils-0.0.16/src/uu/yes/Cargo.toml
  
  [[bin]]
  name = "yes"
-Index: rust-coreutils-0.0.16/src/uucore/Cargo.toml
+Index: coreutils/src/uucore/Cargo.toml
 ===================================================================
---- rust-coreutils-0.0.16.orig/src/uucore/Cargo.toml
-+++ rust-coreutils-0.0.16/src/uucore/Cargo.toml
+--- coreutils.orig/src/uucore/Cargo.toml
++++ coreutils/src/uucore/Cargo.toml
 @@ -38,7 +38,7 @@ os_display = "0.1.3"
  
  [target.'cfg(unix)'.dependencies]
  walkdir = { version="2.3.2", optional=true }
--nix = { version = "0.25", optional = true, default-features = false, features = ["fs", "uio", "zerocopy"] }
-+nix = { version = "0", optional = true, default-features = false, features = ["fs", "uio", "zerocopy"] }
+-nix = { version = "0.25", default-features = false, features = ["fs", "uio", "zerocopy"] }
++nix = { version = "0", default-features = false, features = ["fs", "uio", "zerocopy"] }
  
  [dev-dependencies]
- clap = "3.2"
+ clap = "4.0"
+Index: coreutils/src/uu/env/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/env/Cargo.toml
++++ coreutils/src/uu/env/Cargo.toml
+@@ -20,7 +20,7 @@ rust-ini = "0.18.0"
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"]}
+ 
+ [target.'cfg(unix)'.dependencies]
+-nix = { version = "0.25", default-features = false, features = ["signal"] }
++nix = { version = "0", default-features = false, features = ["signal"] }
+ 
+ 
+ [[bin]]
+Index: coreutils/Cargo.toml
+===================================================================
+--- coreutils.orig/Cargo.toml
++++ coreutils/Cargo.toml
+@@ -960,7 +960,7 @@ default-features = false
+ version = "0.8.3"
+ 
+ [target."cfg(unix)".dev-dependencies.nix]
+-version = "0.25"
++version = "0"
+ features = [
+     "process",
+     "signal",

diff --git a/src/coreutils/debian/patches/relax-notify.diff b/src/coreutils/debian/patches/relax-notify.diff
index f6ddc05872f1ebf54a1a00e99343039622423950..f62c1ac504105c835e866acbffd1cd94657243ab 100644 (file)
--- a/src/coreutils/debian/patches/relax-notify.diff
+++ b/src/coreutils/debian/patches/relax-notify.diff
@@ -2,13 +2,12 @@ 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"
+@@ -19,7 +19,7 @@ path = "src/tail.rs"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ libc = "0.2.137"
  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"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] }
  same-file = "1.0.6"
- 
+ atty = "0.2"

diff --git a/src/coreutils/debian/patches/relax-platform-info.diff b/src/coreutils/debian/patches/relax-platform-info.diff
new file mode 100644 (file)
index 0000000..c9471b7
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-platform-info.diff
@@ -0,0 +1,26 @@
+Index: coreutils/src/uu/arch/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/arch/Cargo.toml
++++ coreutils/src/uu/arch/Cargo.toml
+@@ -15,7 +15,7 @@ edition = "2021"
+ path = "src/arch.rs"
+ 
+ [dependencies]
+-platform-info = "1.0.1"
++platform-info = "1"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+ 
+Index: coreutils/src/uu/uname/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/uname/Cargo.toml
++++ coreutils/src/uu/uname/Cargo.toml
+@@ -15,7 +15,7 @@ edition = "2021"
+ path = "src/uname.rs"
+ 
+ [dependencies]
+-platform-info = "1.0.2"
++platform-info = "1"
+ clap = { version = "4.0", features = ["wrap_help", "cargo"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+ 

diff --git a/src/coreutils/debian/patches/relax-smallvec.diff b/src/coreutils/debian/patches/relax-smallvec.diff
new file mode 100644 (file)
index 0000000..2570be8
--- /dev/null
+++ b/src/coreutils/debian/patches/relax-smallvec.diff
@@ -0,0 +1,13 @@
+Index: coreutils/src/uu/factor/Cargo.toml
+===================================================================
+--- coreutils.orig/src/uu/factor/Cargo.toml
++++ coreutils/src/uu/factor/Cargo.toml
+@@ -19,7 +19,7 @@ clap = { version = "4.0", features = ["w
+ #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 = { version = "1.10", features = ["union"] }
++smallvec = { version = "1", features = ["union"] }
+ uucore = { version=">=0.0.17", package="uucore", path="../../uucore" }
+ 
+ [dev-dependencies]

diff --git a/src/coreutils/debian/patches/remove-dep-rstest.diff b/src/coreutils/debian/patches/remove-dep-rstest.diff
new file mode 100644 (file)
index 0000000..7a4f371
--- /dev/null
+++ b/src/coreutils/debian/patches/remove-dep-rstest.diff
@@ -0,0 +1,15 @@
+Index: coreutils/Cargo.toml
+===================================================================
+--- coreutils.orig/Cargo.toml
++++ coreutils/Cargo.toml
+@@ -729,8 +729,8 @@ version = "0.8"
+ [dev-dependencies.regex]
+ version = "1.7"
+ 
+-[dev-dependencies.rstest]
+-version = "0.16.0"
++#[dev-dependencies.rstest]
++#version = "0.16.0"
+ 
+ [dev-dependencies.sha1]
+ version = "0.10"

diff --git a/src/coreutils/debian/patches/series b/src/coreutils/debian/patches/series
index 250c072b44194f43988dfab54761ed944b03a4ab..fab201e1240c1d4a74e7833a142ccf900ef460e4 100644 (file)
--- a/src/coreutils/debian/patches/series
+++ b/src/coreutils/debian/patches/series
@@ -13,7 +13,7 @@ relax-regex.diff
 relax-z85.diff
 relax-unicode-segmentation.diff
 bump-crossterm.diff
-bump-textwrap.diff
+add_path.diff
 lower-onig.diff
 relax-md-5.diff
 lower-half.diff
@@ -21,3 +21,13 @@ relax-ouroboro.diff
 relax-notify.diff
 relax-nix.diff
 bump-lscolors.diff
+lower-phf.diff
+remove-dep-rstest.diff
+relax-platform-info.diff
+relax-indicatif.diff
+relax-bstr.diff
+disable-windows.diff
+relax-smallvec.diff
+fix-hashsum.diff
+relax-terminal-size.diff
+relax-binary-heap-plus.diff