From dc643d4b030243790ccb704c733ca2130279cbaf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:28 +0200 Subject: Adding debian version 1.72.1+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/README.source | 2 +- debian/changelog | 20 + debian/control | 20 +- debian/copyright | 411 +++++++++------------ debian/libstd-rust-1.71.install | 1 - debian/libstd-rust-1.71.lintian-overrides | 13 - debian/libstd-rust-1.72.install | 1 + debian/libstd-rust-1.72.lintian-overrides | 16 + debian/libstd-rust-1.72.triggers | 2 + debian/patches/c-update-libgit2.patch | 6 +- .../patches/d-0000-ignore-removed-submodules.patch | 51 +-- .../d-0001-pkg-config-no-special-snowflake.patch | 30 +- .../d-0002-mdbook-strip-embedded-libs.patch | 38 +- debian/patches/d-0005-no-jemalloc.patch | 4 +- .../d-0010-cargo-remove-vendored-c-crates.patch | 8 +- debian/patches/d-0011-cargo-remove-nghttp2.patch | 2 +- .../d-0012-cargo-always-return-dev-channel.patch | 4 +- .../d-0020-remove-windows-dependencies.patch | 76 ++-- ...d-0021-vendor-remove-windows-dependencies.patch | 304 ++++++++------- debian/patches/d-armel-fix-lldb.patch | 2 +- debian/patches/d-bootstrap-cargo-check-cfg.patch | 2 +- debian/patches/d-bootstrap-cargo-doc-paths.patch | 6 +- .../d-bootstrap-custom-debuginfo-path.patch | 2 +- debian/patches/d-bootstrap-install-symlinks.patch | 30 +- debian/patches/d-bootstrap-no-assume-tools.patch | 2 +- debian/patches/d-bootstrap-old-cargo-compat.patch | 45 --- debian/patches/d-bootstrap-rustflags.patch | 2 +- debian/patches/d-bootstrap-use-local-css.patch | 4 +- debian/patches/d-disable-download-tests.patch | 4 +- debian/patches/d-fix-rustix-outline.patch | 86 ++++- debian/patches/d-remove-arm-privacy-breaches.patch | 195 ---------- debian/patches/d-rustc-add-soname.patch | 2 +- .../patches/d-rustc-fix-mips64el-bootstrap.patch | 62 ---- .../patches/d-rustdoc-disable-embedded-fonts.patch | 2 +- debian/patches/series | 3 - .../u-disable-fp-precision-test-on-i386.patch | 2 +- debian/patches/u-fix-get-toml-when-test.patch | 2 +- debian/patches/u-profiler.patch | 42 ++- .../patches/ubuntu-disable-ppc64el-asm-tests.patch | 2 +- debian/rules | 6 +- debian/upstream-tarball-unsuspicious.txt | 66 ++-- 41 files changed, 683 insertions(+), 895 deletions(-) delete mode 100644 debian/libstd-rust-1.71.install delete mode 100644 debian/libstd-rust-1.71.lintian-overrides create mode 100644 debian/libstd-rust-1.72.install create mode 100644 debian/libstd-rust-1.72.lintian-overrides create mode 100644 debian/libstd-rust-1.72.triggers delete mode 100644 debian/patches/d-bootstrap-old-cargo-compat.patch delete mode 100644 debian/patches/d-remove-arm-privacy-breaches.patch delete mode 100644 debian/patches/d-rustc-fix-mips64el-bootstrap.patch (limited to 'debian') diff --git a/debian/README.source b/debian/README.source index ef42add62..36a28b7cc 100644 --- a/debian/README.source +++ b/debian/README.source @@ -145,7 +145,7 @@ $ git diff # pulled in new unnecessary dependencies in this newer version. See if you can # drop them by amending the patch "d-0000-ignore-removed-submodules.patch". # Rerun the above "tar ..." commands again and check that your patch works. -# For example, there is absolutely no reason why rustc should need openssl. +# For example, there is absolutely no reason to pull in windows-sys/windows. $ git commit -m "Update Files-Excluded for new upstream version ${ver/\~/-}" debian/copyright $ uscan --verbose # yes, again, to pick up the new Files-Excluded stuff diff --git a/debian/changelog b/debian/changelog index 5e7f33162..517cb87ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +rustc (1.72.1+dfsg1-1) unstable; urgency=medium + + * upload to unstable + + -- Fabian Grünbichler Mon, 27 May 2024 13:28:20 +0200 + +rustc (1.72.1+dfsg1-1~exp2) experimental; urgency=medium + + * patches: apply rustix fixup to all versions + + -- Fabian Grünbichler Mon, 27 May 2024 10:20:22 +0200 + +rustc (1.72.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * Update wasi-libc to ~git20230621.7018e24 + * Allow more test failures on loong64, and less on riscv64 (Closes: 1071707) + + -- Fabian Grünbichler Thu, 23 May 2024 21:16:03 +0200 + rustc (1.71.1+dfsg1-2) unstable; urgency=medium * d/control: fix package names in B+R (Closes: #1071242) diff --git a/debian/control b/debian/control index 494a75301..2d77e8fa5 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,9 @@ Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.17.14), python3:native, - cargo:native (>= 1.70.0+dfsg) , - rustc:native (>= 1.70.0+dfsg) , - rustc:native (<= 1.71.1++) , + cargo:native (>= 1.71.0+dfsg) , + rustc:native (>= 1.71.0+dfsg) , + rustc:native (<= 1.72.1++) , llvm-16-dev:native, llvm-16-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] , @@ -49,8 +49,8 @@ Build-Depends: curl , ca-certificates , Build-Depends-Indep: - wasi-libc (>= 0.0~git20230113.4362b18-2~) , - wasi-libc (<= 0.0~git20230113.4362b18++) , + wasi-libc (>= 0.0~git20230621.7018e24~~) , + wasi-libc (<= 0.0~git20230621.7018e24++) , clang-16:native, Build-Conflicts: gdb-minimal Standards-Version: 4.6.2 @@ -84,7 +84,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.71 +Package: libstd-rust-1.72 Section: libs Architecture: any Multi-Arch: same @@ -111,7 +111,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libstd-rust-1.71 (= ${binary:Version}), + libstd-rust-1.72 (= ${binary:Version}), Description: Rust standard libraries - development files Rust is a curly-brace, block-structured expression language. It visually resembles the C language family, but differs significantly @@ -231,8 +231,8 @@ Package: rust-llvm Architecture: all Breaks: rustc (<< 1.71.1+dfsg1-1~exp1), - rust-web (<< 1.71.1+dfsg1-1~exp1), - rust-mozilla (<< 1.71.1+dfsg1-1~exp1), + rustc-web (<< 1.71.1+dfsg1-1~exp1), + rustc-mozilla (<< 1.71.1+dfsg1-1~exp1), Replaces: rustc (<< 1.71.1+dfsg1-1~exp1), rustc-web (<< 1.71.1+dfsg1-1~exp1), @@ -306,7 +306,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.71 (= ${binary:Version}) + libstd-rust-1.72 (= ${binary:Version}) Recommends: cargo Description: Rust linter Rust is a curly-brace, block-structured expression language. It diff --git a/debian/copyright b/debian/copyright index 0cf15d2dc..182c25738 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,8 +43,7 @@ Files-Excluded: vendor/mdbook/src/theme/playground_editor vendor/psm/src/arch/wasm32.o vendor/rustix/src/backend/linux_raw/arch/outline/*/*.a -# Embedded submodule used for CI - library/stdarch/crates/intrinsic-test/acle + vendor/rustix-*/src/backend/linux_raw/arch/outline/*/*.a # Misc vendor/*/icon_CLion.svg vendor/wasm-bindgen/guide @@ -52,44 +51,44 @@ Files-Excluded: vendor/wasm-bindgen/examples/import_js/webpack.config.js # unused dependencies, generated by debian/prune-unused-deps # DO NOT EDIT below, AUTOGENERATED - vendor/ahash-0.8.2 + vendor/addr2line-0.19.0 vendor/aho-corasick-0.7.18 - vendor/ansi_term + vendor/anstyle-1.0.0 + vendor/anstyle-parse-0.2.0 vendor/anstyle-wincon - vendor/anyhow-1.0.65 vendor/anyhow-1.0.66 - vendor/anyhow-1.0.68 + vendor/anyhow-1.0.70 vendor/anymap vendor/arbitrary - vendor/arrayvec-0.7.0 + vendor/arrayvec-0.7.2 + vendor/backtrace-0.3.67 + vendor/bitflags-2.1.0 + vendor/bitflags-2.3.2 vendor/block-buffer-0.10.2 vendor/bstr-0.2.17 - vendor/bstr-1.3.0 vendor/bumpalo-3.11.1 - vendor/bumpalo-3.12.0 - vendor/bytes-1.0.1 - vendor/camino-1.0.9 - vendor/camino-1.1.2 - vendor/cargo_metadata-0.14.0 - vendor/cargo_metadata-0.15.2 vendor/cc-1.0.73 - vendor/cc-1.0.77 - vendor/cc-1.0.78 vendor/chalk-derive vendor/chalk-ir vendor/chalk-recursive vendor/chalk-solve - vendor/clap_complete-4.0.7 - vendor/color-eyre - vendor/color-spantrace + vendor/clap-4.2.4 + vendor/clap-4.3.3 + vendor/clap_builder-4.2.4 + vendor/clap_builder-4.3.3 + vendor/clap_complete-4.2.2 + vendor/clap_derive-4.2.0 + vendor/clap_lex-0.4.1 vendor/command-group vendor/core-foundation vendor/core-foundation-sys-0.8.3 vendor/cpufeatures-0.2.5 + vendor/cpufeatures-0.2.7 vendor/cranelift-bforest vendor/cranelift-codegen vendor/cranelift-codegen-meta vendor/cranelift-codegen-shared + vendor/cranelift-control vendor/cranelift-entity vendor/cranelift-frontend vendor/cranelift-isle @@ -100,7 +99,9 @@ Files-Excluded: vendor/crossbeam-channel-0.5.6 vendor/crossbeam-deque-0.8.2 vendor/crossbeam-epoch-0.9.13 + vendor/crossbeam-epoch-0.9.14 vendor/crossbeam-utils-0.8.14 + vendor/crossbeam-utils-0.8.15 vendor/crypto-common-0.1.3 vendor/ctor-0.1.22 vendor/ctor @@ -109,185 +110,135 @@ Files-Excluded: vendor/diff-0.1.12 vendor/digest-0.10.3 vendor/directories - vendor/dissimilar-1.0.4 vendor/dot - vendor/either-1.6.0 vendor/either-1.6.1 - vendor/either-1.8.0 - vendor/ena-0.14.0 + vendor/env_logger-0.9.3 vendor/errno-0.3.0 - vendor/eyre - vendor/fastrand-1.8.0 vendor/filetime-0.2.16 vendor/filetime-0.2.19 - vendor/filetime-0.2.20 - vendor/form_urlencoded-1.0.1 + vendor/fixedbitset + vendor/flate2-1.0.25 + vendor/form_urlencoded-1.1.0 vendor/fsevent-sys - vendor/fs_extra vendor/fst vendor/fwdansi - vendor/fxhash - vendor/generic-array-0.14.4 vendor/generic-array-0.14.5 - vendor/getrandom-0.2.8 - vendor/gimli-0.27.0 - vendor/glob-0.3.0 + vendor/gimli-0.27.2 vendor/globset-0.4.8 - vendor/globset-0.4.9 - vendor/hashbrown-0.13.1 vendor/heck-0.3.3 - vendor/heck-0.4.0 - vendor/hermit-abi-0.3.0 - vendor/hex-0.4.2 + vendor/hermit-abi-0.2.6 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index vendor/home-0.5.4 - vendor/humantime-2.0.1 - vendor/idna-0.2.0 + vendor/idna-0.3.0 vendor/ignore-0.4.18 - vendor/indenter - vendor/indexmap-1.9.2 vendor/inotify vendor/inotify-sys - vendor/io-lifetimes-1.0.3 vendor/io-lifetimes-1.0.9 - vendor/is-terminal-0.4.6 + vendor/is-terminal-0.4.7 vendor/itoa-1.0.2 - vendor/itoa-1.0.5 vendor/jemalloc-sys - vendor/jod-thread vendor/junction vendor/kqueue vendor/kqueue-sys vendor/libc-0.2.138 - vendor/libc-0.2.139 vendor/libc-0.2.140 - vendor/libc-0.2.143 + vendor/libc-0.2.141 + vendor/libc-0.2.146 vendor/libffi vendor/libffi-sys - vendor/libloading-0.7.1 vendor/libmimalloc-sys vendor/libnghttp2-sys vendor/linked-hash-map vendor/linux-raw-sys-0.3.2 - vendor/lock_api-0.4.7 - vendor/log-0.4.14 + vendor/lock_api-0.4.9 + vendor/log-0.4.17 vendor/lzma-sys-0.1.17 vendor/mach - vendor/matches - vendor/memmap2-0.5.8 vendor/memoffset-0.7.1 vendor/mimalloc + vendor/miniz_oxide-0.6.2 vendor/mio - vendor/miow-0.3.7 vendor/miow vendor/nix - vendor/nom-7.1.0 vendor/notify vendor/ntapi vendor/num_cpus-1.13.1 - vendor/num-traits-0.2.12 - vendor/object-0.30.1 - vendor/object-0.30.2 + vendor/num_cpus-1.15.0 + vendor/object-0.30.3 vendor/once_cell-1.12.0 vendor/once_cell-1.16.0 - vendor/once_cell-1.17.0 + vendor/once_cell-1.17.1 vendor/opener-0.5.0 vendor/openssl-src - vendor/openssl-sys-0.9.85 vendor/output_vt100 - vendor/owo-colors - vendor/parking_lot_core-0.8.5 - vendor/parking_lot_core-0.9.4 vendor/parking_lot_core-0.9.6 vendor/paste - vendor/percent-encoding-2.1.0 - vendor/pest-2.5.2 - vendor/pest_derive-2.5.2 - vendor/pest_generator-2.5.2 - vendor/pest_meta-2.5.2 - vendor/pin-project-lite-0.2.8 + vendor/percent-encoding-2.2.0 + vendor/pest-2.6.0 + vendor/pest_derive-2.6.0 + vendor/pest_generator-2.6.0 + vendor/pest_meta-2.6.0 + vendor/petgraph + vendor/pin-project-lite-0.2.9 vendor/pkg-config-0.3.25 - vendor/ppv-lite86-0.2.8 - vendor/proc-macro2-1.0.50 - vendor/proc-macro2-1.0.56 + vendor/proc-macro2-1.0.60 vendor/protobuf vendor/protobuf-support vendor/pulldown-cmark-0.9.2 vendor/pulldown-cmark-to-cmark - vendor/quote-1.0.23 - vendor/rand_chacha-0.3.0 - vendor/rayon-1.5.3 + vendor/quote-1.0.26 + vendor/quote-1.0.28 vendor/rayon-1.6.0 - vendor/rayon-1.6.1 vendor/rayon-core-1.10.1 - vendor/rayon-core-1.9.3 - vendor/redox_syscall-0.2.10 vendor/redox_syscall-0.2.13 vendor/regalloc2 vendor/regex-1.5.6 - vendor/regex-1.7.1 + vendor/regex-1.7.3 vendor/regex-syntax-0.6.26 - vendor/regex-syntax-0.6.28 vendor/region vendor/rustc-build-sysroot + vendor/rustc-demangle-0.1.22 vendor/rustix-0.37.6 - vendor/rustix-0.37.7 vendor/ryu-1.0.10 - vendor/ryu-1.0.12 - vendor/ryu-1.0.5 vendor/salsa vendor/salsa-macros - vendor/schannel-0.1.19 vendor/schannel vendor/scip - vendor/scoped-tls-1.0.0 vendor/security-framework vendor/security-framework-sys - vendor/semver-1.0.12 - vendor/semver-1.0.16 - vendor/serde-1.0.152 - vendor/serde_derive-1.0.152 + vendor/serde-1.0.160 + vendor/serde_derive-1.0.160 vendor/serde_json-1.0.81 - vendor/serde_json-1.0.85 - vendor/serde_json-1.0.91 + vendor/serde_json-1.0.96 + vendor/serde_spanned-0.6.2 vendor/sha2-0.10.2 - vendor/sharded-slab-0.1.1 + vendor/sha2-0.10.6 vendor/slice-group-by - vendor/socket2-0.4.1 vendor/syn-1.0.102 - vendor/syn-1.0.107 - vendor/syn-2.0.8 + vendor/syn-2.0.15 vendor/tar-0.4.38 vendor/target-lexicon - vendor/tempfile-3.3.0 - vendor/termcolor-1.1.3 - vendor/thiserror-1.0.38 - vendor/thiserror-impl-1.0.38 + vendor/thiserror-1.0.39 + vendor/thiserror-impl-1.0.39 vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl vendor/tikv-jemalloc-sys - vendor/time-0.3.17 - vendor/tinyvec_macros-0.1.0 - vendor/toml-0.5.7 - vendor/tracing-0.1.35 - vendor/tracing-attributes-0.1.22 - vendor/tracing-core-0.1.28 - vendor/tracing-error - vendor/tracing-log-0.1.2 - vendor/tracing-subscriber-0.3.3 - vendor/tracing-tree-0.2.0 + vendor/time-0.3.20 + vendor/time-core-0.1.0 + vendor/toml-0.5.9 + vendor/toml-0.7.4 + vendor/toml_datetime-0.6.2 + vendor/toml_edit-0.19.10 + vendor/tracing-attributes-0.1.23 + vendor/tracing-subscriber-0.3.16 + vendor/tracing-tree-0.2.2 vendor/typed-arena vendor/typenum-1.15.0 - vendor/ui_test - vendor/unicode-bidi-0.3.10 - vendor/unicode-bidi-0.3.4 vendor/unicode-ident-1.0.0 - vendor/unicode-ident-1.0.5 - vendor/unicode-ident-1.0.6 - vendor/url-2.2.2 - vendor/vcpkg-0.2.10 + vendor/unicode-ident-1.0.8 + vendor/url-2.3.1 vendor/walkdir-2.3.2 vendor/wasmtime-jit-icache-coherence vendor/winapi @@ -295,35 +246,28 @@ Files-Excluded: vendor/winapi-util vendor/winapi-x86_64-pc-windows-gnu vendor/windows-0.46.0 - vendor/windows_aarch64_gnullvm-0.42.1 vendor/windows_aarch64_gnullvm-0.42.2 vendor/windows_aarch64_gnullvm - vendor/windows_aarch64_msvc-0.42.1 vendor/windows_aarch64_msvc-0.42.2 vendor/windows_aarch64_msvc vendor/windows - vendor/windows_i686_gnu-0.42.1 vendor/windows_i686_gnu-0.42.2 vendor/windows_i686_gnu - vendor/windows_i686_msvc-0.42.1 vendor/windows_i686_msvc-0.42.2 vendor/windows_i686_msvc vendor/windows-sys-0.42.0 vendor/windows-sys-0.45.0 vendor/windows-sys - vendor/windows-targets-0.42.1 vendor/windows-targets-0.42.2 + vendor/windows-targets-0.48.0 vendor/windows-targets - vendor/windows_x86_64_gnu-0.42.1 vendor/windows_x86_64_gnu-0.42.2 vendor/windows_x86_64_gnu - vendor/windows_x86_64_gnullvm-0.42.1 vendor/windows_x86_64_gnullvm-0.42.2 vendor/windows_x86_64_gnullvm - vendor/windows_x86_64_msvc-0.42.1 vendor/windows_x86_64_msvc-0.42.2 vendor/windows_x86_64_msvc - vendor/xattr-0.2.2 + vendor/winnow-0.4.6 vendor/xz2-0.1.6 vendor/yaml-merge-keys vendor/yaml-rust @@ -381,13 +325,6 @@ Copyright: 2016-2019 Jorge Aparicio License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang-nursery/compiler-builtins -Files: vendor/compiletest_rs/* -Copyright: 2015-2020 The Rust Project Developers - 2015-2020 Thomas Bracht Laumann Jespersen - 2015-2020 Manish Goregaokar -License: Apache-2.0 or MIT -Comment: see https://github.com/laumann/compiletest-rs - Files: vendor/ahash/* vendor/ahash-0.*/* @@ -403,10 +340,12 @@ Comment: see https://github.com/nical/android_system_properties Files: vendor/anstream/* vendor/anstyle/* - vendor/anstyle-0.*/* vendor/anstyle-parse/* -Copyright: 2023 Ed Page + vendor/anstyle-query/* + vendor/colorchoice/* +Copyright: 2023-2024 Ed Page License: MIT or Apache-2.0 +Comment: see https://github.com/rust-cli/anstyle Files: vendor/ar_archive_writer/* Copyright: 2003-2017 University of Illinois at Urbana-Champaign. @@ -456,8 +395,7 @@ Copyright: 2012-2024 The Servo Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/servo/core-foundation-rs -Files: vendor/num-integer/* - vendor/num-traits/* +Files: vendor/num-traits/* Copyright: 2014-2018 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-num/num @@ -540,6 +478,11 @@ Copyright: 2020-2021 Jonas Schievink License: 0BSD or MIT or Apache-2.0 Comment: see https://github.com/jonas-schievink/adler.git +Files: vendor/allocator-api2/* +Copyright: 2023-2024 Zakarum +License: MIT OR Apache-2.0 +Comment: see https://github.com/zakarumych/allocator-api2 + Files: vendor/always-assert/* Copyright: 2021-2021 Aleksey Kladov License: MIT OR Apache-2.0 @@ -550,6 +493,11 @@ Copyright: 2015-2018 Michael Howell License: MIT or Apache-2.0 Comment: see https://github.com/notriddle/ammonia +Files: vendor/android-tzdata/* +Copyright: 2023-2023 RumovZ +License: MIT OR Apache-2.0 +Comment: see https://github.com/RumovZ/android-tzdata + Files: vendor/annotate-snippets/* Copyright: 2018-2020 Zibi Braniecki @@ -557,6 +505,7 @@ License: Apache-2.0 or MIT Comment: see https://github.com/zbraniecki/annotate-snippets-rs Files: vendor/aho-corasick/* + vendor/aho-corasick-0.*/* vendor/memchr/* Copyright: 2015 Andrew Gallant 2015-2018 bluss @@ -740,17 +689,6 @@ Copyright: 2019-2019 The CryptoCorrosion Contributors License: MIT or Apache-2.0 Comment: see https://github.com/cryptocorrosion/cryptocorrosion -Files: - vendor/chalk-derive-0.*/* - vendor/chalk-engine/* - vendor/chalk-ir-0.*/* - vendor/chalk-solve-0.*/* -Copyright: - 2015-2022 Rust Compiler Team - 2015-2022 Chalk developers -License: Apache-2.0 or MIT -Comment: see https://github.com/rust-lang/chalk - Files: vendor/chrono/* Copyright: 2014-2018 Kang Seonghoon License: MIT or Apache-2.0 @@ -759,15 +697,10 @@ Comment: see https://github.com/chronotope/chrono Files: vendor/clap/* vendor/clap-2.*/* - vendor/clap-3.*/* - vendor/clap-4.*/* vendor/clap_builder/* - vendor/clap_builder-4.*/* vendor/clap_complete/* vendor/clap_derive/* - vendor/clap_derive-3.*/* vendor/clap_lex/* - vendor/clap_lex-0.*/* Copyright: 2015-2022 Kevin K. License: MIT Comment: see https://github.com/clap-rs/clap @@ -777,23 +710,21 @@ Copyright: 2020-2023 marmeladema License: MIT Comment: see https://github.com/marmeladema/clru-rs -Files: vendor/codespan-reporting/* -Copyright: 2018-2024 Brendan Zabarauskas -License: Apache-2.0 -Comment: see https://github.com/brendanzab/codespan +Files: vendor/color-eyre/* +Copyright: 2020-2023 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/color-eyre + +Files: vendor/color-spantrace/* +Copyright: 2020-2024 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/color-spantrace Files: vendor/colored/* Copyright: 2016-2020 Thomas Wickham License: MPL-2.0 Comment: see https://github.com/mackwic/colored -Files: - vendor/concolor-override/* - vendor/concolor-query/* -Copyright: 2021-2023 Ed Page -License: MIT OR Apache-2.0 -Comment: see https://github.com/rust-cli/concolor - Files: vendor/content_inspector/* Copyright: 2018-2018 David Peter License: MIT or Apache-2.0 @@ -862,15 +793,6 @@ Copyright: 2014-2024 Alex Crichton License: MIT Comment: see https://github.com/alexcrichton/curl-rust -Files: - vendor/cxx/* - vendor/cxx-build/* - vendor/cxxbridge-flags/* - vendor/cxxbridge-macro/* -Copyright: 2020-2024 David Tolnay -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/cxx - Files: vendor/dashmap/* Copyright: 2019-2022 Acrimon License: MIT @@ -907,8 +829,9 @@ Files: vendor/quote/* vendor/syn/* vendor/syn-1.*/* + vendor/syn-2.*/* vendor/unicode-ident/* -Copyright: 2016-2022 David Tolnay +Copyright: 2016-2024 David Tolnay License: MIT or Apache-2.0 Comment: see https://github.com/dtolnay/anyhow @@ -922,7 +845,6 @@ Files: vendor/arrayvec/* vendor/arrayvec-0.5.*/* vendor/either/* - vendor/fixedbitset/* vendor/itertools/* vendor/maplit/* vendor/scopeguard/* @@ -998,11 +920,22 @@ Copyright: 2017-2021 Michael Neumann License: MIT Comment: see https://github.com/mneumann/errno-dragonfly-rs +Files: vendor/equivalent/* +Copyright: 2016-2023 Josh Stone +License: Apache-2.0 OR MIT +Comment: see https://github.com/cuviper/equivalent + Files: vendor/expect-test/* Copyright: 2020-2022 rust-analyzer developers License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/expect-test +Files: vendor/eyre/* +Copyright: 2019-2024 David Tolnay + 2019-2024 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/eyre + Files: vendor/fallible-iterator/* Copyright: 2016-2019 Steven Fackler License: MIT or Apache-2.0 @@ -1108,6 +1041,7 @@ Files: vendor/gix-bitmap/* vendor/gix-chunk/* vendor/gix-command/* + vendor/gix-commitgraph/* vendor/gix-config/* vendor/gix-config-value/* vendor/gix-credentials/* @@ -1123,6 +1057,7 @@ Files: vendor/gix-index/* vendor/gix-lock/* vendor/gix-mailmap/* + vendor/gix-negotiate/* vendor/gix-object/* vendor/gix-odb/* vendor/gix-pack/* @@ -1134,6 +1069,7 @@ Files: vendor/gix-ref/* vendor/gix-refspec/* vendor/gix-revision/* + vendor/gix-revwalk/* vendor/gix-sec/* vendor/gix-tempfile/* vendor/gix-transport/* @@ -1142,7 +1078,9 @@ Files: vendor/gix-utils/* vendor/gix-validate/* vendor/gix-worktree/* -Copyright: 2018-2024 Sebastian Thiel +Copyright: + 2018-2024 Sebastian Thiel + 2018-2024 Conor Davis License: MIT or Apache-2.0 Comment: see https://github.com/Byron/gitoxide @@ -1246,7 +1184,14 @@ Copyright: 2017-2022 Bodil Stokke License: MPL-2.0+ Comment: see https://github.com/bodil/im-rs -Files: vendor/indexmap/* +Files: vendor/indenter/* +Copyright: 2020-2023 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/indenter + +Files: + vendor/indexmap/* + vendor/indexmap-1.*/* Copyright: 2016-2019 bluss 2016-2019 Josh Stone License: Apache-2.0 or MIT @@ -1285,6 +1230,11 @@ Copyright: 2022-2023 softprops License: MIT Comment: see https://github.com/sunfishcode/is-terminal +Files: vendor/jod-thread/* +Copyright: 2019-2020 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/jod-thread + Files: vendor/js-sys/* vendor/wasm-bindgen/* @@ -1305,12 +1255,6 @@ License: MIT or Apache-2.0 Comment: see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys -Files: vendors/web-sys/webidls/enabled/MediaCapabilities.webidl -Copyright: 2018 the Contributors to the Media Capabilities Specification -License: MPL-2.0 -Comment: - see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys - Files: vendor/web-sys/webidls/enabled/*.webidl vendor/web-sys/webidls/unavailable_option_primitive/*.webidl vendor/web-sys/webidls/unstable/*.webidl @@ -1321,6 +1265,12 @@ License: MPL-2.0 Comment: see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys +Files: vendor/web-sys/webidls/enabled/MediaCapabilities.webidl +Copyright: 2018 the Contributors to the Media Capabilities Specification +License: MPL-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + Files: vendor/web-sys/webidls/enabled/PointerEvent.webidl Copyright: 2013 Microsoft Open Technologies, Inc. */ License: MPL-2.0 @@ -1381,12 +1331,9 @@ Copyright: 2014-2024 Alex Crichton License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang/libz-sys -Files: vendor/link-cplusplus/* -Copyright: 2020-2024 David Tolnay -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/link-cplusplus - -Files: vendor/linux-raw-sys/* +Files: + vendor/linux-raw-sys/* + vendor/linux-raw-sys-0.*/* Copyright: 2021-2022 Dan Gohman License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT Comment: see https://github.com/sunfishcode/linux-raw-sys @@ -1434,7 +1381,7 @@ Comment: see https://github.com/RazrFalcon/memmap2-rs Files: vendor/memoffset/* - vendor/memoffset-0.6.5/* + vendor/memoffset-0.*/* Copyright: 2017-2019 Gilad Naaman License: MIT Comment: see https://github.com/Gilnaa/memoffset @@ -1466,6 +1413,11 @@ Copyright: 2014-2018 Matt Brubeck License: MIT Comment: see https://github.com/mbrubeck/rust-debug-unreachable +Files: vendor/nohash-hasher/* +Copyright: 2018-2020 Parity Technologies +License: Apache-2.0 OR MIT +Comment: see https://github.com/paritytech/nohash-hasher + Files: vendor/normalize-line-endings/* Copyright: 2016-2018 Richard Dodd License: Apache-2.0 @@ -1556,16 +1508,16 @@ Copyright: 2015-2024 Jan Schulte License: MIT Comment: see https://github.com/stanislav-tkach/os_info -Files: vendor/os_str_bytes/* -Copyright: 2019-2022 dylni -License: MIT OR Apache-2.0 -Comment: see https://github.com/dylni/os_str_bytes - Files: vendor/overload/* Copyright: 2019-2022 Daniel Salvadori License: MIT Comment: see https://github.com/danaugrs/overload +Files: vendor/owo-colors/* +Copyright: 2020-2024 jam1garner <8260240+jam1garner@users.noreply.github.com> +License: MIT +Comment: see https://github.com/jam1garner/owo-colors + Files: vendor/hashbrown/* vendor/hashbrown-0.*/* @@ -1608,6 +1560,7 @@ Comment: see https://github.com/Manishearth/pathdiff Files: vendor/perf-event/* vendor/perf-event-open-sys/* + vendor/perf-event-open-sys-1.*/* Copyright: 2019-2022 Jim Blandy License: MIT OR Apache-2.0 Comment: see https://github.com/jimblandy/perf-event.git @@ -1629,12 +1582,6 @@ Copyright: 2018-2018 The Rust Project Developers License: Apache-2.0 or MIT Comment: see https://github.com/rust-lang-nursery/polonius -Files: vendor/petgraph/* -Copyright: 2014-2018 bluss - 2014-2018 mitchmindtree -License: MIT or Apache-2.0 -Comment: see https://github.com/bluss/petgraph - Files: vendor/phf/* vendor/phf_codegen/* @@ -1675,13 +1622,6 @@ Copyright: 2016-2023 Sean McArthur License: MIT or Apache-2.0 Comment: see https://github.com/seanmonstar/pretty-env-logger -Files: - vendor/proc-macro-error/* - vendor/proc-macro-error-attr/* -Copyright: 2019-2020 CreepySkeleton -License: MIT OR Apache-2.0 -Comment: see https://gitlab.com/CreepySkeleton/proc-macro-error - Files: vendor/proc-macro-hack/* Copyright: 2016-2022 David Tolnay License: MIT OR Apache-2.0 @@ -1759,17 +1699,12 @@ Copyright: 2018-2020 Andrew Gallant License: Unlicense or MIT Comment: see https://github.com/BurntSushi/regex-automata -Files: vendor/remove_dir_all/* -Copyright: 2017-2018 Aaronepower -License: MIT or Apache-2.0 -Comment: see https://github.com/Aaronepower/remove_dir_all.git - Files: vendor/rowan/* Copyright: 2018-2022 Aleksey Kladov License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/rowan -Files: vendor/rustc-ap-rustc_lexer/* +Files: vendor/ra-ap-rustc_lexer/* Copyright: 2010-2022 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang/rust @@ -1784,10 +1719,6 @@ Copyright: 2020-2020 flip1995 License: MIT OR Apache-2.0 Comment: see https://github.com/flip1995/rustc-semver -Files: vendor/rustc-workspace-hack/* -Copyright: 2024 Alex Crichton -License: MIT or Apache-2.0 - Files: vendor/rustc_version/* Copyright: 2015-2021 Dirkjan Ochtman 2015-2021 Marvin Löbel @@ -1801,7 +1732,9 @@ Copyright: License: Apache-2.0 or MIT Comment: see https://github.com/killercup/rustfix -Files: vendor/rustix/* +Files: + vendor/rustix/* + vendor/rustix-0.*/* Copyright: 2020-2023 Dan Gohman 2020-2023 Jakub Konka License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT @@ -1827,11 +1760,6 @@ Copyright: 2018-2018 David Tolnay License: Apache-2.0 or BSL-1.0 Comment: see https://github.com/dtolnay/ryu -Files: vendor/scratch/* -Copyright: 2020-2024 David Tolnay -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/scratch - Files: vendor/self_cell/* Copyright: 2020-2021 Lukas Bergdoll License: Apache-2.0 @@ -1846,8 +1774,10 @@ Comment: see https://github.com/steveklabnik/semver see https://github.com/steveklabnik/semver-parser -Files: vendor/serde/* - vendor/serde_json/* +Files: + vendor/serde/* + vendor/serde-1.*/* + vendor/serde_json/* Copyright: 2014-2017 Erick Tryzelaar License: MIT or Apache-2.0 Comment: @@ -1860,7 +1790,9 @@ Copyright: 2015-2021 Pyfisch License: MIT or Apache-2.0 Comment: see https://github.com/pyfisch/cbor -Files: vendor/serde_derive/* +Files: + vendor/serde_derive/* + vendor/serde_derive-1.*/* Copyright: 2014-2017 Erick Tryzelaar 2016-2017 David Tolnay License: MIT or Apache-2.0 @@ -2060,9 +1992,7 @@ Copyright: 2018-2021 Aleksey Kladov License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/text-size -Files: - vendor/textwrap/* - vendor/textwrap-0.*/* +Files: vendor/textwrap/* Copyright: 2016-2024 Martin Geisler License: MIT Comment: see https://github.com/mgeisler/textwrap @@ -2143,12 +2073,14 @@ Files: vendor/tracing/* vendor/tracing-attributes/* vendor/tracing-core/* + vendor/tracing-error/* vendor/tracing-log/* vendor/tracing-subscriber/* Copyright: - 2018-2020 Eliza Weisman - 2018-2020 Tokio Contributors - 2018-2020 David Barsky + 2018-2024 David Barsky + 2018-2024 Eliza Weisman + 2018-2024 Jane Lusby + 2018-2024 Tokio Contributors License: MIT Comment: see https://github.com/tokio-rs/tracing @@ -2158,6 +2090,11 @@ Copyright: 2020-2020 David Barsky License: MIT OR Apache-2.0 Comment: see https://github.com/davidbarsky/tracing-tree +Files: vendor/triomphe/* +Copyright: 2018-2024 The Servo Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/Manishearth/triomphe + Files: vendor/twox-hash/* Copyright: 2015-2022 Jake Goulding License: MIT @@ -2174,6 +2111,16 @@ Copyright: 2015-2019 Paho Lurie-Gregg License: MIT or Apache-2.0 Comment: see https://github.com/paholg/typenum +Files: vendor/ui_test/* +Copyright: + 2010-2024 The Rust Project Developers + 2015-2024 Thomas Bracht Laumann Jespersen + 2015-2024 Manish Goregaokar + 2022-2024 Oli Scherer +License: MIT OR Apache-2.0 +Comment: see https://github.com/oli-obk/ui_test + extraction of compiletest-rs from rustc itself + Files: vendor/unarray/* Copyright: 2022 Cameron License: MIT OR Apache-2.0 diff --git a/debian/libstd-rust-1.71.install b/debian/libstd-rust-1.71.install deleted file mode 100644 index cd4545cca..000000000 --- a/debian/libstd-rust-1.71.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/ diff --git a/debian/libstd-rust-1.71.lintian-overrides b/debian/libstd-rust-1.71.lintian-overrides deleted file mode 100644 index d9c4d25cf..000000000 --- a/debian/libstd-rust-1.71.lintian-overrides +++ /dev/null @@ -1,13 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.71 binary: package-name-doesnt-match-sonames -libstd-rust-1.71 binary: sharedobject-in-library-directory-missing-soname - -# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff -libstd-rust-1.71 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.71 binary: shlib-without-versioned-soname -libstd-rust-1.71 binary: unused-shlib-entry-in-control-file - -# Libraries that use libc symbols (libterm, libstd, etc) *are* linked -# to libc. Lintian gets upset that some Rust libraries don't need -# libc, boo hoo. -libstd-rust-1.71 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.72.install b/debian/libstd-rust-1.72.install new file mode 100644 index 000000000..cd4545cca --- /dev/null +++ b/debian/libstd-rust-1.72.install @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/ diff --git a/debian/libstd-rust-1.72.lintian-overrides b/debian/libstd-rust-1.72.lintian-overrides new file mode 100644 index 000000000..c7ff5a226 --- /dev/null +++ b/debian/libstd-rust-1.72.lintian-overrides @@ -0,0 +1,16 @@ +# "libstd" just seemed too generic +libstd-rust-1.72 binary: package-name-doesnt-match-sonames +libstd-rust-1.72 binary: sharedobject-in-library-directory-missing-soname + +# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff +libstd-rust-1.72 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.72 binary: shlib-without-versioned-soname +libstd-rust-1.72 binary: unused-shlib-entry-in-control-file + +# can trigger if all its so files' hashes start with a latter and not a digit +libstd-rust-1.72 binary: empty-shlibs + +# Libraries that use libc symbols (libterm, libstd, etc) *are* linked +# to libc. Lintian gets upset that some Rust libraries don't need +# libc, boo hoo. +libstd-rust-1.72 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.72.triggers b/debian/libstd-rust-1.72.triggers new file mode 100644 index 000000000..a88c20f92 --- /dev/null +++ b/debian/libstd-rust-1.72.triggers @@ -0,0 +1,2 @@ +# normally added by dh_makeshlibs, but fails for our versioning scheme +activate-noawait ldconfig diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch index 8fe7c1ca9..192571e46 100644 --- a/debian/patches/c-update-libgit2.patch +++ b/debian/patches/c-update-libgit2.patch @@ -10,10 +10,10 @@ Index: rust/src/tools/cargo/Cargo.toml -git2-curl = "0.18.0" +git2 = "0.18" +git2-curl = "0.19.0" - gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } - gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] } + gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } + gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } glob = "0.3.0" -@@ -53,7 +53,7 @@ jobserver = "0.1.26" +@@ -52,7 +52,7 @@ jobserver = "0.1.26" lazy_static = "1.3.0" lazycell = "1.2.0" libc = "0.2.144" diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index e90237fa8..1cea0a8bf 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -3,18 +3,18 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules --- - Cargo.toml | 11 +++----- - src/bootstrap/bootstrap.py | 4 --- + Cargo.toml | 7 ----- + src/bootstrap/bootstrap.py | 6 +---- src/bootstrap/builder.rs | 54 +++++++++----------------------------- src/bootstrap/test.rs | 12 +-------- src/tools/rust-analyzer/Cargo.toml | 11 +++++++- - 5 files changed, 28 insertions(+), 64 deletions(-) + 5 files changed, 25 insertions(+), 65 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 8eb378a..70487ec 100644 +index 20b1c65..16d4ebe 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -18,22 +18,15 @@ members = [ +@@ -20,22 +20,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -38,13 +38,13 @@ index 8eb378a..70487ec 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 58d1926..527282d 100644 +index 149350e..2813c89 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -899,10 +899,6 @@ class RustBuild(object): +@@ -946,10 +946,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] - args.extend("--verbose" for _ in range(verbose_count)) + args.extend("--verbose" for _ in range(self.verbose)) - if self.use_locked_deps: - args.append("--locked") - if self.use_vendored_sources: @@ -53,10 +53,10 @@ index 58d1926..527282d 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 2fa4455..3f3e5ec 100644 +index 05b66f9..ff1f0eb 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -492,20 +492,20 @@ impl<'a> ShouldRun<'a> { +@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +89,7 @@ index 2fa4455..3f3e5ec 100644 submodules_paths }; -@@ -672,25 +672,14 @@ impl<'a> Builder<'a> { +@@ -646,25 +646,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -115,7 +115,7 @@ index 2fa4455..3f3e5ec 100644 ), Kind::Check | Kind::Clippy | Kind::Fix => describe!( check::Std, -@@ -698,11 +687,6 @@ impl<'a> Builder<'a> { +@@ -672,12 +661,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -123,11 +123,12 @@ index 2fa4455..3f3e5ec 100644 - check::CargoMiri, - check::MiroptTestTools, - check::Rls, -- check::RustAnalyzer, check::Rustfmt, +- check::RustAnalyzer, check::Bootstrap ), -@@ -730,7 +714,6 @@ impl<'a> Builder<'a> { + Kind::Test => describe!( +@@ -706,7 +690,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -135,7 +136,7 @@ index 2fa4455..3f3e5ec 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -746,7 +729,6 @@ impl<'a> Builder<'a> { +@@ -722,7 +705,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -143,7 +144,7 @@ index 2fa4455..3f3e5ec 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -783,7 +765,6 @@ impl<'a> Builder<'a> { +@@ -759,7 +741,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -151,7 +152,7 @@ index 2fa4455..3f3e5ec 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -801,12 +782,9 @@ impl<'a> Builder<'a> { +@@ -777,12 +758,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -164,7 +165,7 @@ index 2fa4455..3f3e5ec 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -823,11 +801,9 @@ impl<'a> Builder<'a> { +@@ -799,11 +777,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -176,7 +177,7 @@ index 2fa4455..3f3e5ec 100644 install::LlvmTools, install::Src, install::Rustc -@@ -837,7 +813,6 @@ impl<'a> Builder<'a> { +@@ -813,7 +789,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -184,7 +185,7 @@ index 2fa4455..3f3e5ec 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1979,10 +1954,7 @@ impl<'a> Builder<'a> { +@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> { } } @@ -197,10 +198,10 @@ index 2fa4455..3f3e5ec 100644 } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 44cd84b..9b37d5d 100644 +index eed7a58..c3bf972 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -2004,17 +2004,7 @@ impl Step for RustcGuide { +@@ -2129,17 +2129,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -209,7 +210,7 @@ index 44cd84b..9b37d5d 100644 - - let src = builder.src.join(relative_path); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); -- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) { +- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() { - ToolState::TestPass - } else { - ToolState::TestFail @@ -220,7 +221,7 @@ index 44cd84b..9b37d5d 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index 333f03c..2a0faa2 100644 +index 3050cf7..174e1f0 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ @@ -237,5 +238,5 @@ index 333f03c..2a0faa2 100644 + "crates/proc-macro-api", +] exclude = ["crates/proc-macro-test/imp"] + resolver = "2" - [workspace.package] diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch index 9e49580b1..4cdf7fbbb 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -8,7 +8,7 @@ Subject: d-0001-pkg-config-no-special-snowflake 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs -index e9395be..2f6819c 100644 +index 3653032..7b82fa5 100644 --- a/vendor/pkg-config/src/lib.rs +++ b/vendor/pkg-config/src/lib.rs @@ -117,11 +117,8 @@ pub enum Error { @@ -49,7 +49,7 @@ index e9395be..2f6819c 100644 } } } -@@ -418,6 +407,8 @@ impl Config { +@@ -420,6 +409,8 @@ impl Config { if host == target { return true; } @@ -59,23 +59,23 @@ index e9395be..2f6819c 100644 // pkg-config may not be aware of cross-compilation, and require // a wrapper script that sets up platform-specific prefixes. @@ -477,7 +468,11 @@ impl Config { - fn command(&self, name: &str, args: &[&str]) -> Command { - let exe = self - .targetted_env_var("PKG_CONFIG") -- .unwrap_or_else(|| OsString::from("pkg-config")); -+ .unwrap_or_else(|| { + } + + fn run(&self, name: &str, args: &[&str]) -> Result, Error> { +- let pkg_config_exe = self.targetted_env_var("PKG_CONFIG"); ++ let pkg_config_exe = self.targetted_env_var("PKG_CONFIG") ++ .or_else(|| { + self.env_var_os("DEB_HOST_GNU_TYPE") -+ .map(|mut t| { t.push(OsString::from("-pkg-config")); t }) -+ .unwrap_or_else(|| OsString::from("pkg-config")) ++ .map(|mut t| { t.push(OsString::from("-pkgconf")); t }) + }); - let mut cmd = Command::new(exe); - if self.is_static(name) { - cmd.arg("--static"); + let fallback_exe = if pkg_config_exe.is_none() { + Some(OsString::from("pkgconf")) + } else { diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs -index 4e04ac0..f884e46 100644 +index 0f37c72..f70e8b7 100644 --- a/vendor/pkg-config/tests/test.rs +++ b/vendor/pkg-config/tests/test.rs -@@ -34,7 +34,6 @@ fn find(name: &str) -> Result { +@@ -31,7 +31,6 @@ fn find(name: &str) -> Result { pkg_config::probe_library(name) } @@ -83,7 +83,7 @@ index 4e04ac0..f884e46 100644 fn cross_disabled() { let _g = LOCK.lock(); reset(); -@@ -46,7 +45,6 @@ fn cross_disabled() { +@@ -43,7 +42,6 @@ fn cross_disabled() { } } diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index 568bf230f..c6acfd458 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -6,12 +6,12 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase --- src/tools/linkchecker/main.rs | 28 +++++- vendor/mdbook/src/book/init.rs | 19 ---- - .../src/renderer/html_handlebars/hbs_renderer.rs | 110 ++++----------------- + .../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++----------------- .../mdbook/src/renderer/html_handlebars/search.rs | 2 - - vendor/mdbook/src/theme/index.hbs | 99 +------------------ - vendor/mdbook/src/theme/mod.rs | 27 ----- + vendor/mdbook/src/theme/index.hbs | 99 +------------------- + vendor/mdbook/src/theme/mod.rs | 27 ------ vendor/mdbook/src/theme/searcher/mod.rs | 2 - - 7 files changed, 47 insertions(+), 240 deletions(-) + 7 files changed, 47 insertions(+), 234 deletions(-) diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index c8a3700..4095c03 100644 @@ -67,7 +67,7 @@ index c8a3700..4095c03 100644 report.links_ignored_exception += 1; } else { diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs -index ebcdd93..41dab42 100644 +index faca1d0..c1a82a3 100644 --- a/vendor/mdbook/src/book/init.rs +++ b/vendor/mdbook/src/book/init.rs @@ -153,25 +153,6 @@ impl BookBuilder { @@ -97,10 +97,10 @@ index ebcdd93..41dab42 100644 } diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -index e170e2f..caa2eff 100644 +index 709aa06..17ff63c 100644 --- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition}; +@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio use crate::errors::*; use crate::renderer::html_handlebars::helpers; use crate::renderer::{RenderContext, Renderer}; @@ -116,7 +116,7 @@ index e170e2f..caa2eff 100644 use std::path::{Path, PathBuf}; use crate::utils::fs::get_404_output_file; -@@ -235,105 +236,28 @@ impl HtmlHandlebars { +@@ -250,99 +251,28 @@ impl HtmlHandlebars { if let Some(contents) = &theme.favicon_svg { write_file(destination, "favicon.svg", contents)?; } @@ -175,7 +175,8 @@ index e170e2f..caa2eff 100644 + "/usr/share/javascript/mathjax/MathJax.js", + destination.join("MathJax.js"), )?; -- if html_config.copy_fonts { +- // Don't copy the stock fonts if the user has specified their own fonts to use. +- if html_config.copy_fonts && theme.fonts_css.is_none() { - write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; - for (file_name, contents) in theme::fonts::LICENSES.iter() { - write_file(destination, file_name, contents)?; @@ -191,20 +192,13 @@ index e170e2f..caa2eff 100644 - } - if let Some(fonts_css) = &theme.fonts_css { - if !fonts_css.is_empty() { -- if html_config.copy_fonts { -- warn!( -- "output.html.copy_fonts is deprecated.\n\ -- Set copy_fonts=false and ensure the fonts you want are in \ -- the `theme/fonts/` directory." -- ); -- } -- write_file(destination, "fonts/fonts.css", &fonts_css)?; +- write_file(destination, "fonts/fonts.css", fonts_css)?; - } - } - if !html_config.copy_fonts && theme.fonts_css.is_none() { - warn!( -- "output.html.copy_fonts is deprecated.\n\ -- This book appears to have copy_fonts=false without a fonts.css file.\n\ +- "output.html.copy-fonts is deprecated.\n\ +- This book appears to have copy-fonts=false in book.toml without a fonts.css file.\n\ - Add an empty `theme/fonts/fonts.css` file to squelch this warning." - ); - } @@ -238,7 +232,7 @@ index e170e2f..caa2eff 100644 Ok(()) } diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs -index a9e2f5c..3e3f69c 100644 +index 24d62fd..849a48c 100644 --- a/vendor/mdbook/src/renderer/html_handlebars/search.rs +++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs @@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) -> @@ -251,7 +245,7 @@ index a9e2f5c..3e3f69c 100644 } diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs -index 6f3948c..7e5c54c 100644 +index 80315c4..48413b0 100644 --- a/vendor/mdbook/src/theme/index.hbs +++ b/vendor/mdbook/src/theme/index.hbs @@ -33,10 +33,7 @@ @@ -324,7 +318,7 @@ index 6f3948c..7e5c54c 100644