lang/rust/patches/0001-Update-xz2-and-use-it-static.patch

   1 From cfa7506a303537ee7211bd46c39a96bbc5cea9cf Mon Sep 17 00:00:00 2001
   2 From: Luca Barbato <lu_zero@gentoo.org>
   3 Date: Fri, 27 Jan 2023 15:34:36 +0100
   4 Subject: [PATCH] Update xz2 and lzma-sys
   5
   6 And use the static build.
   7 ---
   8  Cargo.lock               | 140 +++++++--------------------------------
   9  src/bootstrap/Cargo.lock |   8 +--
  10  src/bootstrap/Cargo.toml |   2 +-
  11  3 files changed, 28 insertions(+), 122 deletions(-)
  12
  13 diff --git a/Cargo.lock b/Cargo.lock
  14 index 6a15105805e..d4ecc363071 100644
  15 --- a/Cargo.lock
  16 +++ b/Cargo.lock
  17 @@ -295,45 +295,44 @@ version = "1.0.9"
  18  source = "registry+https://github.com/rust-lang/crates.io-index"
  19  checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412"
  20  dependencies = [
  21   "serde",
  22  ]
  23
  24  [[package]]
  25  name = "cargo"
  26 -version = "0.68.0"
  27 +version = "0.67.1"
  28  dependencies = [
  29   "anyhow",
  30 + "atty",
  31   "base64",
  32   "bytesize",
  33   "cargo-platform 0.1.2",
  34   "cargo-test-macro",
  35   "cargo-test-support",
  36   "cargo-util",
  37   "clap 4.0.15",
  38   "crates-io",
  39   "curl",
  40   "curl-sys",
  41 - "env_logger 0.10.0",
  42 + "env_logger 0.9.0",
  43   "filetime",
  44   "flate2",
  45   "fwdansi",
  46   "git2",
  47   "git2-curl",
  48   "glob",
  49   "hex 0.4.2",
  50   "hmac",
  51   "home",
  52 - "http-auth",
  53   "humantime 2.0.1",
  54   "ignore",
  55   "im-rc",
  56   "indexmap",
  57 - "is-terminal",
  58   "itertools",
  59   "jobserver",
  60   "lazy_static",
  61   "lazycell",
  62   "libc",
  63   "libgit2-sys",
  64   "log",
  65   "memchr",
  66 @@ -363,38 +362,38 @@ dependencies = [
  67   "unicode-xid",
  68   "url",
  69   "walkdir",
  70   "winapi",
  71  ]
  72
  73  [[package]]
  74  name = "cargo-credential"
  75 -version = "0.2.0"
  76 +version = "0.1.0"
  77
  78  [[package]]
  79  name = "cargo-credential-1password"
  80 -version = "0.2.0"
  81 +version = "0.1.0"
  82  dependencies = [
  83   "cargo-credential",
  84   "serde",
  85   "serde_json",
  86  ]
  87
  88  [[package]]
  89  name = "cargo-credential-macos-keychain"
  90 -version = "0.2.0"
  91 +version = "0.1.0"
  92  dependencies = [
  93   "cargo-credential",
  94   "security-framework",
  95  ]
  96
  97  [[package]]
  98  name = "cargo-credential-wincred"
  99 -version = "0.2.0"
 100 +version = "0.1.0"
 101  dependencies = [
 102   "cargo-credential",
 103   "winapi",
 104  ]
 105
 106  [[package]]
 107  name = "cargo-miri"
 108  version = "0.1.0"
 109 @@ -438,38 +437,39 @@ dependencies = [
 110   "cargo-util",
 111   "crates-io",
 112   "filetime",
 113   "flate2",
 114   "git2",
 115   "glob",
 116   "itertools",
 117   "lazy_static",
 118 + "remove_dir_all",
 119   "serde_json",
 120   "snapbox",
 121   "tar",
 122   "termcolor",
 123   "toml_edit",
 124   "url",
 125   "winapi",
 126  ]
 127
 128  [[package]]
 129  name = "cargo-util"
 130 -version = "0.2.3"
 131 +version = "0.2.2"
 132  dependencies = [
 133   "anyhow",
 134   "core-foundation",
 135   "crypto-hash",
 136   "filetime",
 137   "hex 0.4.2",
 138   "jobserver",
 139   "libc",
 140   "log",
 141 - "miow 0.5.0",
 142 + "miow",
 143   "same-file",
 144   "shell-escape",
 145   "tempfile",
 146   "walkdir",
 147   "winapi",
 148  ]
 149
 150  [[package]]
 151 @@ -832,17 +832,17 @@ version = "0.0.0"
 152  dependencies = [
 153   "colored",
 154   "diff",
 155   "getopts",
 156   "glob",
 157   "lazy_static",
 158   "lazycell",
 159   "libc",
 160 - "miow 0.3.7",
 161 + "miow",
 162   "miropt-test-tools",
 163   "regex",
 164   "rustfix",
 165   "serde",
 166   "serde_json",
 167   "tracing",
 168   "tracing-subscriber",
 169   "unified-diff",
 170 @@ -857,43 +857,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 171  checksum = "70489bbb718aea4f92e5f48f2e3b5be670c2051de30e57cb6e5377b4aa08b372"
 172  dependencies = [
 173   "diff",
 174   "filetime",
 175   "getopts",
 176   "lazy_static",
 177   "libc",
 178   "log",
 179 - "miow 0.3.7",
 180 + "miow",
 181   "regex",
 182   "rustfix",
 183   "serde",
 184   "serde_derive",
 185   "serde_json",
 186   "tempfile",
 187   "tester",
 188   "winapi",
 189  ]
 190
 191  [[package]]
 192  name = "concolor"
 193 -version = "0.0.9"
 194 +version = "0.0.8"
 195  source = "registry+https://github.com/rust-lang/crates.io-index"
 196 -checksum = "b90f9dcd9490a97db91a85ccd79e38a87e14323f0bb824659ee3274e9143ba37"
 197 +checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af"
 198  dependencies = [
 199   "atty",
 200   "bitflags",
 201   "concolor-query",
 202  ]
 203
 204  [[package]]
 205  name = "concolor-query"
 206 -version = "0.1.0"
 207 +version = "0.0.5"
 208  source = "registry+https://github.com/rust-lang/crates.io-index"
 209 -checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317"
 210 +checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449"
 211
 212  [[package]]
 213  name = "content_inspector"
 214  version = "0.2.4"
 215  source = "registry+https://github.com/rust-lang/crates.io-index"
 216  checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
 217  dependencies = [
 218   "memchr",
 219 @@ -939,17 +939,17 @@ version = "0.2.5"
 220  source = "registry+https://github.com/rust-lang/crates.io-index"
 221  checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 222  dependencies = [
 223   "libc",
 224  ]
 225
 226  [[package]]
 227  name = "crates-io"
 228 -version = "0.35.0"
 229 +version = "0.34.0"
 230  dependencies = [
 231   "anyhow",
 232   "curl",
 233   "percent-encoding",
 234   "serde",
 235   "serde_json",
 236   "url",
 237  ]
 238 @@ -1258,50 +1258,16 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 239  dependencies = [
 240   "atty",
 241   "humantime 2.0.1",
 242   "log",
 243   "regex",
 244   "termcolor",
 245  ]
 246
 247 -[[package]]
 248 -name = "env_logger"
 249 -version = "0.10.0"
 250 -source = "registry+https://github.com/rust-lang/crates.io-index"
 251 -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 252 -dependencies = [
 253 - "humantime 2.0.1",
 254 - "is-terminal",
 255 - "log",
 256 - "regex",
 257 - "termcolor",
 258 -]
 259 -
 260 -[[package]]
 261 -name = "errno"
 262 -version = "0.2.8"
 263 -source = "registry+https://github.com/rust-lang/crates.io-index"
 264 -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 265 -dependencies = [
 266 - "errno-dragonfly",
 267 - "libc",
 268 - "winapi",
 269 -]
 270 -
 271 -[[package]]
 272 -name = "errno-dragonfly"
 273 -version = "0.1.2"
 274 -source = "registry+https://github.com/rust-lang/crates.io-index"
 275 -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
 276 -dependencies = [
 277 - "cc",
 278 - "libc",
 279 -]
 280 -
 281  [[package]]
 282  name = "error_index_generator"
 283  version = "0.0.0"
 284  dependencies = [
 285   "mdbook",
 286  ]
 287
 288  [[package]]
 289 @@ -1795,25 +1761,16 @@ dependencies = [
 290   "log",
 291   "mac",
 292   "markup5ever",
 293   "proc-macro2",
 294   "quote",
 295   "syn",
 296  ]
 297
 298 -[[package]]
 299 -name = "http-auth"
 300 -version = "0.1.6"
 301 -source = "registry+https://github.com/rust-lang/crates.io-index"
 302 -checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850"
 303 -dependencies = [
 304 - "memchr",
 305 -]
 306 -
 307  [[package]]
 308  name = "humantime"
 309  version = "1.3.0"
 310  source = "registry+https://github.com/rust-lang/crates.io-index"
 311  checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 312  dependencies = [
 313   "quick-error",
 314  ]
 315 @@ -2004,38 +1961,16 @@ dependencies = [
 316  name = "intl_pluralrules"
 317  version = "7.0.2"
 318  source = "registry+https://github.com/rust-lang/crates.io-index"
 319  checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
 320  dependencies = [
 321   "unic-langid",
 322  ]
 323
 324 -[[package]]
 325 -name = "io-lifetimes"
 326 -version = "1.0.2"
 327 -source = "registry+https://github.com/rust-lang/crates.io-index"
 328 -checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656"
 329 -dependencies = [
 330 - "libc",
 331 - "windows-sys",
 332 -]
 333 -
 334 -[[package]]
 335 -name = "is-terminal"
 336 -version = "0.4.0"
 337 -source = "registry+https://github.com/rust-lang/crates.io-index"
 338 -checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d"
 339 -dependencies = [
 340 - "hermit-abi 0.2.6",
 341 - "io-lifetimes",
 342 - "rustix",
 343 - "windows-sys",
 344 -]
 345 -
 346  [[package]]
 347  name = "itertools"
 348  version = "0.10.5"
 349  source = "registry+https://github.com/rust-lang/crates.io-index"
 350  checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 351  dependencies = [
 352   "either",
 353  ]
 354 @@ -2235,22 +2170,16 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 355  name = "lint-docs"
 356  version = "0.1.0"
 357  dependencies = [
 358   "serde_json",
 359   "tempfile",
 360   "walkdir",
 361  ]
 362
 363 -[[package]]
 364 -name = "linux-raw-sys"
 365 -version = "0.1.3"
 366 -source = "registry+https://github.com/rust-lang/crates.io-index"
 367 -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
 368 -
 369  [[package]]
 370  name = "litemap"
 371  version = "0.6.0"
 372  source = "registry+https://github.com/rust-lang/crates.io-index"
 373  checksum = "f34a3f4798fac63fb48cf277eefa38f94d3443baff555bb98e4f56bc9092368e"
 374
 375  [[package]]
 376  name = "lld-wrapper"
 377 @@ -2272,19 +2201,19 @@ version = "0.4.14"
 378  source = "registry+https://github.com/rust-lang/crates.io-index"
 379  checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 380  dependencies = [
 381   "cfg-if 1.0.0",
 382  ]
 383
 384  [[package]]
 385  name = "lzma-sys"
 386 -version = "0.1.16"
 387 +version = "0.1.20"
 388  source = "registry+https://github.com/rust-lang/crates.io-index"
 389 -checksum = "f24f76ec44a8ac23a31915d6e326bca17ce88da03096f1ff194925dc714dac99"
 390 +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
 391  dependencies = [
 392   "cc",
 393   "libc",
 394   "pkg-config",
 395  ]
 396
 397  [[package]]
 398  name = "mac"
 399 @@ -2434,25 +2363,16 @@ dependencies = [
 400  name = "miow"
 401  version = "0.3.7"
 402  source = "registry+https://github.com/rust-lang/crates.io-index"
 403  checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 404  dependencies = [
 405   "winapi",
 406  ]
 407
 408 -[[package]]
 409 -name = "miow"
 410 -version = "0.5.0"
 411 -source = "registry+https://github.com/rust-lang/crates.io-index"
 412 -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
 413 -dependencies = [
 414 - "windows-sys",
 415 -]
 416 -
 417  [[package]]
 418  name = "miri"
 419  version = "0.1.0"
 420  dependencies = [
 421   "colored",
 422   "env_logger 0.9.0",
 423   "getrandom 0.2.0",
 424   "lazy_static",
 425 @@ -4637,30 +4557,16 @@ dependencies = [
 426   "term",
 427   "thiserror",
 428   "toml",
 429   "unicode-segmentation",
 430   "unicode-width",
 431   "unicode_categories",
 432  ]
 433
 434 -[[package]]
 435 -name = "rustix"
 436 -version = "0.36.3"
 437 -source = "registry+https://github.com/rust-lang/crates.io-index"
 438 -checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
 439 -dependencies = [
 440 - "bitflags",
 441 - "errno",
 442 - "io-lifetimes",
 443 - "libc",
 444 - "linux-raw-sys",
 445 - "windows-sys",
 446 -]
 447 -
 448  [[package]]
 449  name = "rustversion"
 450  version = "1.0.5"
 451  source = "registry+https://github.com/rust-lang/crates.io-index"
 452  checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
 453
 454  [[package]]
 455  name = "ryu"
 456 @@ -4879,19 +4785,19 @@ checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
 457  [[package]]
 458  name = "snap"
 459  version = "1.0.1"
 460  source = "registry+https://github.com/rust-lang/crates.io-index"
 461  checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"
 462
 463  [[package]]
 464  name = "snapbox"
 465 -version = "0.4.1"
 466 +version = "0.3.3"
 467  source = "registry+https://github.com/rust-lang/crates.io-index"
 468 -checksum = "827c00e91b15e2674d8a5270bae91f898693cbf9561cbb58d8eaa31974597293"
 469 +checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7"
 470  dependencies = [
 471   "concolor",
 472   "content_inspector",
 473   "dunce",
 474   "filetime",
 475   "normalize-line-endings",
 476   "similar",
 477   "snapbox-macros",
 478 @@ -5866,19 +5772,19 @@ version = "0.2.2"
 479  source = "registry+https://github.com/rust-lang/crates.io-index"
 480  checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
 481  dependencies = [
 482   "libc",
 483  ]
 484
 485  [[package]]
 486  name = "xz2"
 487 -version = "0.1.6"
 488 +version = "0.1.7"
 489  source = "registry+https://github.com/rust-lang/crates.io-index"
 490 -checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
 491 +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
 492  dependencies = [
 493   "lzma-sys",
 494  ]
 495
 496  [[package]]
 497  name = "yaml-merge-keys"
 498  version = "0.4.1"
 499  source = "registry+https://github.com/rust-lang/crates.io-index"
 500 diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
 501 index efe8ae3169f..ad115c46110 100644
 502 --- a/src/bootstrap/Cargo.lock
 503 +++ b/src/bootstrap/Cargo.lock
 504 @@ -346,19 +346,19 @@ version = "0.4.17"
 505  source = "registry+https://github.com/rust-lang/crates.io-index"
 506  checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 507  dependencies = [
 508   "cfg-if",
 509  ]
 510
 511  [[package]]
 512  name = "lzma-sys"
 513 -version = "0.1.17"
 514 +version = "0.1.20"
 515  source = "registry+https://github.com/rust-lang/crates.io-index"
 516 -checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619"
 517 +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
 518  dependencies = [
 519   "cc",
 520   "libc",
 521   "pkg-config",
 522  ]
 523
 524  [[package]]
 525  name = "memchr"
 526 @@ -780,19 +780,19 @@ version = "0.2.3"
 527  source = "registry+https://github.com/rust-lang/crates.io-index"
 528  checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
 529  dependencies = [
 530   "libc",
 531  ]
 532
 533  [[package]]
 534  name = "xz2"
 535 -version = "0.1.6"
 536 +version = "0.1.7"
 537  source = "registry+https://github.com/rust-lang/crates.io-index"
 538 -checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
 539 +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
 540  dependencies = [
 541   "lzma-sys",
 542  ]
 543
 544  [[package]]
 545  name = "yansi"
 546  version = "0.5.1"
 547  source = "registry+https://github.com/rust-lang/crates.io-index"
 548 diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
 549 index ccc7ec1fce9..6d5838439db 100644
 550 --- a/src/bootstrap/Cargo.toml
 551 +++ b/src/bootstrap/Cargo.toml
 552 @@ -46,17 +46,17 @@ object = { version = "0.29.0", default-features = false, features = ["archive",
 553  serde = { version = "1.0.8", features = ["derive"] }
 554  serde_json = "1.0.2"
 555  sha2 = "0.10"
 556  tar = "0.4"
 557  toml = "0.5"
 558  ignore = "0.4.10"
 559  opener = "0.5"
 560  once_cell = "1.7.2"
 561 -xz2 = "0.1"
 562 +xz2 = { version = "0.1", features = ["static"] }
 563  walkdir = "2"
 564
 565  # Dependencies needed by the build-metrics feature
 566  sysinfo = { version = "0.26.0", optional = true }
 567
 568  [target.'cfg(windows)'.dependencies.winapi]
 569  version = "0.3"
 570  features = [
 571 --
 572 2.38.0
 573