recipes-connectivity/kuksa-val/kuksa-databroker/0001-Force-older-clap-version-to-build-with-Rust-1.68.patch

   1 From 7b9a150acf2e0e05282590765f2b72b53cf0e79f Mon Sep 17 00:00:00 2001
   2 From: Scott Murray <scott.murray@konsulko.com>
   3 Date: Thu, 23 Nov 2023 10:36:27 -0500
   4 Subject: [PATCH 1/2] Force older clap version to build with Rust 1.68
   5
   6 To avoid needing Rust 1.70 for Yocto Kirkstone, patch the Cargo
   7 configuration to use older versions of the clap command-line parser
   8 crate and its dependencies.
   9
  10 Upstream-Status: Inappropriate [oe specific]
  11
  12 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  13 ---
  14  Cargo.lock                                 | 88 ++++++++++++++++------
  15  Cargo.toml                                 |  2 +-
  16  kuksa_databroker/databroker-cli/Cargo.toml |  2 +-
  17  kuksa_databroker/databroker/Cargo.toml     |  2 +-
  18  4 files changed, 69 insertions(+), 25 deletions(-)
  19
  20 diff --git a/Cargo.lock b/Cargo.lock
  21 index b3b48bf..bb9ec7f 100644
  22 --- a/Cargo.lock
  23 +++ b/Cargo.lock
  24 @@ -52,29 +52,30 @@ dependencies = [
  25
  26  [[package]]
  27  name = "anstream"
  28 -version = "0.6.4"
  29 +version = "0.3.2"
  30  source = "registry+https://github.com/rust-lang/crates.io-index"
  31 -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
  32 +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
  33  dependencies = [
  34   "anstyle",
  35   "anstyle-parse",
  36   "anstyle-query",
  37   "anstyle-wincon",
  38   "colorchoice",
  39 + "is-terminal",
  40   "utf8parse",
  41  ]
  42
  43  [[package]]
  44  name = "anstyle"
  45 -version = "1.0.4"
  46 +version = "1.0.1"
  47  source = "registry+https://github.com/rust-lang/crates.io-index"
  48 -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
  49 +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
  50
  51  [[package]]
  52  name = "anstyle-parse"
  53 -version = "0.2.2"
  54 +version = "0.2.1"
  55  source = "registry+https://github.com/rust-lang/crates.io-index"
  56 -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
  57 +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
  58  dependencies = [
  59   "utf8parse",
  60  ]
  61 @@ -90,9 +91,9 @@ dependencies = [
  62
  63  [[package]]
  64  name = "anstyle-wincon"
  65 -version = "3.0.1"
  66 +version = "1.0.2"
  67  source = "registry+https://github.com/rust-lang/crates.io-index"
  68 -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
  69 +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
  70  dependencies = [
  71   "anstyle",
  72   "windows-sys 0.48.0",
  73 @@ -356,19 +357,20 @@ dependencies = [
  74
  75  [[package]]
  76  name = "clap"
  77 -version = "4.4.7"
  78 +version = "4.3.24"
  79  source = "registry+https://github.com/rust-lang/crates.io-index"
  80 -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
  81 +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487"
  82  dependencies = [
  83   "clap_builder",
  84   "clap_derive",
  85 + "once_cell",
  86  ]
  87
  88  [[package]]
  89  name = "clap_builder"
  90 -version = "4.4.7"
  91 +version = "4.3.24"
  92  source = "registry+https://github.com/rust-lang/crates.io-index"
  93 -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
  94 +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e"
  95  dependencies = [
  96   "anstream",
  97   "anstyle",
  98 @@ -379,9 +381,9 @@ dependencies = [
  99
 100  [[package]]
 101  name = "clap_derive"
 102 -version = "4.4.7"
 103 +version = "4.3.12"
 104  source = "registry+https://github.com/rust-lang/crates.io-index"
 105 -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 106 +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 107  dependencies = [
 108   "heck",
 109   "proc-macro2",
 110 @@ -391,9 +393,9 @@ dependencies = [
 111
 112  [[package]]
 113  name = "clap_lex"
 114 -version = "0.6.0"
 115 +version = "0.5.0"
 116  source = "registry+https://github.com/rust-lang/crates.io-index"
 117 -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 118 +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 119
 120  [[package]]
 121  name = "clru"
 122 @@ -1640,6 +1642,28 @@ version = "0.3.12"
 123  source = "registry+https://github.com/rust-lang/crates.io-index"
 124  checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e"
 125
 126 +[[package]]
 127 +name = "io-lifetimes"
 128 +version = "1.0.11"
 129 +source = "registry+https://github.com/rust-lang/crates.io-index"
 130 +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 131 +dependencies = [
 132 + "hermit-abi",
 133 + "libc",
 134 + "windows-sys 0.48.0",
 135 +]
 136 +
 137 +[[package]]
 138 +name = "is-terminal"
 139 +version = "0.4.9"
 140 +source = "registry+https://github.com/rust-lang/crates.io-index"
 141 +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 142 +dependencies = [
 143 + "hermit-abi",
 144 + "rustix 0.38.21",
 145 + "windows-sys 0.48.0",
 146 +]
 147 +
 148  [[package]]
 149  name = "itertools"
 150  version = "0.10.5"
 151 @@ -1759,6 +1783,12 @@ version = "0.5.6"
 152  source = "registry+https://github.com/rust-lang/crates.io-index"
 153  checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 154
 155 +[[package]]
 156 +name = "linux-raw-sys"
 157 +version = "0.3.8"
 158 +source = "registry+https://github.com/rust-lang/crates.io-index"
 159 +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 160 +
 161  [[package]]
 162  name = "linux-raw-sys"
 163  version = "0.4.10"
 164 @@ -2399,6 +2429,20 @@ version = "0.1.23"
 165  source = "registry+https://github.com/rust-lang/crates.io-index"
 166  checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 167
 168 +[[package]]
 169 +name = "rustix"
 170 +version = "0.37.25"
 171 +source = "registry+https://github.com/rust-lang/crates.io-index"
 172 +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
 173 +dependencies = [
 174 + "bitflags 1.3.2",
 175 + "errno",
 176 + "io-lifetimes",
 177 + "libc",
 178 + "linux-raw-sys 0.3.8",
 179 + "windows-sys 0.48.0",
 180 +]
 181 +
 182  [[package]]
 183  name = "rustix"
 184  version = "0.38.21"
 185 @@ -2408,7 +2452,7 @@ dependencies = [
 186   "bitflags 2.4.1",
 187   "errno",
 188   "libc",
 189 - "linux-raw-sys",
 190 + "linux-raw-sys 0.4.10",
 191   "windows-sys 0.48.0",
 192  ]
 193
 194 @@ -2760,17 +2804,17 @@ dependencies = [
 195   "cfg-if",
 196   "fastrand",
 197   "redox_syscall 0.4.1",
 198 - "rustix",
 199 + "rustix 0.38.21",
 200   "windows-sys 0.48.0",
 201  ]
 202
 203  [[package]]
 204  name = "terminal_size"
 205 -version = "0.3.0"
 206 +version = "0.2.6"
 207  source = "registry+https://github.com/rust-lang/crates.io-index"
 208 -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 209 +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 210  dependencies = [
 211 - "rustix",
 212 + "rustix 0.37.25",
 213   "windows-sys 0.48.0",
 214  ]
 215
 216 @@ -3325,7 +3369,7 @@ dependencies = [
 217   "either",
 218   "home",
 219   "once_cell",
 220 - "rustix",
 221 + "rustix 0.38.21",
 222  ]
 223
 224  [[package]]
 225 diff --git a/Cargo.toml b/Cargo.toml
 226 index 51db3f1..df8e82d 100644
 227 --- a/Cargo.toml
 228 +++ b/Cargo.toml
 229 @@ -21,7 +21,7 @@ members = [
 230  ]
 231
 232  [workspace.dependencies]
 233 -clap = { version = "4.2", default-features = false }
 234 +clap = { version = "=4.3", default-features = false }
 235  databroker-proto = { path = "kuksa_databroker/databroker-proto" }
 236  # prost has no features
 237  prost = "0.11"
 238 diff --git a/kuksa_databroker/databroker-cli/Cargo.toml b/kuksa_databroker/databroker-cli/Cargo.toml
 239 index fc54372..9dc362f 100644
 240 --- a/kuksa_databroker/databroker-cli/Cargo.toml
 241 +++ b/kuksa_databroker/databroker-cli/Cargo.toml
 242 @@ -32,7 +32,7 @@ tokio = { workspace = true, features = [
 243  tokio-stream = { workspace = true, features = ["sync"] }
 244  linefeed = "0.6"
 245  ansi_term = "0.12"
 246 -clap = { workspace = true, features = [
 247 +clap = {  version = "=4.3", workspace = true, features = [
 248      "std",
 249      "env",
 250      "derive",
 251 diff --git a/kuksa_databroker/databroker/Cargo.toml b/kuksa_databroker/databroker/Cargo.toml
 252 index d48df29..b34bdb5 100644
 253 --- a/kuksa_databroker/databroker/Cargo.toml
 254 +++ b/kuksa_databroker/databroker/Cargo.toml
 255 @@ -40,7 +40,7 @@ tracing-subscriber = { version = "0.3.11", default-features = false, features =
 256      "env-filter",
 257      "ansi",
 258  ] }
 259 -clap = { workspace = true, features = [
 260 +clap = { version = "=4.3", workspace = true, features = [
 261      "std",
 262      "env",
 263      "derive",
 264 --
 265 2.42.0
 266