From: Fabian Grünbichler Date: Wed, 19 Jun 2024 05:51:49 +0000 (+0200) Subject: Import rustc_1.76.0+dfsg1-1.debian.tar.xz X-Git-Tag: archive/raspbian/1.76.0+dfsg1-1+rpi1^2~49^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2fadc3bf898c343d5a7fc5ca61a7e7240afadfd0;p=rustc.git Import rustc_1.76.0+dfsg1-1.debian.tar.xz [dgit import tarball rustc 1.76.0+dfsg1-1 rustc_1.76.0+dfsg1-1.debian.tar.xz] --- 2fadc3bf898c343d5a7fc5ca61a7e7240afadfd0 diff --git a/NEWS b/NEWS new file mode 100644 index 0000000000..067259d3da --- /dev/null +++ b/NEWS @@ -0,0 +1,29 @@ +rustc (1.20.0+dfsg1-2) unstable; urgency=medium + + Starting from version 1.20.0+dfsg1-1 (i.e. the previous version) the Debian + packages of rustc no longer fail their build if any tests fail. In other + words, some tests might have failed when building this and future versions of + the package. This is due to lack of maintainer time to investigate failures. + + Many previous test failures were reported to upstream and did not receive a + timely response, suggesting the failures were not important. I was then + forced to patch out the test to make the build proceed, so several tests were + being ignored in practise anyway. + + This brings the Debian package in line with the Fedora package which also + ignores all test failures. (Many other distributions don't run tests at all.) + + If you think that the Debian rustc package is miscompiling your program in a + way that the upstream distributed compiler doesn't, you may check the test + failures here: + + https://buildd.debian.org/status/package.php?p=rustc + + If you can identify a relevant test failure as well as the patches needed to + fix it (either to rustc or LLVM), this will speed up the processing of any + bug reports on the Debian side. + + We will also examine these failures ourselves on a best-effort basis and + attempt to fix the more serious-looking ones. + + -- Ximin Luo Mon, 16 Oct 2017 18:02:23 +0200 diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000000..8ad8f09b7b --- /dev/null +++ b/README.Debian @@ -0,0 +1,345 @@ +Architecture-specific notes +=========================== + +This section talks about the rustc compiler on your host architecture. For +cross-compiling to a foreign target architecture, see the next section. + +armhf armel mips mipsel powerpc powerpcspe +------------------------------------------ + +We only ship debuginfo for libstd and not the compiler itself, otherwise builds +run out of memory on the Debian buildds, with non-obvious and random errors. + +See https://github.com/rust-lang/rust/issues/45854 for details. + +If all your armhf build machines have ~8GB memory or more, you can experiment +with disabling this work-around (i.e. revert to normal) in d/rules. + + +Cross-compiling +=============== + +Rust supports cross-compiling to many different architectures, and we expose +this feature as fully as feasible in Debian, including to wasm and windows. + +Introduction and terminology +---------------------------- + +Rust uses LLVM, so cross-compiling works a bit differently from the GNU +toolchain. The most important difference is that there are no "cross" +compilers, every compiler is already a cross compiler. For cross-compiling, all +you need to do (on the rustc / LLVM side) is to install the standard libraries +for each target architecture you want to compile to, i.e. libstd-rust-dev. + +Before we go further, we must clarify some terminology. The rust ecosystem +generally uses the term "host" for the native architecture running the +compiler, equivalent to DEB_BUILD_RUST_TYPE or "build" in GNU terminology, and +"target" for the foreign architecture that the build products run on, +equivalent to DEB_HOST_RUST_TYPE or "host" in GNU terminology. For example, +rustc --version --verbose will output something like: + + rustc 1.16.0 + [..] + host: x86_64-unknown-linux-gnu + +And both rustc and cargo have --target flags: + + $ rustc --help | grep '\-\-target' + --target TARGET Target triple for which the code is compiled + $ cargo build --help | grep '\-\-target' + --target TRIPLE Build for the target triple + +One major exception to this naming scheme is in CERTAIN PARTS OF the build +scripts of cargo and rustc themselves, such as the `./configure` scripts and +SOME PARTS of the `config.toml` files. Here, "build", "host" and "target" mean +the same things they do in GNU toolchain terminology. However, IN OTHER PARTS +OF the build scripts of cargo and rustc, as well as cargo and rustc's own +output and logging messages, the term "host" and "target" mean as they do in +the previous paragraph. Yes, it's a total mind fuck. :( Table for clarity: + +======================================= =============== ======================== + Rust ecosystem, Some parts of the rustc +GNU term / Debian envvar rustc and cargo and cargo build scripts +======================================= =============== ======================== +build DEB_BUILD_{ARCH,RUST_TYPE} host build + the machine running the build +--------------------------------------- --------------- ------------------------ +host DEB_HOST_{ARCH,RUST_TYPE} target host(s) + the machine the build products run on +--------------------------------------- --------------- ------------------------ +only relevant when building a compiler +target DEB_TARGET_{ARCH,RUST_TYPE} N/A target(s) + the one architecture that the built extra architectures + cross-compiler itself builds for to build "std" for +--------------------------------------- --------------- ------------------------ + +General case for other Debian platforms +--------------------------------------- + +To manually use the Debian rustc binary for cross-compiling: + +0. If you haven't done so previously, run: + + dpkg --add-architecture ${DEB_TARGET_ARCH} + apt-get update + + (This is something that you need to do for all Debian crossbuilding or + multi-architecture installing.) + +1. Install crossbuild-essential-${DEB_TARGET_ARCH} e.g. arm64. + + (This is something that you need to do for all Debian crossbuilding.) + + For certain (HOST, TARGET) pairs you can instead install gcc-multilib, e.g. + when compiling from amd64 to i386. + +2. Install libstd-rust-dev:${DEB_TARGET_ARCH}. + +3. Add the following flags to your rustc invocation: + + -C linker=${DEB_TARGET_GNU_TYPE}-gcc # e.g. aarch64-linux-gnu + --target ${DEB_TARGET_RUST_TYPE} # e.g. aarch64-unknown-linux-gnu + + For certain (HOST, TARGET) pairs, namely the same ones as above that are + supported by gcc-multilib, you can omit the linker flag since the default + ``gcc`` linker (with multilib support) will work. + +You can find the right TARGET vars to use in dpkg-architecture(1) and/or +/usr/share/rustc/architecture.mk and/or possibly on the Debian wiki. + +These steps are different when cross-building a Debian package, or preparing +one for cross-compiling. (1) is performed automatically by cross-building tools +such as sbuild, and (3) is performed automatically by our cargo wrapper script. +The details of how to do (2) correctly are explained in the section below +called "Using rustc in a Debian package". + +Foreign non-Debian platforms +---------------------------- + +Targeting a non-Debian platform is not a common Debian crossbuilding pattern, +so we do something ad-hoc for our Debian rust packages. + +Instead of libstd-rust-dev:$arch (for an $arch that is not in Debian), we +provide a libstd-rust-dev-$platform:$arch package. For example, +libstd-rust-dev-windows:i386. For VM platforms such as WASM, $arch is omitted. + +Instead of implicitly relying on crossbuild-essential-$arch (for an $arch that +is not in Debian), we have the libstd-rust-dev-$platform:$arch package +Recommend the appropriate linker. For example, Clang or MinGW. + +To use these for manual crossbuilding: + +1. Install the appropriate library package, as well as the corresponding linker + package from its Recommends if it isn't pulled in automatically. + +2. Pass in the appropriate ``-C linker`` and ``--target`` flags to ``rustc``. + +WASM +~~~~ + +We ship two different wasm32 targets - wasm32-unknown-unknown and wasm32-wasi - +in the libstd-rust-dev-wasm32 package. + +wasm32-unknown-unknown is suitable for web stuff, where you typically will need +to depending on the rust-wasm-bindgen, js-sys, and web-sys crates. Here, calls +to libstd stuff (such as println!()) will silently do nothing, as defined in +``library/std/src/sys/wasm/mod.rs`` and explained in upstream #48564. + +wasm32-wasi is suitable for non-web stuff, and is closer to a "normal" target +where you expect libstd to be available, and for println!() to actually print +to stdout. If you just want to cross-compile a regular non-wasm library or +program to wasm for whatever reason, and only want to run it natively and not +inside a web browser, use this target. + +To run the generated wasm, you can either: + +1. Use /usr/share/rustc/bin/wasi-node, which depends on nodejs. + + Pending #986616, this will be added to the nodejs package directly. + +2. Compile and use one of the following runtimes: + + - https://github.com/bytecodealliance/wasmtime + - https://github.com/bytecodealliance/lucet + - https://github.com/wasmerio/wasmer + +Windows +~~~~~~~ + +We ship the following targets: + +- x86_64-pc-windows-gnu in the libstd-rust-dev-windows:amd64 package +- i686-pc-windows-gnu in the libstd-rust-dev-windows:i386 package + +To run the compiled binaries, you can use wine. You will need to set one of: + +- WINEPATH="/usr/lib/gcc/x86_64-w64-mingw32/10-posix;/usr/lib/rustlib/x86_64-pc-windows-gnu/lib" +- WINEPATH="/usr/lib/gcc/i686-w64-mingw32/10-posix;/usr/lib/rustlib/i686-pc-windows-gnu/lib" + +If you get "import_dll ... not found" errors, check that these paths are mapped +to some windows drive path - run "winecfg $path" for each path in the component +of WINEPATH; if any begin with "\\?\unix\" then you'll need to map them to a +drive in "winecfg" -> Drives. If all begin with some windows drive letter, then +your error is something unrelated and we sadly can't help you here. + + +Using rustc in a Debian package +=============================== + +You are encouraged to support cross-compiling. See the above section for more +details; in summary you need to install rustc for the host architecture and +libstd-rust-dev for the target architecture, so your debian/control would look +something like this: + + Build-Depends: + [..] + rustc:native (>= $version), + libstd-rust-dev (>= $version), + [..] + +You need both, this is important. When Debian build toolchains satisfy the +build-depends of a cross-build, (1) a "rustc:native" Build-Depends selects +rustc for the native architecture, which is possible because it's "Multi-Arch: +allowed", and this will implicitly pull in libstd-rust-dev also for the native +architecture; and (2) a "libstd-rust-dev" Build-Depends implies libstd-rust-dev +for the foreign architecture, since it's "Multi-Arch: same". + +You'll probably also want to add + + include /usr/share/rustc/architecture.mk + +to your debian/rules. This sets some useful variables like DEB_HOST_RUST_TYPE. +See the cargo package for an example. + +If your build uses cargo, you'll want to add: + + Build-Depends: + [..] + cargo:native, + [..] + +and use our cargo wrapper script instead of /usr/bin/cargo directly. See +/usr/share/cargo/bin/cargo for details on how to use it. + + +Porting to new architectures (on the same distro) +================================================= + +As mentioned above, to cross-compile rust packages you need to install the rust +standard library for each relevant foreign architecture. However, this is not +needed when cross-compiling rustc itself; its build system will build any +relevant foreign-architecture standard libraries automatically. + +Cross-build, in a schroot using sbuild +-------------------------------------- + +0. Set up an schroot for your native architecture, for sbuild: + + sudo apt-get install sbuild + sudo sbuild-adduser $LOGNAME + newgrp sbuild # or log out and log back in + sudo sbuild-createchroot --include=eatmydata,ccache,gnupg unstable \ + /srv/chroot/unstable-$(dpkg-architecture -qDEB_BUILD_ARCH)-sbuild \ + http://deb.debian.org/debian + + See https://wiki.debian.org/sbuild for more details. + +1. Build it: + + sudo apt-get source --download-only rustc + sbuild --host=$new_arch rustc_*.dsc + +Cross-build, directly on your own system +---------------------------------------- + +0. Install the build-dependencies of rustc (including cargo and itself): + + sudo dpkg --add-architecture $new_arch + sudo apt-get --no-install-recommends build-dep --host-architecture=$new_arch rustc + +1. Build it: + + apt-get source --compile --host-architecture=$new_arch rustc + +Native-build using bundled upstream binary blobs +------------------------------------------------ + +Use the same instructions as given in "Bootstrapping" in debian/README.source +in the source package, making sure to set the relevant architectures. + +Responsible distribution of cross-built binaries +------------------------------------------------ + +By nature, cross-builds do not run tests. These are important for rustc and +many tests often fail on newly-supported architectures even if builds and +cross-builds work fine. You should find some appropriate way to test your +cross-built packages rather than blindly shipping them to users. + +For example, Debian experimental is an appropriate place to upload them, so +that they can be installed and tested on Debian porter boxes, before being +uploaded to unstable and distributed to users. + + +Test failures +============= + +Starting from version 1.20.0+dfsg1-1 the Debian packages of rustc no longer +fail the overall build if > 0 tests fail. Instead, we allow up to around 5 +tests to fail. In other words, if you're reading this in a binary package, +between 0 and 5 tests might have failed when building this. + +This is due to lack of maintainer time to investigate all failures. Many +previous test failures were reported to upstream and did not receive a timely +response, suggesting the failures were not important. I was then forced to +patch out the test to make the build proceed, so several tests were being +ignored in practise anyway. + +This brings the Debian package in line with the Fedora package which also +ignores all test failures. (Many other distributions don't run tests at all.) + +If you think that the Debian rustc package is miscompiling your program in a +way that the upstream distributed compiler doesn't, you may check the test +failures here: + +https://buildd.debian.org/status/package.php?p=rustc + +If you can identify a relevant test failure, as well as the patches needed to +fix it (either to rustc or LLVM), this will speed up the processing of any bug +reports on the Debian side. + +We will also examine these failures ourselves on a best-effort basis and +attempt to fix the more serious-looking ones. + +Uncommon architectures +---------------------- + +Debian release architectures armel and s390x currently have more test failures, +being tracked by upstream here: + +- https://github.com/rust-lang/rust/issues/52493 armel +- https://github.com/rust-lang/rust/issues/52491 s390x + +Ports architectures +------------------- + +The number of allowed test failures on certain Debian ports architectures +(currently powerpc, powerpcspe, sparc64, x32) is raised greatly to help unblock +progress for porters. Of course, as a user this means you may run into more +bugs than usual; as mentioned above bugs reports and patches are welcome. + + +Shared libraries +================ + +For now, the shared libraries of Rust are private. +The rational is the following: + * Upstream prefers static linking for now + - https://github.com/rust-lang/rust/issues/10209 + * rust is still under heavy development. As far as we know, there is + no commitement from upstream to provide a stable ABI for now. + Until we know more, we cannot take the chance to have Rust-built packages + failing at each release of the compiler. + * Static builds are working out of the box just fine + * However, LD_LIBRARY_PATH has to be updated when -C prefer-dynamic is used + + -- Sylvestre Ledru , Fri, 13 Feb 2015 15:08:43 +0100 diff --git a/README.source b/README.source new file mode 100644 index 0000000000..9783addc1c --- /dev/null +++ b/README.source @@ -0,0 +1,248 @@ +Document by Ximin Luo, Luca Bruno, Sylvestre Ledru & Fabian Grünbichler + +This source package is unfortunately quite tricky and with several cutting +edges, due to the complexity of rust-lang bootstrapping system and the high +rate of language changes still ongoing. + +We try to describe here inner packaging details and the reasons behind them. + +If you are looking to help maintain this package, be sure to read the "Notes +for package maintainers" section further below. + + +Embedded libraries +================== + +The upstream source package embeds many external libraries. We make a great +effort to remove them and use system versions where possible, but there are a +few more remaining: + + * vendor/dlmalloc + + These are small C libraries designed to be statically linked; their upstream + does not support building them as a shared library and they are too small to + justify their own Debian package. + + +Building from source +==================== + +The Debian rustc package will use the system rustc to bootstrap itself from. +The system rustc has to be either the previous or the same version as the rustc +being built; the build will fail if this is not the case. + + sudo apt-get build-dep ./ + dpkg-buildpackage + # Or, to directly use what's in the Debian FTP archive + sudo apt-get build-dep rustc + apt-get source --compile rustc + +Alternatively, you may give the "pkg.rustc.dlstage0" DEB_BUILD_PROFILE to +instead use the process defined by Rust upstream. This downloads the "official" +stage0 compiler for the version being built from rust-lang.org. At the time of +writing "official" means "the previous stable version". + + sudo apt-get build-dep -P pkg.rustc.dlstage0 ./ + dpkg-buildpackage -P pkg.rustc.dlstage0 + # Or, to directly use what's in the Debian FTP archive + sudo apt-get build-dep -P pkg.rustc.dlstage0 rustc + apt-get source --compile -P pkg.rustc.dlstage0 rustc + +After [1] is fixed, both of these should in theory give identical results. + +If neither of these options are acceptable to you, e.g. because your distro +does not have rustc already and your build process cannot access the network, +see "Bootstrapping" below. + +[1] https://github.com/rust-lang/rust/issues/34902 + + +Bootstrapping +============= + +To bootstrap rustc on a distro that does not have it or cargo available on any +architecture (so cross-compiling is not an option) you can run `debian/rules +source_orig-stage0`. This creates a .dsc that does not Build-Depend on rustc or +cargo. Instead, it includes an extra orig-stage0 source tarball that contains +the official stage0 compiler, pre-downloaded from rust-lang.org so that your +build daemons don't need to access the network during the build. + + debian/rules source_orig-stage0 + # Follow the final manual instructions that it outputs. Then: + sbuild ../rustc_*.dsc && dput ../rustc_*.dsc + +To only bootstrap specific architectures, run this instead: + + upstream_bootstrap_arch="arm64 armhf" debian/rules source_orig-stage0 + +This way, other architectures will be omitted from the orig-stage0 tarball. You +might want to do this e.g. if these other architectures are already present in +your distro, but the $upstream_bootstrap_arch ones are not yet present. + +If the toolchain for the architecture you are attempting to bootstrap is not +provided upstream (i.e., it's not at Tier 2 with Host Tools or higher[2]), you +can manually prepare such a stage0 tarball via cross compilation using +upstream's build process. + +[2] https://doc.rust-lang.org/nightly/rustc/platform-support.html + +Notes +----- + +The approach bundles the upstream bootstrapping binaries inside the Debian +source package. This is a nasty hack that stretches the definition of "source +package", but has a few advantages explained below. + +The traditional Debian way of bootstrapping compilers - and other distros have +similar approaches - is some variant of the following: + +1. A developer locally installs some upstream bootstrapping binaries. +2. They locally build a Debian package, using these binaries as undeclared + build dependencies. +3. They upload these binary packages to Debian, which can be used as declared + Build-Depends in the future, including by the same package. + +The problem with this is, Debian does not have any policy nor infrastructure +that can try to reproduce what this developer supposedly did. + +Using bootstrapping binary blobs *at some point of the process* is unavoidable. +Rather than pretending we didn't do this, it is better to record *which blobs* +we used, so it can be audited later. If we bundle non-Debian build-dependencies +inside the source package, then we can do a *source-only upload*, and the +building of the binary packages can be done by the normal build infrastructure. + +If the build process is reproducible [1] then we can be sure that *you* (as the +developer that prepared the source-only upload) didn't backdoor the binaries, +nor did the build daemons even if they were compromised during the build. + +The bootstrapping binaries may still have been backdoored, but this is true in +both scenarios. So our arrangement is still a strict improvement in security, +because it reduces the set of "things that may have been backdoored". Also, +more people use the upstream binaries than the "magical original Debian +package", so backdoors have a greater chance of being detected in the former. + +In the long run, this process is laying the foundations for doing Diverse +Double-Compilation [2], where we use *many independent* bootstrapping binaries +to reproduce bit-for-bit identical output compilers, giving confidence that +nothing was backdoored along the way. + +[1] The build process for rustc is currently *not* reproducible but we're + working towards it. https://github.com/rust-lang/rust/issues/34902 +[2] http://www.dwheeler.com/trusting-trust/ + + +Maintaining this package +======================== + +Import of a new upstream version +-------------------------------- + +$ apt install equivs python3-magic +$ sudo mk-build-deps -irt 'aptitude -R' +$ uscan --verbose # or debian/rules source_orig-beta, for beta +$ ver=UPDATE-ME # whatever it is, probably X.YY.Z or X.YY.Z~beta.N + +$ debian/rebase-patches.sh $ver +# This will require an understanding of how git-rebase and git-mergetool works +# We recommend either kdiff3 or p4merge (proprietary) as the git-mergetool. +# See individual patches for instructions on rebasing. + +$ tar -C /tmp -xf ../rustc-${ver/\~/-}-src.tar.xz && ( dir=$PWD; cd /tmp/rustc-${ver/*~*/beta}-src/ && pwd && $dir/debian/prune-unused-deps ) && rm -rf /tmp/rustc-${ver/*~*/beta}-src/ +$ git diff +# Review the diff. If it removes too much stuff, it could mean that rustc +# 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 to pull in windows-sys/windows or +# openssl-src. + +$ 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 + # or debian/rules source_orig-beta, for beta + +# Keep running this and follow its instructions, until it gives no output: +$ debian/check-orig-suspicious.sh $ver +# When you are satisfied with the above, proceed: + +$ git checkout debian/experimental +$ gbp import-orig ../rustc_$ver+dfsg1.orig.tar.xz +$ dch -v $ver+dfsg1-1~exp1 "New upstream release." +$ debian/rules update-version +# then refresh patches, etc etc +# Use /usr/share/cargo/scripts/guess-crate-copyright to help update d/copyright quickly + +# If you need to repack again, bump the 'repacksuffix' in d/watch then run +$ uscan --verbose --force-download +# This will do a local repack using the new Files-Excluded rules, without +# redownloading the orig tarball (despite the slightly misleading flag). + + +Proceeding after build failure +------------------------------ + +If your build fails, don't run `./x.py` directly as that will detect it's being +run with different settings, and run the build from scratch all over again. +overwriting all intermediate files. Instead, do: + +$ debian/rules run_rustbuild X_CMD="build|test|install" X_FLAGS="whatever" + +Hopefully, this will directly proceed to the step that failed, without +rebuilding everything in between. + + +Comparing Debian rustc vs upstream rustc +---------------------------------------- + +This package does things the Debian way, which differs significantly from +upstream practices. If you find a bug, you might want to check if it is present +in the upstream package. Run "debian/rules debian/config.toml" to generate our +config.toml that you can then use in an upstream directory **unpacked from the +release tarball*. (It is more complex to get this working with their git repo.) + +This will configure it in a "halfway" style between upstream and Debian. +Specifically, it will not build LLVM nor download stuff from crates.io, yet +Debian patches are *not* applied. These specific settings were chosen as a +tradeoff between convenience vs being close to what upstream does - so that the +chances of a bug here being a genuine upstream issue rather than a Debian bug, +is much higher. Also, with the exception of LLVM, these are non-default modes +*supported by* upstream so they would be happy to receive bug reports about it +even if your issue only occurs here. + +OTOH if you need to test a completely clean upstream build, including all the +annoying stuff like building LLVM and downloading dependencies from crates.io, +simply unpack the tarball and run `./configure && ./x.py build` etc as normal. +This can be useful for confirming that an issue is caused by Debian's LLVM. + +If you need to test a LLVM patch, do something like this: + +# build your patched LLVM debs, then: +$ mkdir -p llvm-destdir && cd llvm-destdir +$ ver=4.0; VERSION=FIXME +$ for i in llvm-$ver llvm-$ver-dev llvm-$ver-runtime llvm-$ver-tools libllvm$ver; do \ + dpkg -x ../"$i"_*${VERSION}_*.deb .; done +$ cd ../rustc +$ debian/rules LLVM_DESTDIR=$PWD/../llvm-destdir build + +If you need to test a patch to the stage0 rustc, do something like this: + +# build your patched rustc debs or upstream rustc, then: +$ mkdir -p rust-destdir && cd rust-destdir +$ ver=1.20; VERSION=FIXME; +$ for i in rustc libstd-rust-$ver libstd-rust-dev; do \ + dpkg -x ../"$i"_*${VERSION}_*.deb .; done +$ cd ../rustc +$ debian/rules RUST_DESTDIR=$PWD/../rust-destdir build + + +Useful links +------------ + +The Fedora rust team is more active than the Debian one. Here are their links: + +Source code +https://src.fedoraproject.org/rpms/rust/tree/ + +Binary packages and test logs +https://kojipkgs.fedoraproject.org//packages/rust/ +If the same test fails both on Fedora and Debian it's a good indication that +we're not Doing It Wrong and can file a valid bug upstream. diff --git a/TODO b/TODO new file mode 100644 index 0000000000..ed9f05bc11 --- /dev/null +++ b/TODO @@ -0,0 +1,12 @@ +Older backlog +============= + + * Use Compiler-rt package + * Improve the bootstrap (do the local build first on our systems, upload + to Debian and use the packages) + * Port on other archs + * Create a runtime package (rust-runtime) + * Move the runtime library into a public directory + * Package the various editors plugins (emacs, kate & vim) + + -- Sylvestre Ledru Tue, 20 Jan 2015 08:50:28 +0100 diff --git a/architecture-test.mk b/architecture-test.mk new file mode 100644 index 0000000000..071f63aa20 --- /dev/null +++ b/architecture-test.mk @@ -0,0 +1,16 @@ +# Used for testing architecture.mk, and for make_orig-stage0_tarball.sh. +# Not for end users. +# +# Usage: +# $ make -s --no-print-directory -f debian/architecture-test.mk rust-for-deb_arm64 +# arm64 aarch64-unknown-linux-gnu + +include debian/architecture.mk + +deb_arch_setvars = $(foreach var,ARCH ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\ + $(eval DEB_$(1)_$(var) = $(shell dpkg-architecture -f -a$(1) -qDEB_HOST_$(var) 2>/dev/null))) + +rust-for-deb_%: + $(eval $(call deb_arch_setvars,$*)) + $(eval $(call rust_type_setvar,DEB_$*)) + @echo $(DEB_$(*)_ARCH) $(DEB_$(*)_RUST_TYPE) diff --git a/architecture.mk b/architecture.mk new file mode 100644 index 0000000000..bbf81eef05 --- /dev/null +++ b/architecture.mk @@ -0,0 +1,21 @@ +# This Makefile snippet defines DEB_*_RUST_TYPE triples based on DEB_*_GNU_TYPE + +include /usr/share/dpkg/architecture.mk + +rust_cpu = $(subst i586,i686,\ +$(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\ +$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\ +$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\ +$(1))))) + +rust_os = $(if $(findstring -hurd-,-$(2)-),$(subst gnu,hurd-gnu,$(1)),$1) + +rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$(call rust_os,$($(1)_GNU_SYSTEM),$($(1)_ARCH_OS)) + +$(foreach machine,BUILD HOST TARGET,\ + $(eval $(call rust_type_setvar,DEB_$(machine)))) + +# fallback for older dpkg versions +ifeq ($(DEB_TARGET_RUST_TYPE),-unknown-) + DEB_TARGET_RUST_TYPE = $(DEB_HOST_RUST_TYPE) +endif diff --git a/bin/cargo b/bin/cargo new file mode 100755 index 0000000000..50772347d0 --- /dev/null +++ b/bin/cargo @@ -0,0 +1,257 @@ +#!/usr/bin/python3 +""" +Wrapper around cargo to have it build using Debian settings. + +Usage: + export PATH=/path/to/dir/of/this/script:$PATH + export CARGO_HOME=debian/cargo_home + cargo prepare-debian /path/to/local/registry [--link-from-system] + cargo build + cargo test + cargo install + cargo clean + [rm -rf /path/to/local/registry] + +The "prepare-debian" subcommand writes a config file to $CARGO_HOME that makes +the subsequent invocations use our Debian flags. The "--link-from-system" flag +is optional; if you use it we will create /path/to/local/registry and symlink +the contents of /usr/share/cargo/registry into it. You are then responsible for +cleaning it up afterwards (a simple `rm -rf` should do). + +See cargo:d/rules and dh-cargo:cargo.pm for more examples. + +Make sure you add "Build-Depends: python3:native" if you use this directly. +If using this only indirectly via dh-cargo, then you only need "Build-Depends: +dh-cargo"; this is a general principle when declaring dependencies. + +If CARGO_HOME doesn't end with debian/cargo_home, then this script does nothing +and passes through directly to cargo. + +Otherwise, you *must* set the following environment variables: + +- DEB_CARGO_CRATE + ${crate}_${version} of whatever you're building. + +- CFLAGS CXXFLAGS CPPFLAGS LDFLAGS [*] +- DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE [*] + +- (required only for `cargo install`) DESTDIR + DESTDIR to install build artifacts under. If running via dh-cargo, this will + be set automatically by debhelper, see `dh_auto_install` for details. + +- (optional) DEB_BUILD_OPTIONS DEB_BUILD_PROFILES + +- (optional) DEB_CARGO_INSTALL_PREFIX + Prefix to install build artifacts under. Default: /usr. Sometimes you might + want to change this to /usr/lib/cargo if the binary clashes with something + else, and then symlink it into /usr/bin under an alternative name. + +- (optional) DEB_CARGO_CRATE_IN_REGISTRY + Whether the crate is in the local-registry (1) or cwd (0, empty, default). + +For the envvars marked [*], it is easiest to set these in your d/rules via: + + include /usr/share/dpkg/architecture.mk + include /usr/share/dpkg/buildflags.mk + include /usr/share/rustc/architecture.mk + export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE +""" + +import os +import os.path +import shutil +import subprocess +import sys + +FLAGS = "CFLAGS CXXFLAGS CPPFLAGS LDFLAGS" +ARCHES = "DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE" +SYSTEM_REGISTRY = "/usr/share/cargo/registry" + +def log(*args): + print("debian cargo wrapper:", *args, file=sys.stderr, flush=True) + +def logrun(*args, **kwargs): + log("running subprocess", args, kwargs) + return subprocess.run(*args, **kwargs) + +def sourcepath(p=None): + return os.path.join(os.getcwd(), p) if p else os.getcwd() + +def prepare_debian(cargo_home, registry, cratespec, host_gnu_type, ldflags, link_from_system, extra_rustflags): + registry_path = sourcepath(registry) + if link_from_system: + log("linking %s/* into %s/" % (SYSTEM_REGISTRY, registry_path)) + os.makedirs(registry_path, exist_ok=True) + crates = os.listdir(SYSTEM_REGISTRY) if os.path.isdir(SYSTEM_REGISTRY) else [] + for c in crates: + target = os.path.join(registry_path, c) + if not os.path.islink(target): + os.symlink(os.path.join(SYSTEM_REGISTRY, c), target) + elif not os.path.exists(registry_path): + raise ValueError("non-existent registry: %s" % registry) + + rustflags = "-C debuginfo=2 --cap-lints warn".split() + rustflags.extend(["-C", "linker=%s-gcc" % host_gnu_type]) + for f in ldflags: + rustflags.extend(["-C", "link-arg=%s" % f]) + if link_from_system: + rustflags.extend([ + # Note that this order is important! Rust evaluates these options in + # priority of reverse order, so if the second option were in front, + # it would never be used, because any paths in registry_path are + # also in sourcepath(). + "--remap-path-prefix", "%s=%s/%s" % + (sourcepath(), SYSTEM_REGISTRY, cratespec.replace("_", "-")), + "--remap-path-prefix", "%s=%s" % (registry_path, SYSTEM_REGISTRY), + ]) + rustflags.extend(extra_rustflags.split()) + + # TODO: we cannot enable this until dh_shlibdeps works correctly; atm we get: + # dpkg-shlibdeps: warning: can't extract name and version from library name 'libstd-XXXXXXXX.so' + # and the resulting cargo.deb does not depend on the correct version of libstd-rust-1.XX + # We probably need to add override_dh_makeshlibs to d/rules of rustc + #rustflags.extend(["-C", "prefer-dynamic"]) + + os.makedirs(cargo_home, exist_ok=True) + with open("%s/config" % cargo_home, "w") as fp: + fp.write("""[source.crates-io] +replace-with = "dh-cargo-registry" + +[source.dh-cargo-registry] +directory = "{0}" + +[build] +rustflags = {1} +""".format(registry_path, repr(rustflags))) + + return 0 + +def install(destdir, cratespec, host_rust_type, crate_in_registry, install_prefix, *args): + crate, version = cratespec.rsplit("_", 1) + log("installing into destdir '%s' prefix '%s'" % (destdir, install_prefix)) + install_target = destdir + install_prefix + logrun(["env", "RUST_BACKTRACE=1", + # set CARGO_TARGET_DIR so build products are saved in target/ + # normally `cargo install` deletes them when it exits + "CARGO_TARGET_DIR=" + sourcepath("target"), + "/usr/bin/cargo"] + list(args) + + ([crate, "--vers", version] if crate_in_registry else ["--path", sourcepath()]) + + ["--root", install_target], check=True) + logrun(["rm", "-f", "%s/.crates.toml" % install_target]) + logrun(["rm", "-f", "%s/.crates2.json" % install_target]) + + # if there was a custom build output, symlink it to debian/cargo_out_dir + # hopefully cargo will provide a better solution in future https://github.com/rust-lang/cargo/issues/5457 + r = logrun('''ls -td "target/%s/release/build/%s"-*/out 2>/dev/null | head -n1''' + % (host_rust_type, crate), shell=True, stdout=subprocess.PIPE).stdout + r = r.decode("utf-8").rstrip() + if r: + logrun(["ln", "-sfT", "../%s" % r, "debian/cargo_out_dir"], check=True) + return 0 + +def main(*args): + cargo_home = os.getenv("CARGO_HOME", "") + if not cargo_home.endswith("/debian/cargo_home"): + os.execv("/usr/bin/cargo", ["cargo"] + list(args)) + + if any(f not in os.environ for f in FLAGS.split()): + raise ValueError("not all of %s set; did you call dpkg-buildflags?" % FLAGS) + + if any(f not in os.environ for f in ARCHES.split()): + raise ValueError("not all of %s set; did you include architecture.mk?" % ARCHES) + + build_options = os.getenv("DEB_BUILD_OPTIONS", "").split() + build_profiles = os.getenv("DEB_BUILD_PROFILES", "").split() + + parallel = [] + lto = 0 + for o in build_options: + if o.startswith("parallel="): + parallel = ["-j" + o[9:]] + elif o.startswith("optimize="): + opt_arg = o[9:] + for arg in opt_arg.split(","): + if opt_arg == "-lto": + lto = -1 + elif opt_arg == "+lto": + lto = 1 + else: + log(f"WARNING: unhandled optimization flag: {opt_arg}") + + nodoc = "nodoc" in build_options or "nodoc" in build_profiles + nocheck = "nocheck" in build_options or "nocheck" in build_profiles + + # note this is actually the "build target" type, see rustc's README.Debian + # for full details of the messed-up terminology here + host_rust_type = os.getenv("DEB_HOST_RUST_TYPE", "") + host_gnu_type = os.getenv("DEB_HOST_GNU_TYPE", "") + + log("options, profiles, parallel, lto:", build_options, build_profiles, parallel, lto) + log("rust_type, gnu_type:", ", ".join([host_rust_type, host_gnu_type])) + + if "RUSTFLAGS" in os.environ: + # see https://github.com/rust-lang/cargo/issues/6338 for explanation on why we must do this + log("unsetting RUSTFLAGS and assuming it will be (or already was) added to $CARGO_HOME/config") + extra_rustflags = os.environ["RUSTFLAGS"] + del os.environ["RUSTFLAGS"] + else: + extra_rustflags = "" + + if args[0] == "prepare-debian": + registry = args[1] + link_from_system = False + if len(args) > 2 and args[2] == "--link-from-system": + link_from_system = True + return prepare_debian(cargo_home, registry, + os.environ["DEB_CARGO_CRATE"], host_gnu_type, + os.getenv("LDFLAGS", "").split(), link_from_system, extra_rustflags) + + newargs = [] + subcmd = None + for a in args: + if (subcmd is None) and (a in ("build", "rustc", "doc", "test", "bench", "install")): + subcmd = a + newargs.extend(["-Zavoid-dev-deps", a, "--verbose", "--verbose"] + + parallel + ["--target", host_rust_type]) + elif (subcmd is None) and (a == "clean"): + subcmd = a + newargs.extend([a, "--verbose", "--verbose"]) + else: + newargs.append(a) + + if subcmd is not None and "--verbose" in newargs and "--quiet" in newargs: + newargs.remove("--quiet") + + if nodoc and subcmd == "doc": + return 0 + if nocheck and subcmd in ("test", "bench"): + return 0 + + if lto == 1: + newargs.append("--config profile.release.lto = \"thin\"") + elif lto == -1: + newargs.append("--config profile.release.lto = false") + + if subcmd == "clean": + logrun(["env", "RUST_BACKTRACE=1", "/usr/bin/cargo"] + list(newargs), check=True) + if os.path.exists(cargo_home): + shutil.rmtree(cargo_home) + return 0 + + cargo_config = "%s/config" % cargo_home + if not os.path.exists(cargo_config): + raise ValueError("does not exist: %s, did you run `cargo prepare-debian `?" % cargo_config) + + if subcmd == "install": + return install(os.getenv("DESTDIR", ""), + os.environ["DEB_CARGO_CRATE"], + host_rust_type, + os.getenv("DEB_CARGO_CRATE_IN_REGISTRY", "") == "1", + os.getenv("DEB_CARGO_INSTALL_PREFIX", "/usr"), + *newargs) + else: + return logrun(["env", "RUST_BACKTRACE=1", "/usr/bin/cargo"] + list(newargs)).returncode + +if __name__ == "__main__": + sys.exit(main(*sys.argv[1:])) diff --git a/bin/rust-lld b/bin/rust-lld new file mode 100755 index 0000000000..9d5fdd03dc --- /dev/null +++ b/bin/rust-lld @@ -0,0 +1,9 @@ +#!/bin/bash +# Wrapper around lld that strips away -Wl, which it doesn't recognise. +# We need this for the wasm32 tests, where we have generic RUSTFLAGS that +# includes LDFLAGS from dpkg-buildflags which assumes a GCC linker. +# +# However the tests fail for other reasons, namely we can't build rustdoc +# (which runs the tests) in wasm32 yet. So this is just WIP at the moment, +# it is not expect to work nor to be installed on user machines. +exec /usr/bin/lld-17 "${@/#-Wl,/}" diff --git a/cargo-doc.docs b/cargo-doc.docs new file mode 100644 index 0000000000..1d0004d699 --- /dev/null +++ b/cargo-doc.docs @@ -0,0 +1,2 @@ +usr/share/doc/cargo/reference +usr/share/doc/cargo/book diff --git a/cargo.bash-completion b/cargo.bash-completion new file mode 100644 index 0000000000..e3d4b28571 --- /dev/null +++ b/cargo.bash-completion @@ -0,0 +1 @@ +etc/bash_completion.d/cargo cargo diff --git a/cargo.install b/cargo.install new file mode 100644 index 0000000000..4895cfba0e --- /dev/null +++ b/cargo.install @@ -0,0 +1,4 @@ +usr/bin/cargo +debian/scripts/* usr/share/cargo/scripts +debian/bin/cargo usr/share/cargo/bin +usr/share/zsh/site-functions/_cargo usr/share/zsh/vendor-completions diff --git a/cargo.manpages b/cargo.manpages new file mode 100644 index 0000000000..585a8af0fe --- /dev/null +++ b/cargo.manpages @@ -0,0 +1,2 @@ +usr/share/man/man1/cargo-*.1 +usr/share/man/man1/cargo.1 diff --git a/changelog b/changelog new file mode 100644 index 0000000000..d59dbe310e --- /dev/null +++ b/changelog @@ -0,0 +1,2207 @@ +rustc (1.76.0+dfsg1-1) unstable; urgency=medium + + [ Samuel Thibault ] + * Fix hurd build: + - debian/patches/vendor/u-hurd-gix-index-2.patch + - debian/patches/vendor/u-hurd-gix-index.patch + + -- Fabian Grünbichler Wed, 19 Jun 2024 07:51:49 +0200 + +rustc (1.76.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release (Closes: #1073068) + * switch to gbp pq and topics for patches + * adapt rebasing script to patch changes + * d/control: add libsqlite3-dev to B-D + * doc: fix rust-by-example theme + + -- Fabian Grünbichler Fri, 14 Jun 2024 14:50:17 +0200 + +rustc (1.75.0+dfsg1-5) unstable; urgency=medium + + [ Samuel Thibault ] + * hurd-i386 build fixes: + - d/patches/u-hurd-backtrace.patch + - d/patches/u-hurd-getrandom.patch + - d/patches/u-hurd-libc.3.patch + - d/patches/u-hurd-libc.4.patch + - d/patches/u-hurd-libloading-0.7.4.patch + - d/patches/u-hurd-socket2.patch + - d/patches/u-hurd-tests.patch + + [ Fabian Grünbichler ] + * hurd: also skip problematic run-make test + * powerpc: disable test running into timeout (Closes: #1072897) + * d/control: replace non-ASCII apostrophe (Closes: #1072926) + * stage0: drop mips64el from default list + + [ Rob Shearman ] + * fix get-stage0.py + + -- Fabian Grünbichler Wed, 12 Jun 2024 17:33:10 +0200 + +rustc (1.75.0+dfsg1-4) unstable; urgency=medium + + * d/rules: fix comparison (unbreak 32-bit builds) + + -- Fabian Grünbichler Thu, 06 Jun 2024 10:25:40 +0200 + +rustc (1.75.0+dfsg1-3) unstable; urgency=medium + + * d/rules: fix variable typo + * fix changelog + + -- Fabian Grünbichler Thu, 06 Jun 2024 09:16:53 +0200 + +rustc (1.75.0+dfsg1-1) unstable; urgency=medium + + * d/rules: switch low-mem check to cover all 32-bits archs + + -- Fabian Grünbichler Thu, 06 Jun 2024 08:14:17 +0200 + +rustc (1.75.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release (Closes: #1068008) + * fix cross-building (thanks John Paul Adrian Glaubitz!) + + [ Samuel Thibault ] + * rules: Use 32bit limitations workaround on !linux as well + + + -- Fabian Grünbichler Tue, 04 Jun 2024 21:24:09 +0200 + +rustc (1.74.1+dfsg1-1) unstable; urgency=medium + + * dwz: bump limit to avoid s390x build failures + + -- Fabian Grünbichler Thu, 30 May 2024 11:25:53 +0200 + +rustc (1.74.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release + + [ Samuel Thibault ] + * architecture.mk: Adapt to llvm/rust's hurd naming + * rules: Disable profiling on Hurd ports, llvm does not provide it yet + * rules: Set the number of expected failures on Hurd ports + + -- Fabian Grünbichler Wed, 29 May 2024 11:24:48 +0200 + +rustc (1.73.0+dfsg1-1) unstable; urgency=medium + + * libstd-rust-1.73: fix ldconfig trigger + + -- Fabian Grünbichler Tue, 28 May 2024 17:06:58 +0200 + +rustc (1.73.0+dfsg1-1~exp1) experimental; urgency=medium + + * new upstream release + * switch to LLVM 17 + * update wasi-libc to ~git20230821.ec4566b + * cargo: remove cargo-credential-1password helper binary + + -- Fabian Grünbichler Mon, 27 May 2024 22:20:44 +0200 + +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) + + -- Fabian Grünbichler Fri, 17 May 2024 08:38:11 +0200 + +rustc (1.71.1+dfsg1-1) unstable; urgency=medium + + * upload to unstable + + -- Fabian Grünbichler Thu, 16 May 2024 21:46:58 +0200 + +rustc (1.71.1+dfsg1-1~exp2) experimental; urgency=medium + + * d/control: properly B+R old rustc packages (Closes: #1071005) + + -- Fabian Grünbichler Wed, 15 May 2024 07:21:42 +0200 + +rustc (1.71.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release (Closes: #1069019) + * d/control: tighten cargo versions (Closes: #1029007) + * d/control: remove B-D on cmake-3 (Closes: #1067109) + * d/control: re-enable git-using tests + * rust-doc: fix references to cargo-doc (Closes: #969210, #1063390) + * rust-src: ship Cargo.lock (Closes: #1057736) + * d/control: add libssl and prefer curl with openssl (Closes: #962508) + * d/control: move LLVM symlinks to own package (Closes: #1021868) + + [ Rob Shearman ] + * Support finding llvm-profdata & llvm-cov with cargo-binutils + + -- Fabian Grünbichler Wed, 08 May 2024 18:48:48 +0200 + +rustc (1.70.0+dfsg2-1) unstable; urgency=medium + + * upload to unstable + + -- Fabian Grünbichler Sat, 04 May 2024 13:38:10 +0200 + +rustc (1.70.0+dfsg2-1~exp3) experimental; urgency=medium + + * d/rules: fix last package cache removal + + -- Fabian Grünbichler Fri, 03 May 2024 17:02:14 +0200 + +rustc (1.70.0+dfsg2-1~exp2) experimental; urgency=medium + + * d/rules: allow removal of package cache to fail + * autopkgtest: disable full build test + + -- Fabian Grünbichler Fri, 03 May 2024 15:10:49 +0200 + +rustc (1.70.0+dfsg2-1~exp1) experimental; urgency=medium + + [ liushuyu ] + * d/*: initial merge of cargo into rustc source package (Closes: #1054658) + + [ Fabian Grünbichler ] + * update libgit2 + * cargo: sync test disabling changes + * adapt to current rustc/cargo version + * cargo: actually install, not just build + * add extra component tarball + * scripts/guess-crate-copyright: switch to python3-toml + * d/check-orig-suspicious.sh: remove duplicate comment stripping + * d/check-orig-suspicious.sh: support extra tar ball + * fix autopkgtest control file + * update d/copyright + * extend lintian overrides + + -- Fabian Grünbichler Fri, 03 May 2024 09:27:25 +0200 + +rustc (1.70.0+dfsg1-9) unstable; urgency=medium + + * temporarily skip git(-cli) tests + + -- Fabian Grünbichler Mon, 25 Mar 2024 17:47:08 +0100 + +rustc (1.70.0+dfsg1-8.1) unstable; urgency=medium + + * Non-maintainer upload + * Binary upload to rebootstrap on armel + + -- Emanuele Rocca Thu, 21 Mar 2024 10:52:23 +0000 + +rustc (1.70.0+dfsg1-8) unstable; urgency=medium + + * d/control: switch to libllvm16t64 + * d/control: switch to pkgconf + * d/rules: fix make warning in filter invocation + + -- Fabian Grünbichler Fri, 15 Mar 2024 17:18:37 +0100 + +rustc (1.70.0+dfsg1-7) unstable; urgency=medium + + * profiler: disable on mips64el for now, it's buggy + + -- Fabian Grünbichler Thu, 15 Feb 2024 06:52:19 +0100 + +rustc (1.70.0+dfsg1-6) unstable; urgency=medium + + [ Fabian Grünbichler ] + * fix bootstrap helpers (Closes: #1060808) + * rustix: patch both versions to fix racy build + + [ Andres Salomon ] + * Fix source_orig-stage0 bootstrapping process to actually include all + architectures (closes: #1021711). + * Run 'd/rules clean' after running make_orig-stage0_tarball.sh so that the + suggestion to rebuild the .dsc actually works. + * Don't allow upstream's bootstrap.py to delete .cargo/ directory. + + [ Fabian Grünbichler ] + * stage0: use current release architectures as default + * disable LLVM profiler support on sparc64 (Closes: #1061125) + + -- Fabian Grünbichler Sun, 11 Feb 2024 20:59:19 +0100 + +rustc (1.70.0+dfsg1-5) unstable; urgency=medium + + * adapt LLVM_PROFILER_RT_LIB path + + -- Fabian Grünbichler Mon, 15 Jan 2024 08:16:35 +0100 + +rustc (1.70.0+dfsg1-4) unstable; urgency=medium + + * fix libclang-rt-16-dev Build-dep + + -- Fabian Grünbichler Mon, 15 Jan 2024 07:00:08 +0100 + +rustc (1.70.0+dfsg1-3) unstable; urgency=medium + + [ Andres Salomon ] + * Enable profiler builtin and backport u-profiler.patch (closes: #1043311). + * Build-dep on libclang-rt-16-dev. + + -- Fabian Grünbichler Sun, 14 Jan 2024 20:06:29 +0100 + +rustc (1.70.0+dfsg1-2) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Sat, 30 Dec 2023 14:52:00 +0100 + +rustc (1.70.0+dfsg1-2~exp1) experimental; urgency=medium + + * riscv: disable split debuginfo support + + -- Fabian Grünbichler Sat, 02 Dec 2023 11:19:31 +0100 + +rustc (1.70.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Wed, 20 Sep 2023 20:18:40 +0200 + +rustc (1.70.0+dfsg1-1~exp3) experimental; urgency=medium + + * more test fixes + + -- Fabian Grünbichler Fri, 15 Sep 2023 15:07:01 +0200 + +rustc (1.70.0+dfsg1-1~exp2) experimental; urgency=medium + + * don't remove replace-version-placeholder from workspace + * disable download tests + * fix x86 tests checking for SSE2 + + -- Fabian Grünbichler Fri, 15 Sep 2023 10:10:52 +0200 + +rustc (1.70.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * switch to LLVM 16 + * properly drop more components + * rust-src: fix path of installed example config + * fix lintian overrides + * update d/copyright + + -- Fabian Grünbichler Thu, 14 Sep 2023 09:07:26 +0200 + +rustc (1.69.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Wed, 13 Sep 2023 13:57:58 +0200 + +rustc (1.69.0+dfsg1-1~exp2) experimental; urgency=medium + + * config: also enable rustdoc explicitly + * bump wasi-libc to revert stack protection (Closes: #1051815) + + -- Fabian Grünbichler Wed, 13 Sep 2023 08:02:53 +0200 + +rustc (1.69.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Eric Long ] + * New upstream release + * Manually include `rust-analyzer-proc-macro-srv` (again) + + [ Fabian Grünbichler ] + * add libc with "extra_traits" to feature sync patch + * update d/copyright + * update lintian overrides + + -- Fabian Grünbichler Tue, 12 Sep 2023 10:17:15 +0200 + +rustc (1.68.2+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Sun, 10 Sep 2023 19:22:53 +0200 + +rustc (1.68.2+dfsg1-1~exp1) experimental; urgency=medium + + [ Eric Long ] + * New upstream version 1.68.2+dfsg1 + * Update patches to adapt to upstream test path change + + [ Fabian Grünbichler ] + * Update wasi-libc to 4362b18 + * Update doc path to fix linkcheck + * Update d/copyright + * Update lintian overrides + * Update privacy breach removal (github badge) + * Bump Standards-Version to 4.6.2 + + [Helmut Grohne] + * Fix FTCBFS: Do not pass host CFLAGS to the build compiler + (Closes: #1050975) + + -- Fabian Grünbichler Wed, 02 Aug 2023 13:17:47 +0200 + +rustc (1.67.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Sun, 03 Sep 2023 19:58:53 +0200 + +rustc (1.67.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * update/rebase/drop patches (based on work by Blair Noctis) + * d/copyright: add missing statements + * add missing lintian overrides for test cases + + [ Blair Noctis ] + * New upstream release + * Cherry-pick sysroot detection fix + * Update d/copyright for some vendored + + -- Fabian Grünbichler Fri, 07 Jul 2023 10:01:33 +0200 + +rustc (1.66.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Tue, 27 Jun 2023 17:12:20 +0200 + +rustc (1.66.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Blair Noctis ] + * New upstream version 1.66.0+dfsg1 + * Drop outdated patches + * Work around incorrect config handling (picking up initial rustc) when + running tests + + -- Fabian Grünbichler Sun, 23 Apr 2023 20:45:41 +0200 + +rustc (1.65.0+dfsg1-2) unstable; urgency=medium + + * Team upload + * Source-only upload + + -- Jeremy Bícha Mon, 26 Jun 2023 17:16:27 -0400 + +rustc (1.65.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + + -- Fabian Grünbichler Tue, 20 Jun 2023 20:16:50 +0200 + +rustc (1.65.0+dfsg1-1~exp3) experimental; urgency=medium + + * d/rules: fix typo in mipsel workaround + + -- Fabian Grünbichler Sun, 12 Mar 2023 08:54:15 +0100 + +rustc (1.65.0+dfsg1-1~exp2) experimental; urgency=medium + + [ Fabian Grünbichler ] + * d/control: add myself to Uploaders + * cherry-pick fix for failing backtrace test + * bump mipsel test failure allowance to work around broken gdb 13.1 + * drop duplicate lintian override + + -- Fabian Grünbichler Sat, 11 Mar 2023 18:50:19 +0100 + +rustc (1.65.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream version 1.65.0+dfsg1 + * switch to LLVM-15 + * cherry-pick fix for compiletest with rpath=false + * add overrides for rust-analyzer test data + + -- Fabian Gruenbichler Wed, 15 Feb 2023 20:12:05 +0100 + +rustc (1.64.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + * Add myself to Uploaders + + -- Fabian Grünbichler Mon, 12 Jun 2023 18:36:56 +0200 + +rustc (1.64.0+dfsg1-1~exp4) experimental; urgency=medium + + [ John Paul Adrian Glaubitz ] + * fix sparc64 rustix build (Closes: #1030053) + + -- Fabian Gruenbichler Tue, 31 Jan 2023 19:55:48 +0100 + +rustc (1.64.0+dfsg1-1~exp3) experimental; urgency=medium + + [ Simon Chopin ] + * cherry-pick riscv64 fix from ubuntu + + -- Fabian Gruenbichler Fri, 20 Jan 2023 20:48:11 +0100 + +rustc (1.64.0+dfsg1-1~exp2) experimental; urgency=medium + + [ Fabian Grünbichler ] + * d/prune-unused-deps: unify cargo update calls + * fix rustix on arches requiring outline building + * fix libstd-rust-dev-windows lintian override + * fix compiler_builtins linkage on arm(el) + * add compiler_builtins sync fallbacks for arm(el) + * fix panicking lldb check on armel + + -- Fabian Gruenbichler Wed, 11 Jan 2023 17:22:16 +0100 + +rustc (1.64.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * d/rules: auto_clean: preserve .cargo/config.toml + * d/rules: also clear bootstrap/rust-analyzer Cargo.lock + * d/rules: extend privacy-breach removal + * ship rust-analyzer-proc-macro-srv binary + + -- Fabian Gruenbichler Thu, 08 Dec 2022 09:17:59 +0100 + +rustc (1.63.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable (Closes: #1018859) + + [ Pietro Albini ] + * clarify the licensing of the mpsc implementation + + -- Fabian Gruenbichler Wed, 07 Dec 2022 17:29:00 +0100 + +rustc (1.63.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Fabian Gruenbichler Tue, 15 Nov 2022 19:47:53 +0100 + +rustc (1.62.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable + * Fix armhf build + + -- Fabian Gruenbichler Mon, 31 Oct 2022 14:19:34 +0100 + +rustc (1.62.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Fabian Gruenbichler Fri, 28 Oct 2022 11:35:48 +0200 + +rustc (1.61.0+dfsg1-2) unstable; urgency=medium + + [ Ximin Luo] + * Improve cross-building documentation + + [ Adrian Bunk ] + * Disable kernel_user_helpers on armel (duplicate symbols) + * Increase allowed failures on armel/mips64el/ppc64 (Closes: #1020860) + + [ Fabian Grünbichler ] + * cherry-pick patches from Ubuntu + * fix rebuild of 1.61 with 1.61 + + -- Fabian Gruenbichler Mon, 10 Oct 2022 20:19:05 +0200 + +rustc (1.61.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable (Closes: #1020394) + + -- Sylvestre Ledru Thu, 22 Sep 2022 09:00:21 +0200 + +rustc (1.61.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + + * Switch to LLVM-14 (Closes: #1017656) + + -- Fabian Gruenbichler Wed, 07 Sep 2022 17:33:04 +0200 + +rustc (1.60.0+dfsg1-1) unstable; urgency=medium + + * Ignore more test failures on mips64el for lack of inline assembly support. + + * Add i386 and x32 to list of "low-memory" architectures requiring build + workarounds. + + -- Fabian Gruenbichler Mon, 5 Sep 2022 10:03:18 +0200 + +rustc (1.60.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Fabian Gruenbichler Thu, 14 Jul 2022 13:08:16 +0200 + +rustc (1.59.0+dfsg1-2) unstable; urgency=medium + + * Backport a patch for riscv64. + * Ignore some test failures on armhf due to regression in GDB 11.2. + + -- Ximin Luo Tue, 21 Jun 2022 11:06:16 +0100 + +rustc (1.59.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Wed, 11 May 2022 14:11:46 +0100 + +rustc (1.59.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release + + -- Ximin Luo Tue, 29 Mar 2022 14:32:01 +0100 + +rustc (1.58.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Tue, 29 Mar 2022 12:23:46 +0100 + +rustc (1.58.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Gruenbichler ] + * New upstream release. + + -- Ximin Luo Tue, 08 Mar 2022 11:32:29 +0000 + +rustc (1.57.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. (Closes: #1005203) + + -- Ximin Luo Tue, 08 Mar 2022 10:51:18 +0000 + +rustc (1.57.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Simon Chopin ] + * d/p/d-bootstrap-rustflags.patch: remove the warnings bit, use the option + "deny-warnings = false" in d/config.toml.in instead + + [ Fabian Grünbichler ] + * Fix CVE-2022-21658 - std::fs::remove_dir_all TOCTOU symlink issue + * New upstream release. (Closes: #1005203) + + -- Fabian Grünbichler Thu, 03 Feb 2022 19:14:04 +0100 + +rustc (1.56.0+dfsg1-2) unstable; urgency=medium + + * Update to debhelper 13. + + -- Ximin Luo Fri, 22 Oct 2021 23:29:14 +0100 + +rustc (1.56.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + * Support terse and verbose DEB_BUILD_OPTIONS. + * Support -Z gcc-ld=lld via symlinks. + * Fix RUSTC_SYSROOT in rust-gdb and rust-lldb, thanks James McCoy. + + -- Ximin Luo Fri, 22 Oct 2021 18:54:49 +0100 + +rustc (1.56.0~beta.4+dfsg1-1~exp2) experimental; urgency=medium + + * Include upstream patch for x32 support. (Closes: #993855) + * Update to LLVM 13. + + -- Ximin Luo Fri, 15 Oct 2021 10:44:35 +0100 + +rustc (1.56.0~beta.4+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Thu, 14 Oct 2021 22:50:58 +0100 + +rustc (1.55.0+dfsg1-2) unstable; urgency=medium + + * Actually work around segfault on ppc64el. + * Fix FTBFS on armhf caused by GCC 11 changes. + + -- Ximin Luo Thu, 14 Oct 2021 00:36:15 +0100 + +rustc (1.55.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Bump test failures-allowed on s390x to 40. + * Work around a segfault on ppc64el + + -- Ximin Luo Wed, 13 Oct 2021 22:06:15 +0100 + +rustc (1.55.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 09 Oct 2021 03:22:08 +0100 + +rustc (1.54.0+dfsg1-3) unstable; urgency=medium + + * Fix links to cargo-doc. + + -- Ximin Luo Sat, 09 Oct 2021 11:46:08 +0100 + +rustc (1.54.0+dfsg1-2) unstable; urgency=medium + + * Fix some more build & test failures. + + -- Ximin Luo Sat, 09 Oct 2021 03:12:35 +0100 + +rustc (1.54.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Re-enable backported patch for armhf & reset its allowed-failures. + * Add compatibility patch for cargo 0.47. + * Ignore more spurious test failures, and filed upstream. + * Bump powerpc allowed-failures to 180 at the request of ports maintainers. + + -- Ximin Luo Sat, 09 Oct 2021 00:24:37 +0100 + +rustc (1.54.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Wed, 06 Oct 2021 10:37:55 +0100 + +rustc (1.53.0+dfsg1-4) unstable; urgency=medium + + * Ignore some hanging test regressions on non-release arches powerpc, ppc64. + + -- Ximin Luo Wed, 06 Oct 2021 19:24:11 +0100 + +rustc (1.53.0+dfsg1-3) unstable; urgency=medium + + * Disable patch that was backported incorrectly. + * Temporarily increase armhf allowed-failures to 12. + + -- Ximin Luo Wed, 06 Oct 2021 19:01:54 +0100 + +rustc (1.53.0+dfsg1-2) unstable; urgency=medium + + * Fix some test failures. + + -- Ximin Luo Wed, 06 Oct 2021 10:29:03 +0100 + +rustc (1.53.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Update mips patches, disable a test as our workaround makes it invalid. + * Temporarily ignore some tests that fail on big-endian. + + -- Ximin Luo Tue, 05 Oct 2021 23:19:31 +0100 + +rustc (1.53.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. (Closes: #986803) + * Honour parallel option in DEB_BUILD_OPTIONS. (Closes: #993871) + + -- Ximin Luo Sat, 02 Oct 2021 12:46:49 +0100 + +rustc (1.52.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Reorganise dependencies, move optional rustc deps to rust-all. + + -- Ximin Luo Wed, 29 Sep 2021 20:05:55 +0100 + +rustc (1.52.1+dfsg1-1~exp3) experimental; urgency=medium + + * Update to LLVM 12. + + -- Ximin Luo Wed, 19 May 2021 17:52:44 +0100 + +rustc (1.52.1+dfsg1-1~exp2) experimental; urgency=medium + + * Fix rust-clippy dependency on libstd-rust-* + + -- Ximin Luo Sat, 15 May 2021 22:42:38 +0100 + +rustc (1.52.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 15 May 2021 15:21:27 +0100 + +rustc (1.52.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Fri, 07 May 2021 20:38:38 +0100 + +rustc (1.52.0~beta.3+dfsg1-1~exp4) experimental; urgency=medium + + * Fix issue with dh_missing --fail-missing + + -- Ximin Luo Thu, 06 May 2021 01:52:30 +0100 + +rustc (1.52.0~beta.3+dfsg1-1~exp3) experimental; urgency=medium + + * Fix Makefile addition syntax. + + -- Ximin Luo Wed, 05 May 2021 22:24:22 +0100 + +rustc (1.52.0~beta.3+dfsg1-1~exp2) experimental; urgency=medium + + * Install the rust-llvm-dwp symlink. + + -- Ximin Luo Wed, 05 May 2021 22:20:13 +0100 + +rustc (1.52.0~beta.3+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Mon, 26 Apr 2021 12:31:27 +0100 + +rustc (1.51.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Install the rust-llvm-dwp symlink. + * Bump ppc64 allowed-failures to 24. + + -- Ximin Luo Sun, 19 Sep 2021 19:48:33 +0100 + +rustc (1.51.0+dfsg1-1~exp3) experimental; urgency=medium + + * Restore patch, not actually fixed upstream. + + -- Ximin Luo Mon, 26 Apr 2021 16:17:12 +0100 + +rustc (1.51.0+dfsg1-1~exp2) experimental; urgency=medium + + * Drop patch fixed upstream. + * Fix bootstrap with self version. + + -- Ximin Luo Mon, 26 Apr 2021 12:26:43 +0100 + +rustc (1.51.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Enable 32-bit windows support. + + -- Ximin Luo Mon, 12 Apr 2021 11:04:36 +0100 + +rustc (1.50.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Sat, 18 Sep 2021 11:45:21 +0100 + +rustc (1.50.0+dfsg1-1~exp4) experimental; urgency=medium + + * Fix more tests with a backported upstream PR. + + -- Ximin Luo Mon, 12 Apr 2021 01:51:22 +0100 + +rustc (1.50.0+dfsg1-1~exp3) experimental; urgency=medium + + * Fix cross-compile to windows using same-version stage0. + + -- Ximin Luo Sun, 11 Apr 2021 13:52:41 +0100 + +rustc (1.50.0+dfsg1-1~exp2) experimental; urgency=medium + + * Fix tests, fix s390x breakage. + + -- Ximin Luo Fri, 09 Apr 2021 16:54:20 +0100 + +rustc (1.50.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Mon, 05 Apr 2021 21:30:18 +0100 + +rustc (1.49.0+dfsg1-2) unstable; urgency=medium + + * Backport upstream PR 85807 to fix powerpc test issues. + + -- Ximin Luo Sat, 18 Sep 2021 11:33:09 +0100 + +rustc (1.49.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Sat, 28 Aug 2021 10:48:11 +0100 + +rustc (1.49.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Mon, 05 Apr 2021 14:59:34 +0100 + +rustc (1.49.0~beta.4+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sun, 20 Dec 2020 23:26:55 +0000 + +rustc (1.48.0+dfsg1-2) unstable; urgency=medium + + * Enable +xgot on mips64*, see upstream #52108 for details. + + -- Ximin Luo Sun, 20 Dec 2020 18:52:10 +0000 + +rustc (1.48.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Tue, 01 Dec 2020 19:57:48 +0000 + +rustc (1.48.0~beta.8+dfsg1-1~exp3) experimental; urgency=medium + + * Update u-update-version-check.patch + + -- Ximin Luo Fri, 13 Nov 2020 01:36:31 +0000 + +rustc (1.48.0~beta.8+dfsg1-1~exp2) experimental; urgency=medium + + * Disable copy_file_range optimisation for now, see upstream #78979. + * Ignore some other minor tests, bugs have been filed upstream. + + -- Ximin Luo Thu, 12 Nov 2020 23:51:53 +0000 + +rustc (1.48.0~beta.8+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Wed, 11 Nov 2020 12:31:18 +0000 + +rustc (1.47.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + * Update to LLVM 11. + * Ignore more tests on big-endian. + + -- Ximin Luo Sat, 07 Nov 2020 21:21:03 +0000 + +rustc (1.47.0~beta.2+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 05 Sep 2020 16:11:16 +0100 + +rustc (1.46.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 29 Aug 2020 16:54:36 +0100 + +rustc (1.46.0~beta.2+dfsg1-1~exp5) experimental; urgency=medium + + * Fix rust-gdb install path. (Closes: #968279) + * Drop powerpc allowed-failures to 12. (Closes: #955774) + * Update d-fix-mips64el-bootstrap.patch for newer LLVM. + + -- Ximin Luo Fri, 14 Aug 2020 23:45:25 +0100 + +rustc (1.46.0~beta.2+dfsg1-1~exp4) experimental; urgency=medium + + * Move cross-linker Depends to Recommends - for cross-compiling support + libraries should never hard-depend on toolchains. This also allows us to + add the usual M-A annotations for libraries. + + -- Ximin Luo Sun, 09 Aug 2020 18:16:16 +0100 + +rustc (1.46.0~beta.2+dfsg1-1~exp3) experimental; urgency=medium + + * Drop "-cross" suffix from libstd naming, after discussion with Helmut + Grohne. Since libstd-rust-dev-wasm-cross is not yet in stable and only + has 4 installed users, we do not retain a migration package. + + -- Ximin Luo Sun, 09 Aug 2020 14:27:54 +0100 + +rustc (1.46.0~beta.2+dfsg1-1~exp2) experimental; urgency=medium + + * Add support for cross-compiling to windows. See README.Debian for details. + Currently only 64-bit works, we are waiting on #540782 for 32-bit. + + -- Ximin Luo Sun, 09 Aug 2020 03:52:34 +0100 + +rustc (1.46.0~beta.2+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Fri, 07 Aug 2020 00:15:46 +0100 + +rustc (1.45.0+dfsg1-2) unstable; urgency=medium + + * Add some more big-endian test patches. + * Backport some patches to fix some testsuite ICEs. + + -- Ximin Luo Thu, 06 Aug 2020 21:11:39 +0100 + +rustc (1.45.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Wed, 05 Aug 2020 21:41:39 +0100 + +rustc (1.45.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Mon, 27 Jul 2020 17:45:24 +0100 + +rustc (1.44.1+dfsg1-3) unstable; urgency=medium + + * Fix patch for line numbers on little-endian arches. + + -- Ximin Luo Tue, 28 Jul 2020 21:51:36 +0100 + +rustc (1.44.1+dfsg1-2) unstable; urgency=medium + + * Ignore tests that assume little-endian on big-endian arches. + See upstream #74829 for details. + + -- Ximin Luo Tue, 28 Jul 2020 21:20:24 +0100 + +rustc (1.44.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Backport a typenum fix for i386. + * Work around upstream #74786 involving debuginfo maps. + + -- Ximin Luo Mon, 27 Jul 2020 13:15:20 +0100 + +rustc (1.44.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 04 Jul 2020 18:04:42 +0100 + +rustc (1.43.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Bump LLVM B-D version for some backported fixes affecting rustc. + + -- Ximin Luo Sun, 05 Jul 2020 15:06:52 +0100 + +rustc (1.43.0+dfsg1-1~exp1) experimental; urgency=medium + + * Drop sparc64 workaround. (Closes: #956413) + * Drop stack-gap workaround for old kernels and rust versions. + * New upstream release. + + -- Ximin Luo Mon, 27 Apr 2020 13:09:20 +0100 + +rustc (1.42.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Fri, 10 Apr 2020 11:33:25 +0100 + +rustc (1.42.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * Team upload. + * New upstream release. + + -- Ximin Luo Sat, 04 Apr 2020 16:06:03 +0100 + +rustc (1.41.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Fri, 03 Apr 2020 23:41:11 +0100 + +rustc (1.41.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Ximin Luo ] + * More python 2 -> 3 fixes. + * Enable the wasm32-wasi target for code that needs a "real" libstd. + * Don't strip static rlibs. This sometimes breaks wasm, and more generally + the stripped debuginfo is actually totally lost rather than being moved + into the -dbgsym packages. Shared libraries are unaffected and work. + * Allow 180 failing tests on riscv64, none were actually run last time. + + [ Fabian Grünbichler ] + * New upstream release. + + -- Ximin Luo Mon, 09 Mar 2020 00:31:34 +0000 + +rustc (1.40.0+dfsg1-5) unstable; urgency=medium + + * More python 2 -> 3 fixes. + * Allow 24 failing tests on riscv64. + * Reenable debuginfo for rustc, not just libstd. + * Reenable backtraces during tests. + + -- Ximin Luo Sun, 05 Jan 2020 13:35:46 +0000 + +rustc (1.40.0+dfsg1-4) unstable; urgency=medium + + * Experimental riscv64 support. + + -- Ximin Luo Sat, 04 Jan 2020 05:40:11 +0000 + +rustc (1.40.0+dfsg1-3) unstable; urgency=medium + + * Work around upstream #59264 again. :/ + + -- Ximin Luo Fri, 03 Jan 2020 22:05:16 +0000 + +rustc (1.40.0+dfsg1-2) unstable; urgency=medium + + * Fix more internal build scripts so they use python3. + * Don't add -L/usr/lib/llvm when cross-compiling. (Closes: #941783) + + -- Ximin Luo Fri, 03 Jan 2020 20:18:46 +0000 + +rustc (1.40.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Ignore new test failing on arm that also fails in previous versions. + + -- Ximin Luo Sun, 29 Dec 2019 22:17:04 +0000 + +rustc (1.40.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Wed, 25 Dec 2019 00:09:24 +0000 + +rustc (1.39.0+dfsg1-4) unstable; urgency=medium + + * Update to LLVM 9. (Closes: #946886) + + -- Ximin Luo Mon, 23 Dec 2019 03:21:02 +0000 + +rustc (1.39.0+dfsg1-3) unstable; urgency=medium + + * Fix mips patch involving mxgot for new RUSTFLAGS behaviour. + + -- Ximin Luo Fri, 06 Dec 2019 22:18:53 +0000 + +rustc (1.39.0+dfsg1-2) unstable; urgency=medium + + * Include reproducibility patch for compiler-builtins. + * Use python3 instead of python to run rustbuild. (Closes: #938422) + * Expand d-ignore-error-detail-diff.patch for unfixed upstream #53081. + + -- Ximin Luo Thu, 05 Dec 2019 22:51:41 +0000 + +rustc (1.39.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 30 Nov 2019 22:20:48 +0000 + +rustc (1.38.0+dfsg1-2) unstable; urgency=medium + + * Fix building with rustc 1.38.0 + * Fix building with cargo 0.40.0 + + -- Ximin Luo Fri, 29 Nov 2019 00:05:16 +0000 + +rustc (1.38.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Tue, 26 Nov 2019 14:41:46 +0000 + +rustc (1.37.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Fix a typo in debian/rules regex causing FTBFS on some arches. + + -- Ximin Luo Thu, 05 Sep 2019 00:06:23 -0700 + +rustc (1.37.0+dfsg1-1~exp2) experimental; urgency=medium + + * Support cross-compiling to wasm32. (Closes: #903110) + To do that, install the libstd-rust-dev-wasm32-cross package and give + --target wasm32-unknown-unknown. + * Drop dependency on system compiler-rt, these new versions of rustc + actually don't need it at all. + + -- Ximin Luo Thu, 29 Aug 2019 09:00:03 -0700 + +rustc (1.37.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Use system compiler-rt. + + -- Ximin Luo Sun, 25 Aug 2019 03:06:33 -0700 + +rustc (1.36.0+dfsg1-2) unstable; urgency=medium + + * Set CARGO_HOME to debian/cargo_home (instead of $HOME/.cargo) as newer + versions of cargo must take a file lock that has to exist. + + -- Ximin Luo Wed, 17 Jul 2019 18:25:06 -0700 + +rustc (1.36.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Tue, 16 Jul 2019 20:27:55 -0700 + +rustc (1.36.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sat, 13 Jul 2019 12:42:05 -0700 + +rustc (1.35.0+dfsg1-1) unstable; urgency=medium + + * Add entry in 1.34.2+dfsg1-1 to note that it uses LLVM 7. + * Add entry in 1.35.0+dfsg1-1~exp2 to note that it uses LLVM 8. + * Fix ICE on sparc64 by including upstream PR #61881. + + -- Ximin Luo Sat, 13 Jul 2019 10:30:35 -0700 + +rustc (1.35.0+dfsg1-1~exp1) experimental; urgency=medium + + * Don't use system compiler-rt, it's not ready yet. + * Update to LLVM 8. + * New upstream release. + + -- Ximin Luo Sun, 09 Jun 2019 23:20:52 -0700 + +rustc (1.34.2+dfsg1-1) unstable; urgency=medium + + * Don't use system compiler-rt, there are issues with that for now. + * Use LLVM 7 for the Debian buster release. + + -- Ximin Luo Wed, 29 May 2019 21:52:37 -0700 + +rustc (1.34.2+dfsg1-1~exp2) experimental; urgency=medium + + * Fix doc build, add version 1 compat mode hack for mdBook 2. + * Use system compiler-rt from libclang-common-*-dev. + + -- Ximin Luo Fri, 24 May 2019 00:39:59 -0700 + +rustc (1.34.2+dfsg1-1~exp1) experimental; urgency=medium + + * Ensure Cargo.toml is in rust-src. + * New upstream release. + * Update to LLVM 8. + + -- Ximin Luo Sun, 19 May 2019 02:40:02 -0700 + +rustc (1.33.0+dfsg1-2) unstable; urgency=medium + + * Add Fedora patches. + * Bump i386 allowed test failures to 12. + + -- Ximin Luo Sat, 18 May 2019 12:18:25 -0700 + +rustc (1.33.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Fix build on mips, flags needed whitespace massaging. + * Drop obsolete patches. + + -- Ximin Luo Fri, 17 May 2019 21:04:20 -0700 + +rustc (1.33.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + [ Hiroaki Nakamura ] + * Delete obsolete patch. + + [ Sylvestre Ledru ] + * Update compiler-rt patch. + * Improve build-related docs a bit. + + -- Ximin Luo Mon, 29 Apr 2019 19:50:48 -0700 + +rustc (1.32.0+dfsg1-3) unstable; urgency=medium + + * Conditionally-apply u-compiletest.patch based on stage0 compiler. + * Fix syntax error in d/rules compiletest check. + + -- Ximin Luo Sun, 17 Mar 2019 16:40:05 -0700 + +rustc (1.32.0+dfsg1-2) unstable; urgency=medium + + * More verbose logging during builds. + * Fix compiletest compile error, and check log has at least 1 pass. + + -- Ximin Luo Sun, 17 Mar 2019 12:52:57 -0700 + +rustc (1.32.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Sun, 27 Jan 2019 22:02:48 -0800 + +rustc (1.32.0~beta.2+dfsg1-1~exp2) experimental; urgency=medium + + * Note that this upstream version already Closes: #917191. + * Backport other upstream fixes. (Closes: #916818, #917000, #917192). + + -- Ximin Luo Tue, 01 Jan 2019 15:26:57 -0800 + +rustc (1.32.0~beta.2+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Drop obsolete d-sparc64-dont-pack-spans.patch + + -- Ximin Luo Sun, 16 Dec 2018 13:48:25 -0800 + +rustc (1.31.0+dfsg1-2) unstable; urgency=medium + + * Bump mips mipsel s390x allowed-failures to 24. + + -- Ximin Luo Sun, 16 Dec 2018 14:34:44 -0800 + +rustc (1.31.0+dfsg1-1) unstable; urgency=medium + + * Revert debuginfo patches, they're not ready yet. + + -- Ximin Luo Sun, 16 Dec 2018 09:58:06 -0800 + +rustc (1.31.0+dfsg1-1~exp2) experimental; urgency=medium + + * Drop redundant patches. + * Fix line numbers in some test-case patches. + * Backport an updated patch for gdb 8.2. + + -- Ximin Luo Sat, 15 Dec 2018 13:52:26 -0800 + +rustc (1.31.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Fri, 14 Dec 2018 21:30:56 -0800 + +rustc (1.31.0~beta.19+dfsg1-1~exp2) experimental; urgency=medium + + * Filter LLVM build flags to not be stupid. + + -- Ximin Luo Sat, 01 Dec 2018 12:17:52 -0800 + +rustc (1.31.0~beta.19+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Thu, 29 Nov 2018 22:29:16 -0800 + +rustc (1.31.0~beta.4+dfsg1-1~exp2) experimental; urgency=medium + + * Merge changes from Debian unstable. + + -- Ximin Luo Tue, 06 Nov 2018 19:45:26 -0800 + +rustc (1.31.0~beta.4+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Drop old maintainers from Uploaders. + + -- Ximin Luo Sun, 04 Nov 2018 19:00:16 -0800 + +rustc (1.30.0+dfsg1-2) unstable; urgency=medium + + * Increase FAILURES_ALLOWED for mips mipsel to 20. + * Set debuginfo-only-std = false for 32-bit powerpc architectures. + + -- Ximin Luo Fri, 02 Nov 2018 01:42:36 -0700 + +rustc (1.30.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. (Closes: #881845) + * Increase FAILURES_ALLOWED for mips architectures. + * Set debuginfo-only-std = false for mips architectures. + + -- Ximin Luo Thu, 01 Nov 2018 10:05:52 -0700 + +rustc (1.30.0+dfsg1-1~exp2) experimental; urgency=medium + + * Disable debuginfo-gdb tests relating to enums. These will be fixed in an + upcoming version, see upstream #54614 for details. + + -- Ximin Luo Wed, 31 Oct 2018 00:02:25 -0700 + +rustc (1.30.0+dfsg1-1~exp1) experimental; urgency=medium + + * Actually don't build docs in an arch-only build. + * Add mips patch, hopefully closes #881845 but let's see. + * New upstream release. + + -- Ximin Luo Tue, 30 Oct 2018 22:05:59 -0700 + +rustc (1.30.0~beta.7+dfsg1-1~exp3) experimental; urgency=medium + + * Do the necessary bookkeeping for the LLVM update. + + -- Ximin Luo Wed, 26 Sep 2018 23:29:18 -0700 + +rustc (1.30.0~beta.7+dfsg1-1~exp2) experimental; urgency=medium + + * Tweak test failure rules: armel <= 8, ppc64 <= 12. + * Update to LLVM 7. + + -- Ximin Luo Wed, 26 Sep 2018 21:43:30 -0700 + +rustc (1.30.0~beta.7+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Sun, 23 Sep 2018 10:40:30 -0700 + +rustc (1.29.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Drop d-armel-disable-kernel-helpers.patch as a necessary part of the + fix to #906520, so it is actually fixed. + * Backport a patch to fix the rand crate on powerpc. (Closes: #909400) + * Lower the s390x allowed failures back to 25. + + -- Ximin Luo Sun, 23 Sep 2018 10:16:53 -0700 + +rustc (1.29.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Include patch for armel atomics. (Closes: #906520) + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo Thu, 20 Sep 2018 22:33:20 -0700 + +rustc (1.28.0+dfsg1-3) unstable; urgency=medium + + * Team upload. + + [ Ximin Luo ] + * More sparc64 fixes, and increase allowed-test-failures there to 180. + + [ Julien Cristau ] + * Don't use pentium4 as i686 baseline (closes: #908561) + + -- Julien Cristau Tue, 11 Sep 2018 15:54:27 +0200 + +rustc (1.28.0+dfsg1-2) unstable; urgency=medium + + * Switch on verbose-tests to restore the old pre-1.28 behaviour, and restore + old failure-counting logic. + * Allow 50 test failures on s390x, restored failure-counting logic avoids + more double-counts. + + -- Ximin Luo Sun, 05 Aug 2018 02:18:10 -0700 + +rustc (1.28.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + * Add patches from Fedora to fix some test failures. + * Ignore a failure testing specific error output, under investigation. + * Allow 100 test failures on s390x, should be reducible later with LLVM 7. + * Temporary fix for mips64el bootstrap. + * Be even more verbose during the build. + * Update to latest Standards-Version. + + -- Ximin Luo Sat, 04 Aug 2018 23:04:41 -0700 + +rustc (1.28.0~beta.14+dfsg1-1~exp2) experimental; urgency=medium + + * Update test-failure counting logic. + * Fix version constraints for Recommends: cargo. + * Add patch to fix sparc64 CABI. + + -- Ximin Luo Fri, 27 Jul 2018 04:26:52 -0700 + +rustc (1.28.0~beta.14+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo Wed, 25 Jul 2018 03:11:11 -0700 + +rustc (1.27.2+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * Update of the alioth ML address. + + [ Ximin Luo ] + * Fail the build if our version contains ~exp and we are not releasing to + experimental, this has happened by accident a few times already. + * Allow 36 and 44 test failures on armel and s390x respectively. + * New upstream release. + + -- Ximin Luo Tue, 24 Jul 2018 21:35:56 -0700 + +rustc (1.27.1+dfsg1-1~exp4) experimental; urgency=medium + + * Unconditonally prune crate checksums to avoid having to manually prune them + whenever we patch the vendored crates. + + -- Ximin Luo Thu, 19 Jul 2018 14:49:18 -0700 + +rustc (1.27.1+dfsg1-1~exp3) experimental; urgency=medium + + * Add patch from Fedora to fix rebuild against same version. + + -- Ximin Luo Thu, 19 Jul 2018 08:52:03 -0700 + +rustc (1.27.1+dfsg1-1~exp2) experimental; urgency=medium + + * Fix some failing tests. + + -- Ximin Luo Wed, 18 Jul 2018 09:06:44 -0700 + +rustc (1.27.1+dfsg1-1~exp1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Fri, 13 Jul 2018 22:58:02 -0700 + +rustc (1.26.2+dfsg1-1) unstable; urgency=medium + + * New upstream release. + * Stop ignoring tests that now pass. + * Don't ignore tests that still fail, instead raise FAILURES_ALLOWED. + This allows us to see the test failures in the build logs, rather than + hiding them. + + -- Ximin Luo Sat, 16 Jun 2018 12:39:59 -0700 + +rustc (1.26.1+dfsg1-3) unstable; urgency=medium + + * Fix build-dep version range to build against myself. + + -- Ximin Luo Thu, 31 May 2018 09:25:17 -0700 + +rustc (1.26.1+dfsg1-2) unstable; urgency=medium + + * Also ignore test_loading_cosine on ppc64el. + + -- Ximin Luo Wed, 30 May 2018 20:58:46 -0700 + +rustc (1.26.1+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Wed, 30 May 2018 08:18:04 -0700 + +rustc (1.26.0+dfsg1-1~exp4) experimental; urgency=medium + + * Try alternative patch to ignore x86 stdsimd tests suggested by upstream. + * Bump up allowed-test-failures to 8 to account for the fact that we're now + double-counting some failures. + + -- Ximin Luo Tue, 29 May 2018 20:36:56 -0700 + +rustc (1.26.0+dfsg1-1~exp3) experimental; urgency=medium + + * Ignore some irrelevant tests on ppc64 and non-x86 platforms. + + -- Ximin Luo Tue, 29 May 2018 09:32:38 -0700 + +rustc (1.26.0+dfsg1-1~exp2) experimental; urgency=medium + + * Add Breaks+Replaces for older libstd-rust-dev with codegen-backends. + (Closes: #899180) + * Backport some test and packaging fixes from Ubuntu. + + -- Ximin Luo Tue, 22 May 2018 22:00:53 -0700 + +rustc (1.26.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Update to latest Standards-Version; no changes required. + * Update doc-base files. (Closes: #876831) + + -- Ximin Luo Sun, 20 May 2018 03:11:45 -0700 + +rustc (1.25.0+dfsg1-2) unstable; urgency=medium + + * Add patches for LLVM's compiler-rt to fix bugs on sparc64 and mips64. + (Closes: #898982) + * Install codegen-backends into rustc rather than libstd-rust-dev. + (Closes: #899087) + + -- Ximin Luo Sat, 19 May 2018 13:10:33 -0700 + +rustc (1.25.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Allow up to 15 test failures on s390x. + * Set CARGO_INCREMENTAL=0 on sparc64. + + -- Ximin Luo Fri, 18 May 2018 01:11:15 -0700 + +rustc (1.25.0+dfsg1-1~exp2) experimental; urgency=medium + + * Install missing codegen-backends. + + -- Ximin Luo Fri, 06 Apr 2018 14:05:36 -0700 + +rustc (1.25.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Update to LLVM 6.0. + + -- Ximin Luo Sun, 01 Apr 2018 15:59:47 +0200 + +rustc (1.24.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + * Raise allowed-test-failures to 160 on some non-release arches: powerpc, + powerpcspe, sparc64, x32. + + -- Ximin Luo Wed, 07 Mar 2018 20:07:27 +0100 + +rustc (1.24.1+dfsg1-1~exp2) experimental; urgency=medium + + * Steal some patches from Fedora to fix some test failures. + * Update debian/patches/u-make-tests-work-without-rpath.patch to try to fix + some more test failures. + + -- Ximin Luo Mon, 05 Mar 2018 16:25:26 +0100 + +rustc (1.24.1+dfsg1-1~exp1) experimental; urgency=medium + + * More sparc64 CABI fixes. (Closes: #888757) + * New upstream release. + * Note that s390x baseline was updated in the meantime. (Closes: #851150) + * Include Debian-specific patch to disable kernel helpers on armel. + (Closes: #891902) + * Include missing build-dependencies for pkg.rustc.dlstage0 build profile. + (Closes: #891022) + * Add architecture.mk mapping for armel => armv5te-unknown-linux-gnueabi. + (Closes: #891913) + * Enable debuginfo-only-std on armel as well. (Closes: #891961) + * Backport upstream patch to support powerpcspe. (Closes: #891542) + * Disable full-bootstrap again to work around upstream #48319. + + -- Ximin Luo Sat, 03 Mar 2018 14:23:29 +0100 + +rustc (1.23.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Fri, 19 Jan 2018 11:49:31 +0100 + +rustc (1.23.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo Sun, 14 Jan 2018 00:08:17 +0100 + +rustc (1.22.1+dfsg1-2) unstable; urgency=medium + + * Fix B-D rustc version so this package can be built using itself. + + -- Ximin Luo Mon, 01 Jan 2018 14:27:19 +0100 + +rustc (1.22.1+dfsg1-1) unstable; urgency=medium + + [ Ximin Luo ] + * Remove unimportant files that autoload remote resources from rust-src. + * Fix more symlinks in rust-doc. + * On armhf, only generate debuginfo for libstd and not the compiler itself. + This works around buildds running out of memory, see upstream #45854. + * Update to latest Standards-Version; no changes required. + + [ Chris Coulson ] + * Fix some test failures that occur because we build rust without an rpath. + + -- Ximin Luo Mon, 18 Dec 2017 19:46:25 +0100 + +rustc (1.22.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Fix symlink target. (Closes: #877276) + + -- Ximin Luo Sat, 25 Nov 2017 22:29:12 +0100 + +rustc (1.21.0+dfsg1-3) unstable; urgency=medium + + * Add/fix detection for sparc64, thanks to John Paul Adrian Glaubitz. + * Workaround FTBFS when building docs. (Closes: #880262) + + -- Ximin Luo Mon, 06 Nov 2017 10:03:32 +0100 + +rustc (1.21.0+dfsg1-2) unstable; urgency=medium + + * Upload to unstable. + * Fix bootstrapping using 1.21.0, which is more strict about redundant &mut + previously used in u-output-failed-commands.patch. + * Only allow up to 5 test failures. + + -- Ximin Luo Wed, 25 Oct 2017 20:27:30 +0200 + +rustc (1.21.0+dfsg1-1) experimental; urgency=medium + + * New upstream release. + * Fix the "install" target for cross-compilations; cross-compiling with + sbuild --host=$foreign-arch should work again. + * Update to latest Standards-Version; changes: + - Priority changed to optional from extra. + + -- Ximin Luo Tue, 17 Oct 2017 00:42:54 +0200 + +rustc (1.20.0+dfsg1-3) unstable; urgency=medium + + * Disable jemalloc to fix FTBFS with 1.21 on armhf. + + -- Ximin Luo Wed, 25 Oct 2017 12:01:19 +0200 + +rustc (1.20.0+dfsg1-2) unstable; urgency=medium + + * Update changelog entry for 1.20.0+dfsg1-1 to reflect that it was actually + and accidentally uploaded to unstable. No harm, no foul. + * We are no longer failing the build when tests fail, see NEWS or + README.Debian for details. + * Bump LLVM requirement to fix some failing tests. + + -- Ximin Luo Sat, 21 Oct 2017 14:20:17 +0200 + +rustc (1.20.0+dfsg1-1) unstable; urgency=medium + + * New upstream release. + + -- Ximin Luo Sun, 15 Oct 2017 23:30:35 +0200 + +rustc (1.19.0+dfsg3-4) unstable; urgency=medium + + * Bump LLVM requirement to pull in a fix for a FTBFS on ppc64el. + + -- Ximin Luo Sun, 15 Oct 2017 21:31:03 +0200 + +rustc (1.19.0+dfsg3-3) unstable; urgency=medium + + * Fix a trailing whitespace for tidy. + + -- Ximin Luo Tue, 19 Sep 2017 16:09:41 +0200 + +rustc (1.19.0+dfsg3-2) unstable; urgency=medium + + * Upload to unstable. + * Add a patch to print extra information when tests fail. + + -- Ximin Luo Tue, 19 Sep 2017 12:32:03 +0200 + +rustc (1.19.0+dfsg3-1) experimental; urgency=medium + + * New upstream release. + * Upgrade to LLVM 4.0. (Closes: #873421) + * rust-src: install Debian patches as well + + -- Ximin Luo Fri, 15 Sep 2017 04:02:09 +0200 + +rustc (1.18.0+dfsg1-4) unstable; urgency=medium + + * Support gperf 3.1. (Closes: #869610) + + -- Ximin Luo Tue, 25 Jul 2017 23:19:47 +0200 + +rustc (1.18.0+dfsg1-3) unstable; urgency=medium + + * Upload to unstable. + * Disable failing run-make test on armhf. + + -- Ximin Luo Sat, 22 Jul 2017 20:30:25 +0200 + +rustc (1.18.0+dfsg1-2) experimental; urgency=medium + + * Update to latest Standards-Version; no changes required. + * Change rustc to Multi-Arch: allowed and update Build-Depends with :native + annotations. Multi-Arch: foreign is typically for arch-indep packages that + might need to satisfy dependency chains of different architectures. Also + update instructions on cross-compiling to match this newer situation. + * Build debugging symbols for non-libstd parts of rustc. + + -- Ximin Luo Mon, 17 Jul 2017 23:04:03 +0200 + +rustc (1.18.0+dfsg1-1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Tue, 27 Jun 2017 12:51:22 +0200 + +rustc (1.17.0+dfsg2-8) unstable; urgency=medium + + * Workaround for linux #865549, fix FTBFS on ppc64el. + + -- Ximin Luo Mon, 17 Jul 2017 13:41:59 +0200 + +rustc (1.17.0+dfsg2-7) unstable; urgency=medium + + * Show exception traceback in bootstrap.py to examine ppc64el build failure. + + -- Ximin Luo Wed, 21 Jun 2017 10:46:27 +0200 + +rustc (1.17.0+dfsg2-6) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Wed, 21 Jun 2017 00:24:22 +0200 + +rustc (1.17.0+dfsg2-5) experimental; urgency=medium + + * More work-arounds for armhf test failures. + + -- Ximin Luo Fri, 16 Jun 2017 13:27:45 +0200 + +rustc (1.17.0+dfsg2-4) experimental; urgency=medium + + * Fix arch-indep and arch-dep tests. + * Bump the LLVM requirement to fix FTBFS on armhf. + + -- Ximin Luo Wed, 14 Jun 2017 21:37:16 +0200 + +rustc (1.17.0+dfsg2-3) experimental; urgency=medium + + * Try to force the real gdb package. Some resolvers like aspcud will select + gdb-minimal under some circumstances, but this causes the debuginfo-gdb + tests to break. + + -- Ximin Luo Wed, 14 Jun 2017 00:48:37 +0200 + +rustc (1.17.0+dfsg2-2) experimental; urgency=medium + + * Support and document cross-compiling of rustc itself. + * Document cross-compiling other rust packages such as cargo. + * Work around upstream #39015 by disabling those tests rather than by + disabling optimisation, which causes FTBFS on 1.17.0 ppc64el. See + upstream #42476 and #42532 for details. + + -- Ximin Luo Tue, 13 Jun 2017 21:13:31 +0200 + +rustc (1.17.0+dfsg2-1) experimental; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release + + [ Ximin Luo ] + * Adapt packaging for rustbuild, the new upstream cargo-based build system. + + [ Matthijs van Otterdijk ] + * Add a binary package, rust-src. (Closes: #846177) + * Link to local Debian web resources in the docs, instead of remote ones. + + -- Ximin Luo Tue, 16 May 2017 18:00:53 +0200 + +rustc (1.16.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable so we have something to build 1.17 with. + * Update u-ignoretest-powerpc.patch for 1.16. + + -- Ximin Luo Wed, 19 Apr 2017 22:47:18 +0200 + +rustc (1.16.0+dfsg1-1~exp2) experimental; urgency=medium + + * Don't ignore test failures on Debian unstable. + * Re-fix ignoring armhf test, accidentally reverted in previous version. + * Try to fix buildd failure by swapping B-D alternatives. + + -- Ximin Luo Sun, 16 Apr 2017 15:05:47 +0200 + +rustc (1.16.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * u-ignoretest-jemalloc.patch removed (applied upstream) + + [ Matthias Klose ] + * Bootstrap using the rustc version in the archive, on all architectures. + * Work around a GCC 4.8 ICE on AArch64. + * Use alternative build dependencies on cmake3 and binutils-2.26 for + builds on 14.04 LTS (trusty). + * debian/make_orig*dl_tarball.sh: Include all Ubuntu architectures. + * debian/rules: Ignore test results for now. + + -- Sylvestre Ledru Thu, 13 Apr 2017 15:24:03 +0200 + +rustc (1.15.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable so we have something to build 1.16 with. + * Try to fix ignoring atomic-lock-free tests on armhf. + + -- Ximin Luo Wed, 22 Mar 2017 00:13:27 +0100 + +rustc (1.15.1+dfsg1-1~exp3) experimental; urgency=medium + + * Ignore atomic-lock-free tests on armhf. + * Update ignoretest-armhf_03.patch for newer 1.15.1 behaviour. + * Tidy up some other patches to do with ignoring tests. + + -- Ximin Luo Sun, 12 Mar 2017 04:15:33 +0100 + +rustc (1.15.1+dfsg1-1~exp2) experimental; urgency=medium + + * Update armhf ignoretest patch. + * Bootstrap armhf. (Closes: #809316, #834003) + * Bootstrap ppc4el. (Closes: #839643) + * Fix rust-lldb symlink. (Closes: #850639) + + -- Ximin Luo Thu, 02 Mar 2017 23:01:26 +0100 + +rustc (1.15.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release (won't probably be in stretch). + see the 1.4 git branch for the follow up for stable + * Call to the test renamed from check-notidy => check + * d/p/u-destdir-support.diff: Apply upstream patch to support + destdir in the make install (for rustbuild, in later versions) + * Overrides the 'binary-or-shlib-defines-rpath' lintian warnings. + We need them for now + * Refresh of the patches + + [ Sven Joachim ] + * Drop Pre-Depends on multiarch-support. (Closes: #856109) + + [ Erwan Prioul ] + * Fix test and build failures for ppc64el. (Closes: #839643) + + [ Ximin Luo ] + * Disable rustbuild for the time being (as it was in 1.14) and instead + bootstrap two new arches, armhf and ppc64el. + * Switch back to debhelper 9 to make backporting easier. + * Switch Build-Depends on binutils-multiarch back to binutils, the former is + no longer needed by the upstream tests. + + [ Matthias Klose ] + * Compatibility fixes and improvements to help work better on Ubuntu. + + -- Sylvestre Ledru Sun, 26 Feb 2017 21:12:27 +0100 + +rustc (1.14.0+dfsg1-3) unstable; urgency=medium + + * Fix mips64 Makefile patches. + * Don't run arch-dep tests in a arch-indep build. + + -- Ximin Luo Wed, 04 Jan 2017 21:34:56 +0100 + +rustc (1.14.0+dfsg1-2) unstable; urgency=medium + + * Update README.Debian, the old one was way out of date. + * Detect mips CPUs in ./configure and fill in mips Makefile rules. + * Work around jemalloc-related problems in the upstream bootstrapping + binaries for arm64, ppc64el, s390x. + * Disable jemalloc on s390x - upstream already disable it for some other + arches. + * Disable jemalloc tests for arches where jemalloc is disabled. + * We still expect the following failures: + * arm64 should be fixed (i.e. no failures) compared to the previous upload. + * armhf will FTBFS due to 'Illegal instruction' and this can only be fixed + with the next stable rustc release. + * mips mipsel mips64el ppc64 ppc64el s390x will FTBFS due to yet other + test failures beyond the ones I fixed above; this upload is only to save + me manual work in producing nice reports that exhibit these failures. + + -- Ximin Luo Thu, 29 Dec 2016 23:00:47 +0100 + +rustc (1.14.0+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release + * Update debian/watch + + [ Ximin Luo ] + * Try to bootstrap armhf ppc64 ppc64el s390x mips mipsel mips64el. + (Closes: #809316, #834003, #839643) + * Make rust-gdb and rust-lldb arch:all packages. + * Switch to debhelper 10. + + -- Ximin Luo Sat, 24 Dec 2016 18:03:03 +0100 + +rustc (1.13.0+dfsg1-2) unstable; urgency=high + + * Skip macro-stepping test on arm64, until + https://github.com/rust-lang/rust/issues/37225 is resolved. + + -- Luca Bruno Sat, 26 Nov 2016 23:40:14 +0000 + +rustc (1.13.0+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release. + + [ Ximin Luo ] + * Use Debian system jquery instead of upstream's embedded copy. + + -- Sylvestre Ledru Fri, 11 Nov 2016 13:35:23 +0100 + +rustc (1.12.1+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New (minor) upstream release + * Missing dependency from rust-lldb to python-lldb-3.8 (Closes: #841833) + * Switch to llvm 3.9. (Closes: #841834) + + [ Ximin Luo ] + * Dynamically apply rust-boot-1.12.1-from-1.12.0.diff. + This allows us to bootstrap from either 1.11.0 or 1.12.0. + * Bump LLVM Build-Depends version to get the backported patches for LLVM + #30402 and #29163. + * Install debugger_pretty_printers_common to rust-gdb and rust-lldb. + (Closes: #841835) + + -- Ximin Luo Mon, 07 Nov 2016 14:15:14 +0100 + +rustc (1.12.0+dfsg1-2) unstable; urgency=medium + + * Ignore test run-make/no-duplicate-libs. Fails on i386 + * Ignore test run-pass-valgrind/down-with-thread-dtors.rs . Fails on arm64 + * I am not switching to llvm 3.9 now because a test freezes. The plan is + to silent the warning breaking the build and upload 1.12.1 after + + -- Sylvestre Ledru Wed, 05 Oct 2016 10:48:01 +0200 + +rustc (1.12.0+dfsg1-1) unstable; urgency=medium + + * new upstream release + - Rebase of the patches and removal of deprecated patches + + -- Sylvestre Ledru Thu, 29 Sep 2016 20:45:04 +0200 + +rustc (1.11.0+dfsg1-3) unstable; urgency=medium + + * Fix separate build-arch and build-indep builds. + + -- Ximin Luo Tue, 13 Sep 2016 12:30:41 +0200 + +rustc (1.11.0+dfsg1-2) unstable; urgency=medium + + * Fix rebuilding against the current version, by backporting a patch I wrote + that was already applied upstream. Should fix the FTBFS that was observed + by tests.reproducible-builds.org. + * Ignore a failing stdcall test on arm64; should fix the FTBFS there. + * Backport a doctest fix I wrote, already applied upstream. + + -- Ximin Luo Mon, 12 Sep 2016 17:40:12 +0200 + +rustc (1.11.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + * Add versioned binutils dependency. (Closes: #819475, #823540) + + -- Ximin Luo Wed, 07 Sep 2016 10:31:57 +0200 + +rustc (1.10.0+dfsg1-3) unstable; urgency=medium + + * Rebuild with LLVM 3.8, same as what upstream are using + * Dynamically link against LLVM. (Closes: #832565) + + -- Ximin Luo Sat, 30 Jul 2016 22:36:41 +0200 + +rustc (1.10.0+dfsg1-2) unstable; urgency=medium + + * Tentatively support ARM architectures + * Include upstream arm64,armel,armhf stage0 compilers (i.e. 1.9.0 stable) + in a orig-dl tarball, like how we previously did for amd64,i386. + + -- Ximin Luo Fri, 22 Jul 2016 15:54:51 +0200 + +rustc (1.10.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + * Add myself to uploaders + * Update our build process to bootstrap from the previous Debian rustc stable + version by default. See README.Debian for other options. + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo Sun, 17 Jul 2016 03:40:49 +0200 + +rustc (1.9.0+dfsg1-1) unstable; urgency=medium + + * New upstream release (Closes: #825752) + + -- Sylvestre Ledru Sun, 29 May 2016 17:57:38 +0200 + +rustc (1.8.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + + [ Ximin Luo ] + * Fix using XZ for the orig tarball: needs explicit --repack in debian/watch + * Drop wno-error patch; applied upstream. + + -- Sylvestre Ledru Fri, 15 Apr 2016 12:01:45 +0200 + +rustc (1.7.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Thu, 03 Mar 2016 22:41:24 +0100 + +rustc (1.6.0+dfsg1-3) unstable; urgency=medium + + * Apply upstream fix to silent a valgrind issue in the test suite + (Closes: ##812825) + * Add gcc & libc-dev as dependency of rustc to make sure it works + out of the box + + [ Ximin Luo ] + * Work around rust bug https://github.com/rust-lang/rust/issues/31529 + * Enable optional tests, and add verbosity/backtraces to tests + * Use XZ instead of GZ compression (will apply to the next new upload) + + -- Sylvestre Ledru Tue, 02 Feb 2016 15:08:11 +0100 + +rustc (1.6.0+dfsg1-2) unstable; urgency=medium + + * mk/rt.mk: Modify upstream code to append -Wno-error rather than trying + to remove the string "-Werror". (Closes: #812448) + * Disable new gcc-6 "-Wmisleading-indentation" warning, which triggers + (incorrectly) on src/rt/miniz.c. (Closes: #811573) + * Guard arch-dependent dh_install commands appropriately, fixing + arch-indep-only builds. (Closes: #809124) + + -- Angus Lees Tue, 26 Jan 2016 05:40:14 +1100 + +rustc (1.6.0+dfsg1-1) unstable; urgency=medium + + * new upstream release + + [ Ximin Luo ] + * Use secure links for Vcs-* fields. + + -- Sylvestre Ledru Fri, 22 Jan 2016 10:56:08 +0100 + +rustc (1.5.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + - We believe that we should let rust transit to testing + (Closes: #786836) + * Move away from hash to the same rust naming schema + + -- Sylvestre Ledru Thu, 10 Dec 2015 17:23:32 +0100 + +rustc (1.4.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + 198068b3 => 1bf6e69c + * Update the download url in debian/watch + + -- Sylvestre Ledru Fri, 30 Oct 2015 09:36:02 +0100 + +rustc (1.3.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + 62abc69f => 198068b3 + * jquery updated from 2.1.0 to 2.1.4 + + [ Ximin Luo ] + * Use LLVM 3.7 as upstream does, now that it's released. (Closes: #797626) + * Fix debian/copyright syntax mistakes. + * Don't Replace/Break previous versions of libstd-rust-* + * Check that the libstd-rust-* name in d/control matches upstream. + * Several other minor build tweaks. + + -- Sylvestre Ledru Sat, 19 Sep 2015 14:39:35 +0200 + +rustc (1.2.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + libstd-rust-7d23ff90 => libstd-rust-62abc69f + * Add llvm-3.6-tools to the build dep as it is + now needed for tests + * Fix the Vcs-Browser value + + -- Sylvestre Ledru Sat, 08 Aug 2015 23:13:44 +0200 + +rustc (1.1.0+dfsg1-3) unstable; urgency=medium + + * rust-{gdb,lldb} now Replaces pre-split rustc package. + Closes: #793433. + * Several minor lintian cleanups. + + -- Angus Lees Fri, 24 Jul 2015 17:47:48 +1000 + +rustc (1.1.0+dfsg1-2) unstable; urgency=medium + + [ Angus Lees ] + * Replace remote Rust logo with local file in HTML docs. + * Symlink rust-{gdb,lldb}.1 to {gdb,lldb}.1 manpages. + Note that gdb.1 requires the gdb-doc package, and that lldb.1 doesn't + exist yet (see #792908). + * Restore "Architecture: amd64 i386" filter, mistakenly removed in + previous version. Unfortunately the toolchain bootstrap isn't ready + to support all Debian archs yet. Closes: #793147. + + -- Angus Lees Wed, 22 Jul 2015 09:51:08 +1000 + +rustc (1.1.0+dfsg1-1) unstable; urgency=low + + [ Angus Lees ] + * Set SONAME when building dylibs + * Split out libstd-rust, libstd-rust-dev, rust-gdb, rust-lldb from rustc + - libs are now installed into multiarch-friendly locations + - rpath is no longer required to use dylibs (but talk to Debian Rust + maintainers before building a package that depends on the dylibs) + * Install /usr/share/rustc/architecture.mk, which declares Rust arch + triples for Debian archs and is intended to help future Rust packaging + efforts. Warning: it may not be complete/accurate yet. + * New upstream release (1.1) + + -- Angus Lees Thu, 16 Jul 2015 14:23:47 +1000 + +rustc (1.0.0+dfsg1-1) unstable; urgency=medium + + [ Angus Lees ] + * New upstream release (1.0!) + + [ Sylvestre Ledru ] + * Fix the watch file + * Update of the repack to remove llvm sources + + -- Sylvestre Ledru Sat, 16 May 2015 08:24:32 +1000 + +rustc (1.0.0~beta.4-1~exp1) experimental; urgency=low + + [ Angus Lees ] + * New upstream release (beta 3) + - Drop manpage patch - now included upstream + * Replace duplicated compile-time dylibs with symlinks to run-time libs + (reduces installed size by ~68MB) + + [ Sylvestre Ledru ] + * New upstream release (beta 4) + * Replace two more occurrences of jquery by the package + * Repack upstream to remove an LLVM file with a non-DFSG license + + -- Sylvestre Ledru Wed, 06 May 2015 11:14:30 +0200 + +rustc (1.0.0~alpha.2-1~exp1) experimental; urgency=low + + [ Angus Lees ] + * Patch upstream manpages to address minor troff issues + * Make 'debian/rules clean' also clean LLVM source + * Rename primary 'rust' binary package to 'rustc' + * Fix potential FTBFS: rust-doc requires texlive-fonts-recommended (for + pzdr.tfm) + * Build against system LLVM + + [ Sylvestre Ledru ] + * New testing release + * Renaming of the source package + * Set a minimal version for dpkg-dev and debhelper (for profiles) + * For now, disable build profiles as they are not supported in Debian + * Introduce some changes by Angus Lees + - Introduction of build stages + - Disable the parallel execution of tests + - Improving of the parallel syntax + - Use override_dh_auto_build-arch + - Use override_dh_auto_build-indep + - Better declarations of the doc + - Update of the description + - Watch file updated (with key check) + + [ Luca Bruno ] + * rules: respect 'nocheck' DEB_BUILD_OPTIONS + + -- Sylvestre Ledru Sat, 07 Mar 2015 09:25:47 +0100 + +rust (1.0.0~alpha-0~exp1) experimental; urgency=low + + * Initial package (Closes: #689207) + Work done by Luca Bruno, Jordan Justen and Sylvestre Ledru + + -- Sylvestre Ledru Fri, 23 Jan 2015 15:47:37 +0100 diff --git a/check-orig-suspicious.sh b/check-orig-suspicious.sh new file mode 100755 index 0000000000..a168b7866b --- /dev/null +++ b/check-orig-suspicious.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e + +ver="$1" +test -n "$ver" || exit 2 +dfsg="$2" +if test -z "$dfsg"; then + dfsg=1 +fi + +SUS_WHITELIST="$(find "${PWD}/debian" -name upstream-tarball-unsuspicious.txt -type f)" + +rm -rf "rustc-${ver/*~*/beta}-src/" +tar xf "../rustc_$ver+dfsg$dfsg.orig.tar.xz" && cd "rustc-${ver/*~*/beta}-src/" +if test -f "../../rustc_$ver+dfsg$dfsg.orig-extra.tar.xz" ; then + tar xf "../../rustc_$ver+dfsg$dfsg.orig-extra.tar.xz" +fi + +../debian/scripts/audit-vendor-source \ + "$SUS_WHITELIST" \ + "Files-Excluded: in debian/copyright and run a repack." \ + -m text/x-script.python \ + -m application/csv + +echo "Artifacts left in rustc-$ver-src, please remove them yourself." diff --git a/config.toml.in b/config.toml.in new file mode 100644 index 0000000000..d68eb04517 --- /dev/null +++ b/config.toml.in @@ -0,0 +1,73 @@ +changelog-seen = 2 + +[build] +submodules = false +vendor = true +locked-deps = false +verbose = VERBOSITY +profiler = PROFILER + +rustc = "RUST_DESTDIR/usr/bin/rustc" +cargo = "RUST_DESTDIR/usr/bin/cargo" + +build = "DEB_BUILD_RUST_TYPE" +host = ["DEB_HOST_RUST_TYPE"] +target = ["DEB_TARGET_RUST_TYPE"] + +#full-bootstrap = true +# originally needed to work around #45317 but no longer necessary +# currently we have to omit it because it breaks #48319 + +# this might get changed later by override_dh_auto_configure-indep +# we do it this way to avoid spurious rebuilds +docs = false + +extended = true +tools = ["cargo", "clippy", "rustfmt", "rustdoc", "rust-analyzer-proc-macro-srv"] + +[install] +prefix = "/usr" + +[target.DEB_BUILD_RUST_TYPE] +llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" +linker = "DEB_BUILD_GNU_TYPE-gcc" + +ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,, +[target.DEB_HOST_RUST_TYPE] +llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" +linker = "DEB_HOST_GNU_TYPE-gcc" + +)dnl +ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,, +[target.DEB_TARGET_RUST_TYPE] +llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" +linker = "DEB_TARGET_GNU_TYPE-gcc" + +)dnl +[target.wasm32-wasi] +wasi-root = "/usr" + +[llvm] +link-shared = true + +[rust] +jemalloc = false +optimize = MAKE_OPTIMISATIONS +dist-src = false + +channel = "RELEASE_CHANNEL" + +# parallel codegen interferes with reproducibility, see +# https://github.com/rust-lang/rust/issues/34902#issuecomment-319463586 +#codegen-units = 0 +debuginfo-level = 2 +debuginfo-level-std = 2 +rpath = false +# see also d-custom-debuginfo-path.patch +remap-debuginfo = true + +omit-git-hash = true +verbose-tests = true +backtrace-on-ice = true + +deny-warnings = false diff --git a/control b/control new file mode 100644 index 0000000000..b95d6ebfba --- /dev/null +++ b/control @@ -0,0 +1,434 @@ +Source: rustc +Section: devel +Priority: optional +Maintainer: Debian Rust Maintainers +Uploaders: + Ximin Luo , + Sylvestre Ledru , + Fabian Grünbichler +Rules-Requires-Root: no +# :native annotations are to support cross-compiling, see README.Debian +Build-Depends: + debhelper (>= 9), + debhelper-compat (= 13), + dpkg-dev (>= 1.17.14), + python3:native, + cargo:native (>= 1.75.0+dfsg) , + rustc:native (>= 1.75.0+dfsg) , + rustc:native (<= 1.76.0++) , + llvm-17-dev:native, + llvm-17-tools:native, + gcc-mingw-w64-x86-64-posix:native [amd64] , + gcc-mingw-w64-i686-posix:native [i386] , + libllvm17t64 (>= 1:17.0.0), + libclang-rt-17-dev:native, + libclang-rt-17-dev, + cmake (>= 3.0), +# needed by some vendor crates + pkgconf:native, + pkgconf, +# this is sometimes needed by rustc_llvm + zlib1g-dev:native, + zlib1g-dev, +# used by rust-installer + liblzma-dev:native, +# used by cargo + bash-completion, + libcurl4-openssl-dev | libcurl4-gnutls-dev, + libssh2-1-dev, + libssl-dev, + libsqlite3-dev, + libgit2-dev (>= 1.7.1), + libgit2-dev (<< 1.8~~), + libhttp-parser-dev, +# test dependencies: + binutils (>= 2.26) | binutils-2.26 , +# temporarily disabled cause of #1066794 / t64 transition + git , + procps , +# below are optional tools even for 'make check' + gdb (>= 7.12) , +# Extra build-deps needed for x.py to download stuff in pkg.rustc.dlstage0. + curl , + ca-certificates , +Build-Depends-Indep: + wasi-libc (>= 0.0~git20230821.ec4566b~~) , + wasi-libc (<= 0.0~git20230821.ec4566b++) , + clang-17:native, +Build-Conflicts: gdb-minimal +Standards-Version: 4.6.2 +Homepage: http://www.rust-lang.org/ +Vcs-Git: https://salsa.debian.org/rust-team/rust.git +Vcs-Browser: https://salsa.debian.org/rust-team/rust + +Package: rustc +Architecture: any +Multi-Arch: allowed +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, + libstd-rust-dev (= ${binary:Version}), + gcc, libc-dev, binutils (>= 2.26) +Recommends: + cargo (= ${binary:Version}), +# llvm is needed for llvm-dwp for -C split-debuginfo=packed + rust-llvm, +Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) +Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) +Description: Rust systems programming language + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + +Package: libstd-rust-1.76 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Rust standard libraries + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the standard Rust libraries, built as dylibs, + needed to run dynamically-linked Rust programs (-C prefer-dynamic). + +Package: libstd-rust-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends}, + libstd-rust-1.76 (= ${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 + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains development files for the standard Rust libraries, + needed to compile Rust programs. It may also be installed on a system + of another host architecture, for cross-compiling to this architecture. + +Package: libstd-rust-dev-windows +Section: libdevel +Architecture: amd64 i386 +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: + gcc-mingw-w64-x86-64-posix [amd64], + gcc-mingw-w64-i686-posix [i386], +Build-Profiles: +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 + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the standard Rust libraries including development files, + needed to cross-compile Rust programs to the *-pc-windows-gnu target + corresponding to the architecture of this package. + +Package: libstd-rust-dev-wasm32 +Section: libdevel +Architecture: all +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends} +# Embeds wasi-libc so doesn't need to depend on it +# None of its licenses require source redistrib, so no need for Built-Using +Recommends: + lld-17, clang-17, +Suggests: +# nodejs contains wasi-node for running the program + nodejs (>= 12.16), +Build-Profiles: +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 + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the standard Rust libraries including development files, + needed to cross-compile Rust programs to the wasm32-unknown-unknown and + wasm32-wasi targets. + +Package: rust-gdb +Architecture: all +Depends: gdb, ${misc:Depends} +Suggests: gdb-doc +Replaces: rustc (<< 1.1.0+dfsg1-1) +Description: Rust debugger (gdb) + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains pretty printers and a wrapper script for + invoking gdb on rust binaries. + +Package: rust-lldb +Architecture: all +# When updating, also update rust-lldb.links +Depends: lldb-17, ${misc:Depends}, python3-lldb-17 +Replaces: rustc (<< 1.1.0+dfsg1-1) +Description: Rust debugger (lldb) + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains pretty printers and a wrapper script for + invoking lldb on rust binaries. + +Package: rust-llvm +Architecture: all +Breaks: + rustc (<< 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), + rustc-mozilla (<< 1.71.1+dfsg1-1~exp1), +Depends: + ${misc:Depends}, +# lld and clang are needed for wasm compilation + lld-17, clang-17, +# llvm is needed for llvm-dwp for split-debuginfo=packed + llvm-17 +Description: Rust LLVM integration + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains symlinks for integration with LLVM tools such as lld and + grcov. + +Package: rust-doc +Section: doc +Architecture: all +Build-Profiles: +Depends: ${misc:Depends}, + libjs-jquery, libjs-highlight.js, libjs-mathjax, + fonts-open-sans, fonts-font-awesome +Recommends: cargo-doc +Description: Rust systems programming language - Documentation + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the Rust tutorial, language reference and + standard library documentation. + +Package: rust-src +Architecture: all +Depends: ${misc:Depends} +Description: Rust systems programming language - source code + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains sources of the Rust compiler and standard + libraries, useful for IDEs and code analysis tools such as Racer. + +Package: rust-clippy +Architecture: any +Multi-Arch: allowed +Depends: ${misc:Depends}, ${shlibs:Depends}, + libstd-rust-1.76 (= ${binary:Version}) +Recommends: cargo +Description: Rust linter + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains 'clippy', a linter to catch common mistakes and improve + your Rust code as well a collection of over 400 compatible lints. + . + Lints are divided into categories, each with a default lint level. You can + choose how much Clippy is supposed to annoy help you by changing the lint + level by category. + . + Clippy is integrated into the 'cargo' build tool, available via 'cargo clippy'. + +Package: rustfmt +Architecture: any +Multi-Arch: allowed +Depends: ${misc:Depends}, ${shlibs:Depends}, +Recommends: cargo +Description: Rust formatting helper + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains 'rustfmt', a tool for formatting Rust code according to + style guidelines, as well as 'cargo-fmt', a helper enabling running rustfmt + directly with 'cargo fmt'. + +Package: rust-all +Architecture: all +Depends: ${misc:Depends}, ${shlibs:Depends}, + rustc (>= ${binary:Version}), + rustfmt (>= ${binary:Version}), + rust-clippy (>= ${binary:Version}), + rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}), + cargo, +Recommends: + cargo (= ${binary:Version}) +Suggests: + rust-doc (>= ${binary:Version}), + rust-src (>= ${binary:Version}), + libstd-rust-dev-wasm32 (>= ${binary:Version}), + libstd-rust-dev-windows (>= ${binary:Version}), +Description: Rust systems programming language - all developer tools + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package is an empty metapackage that depends on all developer tools + in the standard rustc distribution that have been packaged for Debian. + +# Cargo binaries +Package: cargo +Architecture: any +Multi-Arch: allowed +Depends: ${shlibs:Depends}, ${misc:Depends}, + rustc (= ${binary:Version}), + binutils, + gcc | clang | c-compiler +Suggests: cargo-doc, python3 +Description: Rust package manager + Cargo is a tool that allows Rust projects to declare their various + dependencies, and ensure that you'll always get a repeatable build. + . + To accomplish this goal, Cargo does four things: + * Introduces two metadata files with various bits of project information. + * Fetches and builds your project's dependencies. + * Invokes rustc or another build tool with the correct parameters to build + your project. + * Introduces conventions, making working with Rust projects easier. + . + Cargo downloads your Rust project's dependencies and compiles your + project. + +Package: cargo-doc +Section: doc +Architecture: all +Build-Profiles: +Recommends: rust-doc +Depends: ${misc:Depends} +Description: Rust package manager, documentation + Cargo is a tool that allows Rust projects to declare their various + dependencies, and ensure that you'll always get a repeatable build. + . + To accomplish this goal, Cargo does four things: + * Introduces two metadata files with various bits of project information. + * Fetches and builds your project's dependencies. + * Invokes rustc or another build tool with the correct parameters to build + your project. + * Introduces conventions, making working with Rust projects easier. + . + Cargo downloads your Rust project's dependencies and compiles your + project. + . + This package contains the documentation. + +# TODO: add a cargo-src package diff --git a/copyright b/copyright new file mode 100644 index 0000000000..6470d94de9 --- /dev/null +++ b/copyright @@ -0,0 +1,3568 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rust +Source: https://www.rust-lang.org +Files-Excluded: + .gitmodules + *.min.js + src/llvm-project +# Pre-generated docs + src/tools/rustfmt/docs +# Fonts already in Debian, covered by d-0003-mdbook-strip-embedded-libs.patch + vendor/mdbook/src/theme/fonts + vendor/mdbook/src/theme/FontAwesome + vendor/mdbook/src/theme/highlight.js + vendor/mdbook/src/theme/highlight.css +# DOCX versions of TRPL book prepared for No Starch Press + src/doc/book/nostarch/docx +# Exclude submodules https://github.com/rust-lang/rust/tree/master/src/tools +# We prefer to do them in different Debian packages so they can have their own +# version numbers. If upstream merges them "properly" (i.e. unify the version +# numbers) then we can merge the packages in Debian. Note that cargotest here +# does actually belong to rustc, it is an integration test suite for rustc to +# check that certain popular crates continue to compile. It is not the same as +# cargo's own test suite (in its own package) also called cargotest. +# NB: don't exclude rust-installer, it's needed for "install" functionality +#src/tools/cargo + src/tools/rls + src/tools/remote-test-client + src/tools/remote-test-server + src/tools/miri +# rust-analyzer parts we don't need (yet) + src/tools/rust-analyzer/editors + src/tools/rust-analyzer/.github + vendor/rust-analyzer-salsa/book +# Embedded GH pages + src/tools/clippy/util/gh-pages +# Embedded C libraries + vendor/curl-sys/curl + vendor/libgit2-sys/libgit2 + vendor/libssh2-sys/libssh2 + vendor/libsqlite3-sys/sqlite3 + vendor/libsqlite3-sys/sqlcipher + vendor/libz-sys/src/zlib* + vendor/lzma-sys*/xz-* +# Embedded binary blobs + vendor/jsonpath_lib/docs + vendor/mdbook/src/theme/playground_editor + vendor/psm/src/arch/wasm32.o +# test binary files + vendor/libloading-0.7.4/tests/*.dll + vendor/libloading/tests/*.dll +# Misc + vendor/*/icon_CLion.svg + vendor/prettydiff/screens/*.png + vendor/wasm-bindgen/guide + vendor/wasm-bindgen/examples/import_js/index.js + vendor/wasm-bindgen/examples/import_js/webpack.config.js +# TMEP hack, see debian/prune-unused-deps + vendor/cc +# unused dependencies, generated by debian/prune-unused-deps +# DO NOT EDIT below, AUTOGENERATED + vendor/addr2line-0.19.0 + vendor/aes + vendor/ahash-0.8.3 + vendor/aho-corasick-0.7.18 + vendor/aho-corasick-1.0.2 + vendor/allocator-api2-0.2.15 + vendor/anstyle-1.0.0 + vendor/anstyle-parse-0.2.1 + vendor/anstyle-query-1.0.0 + vendor/anstyle-wincon-2.1.0 + vendor/anstyle-wincon + vendor/backtrace-0.3.67 + vendor/base64-0.21.2 + vendor/bitflags-2.4.0 + vendor/block-buffer-0.10.2 + vendor/bstr-0.2.17 + vendor/bstr-1.5.0 + vendor/bumpalo-3.13.0 + vendor/bytes-1.4.0 + vendor/camino-1.1.4 + vendor/cargo_metadata-0.18.0 + vendor/cargo-platform-0.1.2 + vendor/cc-1.0.73 + vendor/chalk-derive + vendor/chalk-ir + vendor/chalk-recursive + vendor/chalk-solve + vendor/cipher + vendor/clap-4.4.4 + vendor/clap-4.4.7 + vendor/clap_builder-4.4.4 + vendor/clap_builder-4.4.7 + vendor/clap_complete-4.4.3 + vendor/clap_derive-4.4.2 + vendor/clap_lex-0.5.0 + vendor/command-group + vendor/core-foundation-0.9.3 + vendor/core-foundation-sys-0.8.3 + vendor/core-foundation-sys-0.8.4 + vendor/cpufeatures-0.2.5 + vendor/cpufeatures-0.2.8 + 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 + vendor/cranelift-jit + vendor/cranelift-module + vendor/cranelift-native + vendor/cranelift-object + vendor/crossbeam-deque-0.8.2 + vendor/crossbeam-epoch-0.9.13 + vendor/crossbeam-utils-0.8.14 + vendor/crypto-common-0.1.3 + vendor/ctrlc-3.4.0 + vendor/curl-sys-0.4.63+curl-8.1.2 + vendor/diff-0.1.12 + vendor/digest-0.10.3 + vendor/directories + vendor/dirs-sys + vendor/dissimilar-1.0.6 + vendor/dot + vendor/either-1.6.1 + vendor/either-1.8.1 + vendor/encode_unicode + vendor/encoding_rs-0.8.32 + vendor/equivalent-1.0.0 + vendor/errno-0.3.5 + vendor/fastrand-2.0.0 + vendor/filetime-0.2.16 + vendor/filetime-0.2.21 + vendor/filetime-0.2.22 + vendor/fixedbitset + vendor/flate2-1.0.26 + vendor/form_urlencoded-1.2.0 + vendor/fsevent-sys + vendor/generic-array-0.14.5 + vendor/getrandom-0.2.10 + vendor/gimli-0.27.3 + vendor/globset-0.4.10 + vendor/globset-0.4.8 + vendor/hashbrown-0.13.2 + vendor/hashbrown-0.14.0 + vendor/hermit-abi-0.2.6 + vendor/hermit-abi-0.3.2 + vendor/home-0.5.4 + vendor/idna-0.4.0 + vendor/ignore-0.4.18 + vendor/ignore-0.4.20 + vendor/indexmap-2.0.0 + vendor/inotify + vendor/inotify-sys + vendor/inout + vendor/is-terminal-0.4.8 + vendor/itoa-1.0.2 + vendor/itoa-1.0.6 + vendor/jemalloc-sys + vendor/js-sys-0.3.64 + vendor/junction + vendor/kqueue + vendor/kqueue-sys + vendor/libc-0.2.148 + vendor/libffi + vendor/libffi-sys + vendor/libloading-0.8.0 + vendor/libm-0.2.7 + vendor/libmimalloc-sys + vendor/libnghttp2-sys + vendor/libz-sys-1.1.9 + vendor/linked-hash-map + vendor/linux-raw-sys-0.4.10 + vendor/lock_api-0.4.10 + vendor/log-0.4.17 + vendor/log-0.4.19 + vendor/lsp-server + vendor/lzma-sys-0.1.17 + vendor/mach + vendor/memchr-2.5.0 + vendor/memchr-2.6.3 + vendor/memoffset-0.7.1 + vendor/mimalloc + vendor/miniz_oxide-0.6.2 + vendor/mio-0.8.5 + vendor/miow + vendor/nix-0.26.2 + vendor/normpath + vendor/notify + vendor/ntapi-0.4.0 + vendor/ntapi + vendor/nu-ansi-term + vendor/num_cpus-1.15.0 + vendor/num-traits-0.2.15 + vendor/object-0.30.4 + vendor/object-0.32.0 + vendor/once_cell-1.12.0 + vendor/opener-0.5.0 + vendor/openssl-0.10.55 + vendor/openssl-src + vendor/openssl-sys-0.9.90 + vendor/option-ext + vendor/parking_lot_core-0.9.8 + vendor/paste + vendor/percent-encoding-2.3.0 + vendor/pest-2.7.0 + vendor/pest_derive-2.7.0 + vendor/pest_generator-2.7.0 + vendor/pest_meta-2.7.0 + vendor/petgraph + vendor/pin-project-lite-0.2.10 + vendor/pin-project-lite-0.2.9 + vendor/pkg-config-0.3.25 + vendor/proc-macro2-1.0.60 + vendor/proc-macro2-1.0.63 + vendor/proc-macro2-1.0.69 + vendor/protobuf + vendor/protobuf-support + vendor/pulldown-cmark-to-cmark + vendor/quote-1.0.26 + vendor/quote-1.0.28 + vendor/quote-1.0.29 + vendor/redox_syscall-0.2.13 + vendor/redox_syscall-0.3.5 + vendor/regalloc2 + vendor/regex-1.5.6 + vendor/regex-1.8.4 + vendor/regex-syntax-0.6.26 + vendor/regex-syntax-0.7.2 + vendor/region + vendor/rustc-build-sysroot + vendor/rustix-0.38.19 + vendor/ryu-1.0.10 + vendor/ryu-1.0.13 + vendor/schannel + vendor/scip + vendor/scopeguard-1.1.0 + vendor/security-framework-2.9.1 + vendor/security-framework-sys-2.9.0 + vendor/semver-1.0.17 + vendor/serde-1.0.160 + vendor/serde-1.0.185 + vendor/serde_derive-1.0.160 + vendor/serde_derive-1.0.185 + vendor/serde_json-1.0.81 + vendor/serde_json-1.0.99 + vendor/serde_spanned-0.6.3 + vendor/sha1-0.10.5 + vendor/sha2-0.10.2 + vendor/sha2-0.10.7 + vendor/sharded-slab-0.1.4 + vendor/slice-group-by + vendor/smallvec-1.10.0 + vendor/smallvec-1.11.0 + vendor/socket2-0.4.9 + vendor/syn-2.0.32 + vendor/syn-2.0.8 + vendor/target-lexicon + vendor/tempfile-3.8.0 + vendor/thiserror-1.0.40 + vendor/thiserror-1.0.47 + vendor/thiserror-impl-1.0.40 + vendor/thiserror-impl-1.0.47 + vendor/thread_local-1.1.4 + vendor/tikv-jemallocator + vendor/tikv-jemalloc-ctl + vendor/tikv-jemalloc-sys + vendor/time-0.3.22 + vendor/time-core-0.1.1 + vendor/time-macros-0.2.9 + vendor/toml-0.5.9 + vendor/toml_datetime-0.6.3 + vendor/tracing-attributes-0.1.26 + vendor/tracing-subscriber-0.3.17 + vendor/tracing-tree + vendor/typenum-1.15.0 + vendor/typenum-1.16.0 + vendor/ucd-trie-0.1.5 + vendor/unicase-2.6.0 + vendor/unicode-ident-1.0.0 + vendor/unicode-ident-1.0.9 + vendor/unicode-width-0.1.10 + vendor/url-2.4.0 + vendor/walkdir-2.3.2 + vendor/walkdir-2.3.3 + vendor/wasm-bindgen-0.2.87 + vendor/wasm-bindgen-backend-0.2.87 + vendor/wasm-bindgen-macro-0.2.87 + vendor/wasm-bindgen-macro-support-0.2.87 + vendor/wasm-bindgen-shared-0.2.87 + vendor/wasmtime-jit-icache-coherence + vendor/web-sys-0.3.61 + vendor/winapi + vendor/winapi-i686-pc-windows-gnu + vendor/winapi-util-0.1.5 + vendor/winapi-util + vendor/winapi-x86_64-pc-windows-gnu + vendor/windows-0.48.0 + vendor/windows_aarch64_gnullvm-0.42.2 + vendor/windows_aarch64_gnullvm-0.48.0 + vendor/windows_aarch64_gnullvm-0.48.5 + vendor/windows_aarch64_gnullvm + vendor/windows_aarch64_msvc-0.42.2 + vendor/windows_aarch64_msvc-0.48.0 + vendor/windows_aarch64_msvc-0.48.5 + vendor/windows_aarch64_msvc + vendor/windows + vendor/windows-core + vendor/windows_i686_gnu-0.42.2 + vendor/windows_i686_gnu-0.48.0 + vendor/windows_i686_gnu-0.48.5 + vendor/windows_i686_gnu + vendor/windows_i686_msvc-0.42.2 + vendor/windows_i686_msvc-0.48.0 + vendor/windows_i686_msvc-0.48.5 + vendor/windows_i686_msvc + vendor/windows-sys-0.42.0 + vendor/windows-sys-0.45.0 + vendor/windows-sys-0.48.0 + vendor/windows-sys + vendor/windows-targets-0.42.2 + vendor/windows-targets-0.48.0 + vendor/windows-targets-0.48.1 + vendor/windows-targets-0.48.5 + vendor/windows-targets + vendor/windows_x86_64_gnu-0.42.2 + vendor/windows_x86_64_gnu-0.48.0 + vendor/windows_x86_64_gnu-0.48.5 + vendor/windows_x86_64_gnu + vendor/windows_x86_64_gnullvm-0.42.2 + vendor/windows_x86_64_gnullvm-0.48.0 + vendor/windows_x86_64_gnullvm-0.48.5 + vendor/windows_x86_64_gnullvm + vendor/windows_x86_64_msvc-0.42.2 + vendor/windows_x86_64_msvc-0.48.0 + vendor/windows_x86_64_msvc-0.48.5 + vendor/windows_x86_64_msvc + vendor/winreg + vendor/xz2-0.1.6 + vendor/yaml-merge-keys + vendor/yaml-rust + vendor/zerocopy-0.7.28 + vendor/zerocopy-derive-0.7.28 +# DO NOT EDIT above, AUTOGENERATED + +Files: C*.md + R*.md + Cargo.lock + Cargo.toml + COPYRIGHT + LICENSE* + compiler/* + configure + config.example.toml + git-commit-hash + git-commit-info + library/* + src/README.md + src/bootstrap/* + src/ci/* + src/doc/* + src/etc/* + src/lib* + src/rust* + src/stage0.json + src/tools/* + src/version + tests/* + version + x.py + .cargo/config.toml +Copyright: 2006-2009 Graydon Hoare + 2009-2012 Mozilla Foundation + 2012-2017 The Rust Project Developers (see AUTHORS.txt) +License: MIT or Apache-2.0 + +Files: src/librustdoc/html/static/fonts/FiraSans* +Copyright: 2014, Mozilla Foundation, 2014, Telefonica S.A. +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/fonts/NanumBarun* +Copyright: 2010 NAVER Corporation +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/fonts/SourceCodePro* +Copyright: 2010, 2012 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/fonts/SourceSerif4* +Copyright: 2014-2021 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: vendor/compiler_builtins/* +Copyright: 2016-2019 Jorge Aparicio +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang-nursery/compiler-builtins + +Files: vendor/ahash/* +Copyright: 2019-2022 Tom Kaitchuck +License: MIT OR Apache-2.0 +Comment: see https://github.com/tkaitchuck/ahash + +Files: vendor/android_system_properties/* +Copyright: 2022-2022 Nicolas Silva +License: MIT or Apache-2.0 +Comment: see https://github.com/nical/android_system_properties + +Files: vendor/anes/* +Copyright: 2019-2023 Robert Vojta +License: MIT OR Apache-2.0 +Comment: see https://github.com/zrzka/anes-rs + +Files: vendor/ansi_term/* +Copyright: 2014-2019 ogham@bsago.me + 2014-2019 Ryan Scheel (Havvy) + 2014-2019 Josh Triplett +License: MIT +Comment: see https://github.com/ogham/rust-ansi-term + +Files: + vendor/anstream/* + vendor/anstream-0.*/* + vendor/anstyle/* + vendor/anstyle-parse/* + 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. +License: Apache-2.0 with LLVM exception +Comment: + see https://github.com/rust-lang/ar_archive_writer + derived from LLVM code + +Files: + vendor/arbitrary/* + vendor/derive_arbitrary/* +Copyright: 2017-2024 The Rust-Fuzz Project Developers + 2017-2024 Nick Fitzgerald + 2017-2024 Manish Goregaokar + 2017-2024 Simonas Kazlauskas + 2017-2024 Brian L. Troutwine + 2017-2024 Corey Farwell +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-fuzz/arbitrary/ + +Files: vendor/askama*/* +Copyright: 2016-2022 Dirkjan Ochtman +License: MIT OR Apache-2.0 +Comment: see https://github.com/djc/askama + +Files: + vendor/bitflags/* + vendor/bitflags-1.*/* + vendor/cc-1.*/* + vendor/cmake/* + vendor/env_logger/* + vendor/getopts/* + vendor/glob/* + vendor/libc/* + vendor/log/* + vendor/regex/* + vendor/regex-syntax/* + vendor/regex-syntax-0.*/* + vendor/rustc-hash/* + vendor/time/* +Copyright: 2010-2021 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: + This is a collection of external crates embedded here to bootstrap cargo. + Most of them come from the original upstream Rust project, thus share the + same MIT/Apache-2.0 dual-license. See https://github.com/rust-lang. + Exceptions are noted below. + +Files: + vendor/time-core/* +Copyright: 2019-2023 Jacob Pratt + 2019-2023 Time contributors +License: MIT OR Apache-2.0 +Comment: see https://github.com/time-rs/time + +Files: + vendor/core-foundation/* + vendor/core-foundation-sys/* +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-traits/* +Copyright: 2014-2018 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-num/num + +Files: + vendor/string_cache/* + vendor/string_cache_codegen/* + vendor/unicode-bidi/* +Copyright: 2015-2017 Alex Crichton + 2015-2017 Keegan McAllister + 2015-2017 Chris Morgan + 2014-2017 The html5ever Project Developers + 2014-2017 The Servo Project Developers + 2013-2017 Simon Sapin +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/ + +Files: + vendor/getrandom/* + vendor/rand/* + vendor/rand_chacha/* + vendor/rand_core/* + vendor/rand_xorshift/* + vendor/rand_xoshiro/* +Copyright: 2010-2019 The Rand Project Developers + 2010-2019 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: + see https://github.com/rust-random/getrandom + see https://github.com/rust-random/rand + see https://github.com/rust-random/small-rngs + +Files: + vendor/cfg-if/* + vendor/filetime/* + vendor/flate2/* + vendor/fnv/* + vendor/jobserver/* + vendor/lzma-sys/* + vendor/pkg-config/* + vendor/proc-macro2/* + vendor/rustc-demangle/* + vendor/scoped-tls/* + vendor/tar/* + vendor/toml-0*/* + vendor/xz2/* +Copyright: 2014-2020 Alex Crichton + 2015-2017 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/ + +Files: vendor/dlmalloc/* +Copyright: 2017-2019 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/dlmalloc-rs + +Files: vendor/dlmalloc/src/dlmalloc.c +Copyright: 2000-2012 Doug Lea +License: CC0-1.0 + +Files: vendor/tester/* +Copyright: 2016-2019 The Rust Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/messense/rustc-test + +Files: vendor/addr2line/* +Copyright: + 2016-2021 Nick Fitzgerald + 2016-2021 Philip Craig + 2016-2021 Jon Gjengset + 2016-2021 Noah Bergbauer +License: Apache-2.0 or MIT +Comment: see https://github.com/gimli-rs/addr2line + +Files: + vendor/adler/* +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 +Comment: see https://github.com/matklad/always-assert + +Files: vendor/ammonia/* +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 +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 +License: MIT or Unlicense +Comment: see upstream projects, + * https://github.com/BurntSushi/aho-corasick + * https://github.com/BurntSushi/rust-memchr + +Files: vendor/arc-swap/* +Copyright: 2018-2024 Michal 'vorner' Vaner +License: MIT OR Apache-2.0 +Comment: see https://github.com/vorner/arc-swap + +Files: vendor/autocfg/* +Copyright: 2018-2020 Josh Stone +License: Apache-2.0 or MIT + +Files: vendor/backtrace/* +Copyright: 2015-2022 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/backtrace-rs + +Files: vendor/base64/* +Copyright: 2015-2024 Alice Maz + 2015-2024 Marshall Pierce +License: MIT OR Apache-2.0 +Comment: see https://github.com/marshallpierce/rust-base64 + +Files: vendor/basic-toml/* +Copyright: 2014-2023 Alex Crichton + 2014-2023 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/basic-toml + +Files: vendor/bincode/* +Copyright: 2014-2024 Ty Overby + 2014-2024 Francesco Mazzoli + 2014-2024 David Tolnay + 2014-2024 Zoey Riordan +License: MIT +Comment: see https://github.com/servo/bincode + +Files: vendor/bitmaps/* +Copyright: 2019-2024 Bodil Stokke +License: MPL-2.0+ +Comment: see https://github.com/bodil/bitmaps + +Files: vendor/bit-set/* +Copyright: 2015-2023 Alexis Beingessner +License: MIT or Apache-2.0 +Comment: see https://github.com/contain-rs/bit-set + +Files: vendor/bit-vec/* +Copyright: 2015-2023 Alexis Beingessner +License: MIT or Apache-2.0 +Comment: see https://github.com/contain-rs/bit-vec + +Files: + vendor/base16ct/* + vendor/base64ct/* + vendor/block-buffer/* + vendor/const-oid/* + vendor/cpufeatures/* + vendor/crypto-bigint/* + vendor/crypto-common/* + vendor/der/* + vendor/digest/* + vendor/ecdsa/* + vendor/elliptic-curve/* + vendor/hkdf/* + vendor/hmac/* + vendor/md-5/* + vendor/p384/* + vendor/pem-rfc7468/* + vendor/pkcs8/* + vendor/primeorder/* + vendor/rfc6979/* + vendor/sec1/* + vendor/sha1/* + vendor/sha2/* + vendor/signature/* + vendor/spki/* + vendor/zeroize/* +Copyright: 2015-2024 RustCrypto Developers +License: MIT or Apache-2.0 +Comment: + see https://github.com/RustCrypto/elliptic-curves + see https://github.com/RustCrypto/formats + see https://github.com/RustCrypto/hashes + see https://github.com/RustCrypto/signatures + see https://github.com/RustCrypto/traits + see https://github.com/RustCrypto/utils + see https://github.com/RustCrypto/KDFs + see https://github.com/RustCrypto/MACs + +Files: vendor/bstr/* +Copyright: 2018-2024 Andrew Gallant +License: MIT OR Apache-2.0 +Comment: see https://github.com/BurntSushi/bstr + +Files: vendor/btoi/* +Copyright: 2017-2023 Niklas Fiekas +License: MIT OR Apache-2.0 +Comment: see https://github.com/niklasf/rust-btoi + +Files: vendor/bumpalo/* +Copyright: 2018-2024 Nick Fitzgerald +License: MIT or Apache-2.0 +Comment: see https://github.com/fitzgen/bumpalo + +Files: vendor/bytecount/* +Copyright: 2016-2020 Andre Bogus + 2016-2020 Joshua Landau +License: Apache-2.0 or MIT +Comment: see https://github.com/llogiq/bytecount + +Files: vendor/byteorder/* +Copyright: 2015-2023 Andrew Gallant +License: Unlicense OR MIT +Comment: see https://github.com/BurntSushi/byteorder + +Files: vendor/bytesize/* +Copyright: 2015-2023 Hyunsik Choi +License: Apache-2.0 +Comment: see https://github.com/hyunsik/bytesize/ + +Files: + vendor/globset/* + vendor/ignore/* + vendor/same-file/* + vendor/termcolor/* + vendor/walkdir/* +Copyright: 2015-2020 Andrew Gallant +License: Unlicense or MIT +Comment: + see https://github.com/BurntSushi/same-file + see https://github.com/BurntSushi/walkdir + see https://github.com/BurntSushi/winapi-util + see https://github.com/BurntSushi/ripgrep/tree/master/globset + see https://github.com/BurntSushi/ripgrep/tree/master/ignore + see https://github.com/BurntSushi/ripgrep/tree/master/termcolor + +Files: vendor/camino/* +Copyright: 2020-2022 Without Boats + 2020-2022 Ashley Williams + 2020-2022 Steve Klabnik + 2020-2022 Rain +License: MIT OR Apache-2.0 +Comment: see https://github.com/withoutboats/camino + +Files: + vendor/cargo_metadata/* + vendor/cargo_metadata-0.*/* +Copyright: 2016-2020 Oliver Schneider +License: MIT +Comment: + see https://github.com/oli-obk/cargo_metadata + +Files: vendor/cargo-platform/* +Copyright: 2019-2022 The Cargo Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/cargo + +Files: vendor/cast/* +Copyright: 2014-2021 Jorge Aparicio +License: MIT OR Apache-2.0 +Comment: see https://github.com/japaric/cast.rs + +Files: vendor/ppv-lite86/* +Copyright: 2019-2019 The CryptoCorrosion Contributors +License: MIT or Apache-2.0 +Comment: see https://github.com/cryptocorrosion/cryptocorrosion + +Files: vendor/chrono/* +Copyright: 2014-2018 Kang Seonghoon +License: MIT or Apache-2.0 +Comment: see https://github.com/chronotope/chrono + +Files: + vendor/ciborium/* + vendor/ciborium-io/* + vendor/ciborium-ll/* +Copyright: 2020-2024 Nathaniel McCallum +License: Apache-2.0 +Comment: see https://github.com/enarx/ciborium + +Files: + vendor/clap/* + vendor/clap_builder/* + vendor/clap_complete/* + vendor/clap_derive/* + vendor/clap_lex/* +Copyright: 2015-2022 Kevin K. +License: MIT +Comment: see https://github.com/clap-rs/clap + +Files: vendor/clap-cargo/* +Copyright: 2019-2024 Ed Page +License: MIT OR Apache-2.0 +Comment: see https://github.com/crate-ci/clap-cargo + +Files: vendor/clru/* +Copyright: 2020-2023 marmeladema +License: MIT +Comment: see https://github.com/marmeladema/clru-rs + +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/color-print/* + vendor/color-print-proc-macro/* +Copyright: 2021-2024 Johann David +License: MIT OR Apache-2.0 +Comment: see https://gitlab.com/yolenoyer/color-print + +Files: vendor/comma/* +Copyright: 2019-2023 Ethan McTague +License: MIT +Comment: see https://github.com/emctague/comma + +Files: + vendor/console/* + vendor/indicatif/* +Copyright: 2017-2024 Armin Ronacher +License: MIT +Comment: + see https://github.com/console-rs/console + see https://github.com/console-rs/indicatif + +Files: vendor/content_inspector/* +Copyright: 2018-2018 David Peter +License: MIT or Apache-2.0 +Comment: see https://github.com/sharkdp/content_inspector + +Files: vendor/convert_case/* +Copyright: 2020-2022 David Purdum +License: MIT +Comment: see https://github.com/rutrum/convert-case + +Files: vendor/countme/* +Copyright: 2021-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/countme + +Files: vendor/cov-mark/* +Copyright: 2020-2021 Aleksey Kladov + 2020-2021 Simonas Kazlauskas +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/cov-mark + +Files: vendor/crc32fast/* +Copyright: 2018-2019 Sam Rijs + 2018-2019 Alex Crichton +License: MIT OR Apache-2.0 +Comment: see https://github.com/srijs/rust-crc32fast + +Files: + vendor/criterion/* + vendor/criterion-plot/* +Copyright: 2014-2024 Jorge Aparicio + 2014-2024 Brook Heisler +License: Apache-2.0 or MIT +Comment: see https://github.com/bheisler/criterion.rs + +Files: + vendor/crossbeam-channel/* + vendor/crossbeam-deque/* + vendor/crossbeam-epoch/* + vendor/crossbeam-utils/* +Copyright: 2015-2022 The Crossbeam Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/crossbeam-rs + +Files: vendor/ct-codecs/* +Copyright: 2020-2022 Frank Denis +License: MIT +Comment: see https://github.com/jedisct1/rust-ct-codecs + +Files: vendor/ctrlc/* +Copyright: 2015-2024 Antti Keränen +License: MIT or Apache-2.0 +Comment: see https://github.com/Detegr/rust-ctrlc.git + +Files: + vendor/curl/* + vendor/curl-sys/* +Copyright: 2014-2024 Alex Crichton +License: MIT +Comment: see https://github.com/alexcrichton/curl-rust + +Files: vendor/dashmap/* +Copyright: 2019-2022 Acrimon +License: MIT +Comment: see https://github.com/xacrimon/dashmap + +Files: + vendor/darling/* + vendor/darling-0.*/* + vendor/darling_core/* + vendor/darling_core-0.*/* + vendor/darling_macro/* + vendor/darling_macro-0.*/* +Copyright: 2017-2024 Ted Driggs +License: MIT +Comment: see https://github.com/TedDriggs/darling + +Files: vendor/datafrog/* +Copyright: + 2018 Frank McSherry + 2018 The Rust Project Developers + 2018 Datafrog Developers +License: Apache-2.0 or MIT +Comment: see https://github.com/rust-lang-nursery/datafrog + +Files: vendor/deranged/* +Copyright: 2020-2023 Jacob Pratt +License: MIT OR Apache-2.0 +Comment: see https://github.com/jhpratt/deranged + +Files: vendor/derivative/* +Copyright: 2016-2021 mcarton +License: MIT or Apache-2.0 +Comment: see https://github.com/mcarton/rust-derivative + +Files: + vendor/derive_builder/* + vendor/derive_builder_core/* + vendor/derive_builder_macro/* +Copyright: 2016-2024 Colin Kiegel + 2016-2024 Pascal Hertleif + 2016-2024 Jan-Erik Rediger + 2016-2024 Ted Driggs +License: MIT or Apache-2.0 +Comment: see https://github.com/colin-kiegel/rust-derive-builder + +Files: vendor/derive_more/* +Copyright: 2016-2023 Jelte Fennema +License: MIT +Comment: see https://github.com/JelteF/derive_more + +Files: vendor/derive_setters/* +Copyright: 2019-2023 Lymia Aluysia +License: MIT or Apache-2.0 +Comment: see https://github.com/Lymia/derive_setters + +Files: vendor/diff/* +Copyright: 2015-2017 Utkarsh Kukreti +License: MIT or Apache-2.0 +Comment: see https://github.com/utkarshkukreti/diff.rs + +Files: + vendor/anyhow/* + vendor/dissimilar/* + vendor/itoa/* + vendor/itoa-0.*/* + vendor/quote/* + vendor/syn/* + vendor/syn-1.*/* + vendor/unicode-ident/* +Copyright: 2016-2024 David Tolnay +License: MIT or Apache-2.0 +Comment: + see https://github.com/dtolnay/anyhow + see https://github.com/dtolnay/dissimilar + see https://github.com/dtolnay/itoa + see https://github.com/dtolnay/quote + see https://github.com/dtolnay/syn + see https://github.com/dtolnay/unicode-ident + +Files: + vendor/arrayvec/* + vendor/either/* + vendor/itertools/* + vendor/itertools-0.*/* + vendor/maplit/* + vendor/scopeguard/* +Copyright: 2014-2020 bluss +License: MIT or Apache-2.0 +Comment: + see https://github.com/bluss/rust-itertools + see https://github.com/bluss/either + see https://github.com/bluss/arrayvec + see https://github.com/bluss/fixedbitset + see https://github.com/bluss/maplit + see https://github.com/bluss/scopeguard + +Files: + vendor/dirs/* + vendor/dirs-sys-0.*/* +Copyright: 2015-2024 Simon Ochsenreither + 2015-2024 dirs-rs contributors +License: MIT OR Apache-2.0 +Comment: + see https://github.com/dirs-dev/dirs-rs + see https://github.com/dirs-dev/dirs-sys-rs + +Files: + vendor/dirs-next/* + vendor/dirs-sys-next/* +Copyright: 2017-2021 The @xdg-rs members +License: MIT OR Apache-2.0 +Comment: see https://github.com/xdg-rs/dirs + +Files: vendor/displaydoc/* +Copyright: 2019-2023 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/displaydoc + +Files: vendor/drop_bomb/* +Copyright: 2018-2020 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/drop_bomb + +Files: vendor/dunce/* +Copyright: 2017-2023 Kornel +License: CC0-1.0 +Comment: see https://gitlab.com/kornelski/dunce + +Files: vendor/ed25519-compact/* +Copyright: 2020-2024 Frank Denis +License: MIT +Comment: see https://github.com/jedisct1/rust-ed25519-compact + +Files: vendor/elasticlunr-rs/* +Copyright: 2017-2018 Matt Ickstadt +License: MIT or Apache-2.0 +Comment: see https://github.com/mattico/elasticlunr-rs + +Files: vendor/elsa/* +Copyright: 2018-2023 Manish Goregaokar +License: MIT or Apache-2.0 +Comment: see https://github.com/manishearth/elsa + +Files: vendor/ena/* +Copyright: 2015-2020 Niko Matsakis +License: MIT or Apache-2.0 +Comment: see https://github.com/nikomatsakis/ena + +Files: vendor/encoding_rs/* +Copyright: 2016-2024 Henri Sivonen +License: (Apache-2.0 OR MIT) AND BSD-3-Clause +Comment: see https://github.com/hsivonen/encoding_rs + +Files: vendor/erased-serde/* +Copyright: 2016-2024 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/erased-serde + +Files: vendor/errno/* +Copyright: 2015-2022 Chris Wong +License: MIT or Apache-2.0 +Comment: see https://github.com/lambda-fairy/rust-errno + +Files: vendor/equivalent/* +Copyright: 2016-2023 Josh Stone +License: Apache-2.0 OR MIT +Comment: see https://github.com/cuviper/equivalent + +Files: vendor/escargot/* +Copyright: 2018-2024 Ed Page +License: MIT OR Apache-2.0 +Comment: see https://github.com/crate-ci/escargot.git + +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 +Comment: see https://github.com/sfackler/rust-fallible-iterator + +Files: vendor/fallible-streaming-iterator/* +Copyright: 2016-2018 Steven Fackler +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/fallible-streaming-iterator + +Files: + vendor/faster-hex/* + vendor/faster-hex-0.*/* +Copyright: 2018-2023 zhangsoledad <787953403@qq.com> +License: MIT +Comment: see https://github.com/NervosFoundation/faster-hex + +Files: vendor/fastrand/* +Copyright: 2020-2023 Stjepan Glavina +License: Apache-2.0 OR MIT +Comment: see https://github.com/smol-rs/fastrand + +Files: vendor/fd-lock/* +Copyright: 2019-2022 Yoshua Wuyts +License: MIT OR Apache-2.0 +Comment: see https://github.com/yoshuawuyts/fd-lock + +Files: vendor/ff/* +Copyright: 2017-2023 Sean Bowe + 2017-2023 Jack Grigg +License: MIT or Apache-2.0 +Comment: see https://github.com/zkcrypto/ff + +Files: vendor/fiat-crypto/* +Copyright: 2015-2024 Fiat Crypto library authors +License: MIT OR Apache-2.0 OR BSD-1-Clause-fiat-crypto +Comment: see https://github.com/mit-plv/fiat-crypto + +Files: vendor/field-offset/* +Copyright: 2016-2023 Diggory Blake +License: MIT OR Apache-2.0 +Comment: see https://github.com/Diggsey/rust-field-offset + +Files: + vendor/fluent-bundle/* + vendor/fluent-syntax/* + vendor/intl-memoizer/* +Copyright: 2016-2022 Zibi Braniecki + 2016-2022 Staś Małolepszy + 2016-2022 Manish Goregaokar +License: Apache-2.0 or MIT +Comment: see https://github.com/projectfluent/fluent-rs + +Files: vendor/fluent-langneg/* +Copyright: 2017-2021 Zibi Braniecki +License: Apache-2.0 +Comment: see https://github.com/projectfluent/fluent-langneg-rs + +Files: + vendor/foreign-types/* + vendor/foreign-types-shared/* +Copyright: 2017-2023 Steven Fackler +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/foreign-types + +Files: vendor/fortanix-sgx-abi/* +Copyright: 2015-2019 Jethro Beekman +License: MPL-2.0 +Comment: see https://github.com/fortanix/rust-sgx + +Files: vendor/fs-err/* +Copyright: 2020-2020 Andrew Hickman +License: MIT or Apache-2.0 +Comment: see https://github.com/andrewhickman/fs-err + +Files: vendor/fs_extra/* +Copyright: 2017-2023 Denis Kurilenko +License: MIT +Comment: see https://github.com/webdesus/fs_extra + +Files: vendor/fst/* +Copyright: 2015-2023 Andrew Gallant +License: Unlicense or MIT +Comment: see https://github.com/BurntSushi/fst + +Files: vendor/futf/* +Copyright: 2015-2018 Keegan McAllister +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/futf + +Files: + vendor/generic-array/* +Copyright: + 2015-2020 Bartłomiej Kamiński + 2015-2020 Aaron Trent +License: MIT +Comment: see https://github.com/fizyk20/generic-array.git + +Files: vendor/gimli/* +Copyright: + 2016-2021 Nick Fitzgerald + 2016-2021 Philip Craig +License: Apache-2.0 or MIT +Comment: see https://github.com/gimli-rs/gimli + + +Files: + vendor/git2/* + vendor/git2-curl/* + vendor/libgit2-sys/* +Copyright: 2014-2024 Josh Triplett + 2014-2024 Alex Crichton +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/git2-rs + +Files: + vendor/gix/* + vendor/gix-actor/* + vendor/gix-attributes/* + vendor/gix-bitmap/* + vendor/gix-chunk/* + vendor/gix-command/* + vendor/gix-commitgraph/* + vendor/gix-config/* + vendor/gix-config-value/* + vendor/gix-credentials/* + vendor/gix-date/* + vendor/gix-diff/* + vendor/gix-discover/* + vendor/gix-features/* + vendor/gix-features-0.*/* + vendor/gix-filter/* + vendor/gix-fs/* + vendor/gix-glob/* + vendor/gix-hash/* + vendor/gix-hashtable/* + vendor/gix-ignore/* + vendor/gix-index/* + vendor/gix-lock/* + vendor/gix-macros/* + vendor/gix-negotiate/* + vendor/gix-object/* + vendor/gix-odb/* + vendor/gix-pack/* + vendor/gix-packetline/* + vendor/gix-packetline-blocking/* + vendor/gix-path/* + vendor/gix-pathspec/* + vendor/gix-prompt/* + vendor/gix-protocol/* + vendor/gix-quote/* + vendor/gix-ref/* + vendor/gix-refspec/* + vendor/gix-revision/* + vendor/gix-revwalk/* + vendor/gix-sec/* + vendor/gix-submodule/* + vendor/gix-tempfile/* + vendor/gix-trace/* + vendor/gix-transport/* + vendor/gix-traverse/* + vendor/gix-url/* + vendor/gix-utils/* + vendor/gix-validate/* + vendor/gix-worktree/* +Copyright: + 2018-2024 Conor Davis + 2018-2024 Jiahao XU + 2018-2024 Sebastian Thiel +License: MIT or Apache-2.0 +Comment: see https://github.com/Byron/gitoxide + +Files: vendor/group/* +Copyright: 2018-2023 Sean Bowe + 2018-2023 Jack Grigg +License: MIT or Apache-2.0 +Comment: see https://github.com/zkcrypto/group + +Files: vendor/gsgdt/* +Copyright: 2020 Vishnunarayan K I +License: MIT or Apache-2.0 +Comment: see https://github.com/vn-ki/gsgdt-rs + +Files: vendor/h2/* +Copyright: 2017-2024 Carl Lerche + 2017-2024 Sean McArthur +License: MIT +Comment: see https://github.com/hyperium/h2 + +Files: vendor/half/* +Copyright: 2016-2024 Kathryn Long +License: MIT OR Apache-2.0 +Comment: see https://github.com/starkat99/half-rs + +Files: + vendor/handlebars/* + vendor/handlebars-3.5.*/* +Copyright: 2014-2017 Ning Sun +License: MIT +Comment: see https://github.com/sunng87/handlebars-rust + +Files: vendor/hashlink/* +Copyright: 2019-2024 kyren +License: MIT OR Apache-2.0 +Comment: see https://github.com/kyren/hashlink + +Files: vendor/heck/* +Copyright: 2017-2018 Without Boats +License: MIT OR Apache-2.0 +Comment: see https://github.com/withoutboats/heck + +Files: vendor/hermit-abi/* +Copyright: 2019-2019 Stefan Lankes +License: MIT or Apache-2.0 +Comment: see https://github.com/hermitcore/hermit-abi + +Files: vendor/hex/* +Copyright: 2015-2020 KokaKiwi +License: MIT OR Apache-2.0 +Comment: see https://github.com/KokaKiwi/rust-hex + +Files: vendor/home/* +Copyright: 2017-2022 Brian Anderson +License: MIT OR Apache-2.0 +Comment: see https://github.com/brson/home + +Files: + vendor/html5ever/* + vendor/markup5ever/* +Copyright: 2014-2020 The html5ever Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/html5ever + +Files: vendor/http/* +Copyright: 2017-2024 Alex Crichton + 2017-2024 Carl Lerche + 2017-2024 Sean McArthur +License: MIT OR Apache-2.0 +Comment: see https://github.com/hyperium/http + +Files: vendor/httparse/* +Copyright: 2015-2024 Sean McArthur +License: MIT or Apache-2.0 +Comment: see https://github.com/seanmonstar/httparse + +Files: vendor/http-body/* +Copyright: 2019-2024 Carl Lerche + 2019-2024 Lucio Franco + 2019-2024 Sean McArthur +License: MIT +Comment: see https://github.com/hyperium/http-body + +Files: vendor/httpdate/* +Copyright: 2016-2023 Pyfisch +License: MIT or Apache-2.0 +Comment: see https://github.com/pyfisch/httpdate + +Files: vendor/http-auth/* +Copyright: 2021-2023 Scott Lamp +License: MIT or Apache-2.0 +Comment: see https://github.com/scottlamb/http-auth + +Files: vendor/humansize/* +Copyright: 2016-2022 Leopold Arkham +License: MIT or Apache-2.0 +Comment: see https://github.com/LeopoldArkham/humansize + +Files: + vendor/humantime/* +Copyright: + 2016-2018 Paul Colomiets + 2016 The humantime Developers + 2016 Pyfisch + 2005-2013 Rich Felker +License: MIT or Apache-2.0 + +Files: vendor/hyper/* +Copyright: 2014-2024 Sean McArthur +License: MIT +Comment: see https://github.com/hyperium/hyper + +Files: vendor/hyper-tls/* +Copyright: 2017-2023 Sean McArthur +License: MIT or Apache-2.0 +Comment: see https://github.com/hyperium/hyper-tls + +Files: vendor/if_chain/* +Copyright: 2016-2020 Chris Wong +License: MIT or Apache-2.0 +Comment: see https://github.com/lfairy/if_chain + +Files: + vendor/iana-time-zone/* + vendor/iana-time-zone-haiku/* +Copyright: 2020-2024 Andrew Straw + 2020-2024 René Kijewski + 2020-2024 Ryan Lopopolo +License: MIT OR Apache-2.0 +Comment: see https://github.com/strawlab/iana-time-zone + +Files: + vendor/form_urlencoded/* + vendor/idna/* + vendor/percent-encoding/* + vendor/url/* +Copyright: 2013-2021 The rust-url developers +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/rust-url/ + +Files: vendor/ident_case/* +Copyright: 2017-2021 Ted Driggs +License: MIT or Apache-2.0 +Comment: see https://github.com/TedDriggs/ident_case + +Files: vendor/im-rc/* +Copyright: 2017-2022 Bodil Stokke +License: MPL-2.0+ +Comment: see https://github.com/bodil/im-rs + +Files: vendor/indenter/* +Copyright: 2020-2023 Jane Lusby +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/indenter + +Files: vendor/indexmap/* +Copyright: 2016-2019 bluss + 2016-2019 Josh Stone +License: Apache-2.0 or MIT +Comment: see https://github.com/bluss/indexmap + +Files: + vendor/indoc/* +Copyright: 2016-2022 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/indoc + +Files: vendor/instant/* +Copyright: 2019-2020 sebcrozet +License: BSD-3-Clause +Comment: see https://github.com/sebcrozet/instant + +Files: vendor/intl_pluralrules/* +Copyright: 2018-2021 Kekoa Riggin + 2018-2021 Zibi Braniecki +License: Apache-2.0 or MIT +Comment: see https://github.com/zbraniecki/pluralrules + +Files: vendor/ipnet/* +Copyright: 2017-2023 Kris Price +License: MIT OR Apache-2.0 +Comment: see https://github.com/krisprice/ipnet + +Files: vendor/is-terminal/* +Copyright: 2022-2023 softprops + 2022-2023 Dan Gohman +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/* + vendor/wasm-bindgen-backend/* + vendor/wasm-bindgen-futures/* + vendor/wasm-bindgen-macro-support/* + vendor/wasm-bindgen-macro/* + vendor/wasm-bindgen-shared/* +Copyright: + 2018-2023 The wasm-bindgen Developers + 2014-2023 Alex Crichton +License: MIT or Apache-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen + +Files: vendor/web-sys/* +Copyright: 2018-2024 The wasm-bindgen Developers +License: MIT or Apache-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 +Copyright: + 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA. + 2012-2018 W3C® (MIT, ERCIM, Keio) +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 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + +Files: vendor/jsonpath_lib/* +Copyright: 2018-2021 Changseok Han +License: MIT +Comment: see https://github.com/freestrings/jsonpath + +Files: vendor/kstring/* +Copyright: 2014-2024 Ed Page +License: MIT OR Apache-2.0 +Comment: see https://github.com/cobalt-org/kstring + +Files: vendor/la-arena/* +Copyright: 2024 rust-analyzer team +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust-analyzer/tree/master/lib/la-arena + +Files: vendor/lazycell/* +Copyright: 2016-2020 Alex Crichton + 2016-2020 Nikita Pekin +License: MIT or Apache-2.0 +Comment: see https://github.com/indiv0/lazycell + +Files: vendor/lazy_static/* +Copyright: 2014-2018 Marvin Löbel +License: MIT or Apache-2.0 +Comment: + see https://github.com/rust-lang-nursery/lazy-static.rs + see https://github.com/Kimundi/owning-ref-rs + +Files: vendor/leb128/* +Copyright: 2016-2022 Nick Fitzgerald + 2016-2022 Philip Craig +License: Apache-2.0 or MIT +Comment: see https://github.com/gimli-rs/leb128 + +Files: vendor/levenshtein/* +Copyright: 2016-2021 Titus Wormer +License: MIT +Comment: see https://github.com/wooorm/levenshtein-rs + +Files: + vendor/libloading/* + vendor/libloading-0.7.4/* +Copyright: 2015-2022 Simonas Kazlauskas +License: ISC +Comment: see https://github.com/nagisa/rust_libloading/ + +Files: vendor/libm/* +Copyright: 2018-2024 Jorge Aparicio +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang-nursery/libm + +Files: vendor/libssh2-sys/* +Copyright: 2014-2024 Alex Crichton + 2014-2024 Wez Furlong + 2014-2024 Matteo Bigoi +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/ssh2-rs + +Files: + vendor/libsqlite3-sys/* + vendor/rusqlite/* +Copyright: 2014-2024 The rusqlite developers +License: MIT +Comment: see https://github.com/rusqlite/rusqlite + +Files: vendor/libz-sys/* +Copyright: 2014-2024 Alex Crichton + 2014-2024 Josh Triplett +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/libz-sys + +Files: vendor/line-index/* +Copyright: + 2024 Ariel Davis + 2024 rust-analyzer team +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust-analyzer/tree/master/lib/line-index + +Files: vendor/linux-raw-sys/* +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 + +Files: vendor/lsp-types/* +Copyright: 2016-2022 Markus Westerlind + 2016-2022 Bruno Medeiros +License: MIT +Comment: see https://github.com/gluon-lang/lsp-types + +Files: vendor/mac/* +Copyright: 2014-2017 Jonathan Reem +License: MIT +Comment: + see https://github.com/reem/rust-mac.git + +Files: vendor/matchers/* +Copyright: 2019-2019 Eliza Weisman +License: MIT +Comment: see https://github.com/hawkw/matchers + +Files: vendor/maybe-async/* +Copyright: 2020-2024 Guoli Lyu +License: MIT +Comment: see https://github.com/fMeow/maybe-async-rs + +Files: vendor/mdbook/* +Copyright: 2015-2017 Mathieu David +License: MPL-2.0 +Comment: see https://github.com/azerupi/mdBook + +Files: vendor/measureme/* +Copyright: 2019-2020 Wesley Wiser + 2019-2020 Michael Woerister +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/measureme + +Files: + vendor/memmap2/* + vendor/memmap2-0*/* +Copyright: 2015-2021 Dan Burkert + 2015-2021 Evgeniy Reizner +License: MIT or Apache-2.0 +Comment: see https://github.com/RazrFalcon/memmap2-rs + +Files: vendor/memoffset/* +Copyright: 2017-2019 Gilad Naaman +License: MIT +Comment: see https://github.com/Gilnaa/memoffset + +Files: vendor/mime/* +Copyright: 2014-2019 Sean McArthur +License: MIT or Apache-2.0 +Comment: see https://github.com/hyperium/mime + +Files: vendor/mime_guess/* +Copyright: 2015-2023 Austin Bonander +License: MIT +Comment: see https://github.com/abonander/mime_guess + +Files: vendor/minifier/* +Copyright: 2017-2018 Guillaume Gomez +License: MIT +Comment: + see https://github.com/GuillaumeGomez/minifier-rs + +Files: vendor/miniz_oxide/* +Copyright: 2017-2020 Frommi +License: MIT +Comment: see https://github.com/Frommi/miniz_oxide + +Files: vendor/mio/* +Copyright: 2014-2024 Carl Lerche + 2014-2024 Thomas de Zeeuw + 2014-2024 Tokio Contributors +License: MIT +Comment: see https://github.com/tokio-rs/mio + +Files: vendor/native-tls/* +Copyright: 2016-2024 Steven Fackler +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/rust-native-tls + +Files: vendor/new_debug_unreachable/* +Copyright: 2014-2018 Matt Brubeck + 2014-2018 Jonathan Reem +License: MIT +Comment: see https://github.com/mbrubeck/rust-debug-unreachable + +Files: vendor/nix/* +Copyright: 2014-2024 The nix-rust Project Developers +License: MIT +Comment: see https://github.com/nix-rust/nix + +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 +Comment: see https://github.com/derekdreery/normalize-line-endings + +Files: vendor/num_threads/* +Copyright: 2021-2024 Jacob Pratt +License: MIT OR Apache-2.0 +Comment: see https://github.com/jhpratt/num_threads + +Files: vendor/nu-ansi-term-0.46.0/* +Copyright: 2014-2023 ogham@bsago.me + 2014-2023 Ryan Scheel (Havvy) + 2014-2023 Josh Triplett + 2014-2023 The Nushell Project Developers +License: MIT +Comment: see https://github.com/nushell/nu-ansi-term + +Files: vendor/num_cpus/* +Copyright: 2015 Sean McArthur +License: MIT +Comment: see https://github.com/seanmonstar/num_cpus + +Files: vendor/number_prefix/* +Copyright: 2014-2020 Benjamin Sago +License: MIT +Comment: see https://github.com/ogham/rust-number-prefix + +Files: vendor/object/* +Copyright: + 2016-2020 Nick Fitzgerald + 2016-2020 Philip Craig +License: Apache-2.0 or MIT +Comment: see https://github.com/gimli-rs/object + +Files: vendor/odht/* +Copyright: 2021 Michael Woerister +License: Apache-2.0 or MIT +Comment: see https://github.com/rust-lang/odht + +Files: vendor/once_cell/* +Copyright: 2018-2019 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/once_cell + +Files: vendor/oorandom/* +Copyright: 2019-2021 Simon Heath +License: MIT +Comment: see https://sr.ht/~icefox/oorandom/ + +Files: + vendor/opener/* + vendor/opener-0.*/* +Copyright: 2018-2024 Brian Bowman +License: MIT OR Apache-2.0 +Comment: see https://github.com/Seeker14491/opener + +Files: vendor/openssl/* +Copyright: 2011-2024 Steven Fackler +License: Apache-2.0 +Comment: see https://github.com/sfackler/rust-openssl + +Files: vendor/openssl-macros/* +Copyright: 2022-2024 Steven Fackler +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/rust-openssl + +Files: vendor/openssl-probe/* +Copyright: 2016-2022 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/rust-openssl + +Files: vendor/openssl-sys/* +Copyright: 2011-2024 Alex Crichton + 2011-2024 Steven Fackler +License: MIT +Comment: see https://github.com/sfackler/rust-openssl + +Files: vendor/ordered-float/* +Copyright: 2014-2024 Jonathan Reem + 2014-2024 Matt Brubeck +License: MIT +Comment: see https://github.com/reem/rust-ordered-float + +Files: vendor/orion/* +Copyright: 2018-2024 brycx +License: MIT +Comment: see https://github.com/orion-rs/orion + +Files: vendor/os_info/* +Copyright: 2015-2024 Jan Schulte + 2015-2024 Stanislav Tkach +License: MIT +Comment: see https://github.com/stanislav-tkach/os_info + +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/lock_api/* + vendor/thread_local/* + vendor/parking_lot/* + vendor/parking_lot_core/* +Copyright: 2016-2019 Amanieu d'Antras +License: MIT or Apache-2.0 +Comment: + see https://github.com/rust-lang/hashbrown + see https://github.com/Amanieu/thread_local-rs + see https://github.com/Amanieu/parking_lot + +Files: vendor/packed_simd/* +Copyright: + 2018-2023 Gonzalo Brito Gadeschi + 2014-2023 The Rust Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/packed_simd + +Files: vendor/pad/* +Copyright: 2018-2024 Ben S +License: MIT + +Files: vendor/papergrid/* +Copyright: 2020-2024 Maxim Zhiburt +License: MIT +Comment: see https://github.com/zhiburt/tabled + +Files: + vendor/partial_ref/* + vendor/partial_ref_derive/* +Copyright: 2018-2021 Jannis Harder +License: MIT or Apache-2.0 +Comment: see https://github.com/jix/partial_ref + +Files: vendor/pasetors/* +Copyright: 2020-2024 brycx +License: MIT +Comment: see https://github.com/brycx/pasetors + +Files: vendor/pathdiff/* +Copyright: 2017-2020 Manish Goregaokar +License: MIT or Apache-2.0 +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 + +Files: + vendor/pest/* + vendor/pest_derive/* + vendor/pest_generator/* + vendor/pest_meta/* +Copyright: 2016-2019 Dragoș Tiselice +License: MIT or Apache-2.0 +Comment: + see https://github.com/dragostis/pest + see https://github.com/pest-parser/pest + +Files: vendor/polonius-engine/* +Copyright: 2018-2018 The Rust Project Developers + 2018-2018 Polonius Developers +License: Apache-2.0 or MIT +Comment: see https://github.com/rust-lang-nursery/polonius + +Files: + vendor/phf/* + vendor/phf_codegen/* + vendor/phf_generator/* + vendor/phf_shared/* +Copyright: 2014-2018 Steven Fackler +License: MIT +Comment: see https://github.com/sfackler/rust-phf + +Files: vendor/pin-project-lite/* +Copyright: 2018-2021 Taiki Endo +License: Apache-2.0 or MIT +Comment: + see https://github.com/taiki-e/pin-project-lite + +Files: + vendor/plotters/* + vendor/plotters-backend/* + vendor/plotters-svg/* +Copyright: 2019-2024 Hao Hou +License: MIT +Comment: see https://github.com/plotters-rs/plotters + +Files: vendor/portable-atomic/* +Copyright: 2022 Taiki Endo +License: Apache-2.0 OR MIT +Comment: see https://github.com/taiki-e/portable-atomic + +Files: vendor/powerfmt/* +Copyright: 2023-2024 Jacob Pratt +License: MIT OR Apache-2.0 +Comment: see https://github.com/jhpratt/powerfmt + +Files: vendor/precomputed-hash/* +Copyright: 2017-2017 Emilio Cobos Álvarez +License: MIT +Comment: see https://github.com/emilio/precomputed-hash + +Files: vendor/pretty_assertions/* +Copyright: 2017-2022 Colin Kiegel + 2017-2022 Florent Fayolle + 2017-2022 Tom Milligan +License: MIT or Apache-2.0 +Comment: see https://github.com/colin-kiegel/rust-pretty-assertions + +Files: vendor/prettydiff/* +Copyright: 2019-2024 Roman Koblov +License: MIT +Comment: see https://github.com/romankoblov/prettydiff + +Files: vendor/proc-macro-hack/* +Copyright: 2016-2022 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/proc-macro-hack + +Files: vendor/prodash/* +Copyright: 2020-2023 Sebastian Thiel +License: MIT +Comment: see https://github.com/Byron/prodash + +Files: vendor/proptest/* +Copyright: 2017-2024 Jason Lingle +License: MIT or Apache-2.0 +Comment: see https://github.com/proptest-rs/proptest + +Files: vendor/psm/* +Copyright: 2015-2020 Simonas Kazlauskas +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/stacker/ + +Files: vendor/pulldown-cmark/* +Copyright: 2015-2017 Raph Levien +License: MIT +Comment: see https://github.com/google/pulldown-cmark + +Files: vendor/punycode/* +Copyright: 2015-2019 mcarton +License: MIT +Comment: see https://github.com/mcarton/rust-punycode.git + +Files: + vendor/quick-error-1.*/* + vendor/quick-error/* +Copyright: + 2015-2023 Paul Colomiets + 2015-2023 Colin Kiegel +License: MIT or Apache-2.0 +Comment: see http://github.com/tailhook/quick-error + +Files: vendor/quine-mc_cluskey/* +Copyright: 2016-2016 Oliver Schneider +License: MIT +Comment: see https://github.com/oli-obk/quine-mc_cluskey + +Files: + vendor/rayon/* + vendor/rayon-core/* + vendor/rustc-rayon/* + vendor/rustc-rayon-core/* +Copyright: 2014-2018 Niko Matsakis + 2014-2018 Josh Stone +License: Apache-2.0 or MIT +Comment: + see https://github.com/rayon-rs/rayon + see https://github.com/Zoxc/rayon/tree/rustc + +Files: vendor/r-efi/* +Copyright: 2018-2024 David Rheinsberg + 2018-2024 Tom Gundersen +License: MIT OR Apache-2.0 OR LGPL-2.1-or-later +Comment: see https://github.com/r-efi/r-efi + +Files: vendor/r-efi-alloc/* +Copyright: 2018-2022 David Rheinsberg + 2018-2022 Tom Gundersen +License: MIT OR Apache-2.0 OR LGPL-2.1-or-later +Comment: see https://github.com/r-efi/r-efi-alloc + +Files: vendor/redox_users/* +Copyright: 2017-2021 Jose Narvaez + 2017-2021 Wesley Hershberger +License: MIT +Comment: see https://gitlab.redox-os.org/redox-os/users + +Files: + vendor/redox_syscall/* + vendor/redox_syscall-0.*/* +Copyright: 2016-2021 Jeremy Soller +License: MIT +Comment: + see https://github.com/redox-os/syscall + +Files: + vendor/regex-automata/* + vendor/regex-automata-0.1.*/* + vendor/regex-automata-0.2.*/* +Copyright: 2018-2020 Andrew Gallant +License: Unlicense or MIT +Comment: see https://github.com/BurntSushi/regex-automata + +Files: vendor/reqwest/* +Copyright: 2016-2024 Sean McArthur +License: MIT OR Apache-2.0 +Comment: see https://github.com/seanmonstar/reqwest + +Files: vendor/rowan/* +Copyright: 2018-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-analyzer/rowan + +Files: + vendor/ra-ap-rustc_lexer/* + vendor/ra-ap-rustc_abi/* + vendor/ra-ap-rustc_index/* + vendor/ra-ap-rustc_index_macros/* + vendor/ra-ap-rustc_parse_format/* +Copyright: 2010-2024 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust + +Files: + vendor/rust-analyzer-salsa/* + vendor/rust-analyzer-salsa-macros/* +Copyright: 2018-2024 Salsa developers +License: Apache-2.0 OR MIT +Comment: see https://github.com/salsa-rs/salsa + +Files: vendor/rustc_apfloat/* +Copyright: 2003-2017 University of Illinois at Urbana-Champaign. +License: Apache-2.0 with LLVM exception +Comment: see https://github.com/rust-lang/rustc_apfloat , in particular LICENSE-DETAILS.md + +Files: vendor/rustc_tools_util/* +Copyright: 2014-2022 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust-clippy/tree/master/rustc_tools_util + +Files: vendor/rustc-semver/* +Copyright: 2020-2020 flip1995 +License: MIT OR Apache-2.0 +Comment: see https://github.com/flip1995/rustc-semver + +Files: vendor/rustc_version/* +Copyright: 2015-2021 Dirkjan Ochtman + 2015-2021 Marvin Löbel +License: MIT or Apache-2.0 +Comment: see https://github.com/Kimundi/rustc-version-rs + +Files: vendor/rustfix/* +Copyright: + 2016-2021 Pascal Hertleif + 2016-2021 Oliver Schneider +License: Apache-2.0 or MIT +Comment: see https://github.com/killercup/rustfix + +Files: vendor/rustix/* +Copyright: 2020-2023 Dan Gohman + 2020-2023 Jakub Konka +License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT +Comment: see https://github.com/bytecodealliance/rustix + +Files: vendor/rustversion/* +Copyright: 2019-2021 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/rustversion + +Files: vendor/rusty-fork/* +Copyright: 2018-2020 Jason Lingle +License: MIT or Apache-2.0 +Comment: see https://github.com/altsysrq/rusty-fork + +Files: vendor/ruzstd/* +Copyright: 2019-2024 Moritz Borcherding +License: MIT +Comment: see https://github.com/KillingSpark/zstd-rs + +Files: vendor/ryu/* +Copyright: 2018-2018 David Tolnay +License: Apache-2.0 or BSL-1.0 +Comment: see https://github.com/dtolnay/ryu + +Files: + vendor/security-framework/* + vendor/security-framework-sys/* +Copyright: 2015-2024 Steven Fackler + 2015-2024 Kornel +License: MIT OR Apache-2.0 +Comment: see https://github.com/kornelski/rust-security-framework + +Files: + vendor/self_cell/* + vendor/self_cell-0.*/* +Copyright: 2020-2021 Lukas Bergdoll +License: Apache-2.0 +Comment: see https://github.com/Voultapher/self_cell + +Files: vendor/semver/* +Copyright: + 2014-2020 Steve Klabnik + 2014-2020 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: + see https://github.com/steveklabnik/semver + see https://github.com/steveklabnik/semver-parser + +Files: + vendor/serde/* + vendor/serde_json/* +Copyright: 2014-2017 Erick Tryzelaar +License: MIT or Apache-2.0 +Comment: + see https://github.com/serde-rs/serde + see https://github.com/serde-rs/json + +Files: vendor/serde_derive/* +Copyright: 2014-2017 Erick Tryzelaar + 2016-2017 David Tolnay +License: MIT or Apache-2.0 +Comment: see https://github.com/serde-rs/serde + +Files: vendor/serde_ignored/* +Copyright: 2017-2024 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/serde-ignored + +Files: vendor/serde_repr/* +Copyright: 2019-2022 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/serde-repr + +Files: vendor/serde_spanned/* +Copyright: + 2014-2023 Alex Crichton + 2023 Ed Page +License: MIT or Apache-2.0 +Comment: see https://github.com/toml-rs/toml + +Files: vendor/serde-untagged/* +Copyright: 2023-2024 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/serde-untagged + +Files: vendor/serde_urlencoded/* +Copyright: 2016-2024 Anthony Ramine +License: MIT or Apache-2.0 +Comment: see https://github.com/nox/serde_urlencoded + +Files: vendor/serde-value/* +Copyright: 2016-2020 arcnmx +License: MIT +Comment: see https://github.com/arcnmx/serde-value + +Files: vendor/sha1_smol/* +Copyright: 2014-2022 Armin Ronacher +License: BSD-3-Clause +Comment: see https://github.com/mitsuhiko/sha1-smol + +Files: vendor/sharded-slab/* +Copyright: 2019-2020 Eliza Weisman +License: MIT +Comment: see https://github.com/hawkw/sharded-slab + +Files: vendor/shell-escape/* +Copyright: 2016-2020 Steven Fackler +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/shell-escape + +Files: vendor/shell-words/* +Copyright: 2018-2022 Tomasz Miąsko +License: MIT or Apache-2.0 +Comment: see https://github.com/tmiasko/shell-words + +Files: vendor/shlex/* +Copyright: 2015-2015 comex +License: MIT or Apache-2.0 +Comment: see https://github.com/comex/rust-shlex + +Files: vendor/similar/* +Copyright: 2021-2024 Armin Ronacher + 2021-2024 Pierre-Étienne Meunier + 2021-2024 Brandon Williams +License: Apache-2.0 +Comment: see https://github.com/mitsuhiko/similar + +Files: vendor/siphasher/* +Copyright: 2016-2018 Frank Denis +License: MIT or Apache-2.0 +Comment: see https://github.com/jedisct1/rust-siphash + +Files: vendor/sized-chunks/* +Copyright: 2019-2022 Bodil Stokke +License: MPL-2.0+ +Comment: see https://github.com/bodil/sized-chunks + +Files: vendor/smallvec/* +Copyright: 2015-2020 Simon Sapin +License: MPL-2.0 +Comment: see https://github.com/servo/rust-smallvec + +Files: vendor/smol_str/* +Copyright: 2018-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-analyzer/smol_str + +Files: vendor/snap/* +Copyright: 2016-2020 Andrew Gallant +License: BSD-3-Clause +Comment: see https://github.com/BurntSushi/rust-snappy + +Files: + vendor/snapbox/* + vendor/snapbox-macros/* +Copyright: Ed Page 2022 +License: MIT OR Apache-2.0 +Comment: see https://github.com/assert-rs/trycmd/ + +Files: vendor/socket2/* +Copyright: 2017-2024 Alex Crichton + 2017-2024 Thomas de Zeeuw +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/socket2 + +Files: + vendor/spdx-expression/* + vendor/spdx-rs/* +Copyright: 2021-2022 Mikko Murto +License: MIT +Comment: + see https://github.com/doubleopen-project/spdx-expression + see https://github.com/doubleopen-project/spdx-rs + +Files: vendor/stable_deref_trait/* +Copyright: 2017-2017 Robert Grosse +License: MIT or Apache-2.0 +Comment: see https://github.com/storyyeller/stable_deref_trait + +Files: vendor/stacker/* +Copyright: 2015-2020 Alex Crichton + 2015-2020 Simonas Kazlauskas +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/stacker + +Files: vendor/static_assertions/* +Copyright: 2017-2020 Nikolai Vazquez +License: MIT OR Apache-2.0 +Comment: see https://github.com/nvzqz/static-assertions-rs + +Files: vendor/strsim/* +Copyright: 2015-2021 Danny Guo +License: MIT +Comment: see https://github.com/dguo/strsim-rs + +Files: + vendor/strum/* + vendor/strum_macros/* +Copyright: 2017-2023 Peter Glotfelty +License: MIT +Comment: see https://github.com/Peternator7/strum + +Files: vendor/subtle/* +Copyright: 2017-2023 Isis Lovecruft + 2017-2023 Henry de Valence +License: BSD-3-Clause +Comment: see https://github.com/dalek-cryptography/subtle + +Files: vendor/supports-hyperlinks/* +Copyright: 2021-2024 Kat Marchán +License: Apache-2.0 +Comment: see https://github.com/zkat/supports-hyperlinks + +Files: + vendor/synstructure/* + vendor/synstructure-0.*/* +Copyright: + 2016-2023 Nika Layzell +License: MIT +Comment: see https://github.com/mystor/synstructure + +Files: + vendor/sysinfo/* + vendor/sysinfo-0.*/* +Copyright: 2015-2022 Guillaume Gomez +License: MIT +Comment: see https://github.com/GuillaumeGomez/sysinfo + +Files: vendor/tabled/* +Copyright: 2020-2024 Maxim Zhiburt +License: MIT +Comment: see https://github.com/zhiburt/tabled + +Files: vendor/tar-0.4.38/* +Copyright: 2014-2023 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/tar-rs + +Files: vendor/tempfile/* +Copyright: 2015-2018 Steven Allen + 2015-2018 The Rust Project Developers + 2015-2018 Ashley Mannix + 2015-2018 Jason White +License: MIT or Apache-2.0 +Comment: see https://github.com/Stebalien/tempfile + +Files: vendor/tendril/* +Copyright: 2015-2017 Keegan McAllister + 2015-2017 Simon Sapin + 2015-2017 Chris Morgan +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/tendril + +Files: vendor/term/* +Copyright: + 2014-2021 The Rust Project Developers + 2014-2021 Steven Allen +License: MIT or Apache-2.0 +Comment: see https://github.com/Stebalien/term + +Files: vendor/terminal_size/* +Copyright: 2015-2023 Andrew Chin +License: MIT OR Apache-2.0 +Comment: see https://github.com/eminence/terminal-size + +Files: vendor/termize/* +Copyright: 2016-2020 Yuki Okushi +License: MIT or Apache-2.0 +Comment: see https://github.com/JohnTitor/termize + +Files: vendor/text-size/* +Copyright: 2018-2021 Aleksey Kladov + 2018-2021 Christopher Durham (CAD97) +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-analyzer/text-size + +Files: vendor/thin-vec/* +Copyright: 2017-2022 Aria Beingessner +License: MIT or Apache-2.0 +Comment: see https://github.com/gankra/thin-vec + +Files: + vendor/thiserror/* + vendor/thiserror-impl/* +Copyright: 2019-2020 David Tolnay +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/thiserror + +Files: + vendor/thiserror-core/* + vendor/thiserror-core-impl/* +Copyright: + 2019-2023 David Tolnay + 2022-2023 Florian Uekermann +License: MIT or Apache-2.0 +Comment: https://github.com/FlorianUekermann/thiserror/tree/core + +Files: vendor/thorin-dwp/* +Copyright: 2021-2022 David Wood +License: MIT OR Apache-2.0 +Comment: see https://github.com/davidtwco/thorin + +Files: vendor/threadpool/* +Copyright: 2015-2021 The Rust Project Developers + 2015-2021 Corey Farwell + 2015-2021 Stefan Schindler +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-threadpool/rust-threadpool + +Files: vendor/time-macros/* +Copyright: 2019-2024 Jacob Pratt + 2019-2024 Time contributors +License: MIT OR Apache-2.0 +Comment: see https://github.com/time-rs/time + +Files: vendor/tinystr/* +Copyright: 2019-2022 Raph Levien + 2019-2022 Zibi Braniecki +License: Apache-2.0 or MIT +Comment: see https://github.com/zbraniecki/tinystr + +Files: vendor/tinytemplate/* +Copyright: 2018-2022 Brook Heisler +License: Apache-2.0 OR MIT +Comment: see https://github.com/bheisler/TinyTemplate + +Files: vendor/tinyvec/* +Copyright: 2020 Lokathor +License: Zlib +Comment: see https://github.com/Lokathor/tinyvec + +Files: vendor/tinyvec_macros/* +Copyright: 2020 Soveu +License: MIT or Apache-2.0 or Zlib +Comment: see https://github.com/Soveu/tinyvec_macros + +Files: vendor/topological-sort/* +Copyright: 2015-2018 gifnksm +License: MIT OR Apache-2.0 +Comment: see https://github.com/gifnksm/topological-sort-rs + +Files: vendor/toml/* +Copyright: 2014-2024 Alex Crichton +License: MIT OR Apache-2.0 +Comment: see https://github.com/toml-rs/toml + +Files: vendor/toml_datetime/* +Copyright: 2014-2024 Alex Crichton +License: MIT OR Apache-2.0 +Comment: see https://github.com/toml-rs/toml + +Files: + vendor/toml_edit/* + vendor/toml_edit-0.*/* +Copyright: 2014-2024 Andronik Ordian + 2014-2024 Ed Page +License: MIT OR Apache-2.0 +Comment: see https://github.com/ordian/toml_edit + +Files: + vendor/tracing/* + vendor/tracing-0.*/* + vendor/tracing-attributes/* + vendor/tracing-core/* + vendor/tracing-core-0.*/* + vendor/tracing-error/* + vendor/tracing-log/* + vendor/tracing-log-0.*/* + vendor/tracing-subscriber/* +Copyright: + 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 + +Files: vendor/tracing-tree-0.*/* +Copyright: 2020-2020 David Barsky + 2020-2020 Nathan Whitaker +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/try-lock/* +Copyright: 2018-2023 Sean McArthur +License: MIT +Comment: see https://github.com/seanmonstar/try-lock + +Files: vendor/twox-hash/* +Copyright: 2015-2022 Jake Goulding +License: MIT +Comment: see https://github.com/shepmaster/twox-hash + +Files: vendor/type-map/* +Copyright: 2019-2022 Jacob Brown +License: MIT or Apache-2.0 +Comment: see https://github.com/kardeiz/type-map + +Files: vendor/typed-arena/* +Copyright: 2015-2023 The typed-arena developers +License: MIT +Comment: see https://github.com/SimonSapin/rust-typed-arena + +Files: vendor/typenum/* +Copyright: 2015-2019 Paho Lurie-Gregg + 2015-2019 Andre Bogus +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 +Comment: see https://github.com/cameron1024/unarray + +Files: vendor/unicode-bom/* +Copyright: 2018-2023 Phil Booth +License: Apache-2.0 +Comment: see https://gitlab.com/philbooth/unicode-bom + +Files: vendor/unicode-properties/* +Copyright: 2022-2024 Charles Lew + 2022-2024 Manish Goregaokar +License: MIT or Apache-2.0 +Comment: see https://github.com/unicode-rs/unicode-properties + +Files: vendor/unwinding/* +Copyright: 2021-2024 Gary Guo +License: MIT OR Apache-2.0 +Comment: see https://github.com/nbdd0121/unwinding/ + +Files: + vendor/varisat/* + vendor/varisat-checker/* + vendor/varisat-dimacs/* + vendor/varisat-formula/* + vendor/varisat-internal-macros/* + vendor/varisat-internal-proof/* +Copyright: 2018-2022 Jannis Harder +License: MIT or Apache-2.0 +Comment: see https://github.com/jix/varisat + +Files: vendor/vcpkg/* +Copyright: 2017-2024 Jim McGrath +License: MIT or Apache-2.0 +Comment: see https://github.com/mcgoo/vcpkg-rs + +Files: vendor/vec_mut_scan/* +Copyright: 2019-2023 Jannis Harder +License: 0BSD +Comment: see https://github.com/jix/vec_mut_scan + +Files: vendor/version_check/* +Copyright: 2017-2019 Sergio Benitez +License: MIT or Apache-2.0 +Comment: see https://github.com/SergioBenitez/version_check + +Files: vendor/want/* +Copyright: 2018-2023 Sean McArthur +License: MIT +Comment: see https://github.com/seanmonstar/want + +Files: vendor/xz/* +Copyright: 2016-2023 Hyeon Kim + 2016-2023 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/xz2-rs + +Files: + vendor/ucd-parse/* + vendor/ucd-trie/* +Copyright: 2017-2020 Andrew Gallant +License: MIT or Apache-2.0 +Comment: + see https://github.com/BurntSushi/rucd + see https://github.com/BurntSushi/ucd-generate + +Files: vendor/ungrammar/* +Copyright: 2020-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/ungrammar + +Files: vendor/unicase/* +Copyright: 2014-2019 Sean McArthur +License: MIT or Apache-2.0 +Comment: see https://github.com/seanmonstar/unicase + +Files: vendor/unic-*/* +Copyright: 2017-2022 The UNIC Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/open-i18n/rust-unic/ + +Files: + vendor/unicode-normalization/* + vendor/unicode-segmentation/* + vendor/unicode-width/* +Copyright: 2015-2019 kwantam +License: MIT or Apache-2.0 +Comment: + see https://github.com/unicode-rs/unicode-normalization + see https://github.com/unicode-rs/unicode-segmentation + see https://github.com/unicode-rs/unicode-width + +Files: vendor/unicode-xid/* +Copyright: 2015-2017 erick.tryzelaar + 2015-2017 kwantam +License: MIT or Apache-2.0 +Comment: see https://github.com/unicode-rs/unicode-xid + +Files: vendor/unicode-script/* +Copyright: 2017-2020 Manish Goregaokar +License: MIT or Apache-2.0 +Comment: see https://github.com/unicode-rs/unicode-script + +Files: vendor/unicode-security/* +Copyright: 2020-2020 Charles Lew + 2020-2020 Manish Goregaokar +License: MIT or Apache-2.0 +Comment: see https://github.com/unicode-rs/unicode-security + +Files: vendor/unified-diff/* +Copyright: 2021-2021 Michael Howell + 2021-2021 The Rust Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/notriddle/rust-unified-diff + +Files: vendor/utf-8/* +Copyright: 2015-2018 Simon Sapin +License: MIT OR Apache-2.0 +Comment: see https://github.com/SimonSapin/rust-utf8 + +Files: vendor/utf8parse/* +Copyright: 2016-2023 Joe Wilm + 2016-2023 Christian Duerr +License: Apache-2.0 OR MIT +Comment: see https://github.com/alacritty/vte + +Files: vendor/uuid/* +Copyright: 2014-2023 Ashley Mannix + 2014-2023 Christopher Armstrong + 2014-2023 Dylan DPC + 2014-2023 Hunar Roop Kahlon +License: Apache-2.0 OR MIT +Comment: see https://github.com/uuid-rs/uuid + +Files: vendor/wait-timeout/* +Copyright: 2015-2021 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/wait-timeout + +Files: vendor/wasi/* +Copyright: 2019-2020 The Cranelift Project Developers +License: Apache-2.0 with LLVM exception or Apache-2.0 or MIT +Comment: see https://github.com/CraneStation/rust-wasi + +Files: vendor/windows-bindgen/* +Copyright: 2019-2024 Microsoft +License: MIT OR Apache-2.0 +Comment: see https://github.com/microsoft/windows-rs + this contains pre-generated files which are also MIT or Apache-2.0 licensed, + see vendor/windows-bindgen/default/readme.md + +Files: vendor/windows-metadata/* +Copyright: Microsoft 2024 +License: MIT or Apache-2.0 +Comment: + see https://github.com/microsoft/windows-rs + +Files: + vendor/winnow/* + vendor/winnow-0.*/* +Copyright: + 2023 winnow contributors + 2014-2023 nom contributors + 2014-2023 Geoffroy Couprie +License: MIT +Comment: see https://github.com/winnow-rs/winnow + +Files: vendor/xattr/* +Copyright: 2015-2017 Steven Allen +License: MIT or Apache-2.0 +Comment: see https://github.com/Stebalien/xattr + +Files: vendor/yansi/* +Copyright: 2017-2022 Sergio Benitez +License: MIT or Apache-2.0 +Comment: see https://github.com/SergioBenitez/yansi + +Files: vendor/yansi-term/* +Copyright: 2014-2020 ogham@bsago.me + 2014-2020 Ryan Scheel (Havvy) + 2014-2020 Josh Triplett + 2014-2020 Juan Aguilar Santillana +License: MIT +Comment: see https://github.com/botika/yansi-term + +Files: + vendor/zerocopy/* + vendor/zerocopy-derive/* +Copyright: 2019-2024 Joshua Liebow-Feeser +License: BSD-2-Clause OR Apache-2.0 OR MIT +Comment: see https://github.com/google/zerocopy + +Files: vendor/bytes/* +Copyright: 2015-2022 Carl Lerche + 2015-2022 Sean McArthur +License: MIT +Comment: see https://github.com/tokio-rs/bytes + +Files: + vendor/futures/* + vendor/futures-channel/* + vendor/futures-core/* + vendor/futures-executor/* + vendor/futures-io/* + vendor/futures-macro/* + vendor/futures-sink/* + vendor/futures-task/* + vendor/futures-util/* +Copyright: + 2016-2018 Alex Crichton + 2017 The Tokio Authors + 2018-2022 The Rust Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/futures-rs + +Files: vendor/minimal-lexical/* +Copyright: 2020-2022 Alex Huszagh +License: MIT or Apache-2.0 +Comment: see https://github.com/Alexhuszagh/minimal-lexical + +Files: vendor/nom/* +Copyright: 2014-2022 contact@geoffroycouprie.com +License: MIT +Comment: see https://github.com/Geal/nom + +Files: vendor/pin-utils/* +Copyright: 2018-2022 Josef Brandl +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang-nursery/pin-utils + +Files: vendor/slab/* +Copyright: 2015-2022 Carl Lerche +License: MIT +Comment: see https://github.com/carllerche/slab + +Files: vendor/tokio/* +Copyright: 2016-2022 Tokio Contributors +License: MIT +Comment: see https://github.com/tokio-rs/tokio + +Files: vendor/tokio-native-tls/* +Copyright: 2017-2023 Tokio Contributors +License: MIT +Comment: see https://github.com/tokio-rs/tls + +Files: vendor/tokio-util/* +Copyright: 2016-2024 Tokio Contributors +License: MIT +Comment: see https://github.com/tokio-rs/tokio + +Files: vendor/tower-service/* +Copyright: 2016-2023 Tower Maintainers +License: MIT +Comment: see https://github.com/tower-rs/tower + +Files: vendor/valuable/* +Copyright: + 2021 Valuable Contributors + 2021-2022 Carl Lerche + 2021-2022 Taiki Endo +License: MIT +Comment: see https://github.com/tokio-rs/valuable + +Files: vendor/write-json/* +Copyright: 2020-2020 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/write-json + +Files: + vendor/xflags/* + vendor/xflags-macros/* +Copyright: 2021-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/xflags + +Files: + vendor/xshell/* + vendor/xshell-macros/* +Copyright: 2020-2022 Aleksey Kladov +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/xshell + +Files: vendor/zip/* +Copyright: 2014-2023 Mathijs van de Nes + 2014-2023 Marli Frost + 2014-2023 Ryan Levick +License: MIT +Comment: see https://github.com/zip-rs/zip.git + +Files: + vendor/icu_list/* + vendor/icu_list_data/* + vendor/icu_locid/* + vendor/icu_locid_transform/* + vendor/icu_locid_transform_data/* + vendor/icu_provider/* + vendor/icu_provider_adapters/* + vendor/icu_provider_macros/* + vendor/litemap/* + vendor/yoke/* + vendor/yoke-derive/* + vendor/writeable/* + vendor/zerofrom/* + vendor/zerofrom-derive/* + vendor/zerovec/* + vendor/zerovec-derive/* +Copyright: 1999-2022 Unicode, Inc. +License: Unicode-Data-Files-and-Software-License +Comment: See https://github.com/unicode-org/icu4x + +Files: debian/* +Copyright: 2013-2018 Debian Rust Maintainers +License: MIT or Apache-2.0 + +Files: debian/icons/rust-logo-32x32-blk.png +Copyright: Mozilla Foundation +License: CC-BY +Comment: + Relevant discussion in https://github.com/rust-lang/rust/issues/11562 + +License: 0BSD + Permission to use, copy, modify, and/or distribute this software for + any purpose with or without fee is hereby granted. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: Apache-2.0 + On Debian systems, the full text of the Apache License Version 2.0 + can be found in the file `/usr/share/common-licenses/Apache-2.0'. + +License: Apache-2.0 with LLVM exception + On Debian systems, the full text of the Apache License Version 2.0 + can be found in the file `/usr/share/common-licenses/Apache-2.0'. + Additionally, the LLVM exception is as follows: + . + As an exception, if, as a result of your compiling your source code, portions + of this Software are embedded into an Object form of such source code, you + may redistribute such embedded portions in such Object form without complying + with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + . + In addition, if you combine or link compiled forms of this Software with + software that is licensed under the GPLv2 ("Combined Software") and if a + court of competent jurisdiction determines that the patent provision (Section + 3), the indemnity provision (Section 9) or other Section of the License + conflicts with the conditions of the GPLv2, you may retroactively and + prospectively choose to deem waived or otherwise exclude such Section(s) of + the License, but only in their entirety and only with respect to the Combined + Software. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with + or without modification, are permitted provided that the + following conditions are met: + . + 1. Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + 2. Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or + other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: CC0-1.0 + On Debian systems, the full text of the CC0 1.0 Universal + License can be found in the file + `/usr/share/common-licenses/CC0-1.0'. + +License: ISC + Permission to use, copy, modify, and/or distribute this software for any purpose + with or without fee is hereby granted, provided that the above copyright notice + and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +License: MIT + Permission is hereby granted, free of charge, to any + person obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the + Software without restriction, including without + limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software + is furnished to do so, subject to the following + conditions: + . + The above copyright notice and this permission notice + shall be included in all copies or substantial portions + of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED + TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: BSL-1.0 + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the organization nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: Unlicense + This is free and unencumbered software released into the public domain. + . + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + . + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the + benefit of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + For more information, please refer to + +License: SIL-OPEN-FONT + This Font Software is licensed under the SIL Open Font License, + Version 1.1. + . + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + . + PREAMBLE The goals of the Open Font License (OFL) are to stimulate + worldwide development of collaborative font projects, to support the font + creation efforts of academic and linguistic communities, and to provide + a free and open framework in which fonts may be shared and improved in + partnership with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. + The fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply to + any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. + This may include source files, build scripts and documentation. + . + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components + as distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting ? in part or in whole ? + any of the components of the Original Version, by changing formats or + by porting the Font Software to a new environment. + . + "Author" refers to any designer, engineer, programmer, technical writer + or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + 5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are not met. + . + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, see /usr/share/common-licenses/GPL-2 for the full + text of the GPL version 2. + +License: CC-BY + Attribution 4.0 International + . + ======================================================================= + . + Creative Commons Corporation ("Creative Commons") is not a law firm and + does not provide legal services or legal advice. Distribution of + Creative Commons public licenses does not create a lawyer-client or + other relationship. Creative Commons makes its licenses and related + information available on an "as-is" basis. Creative Commons gives no + warranties regarding its licenses, any material licensed under their + terms and conditions, or any related information. Creative Commons + disclaims all liability for damages resulting from their use to the + fullest extent possible. + . + Using Creative Commons Public Licenses + . + Creative Commons public licenses provide a standard set of terms and + conditions that creators and other rights holders may use to share + original works of authorship and other material subject to copyright + and certain other rights specified in the public license below. The + following considerations are for informational purposes only, are not + exhaustive, and do not form part of our licenses. + . + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + . + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + . + ======================================================================= + . + Creative Commons Attribution 4.0 International Public License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution 4.0 International Public License ("Public License"). To the + extent this Public License may be interpreted as a contract, You are + granted the Licensed Rights in consideration of Your acceptance of + these terms and conditions, and the Licensor grants You such rights in + consideration of benefits the Licensor receives from making the + Licensed Material available under these terms and conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + . + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + . + . + ======================================================================= + . + Creative Commons is not a party to its public licenses. + Notwithstanding, Creative Commons may elect to apply one of its public + licenses to material it publishes and in those instances will be + considered the "Licensor." Except for the limited purpose of indicating + that material is shared under a Creative Commons public license or as + otherwise permitted by the Creative Commons policies published at + creativecommons.org/policies, Creative Commons does not authorize the + use of the trademark "Creative Commons" or any other trademark or logo + of Creative Commons without its prior written consent including, + without limitation, in connection with any unauthorized modifications + to any of its public licenses or any other arrangements, + understandings, or agreements concerning use of licensed material. For + the avoidance of doubt, this paragraph does not form part of the public + licenses. + . + Creative Commons may be contacted at creativecommons.org. + +License: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + . + On Debian systems, see /usr/share/common-licenses/MPL-2.0 for the full + text of the MPL version 2.0. + +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: Unicode-Data-Files-and-Software-License + UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE + . + See Terms of Use + for definitions of Unicode Inc.’s Data Files and Software. + . + NOTICE TO USER: Carefully read the following legal agreement. + BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S + DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), + YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE + TERMS AND CONDITIONS OF THIS AGREEMENT. + IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE + THE DATA FILES OR SOFTWARE. + . + COPYRIGHT AND PERMISSION NOTICE + . + Copyright © 1991-2022 Unicode, Inc. All rights reserved. + Distributed under the Terms of Use in https://www.unicode.org/copyright.html. + . + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Unicode data files and any associated documentation + (the "Data Files") or Unicode software and any associated documentation + (the "Software") to deal in the Data Files or Software + without restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, and/or sell copies of + the Data Files or Software, and to permit persons to whom the Data Files + or Software are furnished to do so, provided that either + (a) this copyright and permission notice appear with all copies + of the Data Files or Software, or + (b) this copyright and permission notice appear in associated + Documentation. + . + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT OF THIRD PARTY RIGHTS. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS + NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL + DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THE DATA FILES OR SOFTWARE. + . + Except as contained in this notice, the name of a copyright holder + shall not be used in advertising or otherwise to promote the sale, + use or other dealings in these Data Files or Software without prior + written authorization of the copyright holder. + +License: BSD-1-Clause-fiat-crypto + Copyright (c) 2015-2020 the fiat-crypto authors (see the AUTHORS file) + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY the fiat-crypto authors "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Berkeley Software Design, + Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/docs b/docs new file mode 100644 index 0000000000..b43bf86b50 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README.md diff --git a/ensure-patch b/ensure-patch new file mode 100755 index 0000000000..b8562f2d93 --- /dev/null +++ b/ensure-patch @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +case "$1" in +"-N") fwd=-N; rev=-R; verb="applied";; +"-R") fwd=-R; rev=-N; verb="reversed";; +*) echo >&2 "Usage: $0 <-N|-R> "; exit 2;; +esac + +if patch --dry-run -F0 -f $rev -p1 < "$2" >/dev/null; then + echo >&2 "patch already $verb: $2" + exit 0 +fi +patch --dry-run -F0 -f $fwd -p1 < "$2" +patch -F0 -f $fwd -p1 < "$2" diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000000..e5a3579315 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,12 @@ +[DEFAULT] +pristine-tar = True +ignore-branch = True +#component = extra + +[import-orig] +upstream-branch = upstream/experimental +debian-branch = debian/experimental + +[pq] +patch-numbers = False +drop = True diff --git a/get-stage0.py b/get-stage0.py new file mode 100755 index 0000000000..f37ef2b618 --- /dev/null +++ b/get-stage0.py @@ -0,0 +1,38 @@ +#!/usr/bin/python3 +# Sometimes this might fail due to upstream changes. +# In that case, you probably just need to override the failing step in our +# DownloadOnlyRustBuild class below. + +import shutil +import sys + +import bootstrap +from bootstrap import RustBuild + +class DownloadOnlyRustBuild(RustBuild): + triple = None + def build_bootstrap(self): + pass + def run(self, *args): + pass + def build_triple(self): + return self.triple + def update_submodules(self): + pass + def bootstrap_binary(self): + return "true" + +def main(argv): + triple = argv.pop(1) + DownloadOnlyRustBuild.triple = triple + bootstrap.RustBuild = DownloadOnlyRustBuild + args = bootstrap.parse_args(argv) + # bootstrap.py likes to delete our .cargo directory out from under us + shutil.move(".cargo", ".cargo-bak") + try: + bootstrap.bootstrap(args) + finally: + shutil.move(".cargo-bak", ".cargo") + +if __name__ == '__main__': + main(sys.argv) diff --git a/icons/rust-logo-32x32-blk.png b/icons/rust-logo-32x32-blk.png new file mode 100644 index 0000000000..9cc1452e37 Binary files /dev/null and b/icons/rust-logo-32x32-blk.png differ diff --git a/libstd-rust-1.76.install b/libstd-rust-1.76.install new file mode 100644 index 0000000000..cd4545cca3 --- /dev/null +++ b/libstd-rust-1.76.install @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/ diff --git a/libstd-rust-1.76.lintian-overrides b/libstd-rust-1.76.lintian-overrides new file mode 100644 index 0000000000..42311e89c3 --- /dev/null +++ b/libstd-rust-1.76.lintian-overrides @@ -0,0 +1,16 @@ +# "libstd" just seemed too generic +libstd-rust-1.76 binary: package-name-doesnt-match-sonames +libstd-rust-1.76 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.76 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.76 binary: shlib-without-versioned-soname +libstd-rust-1.76 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.76 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.76 binary: library-not-linked-against-libc diff --git a/libstd-rust-1.76.triggers b/libstd-rust-1.76.triggers new file mode 100644 index 0000000000..a88c20f92b --- /dev/null +++ b/libstd-rust-1.76.triggers @@ -0,0 +1,2 @@ +# normally added by dh_makeshlibs, but fails for our versioning scheme +activate-noawait ldconfig diff --git a/libstd-rust-dev-wasm32.install b/libstd-rust-dev-wasm32.install new file mode 100644 index 0000000000..a2949f140c --- /dev/null +++ b/libstd-rust-dev-wasm32.install @@ -0,0 +1 @@ +usr/lib/rustlib/wasm32-*/lib/ diff --git a/libstd-rust-dev-wasm32.lintian-overrides b/libstd-rust-dev-wasm32.lintian-overrides new file mode 100644 index 0000000000..2664d9cf30 --- /dev/null +++ b/libstd-rust-dev-wasm32.lintian-overrides @@ -0,0 +1,6 @@ +# wasm object files count as arch-independent for now, +# at least until we starting offering Debian in wasm +libstd-rust-dev-wasm32 binary: arch-independent-package-contains-binary-or-object * + +# lintian doesn't understand rlib files +libstd-rust-dev-wasm32 binary: no-code-sections * diff --git a/libstd-rust-dev-windows.install b/libstd-rust-dev-windows.install new file mode 100644 index 0000000000..1a0734fa9e --- /dev/null +++ b/libstd-rust-dev-windows.install @@ -0,0 +1 @@ +usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/ diff --git a/libstd-rust-dev-windows.lintian-overrides b/libstd-rust-dev-windows.lintian-overrides new file mode 100644 index 0000000000..8ab4804c56 --- /dev/null +++ b/libstd-rust-dev-windows.lintian-overrides @@ -0,0 +1,8 @@ +# lintian does not know about rust arch-specific directories +libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib] +libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.a] +libstd-rust-dev-windows binary: executable-not-elf-or-script [usr/lib/rustlib/*/lib/*.dll] + +# lintian doesn't understand these files +libstd-rust-dev-windows binary: no-code-sections [*.rlib] +libstd-rust-dev-windows binary: no-code-sections [usr/lib/rustlib/*-pc-windows-gnu/lib/lib*.dll.a] diff --git a/libstd-rust-dev.install b/libstd-rust-dev.install new file mode 100644 index 0000000000..399e4c0754 --- /dev/null +++ b/libstd-rust-dev.install @@ -0,0 +1 @@ +usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/ diff --git a/libstd-rust-dev.lintian-overrides b/libstd-rust-dev.lintian-overrides new file mode 100644 index 0000000000..33ea50b57e --- /dev/null +++ b/libstd-rust-dev.lintian-overrides @@ -0,0 +1,11 @@ +# lintian does not know about rust arch-specific directories +libstd-rust-dev binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib] +libstd-rust-dev binary: breakout-link usr/lib/rustlib/*/lib/lib*.so -> usr/lib/*/lib*.so + +# lintian doesn't understand rlib files +libstd-rust-dev binary: no-code-sections [*.rlib] + +# See debhelper bug #875780. This override is commented out because it's not +# always needed, but we want it here for documentation purposes. Basically, +# if you see it then you probably don't need to worry about it. +#libstd-rust-dev binary: unstripped-static-library usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/lib*.rlib(*) diff --git a/lintian-to-copyright.sh b/lintian-to-copyright.sh new file mode 100755 index 0000000000..866e31bcd0 --- /dev/null +++ b/lintian-to-copyright.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# Pipe the output of lintian into this. +sed -ne 's/.* file-without-copyright-information //p' | cut -d/ -f1-2 | sort -u | while read x; do + debian/scripts/guess-crate-copyright "$x" +done diff --git a/llvm-upstream-patch.sh b/llvm-upstream-patch.sh new file mode 100755 index 0000000000..fc87971361 --- /dev/null +++ b/llvm-upstream-patch.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# Run this on https://github.com/llvm-mirror/llvm +# Or another repo where the above is the "upstream" remote +set -e +head=$(git rev-parse --verify -q remotes/upstream/master || git rev-parse --verify -q remotes/origin/master) +test -n "$head" +for i in "$@"; do + git show $(git rev-list "$head" -n1 --grep='git-svn-id: .*@'"$i") > rL"$i".patch +done diff --git a/make_orig-stage0_tarball.sh b/make_orig-stage0_tarball.sh new file mode 100755 index 0000000000..b6010532ae --- /dev/null +++ b/make_orig-stage0_tarball.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# See README.Debian "Bootstrapping" for details. +# +# You may want to use `debian/rules source_orig-stage0` instead of calling this +# directly. + +set -e + +upstream_version="$(dpkg-parsechangelog -SVersion | sed -e 's/\(.*\)-.*/\1/g')" +upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armhf i386 ppc64el riscv64 s390x}" + +rm -f stage0/*/*.sha256 +mkdir -p stage0 build && ln -sf ../stage0 build/cache +if [ -n "$(find stage0/ -type f)" ]; then + echo >&2 "$0: NOTE: extra artifacts in stage0/ will be included:" + find stage0/ -type f +fi +for deb_host_arch in $upstream_bootstrap_arch; do + make -s --no-print-directory -f debian/architecture-test.mk "rust-for-deb_${deb_host_arch}" | { + read deb_host_arch rust_triplet + PYTHONPATH=src/bootstrap debian/get-stage0.py "${rust_triplet}" + rm -rf "${rust_triplet}" + } +done + +echo >&2 "building stage0 tar file now, this will take a while..." +stamp=@${SOURCE_DATE_EPOCH:-$(date +%s)} +touch --date="$stamp" stage0/dpkg-source-dont-rename-parent-directory +tar --mtime="$stamp" --clamp-mtime \ + --owner=root --group=root \ + -cJf "../rustc_${upstream_version}.orig-stage0.tar.xz" \ + --transform "s/^stage0\///" \ + stage0/* + +rm -f src/bootstrap/bootstrap.pyc + +cat < text.length) { + // Something went terribly wrong, ABORT, ABORT! + break tokenloop; + } + + if (str instanceof Token) { + continue; + } + + pattern.lastIndex = 0; + + var match = pattern.exec(str); + + if (match) { + if(lookbehind) { + lookbehindLength = match[1].length; + } + + var from = match.index - 1 + lookbehindLength, + match = match[0].slice(lookbehindLength), + len = match.length, + to = from + len, + before = str.slice(0, from + 1), + after = str.slice(to + 1); + + var args = [i, 1]; + + if (before) { + args.push(before); + } + + var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias); + + args.push(wrapped); + + if (after) { + args.push(after); + } + + Array.prototype.splice.apply(strarr, args); + } + } + } + } + + return strarr; + }, + + hooks: { + all: {}, + + add: function (name, callback) { + var hooks = _.hooks.all; + + hooks[name] = hooks[name] || []; + + hooks[name].push(callback); + }, + + run: function (name, env) { + var callbacks = _.hooks.all[name]; + + if (!callbacks || !callbacks.length) { + return; + } + + for (var i=0, callback; callback = callbacks[i++];) { + callback(env); + } + } + } +}; + +var Token = _.Token = function(type, content, alias) { + this.type = type; + this.content = content; + this.alias = alias; +}; + +Token.stringify = function(o, language, parent) { + if (typeof o == 'string') { + return o; + } + + if (_.util.type(o) === 'Array') { + return o.map(function(element) { + return Token.stringify(element, language, o); + }).join(''); + } + + var env = { + type: o.type, + content: Token.stringify(o.content, language, parent), + tag: 'span', + classes: ['token', o.type], + attributes: {}, + language: language, + parent: parent + }; + + if (env.type == 'comment') { + env.attributes['spellcheck'] = 'true'; + } + + if (o.alias) { + var aliases = _.util.type(o.alias) === 'Array' ? o.alias : [o.alias]; + Array.prototype.push.apply(env.classes, aliases); + } + + _.hooks.run('wrap', env); + + var attributes = ''; + + for (var name in env.attributes) { + attributes += name + '="' + (env.attributes[name] || '') + '"'; + } + + return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + ''; + +}; + +if (!_self.document) { + if (!_self.addEventListener) { + // in Node.js + return _self.Prism; + } + // In worker + _self.addEventListener('message', function(evt) { + var message = JSON.parse(evt.data), + lang = message.language, + code = message.code; + + _self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang])))); + _self.close(); + }, false); + + return _self.Prism; +} + +// Get current script and highlight +var script = document.getElementsByTagName('script'); + +script = script[script.length - 1]; + +if (script) { + _.filename = script.src; + + if (document.addEventListener && !script.hasAttribute('data-manual')) { + document.addEventListener('DOMContentLoaded', _.highlightAll); + } +} + +return _self.Prism; + +})(); + +if (typeof module !== 'undefined' && module.exports) { + module.exports = Prism; +} +; +Prism.languages.markup = { + 'comment': //, + 'prolog': /<\?[\w\W]+?\?>/, + 'doctype': //, + 'cdata': //i, + 'tag': { + pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i, + inside: { + 'tag': { + pattern: /^<\/?[^\s>\/]+/i, + inside: { + 'punctuation': /^<\/?/, + 'namespace': /^[^\s>\/:]+:/ + } + }, + 'attr-value': { + pattern: /=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i, + inside: { + 'punctuation': /[=>"']/ + } + }, + 'punctuation': /\/?>/, + 'attr-name': { + pattern: /[^\s>\/]+/, + inside: { + 'namespace': /^[^\s>\/:]+:/ + } + } + + } + }, + 'entity': /&#?[\da-z]{1,8};/i +}; + +// Plugin to make entity title show the real entity, idea by Roman Komarov +Prism.hooks.add('wrap', function(env) { + + if (env.type === 'entity') { + env.attributes['title'] = env.content.replace(/&/, '&'); + } +}); +; +Prism.languages.css = { + 'comment': /\/\*[\w\W]*?\*\//, + 'atrule': { + pattern: /@[\w-]+?.*?(;|(?=\s*\{))/i, + inside: { + 'rule': /@[\w-]+/ + // See rest below + } + }, + 'url': /url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i, + 'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/, + 'string': /("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/, + 'property': /(\b|\B)[\w-]+(?=\s*:)/i, + 'important': /\B!important\b/i, + 'function': /[-a-z0-9]+(?=\()/i, + 'punctuation': /[(){};:]/ +}; + +Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css); + +if (Prism.languages.markup) { + Prism.languages.insertBefore('markup', 'tag', { + 'style': { + pattern: /[\w\W]*?<\/style>/i, + inside: { + 'tag': { + pattern: /|<\/style>/i, + inside: Prism.languages.markup.tag.inside + }, + rest: Prism.languages.css + }, + alias: 'language-css' + } + }); + + Prism.languages.insertBefore('inside', 'attr-value', { + 'style-attr': { + pattern: /\s*style=("|').*?\1/i, + inside: { + 'attr-name': { + pattern: /^\s*style/i, + inside: Prism.languages.markup.tag.inside + }, + 'punctuation': /^\s*=\s*['"]|['"]\s*$/, + 'attr-value': { + pattern: /.+/i, + inside: Prism.languages.css + } + }, + alias: 'language-css' + } + }, Prism.languages.markup.tag); +}; +Prism.languages.clike = { + 'comment': [ + { + pattern: /(^|[^\\])\/\*[\w\W]*?\*\//, + lookbehind: true + }, + { + pattern: /(^|[^\\:])\/\/.*/, + lookbehind: true + } + ], + 'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/, + 'class-name': { + pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i, + lookbehind: true, + inside: { + punctuation: /(\.|\\)/ + } + }, + 'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/, + 'boolean': /\b(true|false)\b/, + 'function': /[a-z0-9_]+(?=\()/i, + 'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/, + 'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/, + 'punctuation': /[{}[\];(),.:]/ +}; +; +Prism.languages.javascript = Prism.languages.extend('clike', { + 'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/, + 'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/, + 'function': /(?!\d)[a-z0-9_$]+(?=\()/i +}); + +Prism.languages.insertBefore('javascript', 'keyword', { + 'regex': { + pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/, + lookbehind: true + } +}); + +Prism.languages.insertBefore('javascript', 'class-name', { + 'template-string': { + pattern: /`(?:\\`|\\?[^`])*`/, + inside: { + 'interpolation': { + pattern: /\$\{[^}]+\}/, + inside: { + 'interpolation-punctuation': { + pattern: /^\$\{|\}$/, + alias: 'punctuation' + }, + rest: Prism.languages.javascript + } + }, + 'string': /[\s\S]+/ + } + } +}); + +if (Prism.languages.markup) { + Prism.languages.insertBefore('markup', 'tag', { + 'script': { + pattern: /[\w\W]*?<\/script>/i, + inside: { + 'tag': { + pattern: /|<\/script>/i, + inside: Prism.languages.markup.tag.inside + }, + rest: Prism.languages.javascript + }, + alias: 'language-javascript' + } + }); +} +; diff --git a/not-installed b/not-installed new file mode 100644 index 0000000000..67d85a2dca --- /dev/null +++ b/not-installed @@ -0,0 +1,18 @@ +# rust-installer stuff, not relevant for Debian +usr/lib/rustlib/components +usr/lib/rustlib/install.log +usr/lib/rustlib/manifest-* +usr/lib/rustlib/rust-installer-version +usr/lib/rustlib/uninstall.sh + +# redundant copy of llvm-dwp, we already link it in rustc.links +usr/lib/rustlib/*/bin/rust-llvm-dwp + +# docs, we already install into /usr/share/doc/rustc +usr/share/doc/rust/* + +# should be claimed by dh_bash-completion +etc/bash_completion.d/cargo + +# backup files from the previous stages +usr/bin/*.old diff --git a/patches-unused/d-bootstrap-use-system-compiler-rt.patch b/patches-unused/d-bootstrap-use-system-compiler-rt.patch new file mode 100644 index 0000000000..9c34e7257b --- /dev/null +++ b/patches-unused/d-bootstrap-use-system-compiler-rt.patch @@ -0,0 +1,40 @@ +Description: Use system compiler-rt from clang, EXPERIMENTAL AND NOT WORKING YET +Forwarded: not-needed +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -200,6 +200,12 @@ + let mut features = builder.std_features(); + features.push_str(&compiler_builtins_c_feature); + ++ // In Debian this is always available ++ let llvm_config = builder.ensure(native::Llvm { ++ target: builder.config.build, ++ emscripten: false, ++ }); ++ cargo.env("LLVM_CONFIG", llvm_config); + if compiler.stage != 0 && builder.config.sanitizers { + // This variable is used by the sanitizer runtime crates, e.g. + // rustc_lsan, to build the sanitizer runtime from C code +@@ -208,11 +214,6 @@ + // missing + // We also only build the runtimes when --enable-sanitizers (or its + // config.toml equivalent) is used +- let llvm_config = builder.ensure(native::Llvm { +- target: builder.config.build, +- emscripten: false, +- }); +- cargo.env("LLVM_CONFIG", llvm_config); + cargo.env("RUSTC_BUILD_SANITIZERS", "1"); + } + +--- a/vendor/compiler_builtins/Cargo.toml ++++ b/vendor/compiler_builtins/Cargo.toml +@@ -49,7 +49,7 @@ + # LLVM_CONFIG or CLANG (more reliable) must be set. + c-system = [] + +-c = ["c-vendor"] ++c = ["c-system"] + compiler-builtins = [] + default = ["compiler-builtins"] + mangled-names = [] diff --git a/patches-unused/d-rustc-prefer-dynamic.patch b/patches-unused/d-rustc-prefer-dynamic.patch new file mode 100644 index 0000000000..13bb429220 --- /dev/null +++ b/patches-unused/d-rustc-prefer-dynamic.patch @@ -0,0 +1,18 @@ +Description: Prefer dynamic linking (currently disabled, not applied) + As per Debian policy, we basically revert + https://github.com/rust-lang/rfcs/blob/master/text/0404-change-prefer-dynamic.md + TODO: this does not yet work: https://github.com/rust-lang/rust/issues/43289 + Perhaps a better method would be to modify dh-cargo instead of rustc +Author: Ximin Luo +Forwarded: not-needed +--- a/src/librustc/session/config.rs ++++ b/src/librustc/session/config.rs +@@ -846,7 +846,7 @@ + "don't run LLVM's SLP vectorization pass"), + soft_float: bool = (false, parse_bool, [TRACKED], + "use soft float ABI (*eabihf targets only)"), +- prefer_dynamic: bool = (false, parse_bool, [TRACKED], ++ prefer_dynamic: bool = (true, parse_bool, [TRACKED], + "prefer dynamic linking to static linking"), + no_integrated_as: bool = (false, parse_bool, [TRACKED], + "use an external assembler rather than LLVM's integrated one"), diff --git a/patches-unused/d-test-host-duplicates.patch b/patches-unused/d-test-host-duplicates.patch new file mode 100644 index 0000000000..50c39adf90 --- /dev/null +++ b/patches-unused/d-test-host-duplicates.patch @@ -0,0 +1,20 @@ +Description: Work around #842634 on some machines, e.g. Debian porterboxes + This should remain commented-out in debian/patches/series, it's not needed everywhere +Author: Ximin Luo +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/library/std/src/sys_common/net/tests.rs ++++ b/library/std/src/sys_common/net/tests.rs +@@ -11,8 +11,10 @@ + for sa in lh { + *addrs.entry(sa).or_insert(0) += 1; + } ++ let mut v = addrs.iter().filter(|&(_, &v)| v > 1).collect::>(); ++ v.clear(); + assert_eq!( +- addrs.iter().filter(|&(_, &v)| v > 1).collect::>(), ++ v, + vec![], + "There should be no duplicate localhost entries" + ); diff --git a/patches-unused/u-allow-system-compiler-rt.patch b/patches-unused/u-allow-system-compiler-rt.patch new file mode 100644 index 0000000000..3bd874a5ce --- /dev/null +++ b/patches-unused/u-allow-system-compiler-rt.patch @@ -0,0 +1,327 @@ +Description: Support linking against system clang libs + Note: the above PR only covers the compiler_builtins crate, rustc itself also + needs patching as per below once that is accepted. +Forwarded: https://github.com/rust-lang-nursery/compiler-builtins/pull/296 +--- a/vendor/compiler_builtins/Cargo.toml ++++ b/vendor/compiler_builtins/Cargo.toml +@@ -43,7 +43,13 @@ + optional = true + + [features] +-c = ["cc"] ++c-vendor = ["cc"] ++ ++# Link against system clang_rt.* libraries. ++# LLVM_CONFIG or CLANG (more reliable) must be set. ++c-system = [] ++ ++c = ["c-vendor"] + compiler-builtins = [] + default = ["compiler-builtins"] + mangled-names = [] +--- a/vendor/compiler_builtins/build.rs ++++ b/vendor/compiler_builtins/build.rs +@@ -37,7 +37,7 @@ + // mangling names though we assume that we're also in test mode so we don't + // build anything and we rely on the upstream implementation of compiler-rt + // functions +- if !cfg!(feature = "mangled-names") && cfg!(feature = "c") { ++ if !cfg!(feature = "mangled-names") && cfg!(any(feature = "c-vendor", feature = "c-system")) { + // Don't use a C compiler for these targets: + // + // * wasm32 - clang 8 for wasm is somewhat hard to come by and it's +@@ -47,8 +47,10 @@ + // compiler nor is cc-rs ready for compilation to riscv (at this + // time). This can probably be removed in the future + if !target.contains("wasm32") && !target.contains("nvptx") && !target.starts_with("riscv") { +- #[cfg(feature = "c")] +- c::compile(&llvm_target); ++ #[cfg(feature = "c-vendor")] ++ c_vendor::compile(&llvm_target); ++ #[cfg(feature = "c-system")] ++ c_system::compile(&llvm_target); + } + } + +@@ -70,17 +72,14 @@ + } + } + +-#[cfg(feature = "c")] +-mod c { +- extern crate cc; +- ++#[cfg(any(feature = "c-vendor", feature = "c-system"))] ++mod sources { + use std::collections::BTreeMap; + use std::env; +- use std::path::PathBuf; + +- struct Sources { ++ pub struct Sources { + // SYMBOL -> PATH TO SOURCE +- map: BTreeMap<&'static str, &'static str>, ++ pub map: BTreeMap<&'static str, &'static str>, + } + + impl Sources { +@@ -117,39 +116,11 @@ + } + } + +- /// Compile intrinsics from the compiler-rt C source code +- pub fn compile(llvm_target: &[&str]) { ++ pub fn get_sources(llvm_target: &[&str]) -> Sources { + let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap(); + let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap(); + let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap(); + let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap(); +- let cfg = &mut cc::Build::new(); +- +- cfg.warnings(false); +- +- if target_env == "msvc" { +- // Don't pull in extra libraries on MSVC +- cfg.flag("/Zl"); +- +- // Emulate C99 and C++11's __func__ for MSVC prior to 2013 CTP +- cfg.define("__func__", Some("__FUNCTION__")); +- } else { +- // Turn off various features of gcc and such, mostly copying +- // compiler-rt's build system already +- cfg.flag("-fno-builtin"); +- cfg.flag("-fvisibility=hidden"); +- cfg.flag("-ffreestanding"); +- // Avoid the following warning appearing once **per file**: +- // clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument] +- // +- // Note that compiler-rt's build system also checks +- // +- // `check_cxx_compiler_flag(-fomit-frame-pointer COMPILER_RT_HAS_FOMIT_FRAME_POINTER_FLAG)` +- // +- // in https://github.com/rust-lang/compiler-rt/blob/c8fbcb3/cmake/config-ix.cmake#L19. +- cfg.flag_if_supported("-fomit-frame-pointer"); +- cfg.define("VISIBILITY_HIDDEN", None); +- } + + let mut sources = Sources::new(); + sources.extend(&[ +@@ -411,6 +382,48 @@ + sources.remove(&["__aeabi_cdcmp", "__aeabi_cfcmp"]); + } + ++ sources ++ } ++} ++ ++#[cfg(feature = "c-vendor")] ++mod c_vendor { ++ extern crate cc; ++ ++ use std::env; ++ use std::path::PathBuf; ++ use sources; ++ ++ /// Compile intrinsics from the compiler-rt C source code ++ pub fn compile(llvm_target: &[&str]) { ++ let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap(); ++ let cfg = &mut cc::Build::new(); ++ cfg.warnings(false); ++ ++ if target_env == "msvc" { ++ // Don't pull in extra libraries on MSVC ++ cfg.flag("/Zl"); ++ ++ // Emulate C99 and C++11's __func__ for MSVC prior to 2013 CTP ++ cfg.define("__func__", Some("__FUNCTION__")); ++ } else { ++ // Turn off various features of gcc and such, mostly copying ++ // compiler-rt's build system already ++ cfg.flag("-fno-builtin"); ++ cfg.flag("-fvisibility=hidden"); ++ cfg.flag("-ffreestanding"); ++ // Avoid the following warning appearing once **per file**: ++ // clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument] ++ // ++ // Note that compiler-rt's build system also checks ++ // ++ // `check_cxx_compiler_flag(-fomit-frame-pointer COMPILER_RT_HAS_FOMIT_FRAME_POINTER_FLAG)` ++ // ++ // in https://github.com/rust-lang/compiler-rt/blob/c8fbcb3/cmake/config-ix.cmake#L19. ++ cfg.flag_if_supported("-fomit-frame-pointer"); ++ cfg.define("VISIBILITY_HIDDEN", None); ++ } ++ + // When compiling the C code we require the user to tell us where the + // source code is, and this is largely done so when we're compiling as + // part of rust-lang/rust we can use the same llvm-project repository as +@@ -423,6 +436,7 @@ + panic!("RUST_COMPILER_RT_ROOT={} does not exist", root.display()); + } + ++ let sources = sources::get_sources(llvm_target); + let src_dir = root.join("lib/builtins"); + for (sym, src) in sources.map.iter() { + let src = src_dir.join(src); +@@ -434,3 +448,103 @@ + cfg.compile("libcompiler-rt.a"); + } + } ++ ++#[cfg(feature = "c-system")] ++mod c_system { ++ use std::env; ++ use std::process::{Command, Output}; ++ use std::str; ++ use std::path::Path; ++ use sources; ++ ++ fn success_output(err: &str, cmd: &mut Command) -> Output { ++ let output = cmd.output().expect(err); ++ let status = output.status; ++ if !status.success() { ++ panic!("{}: {:?}", err, status.code()); ++ } ++ output ++ } ++ ++ // This can be obtained by adding the line: ++ // message(STATUS "All builtin supported architectures: ${ALL_BUILTIN_SUPPORTED_ARCH}") ++ // to the bottom of compiler-rt/cmake/builtin-config-ix.cmake, then running ++ // cmake and looking at the output. ++ const ALL_SUPPORTED_ARCHES : &'static str = "i386;x86_64;arm;armhf;armv6m;armv7m;armv7em;armv7;armv7s;armv7k;aarch64;hexagon;mips;mipsel;mips64;mips64el;powerpc64;powerpc64le;riscv32;riscv64;wasm32;wasm64"; ++ ++ // This function recreates the logic of getArchNameForCompilerRTLib, ++ // defined in clang/lib/Driver/ToolChain.cpp. ++ fn get_arch_name_for_compiler_rtlib() -> String { ++ let target = env::var("TARGET").unwrap(); ++ let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap(); ++ let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap(); ++ let r = match target_arch.as_str() { ++ "arm" => if target.ends_with("eabihf") && target_os != "windows" { ++ "armhf" ++ } else { ++ "arm" ++ }, ++ "x86" => if target_os == "android" { ++ "i686" ++ } else { ++ "i386" ++ }, ++ _ => target_arch.as_str(), ++ }; ++ r.to_string() ++ } ++ ++ /// Link against system clang runtime libraries ++ pub fn compile(llvm_target: &[&str]) { ++ let target = env::var("TARGET").unwrap(); ++ let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap(); ++ let compiler_rt_arch = get_arch_name_for_compiler_rtlib(); ++ ++ if ALL_SUPPORTED_ARCHES.split(";").find(|x| *x == compiler_rt_arch) == None { ++ return; ++ } ++ ++ if let Ok(clang) = env::var("CLANG") { ++ let output = success_output( ++ "failed to find clang's compiler-rt", ++ Command::new(clang) ++ .arg(format!("--target={}", target)) ++ .arg("--rtlib=compiler-rt") ++ .arg("--print-libgcc-file-name"), ++ ); ++ let fullpath = Path::new(str::from_utf8(&output.stdout).unwrap()); ++ let libpath = fullpath.parent().unwrap().display(); ++ let libname = fullpath ++ .file_stem() ++ .unwrap() ++ .to_str() ++ .unwrap() ++ .trim_start_matches("lib"); ++ println!("cargo:rustc-link-search=native={}", libpath); ++ println!("cargo:rustc-link-lib=static={}", libname); ++ } else if let Ok(llvm_config) = env::var("LLVM_CONFIG") { ++ // fallback if clang is not installed ++ let (subpath, libname) = match target_os.as_str() { ++ "linux" => ("linux", format!("clang_rt.builtins-{}", &compiler_rt_arch)), ++ "macos" => ("darwin", "clang_rt.builtins_osx_dynamic".to_string()), ++ _ => panic!("unsupported target os: {}", target_os), ++ }; ++ let cmd = format!("ls -1d $({} --libdir)/clang/*/lib/{}", llvm_config, subpath); ++ let output = success_output( ++ "failed to find clang's lib dir", ++ Command::new("sh").args(&["-ec", &cmd]), ++ ); ++ for search_dir in str::from_utf8(&output.stdout).unwrap().lines() { ++ println!("cargo:rustc-link-search=native={}", search_dir); ++ } ++ println!("cargo:rustc-link-lib=static={}", libname); ++ } else { ++ panic!("neither CLANG nor LLVM_CONFIG could be read"); ++ } ++ ++ let sources = sources::get_sources(llvm_target); ++ for (sym, _src) in sources.map.iter() { ++ println!("cargo:rustc-cfg={}=\"optimized-c\"", sym); ++ } ++ } ++} +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -213,6 +213,7 @@ + emscripten: false, + }); + cargo.env("LLVM_CONFIG", llvm_config); ++ cargo.env("RUSTC_BUILD_SANITIZERS", "1"); + } + + cargo.arg("--features").arg(features) +--- a/src/librustc_asan/build.rs ++++ b/src/librustc_asan/build.rs +@@ -4,6 +4,9 @@ + use cmake::Config; + + fn main() { ++ if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) { ++ return; ++ } + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { + build_helper::restore_library_path(); + +--- a/src/librustc_lsan/build.rs ++++ b/src/librustc_lsan/build.rs +@@ -4,6 +4,9 @@ + use cmake::Config; + + fn main() { ++ if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) { ++ return; ++ } + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { + build_helper::restore_library_path(); + +--- a/src/librustc_msan/build.rs ++++ b/src/librustc_msan/build.rs +@@ -4,6 +4,9 @@ + use cmake::Config; + + fn main() { ++ if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) { ++ return; ++ } + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { + build_helper::restore_library_path(); + +--- a/src/librustc_tsan/build.rs ++++ b/src/librustc_tsan/build.rs +@@ -4,6 +4,9 @@ + use cmake::Config; + + fn main() { ++ if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) { ++ return; ++ } + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { + build_helper::restore_library_path(); + diff --git a/patches/behaviour/d-rust-gdb-paths.patch b/patches/behaviour/d-rust-gdb-paths.patch new file mode 100644 index 0000000000..86d9c2d4dd --- /dev/null +++ b/patches/behaviour/d-rust-gdb-paths.patch @@ -0,0 +1,25 @@ +From: Angus Lees +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Hardcode GDB python module directory + +Debian package installs python modules into a fixed directory, so +just hardcode path in wrapper script. + +Forwarded: not-needed +--- + src/etc/rust-gdbgui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui +index 471810c..be62b44 100755 +--- a/src/etc/rust-gdbgui ++++ b/src/etc/rust-gdbgui +@@ -40,7 +40,7 @@ else + fi + + # Find out where the pretty printer Python module is +-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" ++RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)" + GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" + # Get the commit hash for path remapping + RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')" diff --git a/patches/behaviour/d-rust-lldb-paths.patch b/patches/behaviour/d-rust-lldb-paths.patch new file mode 100644 index 0000000000..6afe0cc19e --- /dev/null +++ b/patches/behaviour/d-rust-lldb-paths.patch @@ -0,0 +1,29 @@ +From: Angus Lees +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Hardcode LLDB python module directory + +Debian package installs python modules into a fixed directory, so +just hardcode path in wrapper script. + +Forwarded: not-needed +--- + src/etc/rust-lldb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb +index bce72f1..38e76c2 100755 +--- a/src/etc/rust-lldb ++++ b/src/etc/rust-lldb +@@ -7,10 +7,10 @@ set -e + host=$(rustc -vV | sed -n -e 's/^host: //p') + + # Find out where to look for the pretty printer Python module +-RUSTC_SYSROOT=$(rustc --print sysroot) ++RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)" + RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" + +-lldb=lldb ++lldb=lldb-17 + if [ -f "$RUST_LLDB" ]; then + lldb="$RUST_LLDB" + else diff --git a/patches/behaviour/d-rustc-add-soname.patch b/patches/behaviour/d-rustc-add-soname.patch new file mode 100644 index 0000000000..91959bdc0d --- /dev/null +++ b/patches/behaviour/d-rustc-add-soname.patch @@ -0,0 +1,44 @@ +From: Angus Lees +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Set DT_SONAME when building dylibs + +In Rust, library filenames include a version-specific hash to help +the run-time linker find the correct version. Unlike in C/C++, the +compiler looks for all libraries matching a glob that ignores the +hash and reads embedded metadata to work out versions, etc. + +The upshot is that there is no need for the usual "libfoo.so -> +libfoo-1.2.3.so" symlink common with C/C++ when building with Rust, +and no need to communicate an alternate filename to use at run-time +vs compile time. If linking to a Rust dylib from C/C++ however, a +"libfoo.so -> libfoo-$hash.so" symlink may well be useful and in +this case DT_SONAME=libfoo-$hash.so would be required. More +mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't +find DT_SONAME on shared libraries in public directories. + +This patch passes -Wl,-soname=$outfile when building dylibs (and +using a GNU linker). + +Forwarded: no +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index b0d22ad..9f824f4 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -2384,6 +2384,13 @@ fn add_order_independent_options( + } + + add_rpath_args(cmd, sess, codegen_results, out_filename); ++ ++ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) ++ && sess.target.linker_flavor.is_gnu() { ++ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); ++ let soname = [String::from("-Wl,-soname=") + &filename]; ++ cmd.args(&soname); ++ } + } + + // Write the NatVis debugger visualizer files for each crate to the temp directory and gather the file paths. diff --git a/patches/behaviour/d-rustc-i686-baseline.patch b/patches/behaviour/d-rustc-i686-baseline.patch new file mode 100644 index 0000000000..0e40ad70ba --- /dev/null +++ b/patches/behaviour/d-rustc-i686-baseline.patch @@ -0,0 +1,56 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Change i686 to match Debian i386 baseline + +see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973414 , might need to be +adapted to reduce the baseline again + +Forwarded: not-needed + +=================================================================== +--- + compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 +- + tests/ui/abi/homogenous-floats-target-feature-mixup.rs | 3 ++- + tests/ui/sse2.rs | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +index 3b7be48..4f01366 100644 +--- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +@@ -2,7 +2,7 @@ use crate::spec::{base, Cc, LinkerFlavor, Lld, SanitizerSet, StackProbeType, Tar + + pub fn target() -> Target { + let mut base = base::linux_gnu::opts(); +- base.cpu = "pentium4".into(); ++ base.cpu = "pentiumpro".into(); + base.max_atomic_width = Some(64); + base.supported_sanitizers = SanitizerSet::ADDRESS; + base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]); +diff --git a/tests/ui/abi/homogenous-floats-target-feature-mixup.rs b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs +index 4600bd0..e178964 100644 +--- a/tests/ui/abi/homogenous-floats-target-feature-mixup.rs ++++ b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs +@@ -24,7 +24,8 @@ fn main() { + match std::env::var("TARGET") { + Ok(s) => { + // Skip this tests on i586-unknown-linux-gnu where sse2 is disabled +- if s.contains("i586") { ++ // Debian: our i686 doesn't have SSE 2.. ++ if s.contains("i586") || s.contains("i686") { + return + } + } +diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs +index 172f407..bf39939 100644 +--- a/tests/ui/sse2.rs ++++ b/tests/ui/sse2.rs +@@ -15,7 +15,7 @@ fn main() { + } + Err(_) => return, + } +- if cfg!(any(target_arch = "x86", target_arch = "x86_64")) { ++ if cfg!(any(target_arch = "x86_64")) { + assert!(cfg!(target_feature = "sse2"), + "SSE2 was not detected as available on an x86 platform"); + } diff --git a/patches/behaviour/d-rustc-windows-ssp.patch b/patches/behaviour/d-rustc-windows-ssp.patch new file mode 100644 index 0000000000..6cacf0ef1b --- /dev/null +++ b/patches/behaviour/d-rustc-windows-ssp.patch @@ -0,0 +1,22 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: d-rustc-windows-ssp + +Bug: https://github.com/rust-lang/rust/issues/68973 +--- + compiler/rustc_target/src/spec/base/windows_gnu.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/compiler/rustc_target/src/spec/base/windows_gnu.rs b/compiler/rustc_target/src/spec/base/windows_gnu.rs +index 25f02dc..402bb29 100644 +--- a/compiler/rustc_target/src/spec/base/windows_gnu.rs ++++ b/compiler/rustc_target/src/spec/base/windows_gnu.rs +@@ -42,6 +42,8 @@ pub fn opts() -> TargetOptions { + "-lmsvcrt", + "-luser32", + "-lkernel32", ++ "-lssp_nonshared", ++ "-lssp", + ]; + let mut late_link_args = + TargetOptions::link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), mingw_libs); diff --git a/patches/behaviour/d-rustdoc-disable-embedded-fonts.patch b/patches/behaviour/d-rustdoc-disable-embedded-fonts.patch new file mode 100644 index 0000000000..7f9a13289b --- /dev/null +++ b/patches/behaviour/d-rustdoc-disable-embedded-fonts.patch @@ -0,0 +1,43 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: removed some embedded fonts + +Forwarded: not-needed +=================================================================== +--- + src/librustdoc/html/static/css/rustdoc.css | 8 -------- + src/librustdoc/html/static_files.rs | 2 -- + 2 files changed, 10 deletions(-) + +diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css +index c4e97de..e9ea715 100644 +--- a/src/librustdoc/html/static/css/rustdoc.css ++++ b/src/librustdoc/html/static/css/rustdoc.css +@@ -86,14 +86,6 @@ + font-display: swap; + } + +-/* Avoid using legacy CJK serif fonts in Windows like Batang. */ +-@font-face { +- font-family: 'NanumBarunGothic'; +- src: url("NanumBarunGothic-0f09457c7a19b7c6.ttf.woff2") format("woff2"); +- font-display: swap; +- unicode-range: U+AC00-D7AF, U+1100-11FF, U+3130-318F, U+A960-A97F, U+D7B0-D7FF; +-} +- + * { + box-sizing: border-box; + } +diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs +index ca9a78f..2fd45fb 100644 +--- a/src/librustdoc/html/static_files.rs ++++ b/src/librustdoc/html/static_files.rs +@@ -119,8 +119,6 @@ static_files! { + source_code_pro_semibold => "static/fonts/SourceCodePro-Semibold.ttf.woff2", + source_code_pro_italic => "static/fonts/SourceCodePro-It.ttf.woff2", + source_code_pro_license => "static/fonts/SourceCodePro-LICENSE.txt", +- nanum_barun_gothic_regular => "static/fonts/NanumBarunGothic.ttf.woff2", +- nanum_barun_gothic_license => "static/fonts/NanumBarunGothic-LICENSE.txt", + } + + pub(crate) static SCRAPE_EXAMPLES_HELP_MD: &str = include_str!("static/scrape-examples-help.md"); diff --git a/patches/build/d-armel-fix-lldb.patch b/patches/build/d-armel-fix-lldb.patch new file mode 100644 index 0000000000..53fd45d49d --- /dev/null +++ b/patches/build/d-armel-fix-lldb.patch @@ -0,0 +1,26 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:40 +0200 +Subject: run panics if lldb is not installed and no output is produced.. + +Forwarded: no +--- + src/bootstrap/src/core/build_steps/test.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs +index 5c115cf..5c28e3d 100644 +--- a/src/bootstrap/src/core/build_steps/test.rs ++++ b/src/bootstrap/src/core/build_steps/test.rs +@@ -1787,7 +1787,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the + .ok(); + if let Some(ref vers) = lldb_version { + cmd.arg("--lldb-version").arg(vers); +- let lldb_python_dir = run(Command::new(lldb_exe).arg("-P")).ok(); ++ let lldb_python_dir = Command::new(lldb_exe) ++ .arg("-P") ++ .output() ++ .map(|output| String::from_utf8_lossy(&output.stdout).to_string()) ++ .ok(); + if let Some(ref dir) = lldb_python_dir { + cmd.arg("--lldb-python-dir").arg(dir); + } diff --git a/patches/build/d-bootstrap-cargo-doc-paths.patch b/patches/build/d-bootstrap-cargo-doc-paths.patch new file mode 100644 index 0000000000..d0db153e51 --- /dev/null +++ b/patches/build/d-bootstrap-cargo-doc-paths.patch @@ -0,0 +1,387 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Fix links to cargo-doc + +We package cargo docs in a slightly different location; also tweak linkchecker +to not fail these links. + +Forwarded: not-needed +--- + compiler/rustc_error_codes/src/error_codes/E0460.md | 2 +- + compiler/rustc_error_codes/src/error_codes/E0461.md | 2 +- + compiler/rustc_error_codes/src/error_codes/E0462.md | 2 +- + compiler/rustc_error_codes/src/error_codes/E0514.md | 2 +- + compiler/rustc_error_codes/src/error_codes/E0519.md | 2 +- + src/doc/edition-guide/book.toml | 18 +++++++++--------- + .../edition-guide/src/editions/advanced-migrations.md | 14 +++++++------- + ...ansitioning-an-existing-project-to-a-new-edition.md | 4 ++-- + .../src/rust-2021/default-cargo-resolver.md | 10 +++++----- + src/doc/index.md | 2 +- + src/doc/reference/src/conditional-compilation.md | 2 +- + src/doc/reference/src/introduction.md | 4 ++-- + src/doc/reference/src/linkage.md | 2 +- + src/doc/reference/src/procedural-macros.md | 2 +- + src/doc/rustc/src/linker-plugin-lto.md | 2 +- + src/doc/rustc/src/platform-support/fuchsia.md | 2 +- + src/doc/rustc/src/targets/custom.md | 2 +- + src/doc/rustc/src/tests/index.md | 4 ++-- + src/doc/rustc/src/what-is-rustc.md | 2 +- + .../src/compiler-flags/branch-protection.md | 2 +- + .../src/compiler-flags/control-flow-guard.md | 2 +- + src/doc/unstable-book/src/compiler-flags/sanitizer.md | 2 +- + src/tools/linkchecker/main.rs | 4 ++++ + 23 files changed, 47 insertions(+), 43 deletions(-) + +diff --git a/compiler/rustc_error_codes/src/error_codes/E0460.md b/compiler/rustc_error_codes/src/error_codes/E0460.md +index 001678a..e8b77bf 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0460.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0460.md +@@ -68,4 +68,4 @@ This error can be fixed by: + * Recompiling crate `a` so that both crate `b` and `main` have a uniform + version to depend on. + +-[Cargo]: ../cargo/index.html ++[Cargo]: ../../../cargo/book/index.html +diff --git a/compiler/rustc_error_codes/src/error_codes/E0461.md b/compiler/rustc_error_codes/src/error_codes/E0461.md +index 33105c4..088833d 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0461.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0461.md +@@ -25,6 +25,6 @@ architectures. This issue also extends to any difference in target triples, as + `std` is operating-system specific. + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling either crate so that they target a consistent target triple. +diff --git a/compiler/rustc_error_codes/src/error_codes/E0462.md b/compiler/rustc_error_codes/src/error_codes/E0462.md +index 4509cc6..b0538b9 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0462.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0462.md +@@ -26,7 +26,7 @@ prefer `staticlib` for linking with C programs. Learn more about different + `crate_type`s in [this section of the Reference](../reference/linkage.html). + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling the crate as a `rlib` or `dylib`; formats suitable for Rust + linking. +diff --git a/compiler/rustc_error_codes/src/error_codes/E0514.md b/compiler/rustc_error_codes/src/error_codes/E0514.md +index ce2bbc5..0b2dab8 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0514.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0514.md +@@ -27,7 +27,7 @@ the compiler cannot be sure about *how* to call a function between compiler + versions, and therefore this error occurs. + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager and ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager and + [Rustup](https://rust-lang.github.io/rustup/), the Rust toolchain installer, + automatically fixing this issue. + * Recompiling the crates with a uniform `rustc` version. +diff --git a/compiler/rustc_error_codes/src/error_codes/E0519.md b/compiler/rustc_error_codes/src/error_codes/E0519.md +index 12876e2..09bd221 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0519.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0519.md +@@ -34,7 +34,7 @@ The above example compiles two crates with exactly the same name and + impossible for the compiler to distinguish between symbols (`pub` item names). + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling the crate with different metadata (different name/ + `crate_type`). +diff --git a/src/doc/edition-guide/book.toml b/src/doc/edition-guide/book.toml +index 7841b64..7094175 100644 +--- a/src/doc/edition-guide/book.toml ++++ b/src/doc/edition-guide/book.toml +@@ -53,15 +53,15 @@ git-repository-url = "https://github.com/rust-lang/edition-guide" + "/rust-2018/the-compiler/incremental-compilation-for-faster-compiles.html" = "https://blog.rust-lang.org/2018/02/15/Rust-1.24.html#incremental-compilation" + "/rust-2018/the-compiler/an-attribute-for-deprecation.html" = "../../../reference/attributes/diagnostics.html#the-deprecated-attribute" + "/rust-2018/rustup-for-managing-rust-versions.html" = "https://rust-lang.github.io/rustup/" +-"/rust-2018/cargo-and-crates-io/index.html" = "../../../cargo/index.html" +-"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../cargo/commands/cargo-check.html" +-"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../cargo/commands/cargo-install.html" ++"/rust-2018/cargo-and-crates-io/index.html" = "../../../../../cargo/book/index.html" ++"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../../../cargo/book/commands/cargo-check.html" ++"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../../../cargo/book/commands/cargo-install.html" + "/rust-2018/cargo-and-crates-io/cargo-new-defaults-to-a-binary-project.html" = "https://blog.rust-lang.org/2018/03/29/Rust-1.25.html#cargo-features" +-"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../cargo/commands/cargo-rustc.html" +-"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../cargo/reference/workspaces.html" +-"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../cargo/guide/project-layout.html" +-"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../cargo/reference/overriding-dependencies.html#the-patch-section" +-"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../cargo/reference/source-replacement.html" ++"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../../../cargo/book/commands/cargo-rustc.html" ++"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../../../cargo/book/reference/workspaces.html" ++"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../../../cargo/book/guide/project-layout.html" ++"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../../../cargo/book/reference/overriding-dependencies.html#the-patch-section" ++"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../../../cargo/book/reference/source-replacement.html" + "/rust-2018/cargo-and-crates-io/crates-io-disallows-wildcard-dependencies.html" = "https://blog.rust-lang.org/2016/01/21/Rust-1.6.html#cratesio-disallows-wildcards" + "/rust-2018/documentation/index.html" = "../../../index.html" + "/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html" +@@ -93,4 +93,4 @@ git-repository-url = "https://github.com/rust-lang/edition-guide" + "/rust-next/future.html" = "../../std/future/trait.Future.html" + "/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable" + "/rust-next/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized" +-"/rust-next/cargo-vendor.html" = "../../cargo/commands/cargo-vendor.html" ++"/rust-next/cargo-vendor.html" = "../../../../cargo/book/commands/cargo-vendor.html" +diff --git a/src/doc/edition-guide/src/editions/advanced-migrations.md b/src/doc/edition-guide/src/editions/advanced-migrations.md +index a1a5d80..0c3b0c8 100644 +--- a/src/doc/edition-guide/src/editions/advanced-migrations.md ++++ b/src/doc/edition-guide/src/editions/advanced-migrations.md +@@ -186,18 +186,18 @@ Afterwards, the line with `extern crate rand;` in `src/lib.rs` will be removed. + + We're now more idiomatic, and we didn't have to fix our code manually! + +-[`cargo check`]: ../../cargo/commands/cargo-check.html +-[`cargo fix`]: ../../cargo/commands/cargo-fix.html ++[`cargo check`]: ../../../../cargo/book/commands/cargo-check.html ++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html + [`explicit-outlives-requirements`]: ../../rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements + [`keyword-idents`]: ../../rustc/lints/listing/allowed-by-default.html#keyword-idents + [`rustfix`]: https://crates.io/crates/rustfix + [`unused-extern-crates`]: ../../rustc/lints/listing/allowed-by-default.html#unused-extern-crates +-[Cargo features]: ../../cargo/reference/features.html +-[Cargo package]: ../../cargo/reference/manifest.html#the-package-section +-[Cargo targets]: ../../cargo/reference/cargo-targets.html +-[Cargo workspace]: ../../cargo/reference/workspaces.html ++[Cargo features]: ../../../../cargo/book/reference/features.html ++[Cargo package]: ../../../../cargo/book/reference/manifest.html#the-package-section ++[Cargo targets]: ../../../../cargo/book/reference/cargo-targets.html ++[Cargo workspace]: ../../../../cargo/book/reference/workspaces.html + [CLI flag]: ../../rustc/lints/levels.html#via-compiler-flag +-[Code generation]: ../../cargo/reference/build-script-examples.html#code-generation ++[Code generation]: ../../../../cargo/book/reference/build-script-examples.html#code-generation + [conditional compilation]: ../../reference/conditional-compilation.html + [documentation tests]: ../../rustdoc/documentation-tests.html + [JSON messages]: ../../rustc/json.html +diff --git a/src/doc/edition-guide/src/editions/transitioning-an-existing-project-to-a-new-edition.md b/src/doc/edition-guide/src/editions/transitioning-an-existing-project-to-a-new-edition.md +index d4ebd23..afbb17d 100644 +--- a/src/doc/edition-guide/src/editions/transitioning-an-existing-project-to-a-new-edition.md ++++ b/src/doc/edition-guide/src/editions/transitioning-an-existing-project-to-a-new-edition.md +@@ -83,7 +83,7 @@ If new warnings are issued, you may want to consider running `cargo fix` again ( + + Congrats! Your code is now valid in both Rust 2015 and Rust 2018! + +-[`cargo fix`]: ../../cargo/commands/cargo-fix.html +-[`cargo test`]: ../../cargo/commands/cargo-test.html ++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html ++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html + [Advanced migration strategies]: advanced-migrations.md + [nightly channel]: ../../book/appendix-07-nightly-rust.html +diff --git a/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md b/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md +index 5f6653d..99332c3 100644 +--- a/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md ++++ b/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md +@@ -21,11 +21,11 @@ The new feature resolver no longer merges all requested features for + crates that are depended on in multiple ways. + See [the announcement of Rust 1.51][5] for details. + +-[4]: ../../cargo/reference/resolver.html#feature-resolver-version-2 ++[4]: ../../../../cargo/book/reference/resolver.html#feature-resolver-version-2 + [5]: https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver +-[workspace]: ../../cargo/reference/workspaces.html +-[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-workspace +-[`resolver` field]: ../../cargo/reference/resolver.html#resolver-versions ++[workspace]: ../../../../cargo/book/reference/workspaces.html ++[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-workspace ++[`resolver` field]: ../../../../cargo/book/reference/resolver.html#resolver-versions + + ## Migration + +@@ -176,4 +176,4 @@ This snippet of output shows that the project `foo` depends on `bar` with the "d + Then, `bar` depends on `bstr` as a build-dependency with the "default" feature. + We can further see that `bstr`'s "default" feature enables "unicode" (among other features). + +-[`cargo tree`]: ../../cargo/commands/cargo-tree.html ++[`cargo tree`]: ../../../../cargo/book/commands/cargo-tree.html +diff --git a/src/doc/index.md b/src/doc/index.md +index 8ad5b42..f93d3da 100644 +--- a/src/doc/index.md ++++ b/src/doc/index.md +@@ -128,7 +128,7 @@ historical editions. + + ### The Cargo Book + +-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and ++[The Cargo Book](../../cargo/book/index.html) is a guide to Cargo, Rust's build tool and + dependency manager. + + ### The Rustdoc Book +diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md +index e724b21..803d31c 100644 +--- a/src/doc/reference/src/conditional-compilation.md ++++ b/src/doc/reference/src/conditional-compilation.md +@@ -377,6 +377,6 @@ println!("I'm running on a {} machine!", machine_kind); + [`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute + [attribute]: attributes.md + [attributes]: attributes.md +-[cargo-feature]: ../cargo/reference/features.html ++[cargo-feature]: ../../../cargo/book/reference/features.html + [crate type]: linkage.md + [static C runtime]: linkage.md#static-and-dynamic-c-runtimes +diff --git a/src/doc/reference/src/introduction.md b/src/doc/reference/src/introduction.md +index 9038efd..770680d 100644 +--- a/src/doc/reference/src/introduction.md ++++ b/src/doc/reference/src/introduction.md +@@ -135,8 +135,8 @@ We also want the reference to be as normative as possible, so if you see anythin + [the Rust Reference repository]: https://github.com/rust-lang/reference/ + [Unstable Book]: https://doc.rust-lang.org/nightly/unstable-book/ + [_Expression_]: expressions.md +-[cargo book]: ../cargo/index.html +-[cargo reference]: ../cargo/reference/index.html ++[cargo book]: ../../../cargo/book/index.html ++[cargo reference]: ../../../cargo/book/reference/index.html + [expressions chapter]: expressions.html + [file an issue]: https://github.com/rust-lang/reference/issues + [lifetime of temporaries]: expressions.html#temporaries +diff --git a/src/doc/reference/src/linkage.md b/src/doc/reference/src/linkage.md +index 82864b0..db1508c 100644 +--- a/src/doc/reference/src/linkage.md ++++ b/src/doc/reference/src/linkage.md +@@ -201,7 +201,7 @@ fn main() { + } + ``` + +-[cargo]: ../cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts ++[cargo]: ../../../cargo/book/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts + + To use this feature locally, you typically will use the `RUSTFLAGS` environment + variable to specify flags to the compiler through Cargo. For example to compile +diff --git a/src/doc/reference/src/procedural-macros.md b/src/doc/reference/src/procedural-macros.md +index 7d69ab7..5d744c9 100644 +--- a/src/doc/reference/src/procedural-macros.md ++++ b/src/doc/reference/src/procedural-macros.md +@@ -331,7 +331,7 @@ Note that neither declarative nor procedural macros support doc comment tokens + their equivalent `#[doc = r"str"]` attributes when passed to macros. + + [Attribute macros]: #attribute-macros +-[Cargo's build scripts]: ../cargo/reference/build-scripts.html ++[Cargo's build scripts]: ../../../cargo/book/reference/build-scripts.html + [Derive macros]: #derive-macros + [Function-like macros]: #function-like-procedural-macros + [`Delimiter::None`]: ../proc_macro/enum.Delimiter.html#variant.None +diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md +index ff80f14..99745bc 100644 +--- a/src/doc/rustc/src/linker-plugin-lto.md ++++ b/src/doc/rustc/src/linker-plugin-lto.md +@@ -112,7 +112,7 @@ targeting Windows-like targets + This is fixed if you explicitly set the target, for example + `cargo build --target x86_64-pc-windows-msvc` + Without an explicit --target the flags will be passed to all compiler invocations (including build +-scripts and proc macros), see [cargo docs on rustflags](../cargo/reference/config.html#buildrustflags) ++scripts and proc macros), see [cargo docs on rustflags](../../../cargo/book/reference/config.html#buildrustflags) + + If you have dependencies using the `cc` crate, you will need to set these + environment variables: +diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md +index 34ab3cd..d3dac67 100644 +--- a/src/doc/rustc/src/platform-support/fuchsia.md ++++ b/src/doc/rustc/src/platform-support/fuchsia.md +@@ -931,7 +931,7 @@ attach and load any relevant debug symbols. + [Fuchsia]: https://fuchsia.dev/ + [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build + [rustup]: https://rustup.rs/ +-[cargo]: ../../cargo/index.html ++[cargo]: ../../../../cargo/book/index.html + [Fuchsia SDK]: https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core + [overview of CML]: https://fuchsia.dev/fuchsia-src/concepts/components/v2/component_manifests + [reference for the file format]: https://fuchsia.dev/reference/cml +diff --git a/src/doc/rustc/src/targets/custom.md b/src/doc/rustc/src/targets/custom.md +index a67cb10..764ed34 100644 +--- a/src/doc/rustc/src/targets/custom.md ++++ b/src/doc/rustc/src/targets/custom.md +@@ -14,4 +14,4 @@ To see it for a different target, add the `--target` flag: + rustc +nightly -Z unstable-options --target=wasm32-unknown-unknown --print target-spec-json + ``` + +-To use a custom target, see the (unstable) [`build-std` feature](../../cargo/reference/unstable.html#build-std) of `cargo`. ++To use a custom target, see the (unstable) [`build-std` feature](../../../../cargo/book/reference/unstable.html#build-std) of `cargo`. +diff --git a/src/doc/rustc/src/tests/index.md b/src/doc/rustc/src/tests/index.md +index 32baed9..2c36c1d 100644 +--- a/src/doc/rustc/src/tests/index.md ++++ b/src/doc/rustc/src/tests/index.md +@@ -301,7 +301,7 @@ Experimental support for using custom test harnesses is available on the + [`--test` option]: ../command-line-arguments.md#option-test + [`-Z panic-abort-tests`]: https://github.com/rust-lang/rust/issues/67650 + [`available_parallelism`]: ../../std/thread/fn.available_parallelism.html +-[`cargo test`]: ../../cargo/commands/cargo-test.html ++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html + [`libtest`]: ../../test/index.html + [`main` function]: ../../reference/crates-and-source-files.html#main-functions + [`Result`]: ../../std/result/index.html +@@ -311,7 +311,7 @@ Experimental support for using custom test harnesses is available on the + [attribute-should_panic]: ../../reference/attributes/testing.html#the-should_panic-attribute + [attribute-test]: ../../reference/attributes/testing.html#the-test-attribute + [bench-docs]: ../../unstable-book/library-features/test.html +-[Cargo]: ../../cargo/index.html ++[Cargo]: ../../../../cargo/book/index.html + [crate type]: ../../reference/linkage.html + [custom_test_frameworks documentation]: ../../unstable-book/language-features/custom-test-frameworks.html + [nightly channel]: ../../book/appendix-07-nightly-rust.html +diff --git a/src/doc/rustc/src/what-is-rustc.md b/src/doc/rustc/src/what-is-rustc.md +index 39a05cf..7e450ae 100644 +--- a/src/doc/rustc/src/what-is-rustc.md ++++ b/src/doc/rustc/src/what-is-rustc.md +@@ -5,7 +5,7 @@ language, provided by the project itself. Compilers take your source code and + produce binary code, either as a library or executable. + + Most Rust programmers don't invoke `rustc` directly, but instead do it through +-[Cargo](../cargo/index.html). It's all in service of `rustc` though! If you ++[Cargo](../../../cargo/book/index.html). It's all in service of `rustc` though! If you + want to see how Cargo calls `rustc`, you can + + ```bash +diff --git a/src/doc/unstable-book/src/compiler-flags/branch-protection.md b/src/doc/unstable-book/src/compiler-flags/branch-protection.md +index ca56648..85285e3 100644 +--- a/src/doc/unstable-book/src/compiler-flags/branch-protection.md ++++ b/src/doc/unstable-book/src/compiler-flags/branch-protection.md +@@ -15,4 +15,4 @@ For example, `-Z branch-protection=bti,pac-ret,leaf` is valid, but + + Rust's standard library does not ship with BTI or pointer authentication enabled by default. + In Cargo projects the standard library can be recompiled with pointer authentication using the nightly +-[build-std](../../cargo/reference/unstable.html#build-std) feature. ++[build-std](../../../../cargo/book/reference/unstable.html#build-std) feature. +diff --git a/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md b/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md +index dbb7414..73876b0 100644 +--- a/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md ++++ b/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md +@@ -39,7 +39,7 @@ It is strongly recommended to also enable CFG checks for all linked libraries, i + + To enable CFG in the standard library, use the [cargo `-Z build-std` functionality][build-std] to recompile the standard library with the same configuration options as the main program. + +-[build-std]: ../../cargo/reference/unstable.html#build-std ++[build-std]: ../../../../cargo/book/reference/unstable.html#build-std + + For example: + ```cmd +diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md +index 502853f..00a3b1f 100644 +--- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md ++++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md +@@ -813,7 +813,7 @@ It is strongly recommended to combine sanitizers with recompiled and + instrumented standard library, for example using [cargo `-Zbuild-std` + functionality][build-std]. + +-[build-std]: ../../cargo/reference/unstable.html#build-std ++[build-std]: ../../../../cargo/book/reference/unstable.html#build-std + + # Build scripts and procedural macros + +diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs +index e4805cc..02f43456 100644 +--- a/src/tools/linkchecker/main.rs ++++ b/src/tools/linkchecker/main.rs +@@ -262,6 +262,10 @@ impl Checker { + return; + } + } ++ if url.contains("../../cargo/book/") { ++ // link to related cargo-doc, ok for our Debian build ++ return; ++ } + if is_exception(file, &target_pretty_path) { + report.links_ignored_exception += 1; + } else { diff --git a/patches/build/d-bootstrap-custom-debuginfo-path.patch b/patches/build/d-bootstrap-custom-debuginfo-path.patch new file mode 100644 index 0000000000..04daef05db --- /dev/null +++ b/patches/build/d-bootstrap-custom-debuginfo-path.patch @@ -0,0 +1,56 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: d-bootstrap-custom-debuginfo-path + +Forwarded: not-needed +=================================================================== +--- + src/bootstrap/src/core/builder.rs | 3 ++- + src/bootstrap/src/lib.rs | 5 ++--- + tests/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index 82f8e91..5f4a7af 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -1787,7 +1787,8 @@ impl<'a> Builder<'a> { + cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to); + } + +- if self.config.rust_remap_debuginfo { ++ // Debian: this breaks with our vendored sources! ++ if false && self.config.rust_remap_debuginfo { + // FIXME: handle vendored sources + let registry_src = t!(home::cargo_home()).join("registry").join("src"); + let mut env_var = OsString::new(); +diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs +index 871318d..861a2aa 100644 +--- a/src/bootstrap/src/lib.rs ++++ b/src/bootstrap/src/lib.rs +@@ -1155,10 +1155,9 @@ impl Build { + + match which { + GitRepo::Rustc => { +- let sha = self.rust_sha().unwrap_or(&self.version); +- Some(format!("/rustc/{sha}")) ++ Some(format!("/usr/src/rustc-{}", &self.version)) + } +- GitRepo::Llvm => Some(String::from("/rustc/llvm")), ++ GitRepo::Llvm => panic!("GitRepo::Llvm unsupported on Debian"), + } + } + +diff --git a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs +index b66abc6..f6efe1e 100644 +--- a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs ++++ b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs +@@ -7,7 +7,7 @@ + // true automatically. If paths to std library hasn't been remapped, we use the + // above simulate-remapped-rust-src-base option to do it temporarily + +-// CHECK: !DIFile(filename: "{{/rustc/.*/library/std/src/panic.rs}}" ++// CHECK: !DIFile(filename: "{{/usr/src/rustc-.*/library/std/src/panic.rs}}" + fn main() { + std::thread::spawn(|| { + println!("hello"); diff --git a/patches/build/d-bootstrap-disable-git.patch b/patches/build/d-bootstrap-disable-git.patch new file mode 100644 index 0000000000..f63e3a6cd1 --- /dev/null +++ b/patches/build/d-bootstrap-disable-git.patch @@ -0,0 +1,44 @@ +From: Matthijs van Otterdijk +Date: Thu, 14 Jul 2022 13:17:38 +0200 +Subject: Don't check for cargo-vendor when building from (Debian's) git + +Forwarded: not-needed +--- + src/bootstrap/src/core/build_steps/dist.rs | 6 ++++-- + src/bootstrap/src/utils/channel.rs | 6 ++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs +index 98e2677..cad4935 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs +@@ -991,8 +991,10 @@ impl Step for PlainSourceTarball { + + // If we're building from git or tarball sources, we need to vendor + // a complete distribution. +- if builder.rust_info().is_managed_git_subrepository() +- || builder.rust_info().is_from_tarball() ++ // ++ // Debian: short-circuited because the Debian package is also in a git ++ // repository, but cargo-vendor should not be installed or run. ++ if false + { + if builder.rust_info().is_managed_git_subrepository() { + // Ensure we have the submodules checked out. +diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs +index e59d7f2..bd93209 100644 +--- a/src/bootstrap/src/utils/channel.rs ++++ b/src/bootstrap/src/utils/channel.rs +@@ -35,6 +35,12 @@ pub struct Info { + + impl GitInfo { + pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo { ++ // ++ // Debian: returning early because the Debian package is also in a git ++ // repository, but we don't want to parse gitinfo. This is ++ // needed for the bootstrap tests to work which running for ++ // Debian git. ++ return GitInfo::Absent; + // See if this even begins to look like a git dir + if !dir.join(".git").exists() { + match read_commit_info_file(dir) { diff --git a/patches/build/d-bootstrap-install-symlinks.patch b/patches/build/d-bootstrap-install-symlinks.patch new file mode 100644 index 0000000000..bb0cc7c9ac --- /dev/null +++ b/patches/build/d-bootstrap-install-symlinks.patch @@ -0,0 +1,38 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:38 +0200 +Subject: Install symlinks as-is, don't dereference them + +Our patch to mdbook installs symlinks to systems versions of font-awesome, +highlight, etc. Upstream mdbook otherwise doesn't use symlinks, so this +doesn't affect anything else that's already generated. + +Forwarded: not-needed +--- + src/tools/rust-installer/install-template.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh +index b477c3e..fd93316 100644 +--- a/src/tools/rust-installer/install-template.sh ++++ b/src/tools/rust-installer/install-template.sh +@@ -617,7 +617,10 @@ install_components() { + + maybe_backup_path "$_file_install_path" + +- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" ++ if [ -h "$_src_dir/$_component/$_file" ] ++ then ++ run cp -d "$_src_dir/$_component/$_file" "$_file_install_path" ++ elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" + then + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" +@@ -639,7 +642,7 @@ install_components() { + + maybe_backup_path "$_file_install_path" + +- run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" ++ run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path" + critical_need_ok "failed to copy directory" + + # Set permissions. 0755 for dirs, 644 for files diff --git a/patches/build/d-bootstrap-no-assume-tools.patch b/patches/build/d-bootstrap-no-assume-tools.patch new file mode 100644 index 0000000000..512e6a9cde --- /dev/null +++ b/patches/build/d-bootstrap-no-assume-tools.patch @@ -0,0 +1,28 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: set tools to those built in Debian + +Forwarded: not-needed +=================================================================== +--- + src/bootstrap/src/tests/builder.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/bootstrap/src/tests/builder.rs b/src/bootstrap/src/tests/builder.rs +index 700ebcf..bf31009 100644 +--- a/src/bootstrap/src/tests/builder.rs ++++ b/src/bootstrap/src/tests/builder.rs +@@ -374,9 +374,13 @@ mod dist { + #[test] + fn dist_only_cross_host() { + let b = TargetSelection::from_user("B"); ++ let mut tools = std::collections::HashSet::new(); ++ tools.insert("clippy".to_string()); ++ tools.insert("rustfmt".to_string()); + let mut config = configure(&["A", "B"], &["A", "B"]); + config.docs = false; + config.extended = true; ++ config.tools = Some(tools); + config.hosts = vec![b]; + let mut cache = run_build(&[], config); + diff --git a/patches/build/d-bootstrap-permit-symlink-in-docs.patch b/patches/build/d-bootstrap-permit-symlink-in-docs.patch new file mode 100644 index 0000000000..bee12f270c --- /dev/null +++ b/patches/build/d-bootstrap-permit-symlink-in-docs.patch @@ -0,0 +1,21 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:40 +0200 +Subject: partial revert of b9eedea4b0368fd1f00f204db75109ff444fab5b upstream + +Forwarded: not-needed +--- + src/bootstrap/src/core/build_steps/dist.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs +index cad4935..6cabff7 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs +@@ -79,6 +79,7 @@ impl Step for Docs { + tarball.set_product_name("Rust Documentation"); + tarball.add_bulk_dir(&builder.doc_out(host), dest); + tarball.add_file(&builder.src.join("src/doc/robots.txt"), dest, 0o644); ++ tarball.permit_symlinks(true); + Some(tarball.generate()) + } + } diff --git a/patches/build/d-bootstrap-rustflags.patch b/patches/build/d-bootstrap-rustflags.patch new file mode 100644 index 0000000000..ad9be6165f --- /dev/null +++ b/patches/build/d-bootstrap-rustflags.patch @@ -0,0 +1,34 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:38 +0200 +Subject: d-bootstrap-rustflags + +Forwarded: not-needed + +=================================================================== +--- + src/bootstrap/src/core/builder.rs | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index 7245d11..82f8e91 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -1462,6 +1462,18 @@ impl<'a> Builder<'a> { + hostflags.arg("-Zunstable-options"); + hostflags.arg("--check-cfg=cfg(bootstrap)"); + ++ // Debian-specific stuff here ++ // set linker flags from LDFLAGS ++ if let Ok(ldflags) = env::var("LDFLAGS") { ++ for flag in ldflags.split_whitespace() { ++ if target.contains("windows") && flag.contains("relro") { ++ // relro is ELF-specific ++ continue; ++ } ++ rustflags.arg(&format!("-Clink-args={}", flag)); ++ } ++ } ++ + // FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`, + // but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See + // #71458. diff --git a/patches/build/d-bootstrap-use-local-css.patch b/patches/build/d-bootstrap-use-local-css.patch new file mode 100644 index 0000000000..d6cb82cf3c --- /dev/null +++ b/patches/build/d-bootstrap-use-local-css.patch @@ -0,0 +1,55 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: d-bootstrap-use-local-css + +Forwarded: not-needed +=================================================================== +--- + src/bootstrap/src/core/build_steps/doc.rs | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs +index cf3f5bc..11ae464 100644 +--- a/src/bootstrap/src/core/build_steps/doc.rs ++++ b/src/bootstrap/src/core/build_steps/doc.rs +@@ -363,7 +363,27 @@ impl Step for Standalone { + .arg("--index-page") + .arg(&builder.src.join("src/doc/index.md")) + .arg("--markdown-playground-url") +- .arg("https://play.rust-lang.org/") ++ .arg("https://play.rust-lang.org/"); ++ ++ // Debian: librustdoc now generates a resource-suffix for static ++ // files with rustc_hash::FxHasher, so we need to find it. ++ let _dir = out.join("static.files"); ++ if _dir.is_dir() { ++ let _css = _dir.read_dir().expect("Debian: failed to read static.files/ when is_dir() == true") ++ .find_map(|entry| entry.ok().map(|entry| { ++ let name = entry.file_name().into_string() ++ .expect("Debian: rustc files should have UTF-8 name"); ++ if name.starts_with("rustdoc-") && name.ends_with(".css") { ++ Some(name) ++ } else { None } ++ })).flatten(); ++ if let Some(name) = _css { ++ cmd.arg("--markdown-css").arg(name); ++ } ++ } ++ ++ cmd.arg("--markdown-css") ++ .arg("rust.css") + .arg("-o") + .arg(&out) + .arg(&path); +@@ -372,11 +392,6 @@ impl Step for Standalone { + cmd.arg("--disable-minification"); + } + +- if filename == "not_found.md" { +- cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css"); +- } else { +- cmd.arg("--markdown-css").arg("rust.css"); +- } + builder.run(&mut cmd); + } + diff --git a/patches/build/d-test-ignore-avx-44056.patch b/patches/build/d-test-ignore-avx-44056.patch new file mode 100644 index 0000000000..dfee30eefb --- /dev/null +++ b/patches/build/d-test-ignore-avx-44056.patch @@ -0,0 +1,23 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: d-test-ignore-avx-44056 + +Bug: https://github.com/rust-lang/rust/pull/55667 +Forwarded: not-needed + +=================================================================== +--- + tests/ui/issues/issue-44056.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ui/issues/issue-44056.rs b/tests/ui/issues/issue-44056.rs +index a4903ed..ebe8402 100644 +--- a/tests/ui/issues/issue-44056.rs ++++ b/tests/ui/issues/issue-44056.rs +@@ -1,5 +1,5 @@ + // build-pass (FIXME(55996): should be run on targets supporting avx) +-// only-x86_64 ++// ignore-test + // no-prefer-dynamic + // compile-flags: -Ctarget-feature=+avx -Clto + diff --git a/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch b/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch new file mode 100644 index 0000000000..fef435fc64 --- /dev/null +++ b/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch @@ -0,0 +1,42 @@ +From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= +Date: Sat, 19 Nov 2022 10:24:08 +0100 +Subject: [PATCH] tests: add missing cross disabled checks +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +cross_conmpile::alternate states it should only be used in test cases +after checking cross_compile::disabled(), which is missing here. these +tests fail despite setting CFG_DISABLE_CROSS_TESTS on i386, since both +the host and the alternate cross target would be i686 in that case. + + +Signed-off-by: Fabian Grünbichler +--- + src/tools/cargo/tests/testsuite/build_script.rs | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs +index f7361fc..f587ddd 100644 +--- a/src/tools/cargo/tests/testsuite/build_script.rs ++++ b/src/tools/cargo/tests/testsuite/build_script.rs +@@ -734,6 +734,9 @@ fn custom_build_linker_bad_host_with_arch() { + #[cargo_test] + fn custom_build_env_var_rustc_linker_cross_arch_host() { + let target = rustc_host(); ++ if cross_compile::disabled() { ++ return; ++ } + let cross_target = cross_compile::alternate(); + let p = project() + .file( +@@ -772,6 +775,9 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() { + #[cargo_test] + fn custom_build_linker_bad_cross_arch_host() { + let target = rustc_host(); ++ if cross_compile::disabled() { ++ return; ++ } + let cross_target = cross_compile::alternate(); + let p = project() + .file( diff --git a/patches/cargo/c-2002_disable-net-tests.patch b/patches/cargo/c-2002_disable-net-tests.patch new file mode 100644 index 0000000000..5ed606980c --- /dev/null +++ b/patches/cargo/c-2002_disable-net-tests.patch @@ -0,0 +1,595 @@ +From: Ximin Luo +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: Disable network tests + +Forwarded: TODO +--- + .../cargo/tests/testsuite/credential_process.rs | 14 +-- + src/tools/cargo/tests/testsuite/git_auth.rs | 4 +- + src/tools/cargo/tests/testsuite/net_config.rs | 4 +- + src/tools/cargo/tests/testsuite/publish.rs | 104 ++++++++++----------- + 4 files changed, 63 insertions(+), 63 deletions(-) + +diff --git a/src/tools/cargo/tests/testsuite/credential_process.rs b/src/tools/cargo/tests/testsuite/credential_process.rs +index 815089f..477e5d2 100644 +--- a/src/tools/cargo/tests/testsuite/credential_process.rs ++++ b/src/tools/cargo/tests/testsuite/credential_process.rs +@@ -63,7 +63,7 @@ fn get_token_test() -> (Project, TestRegistry) { + (p, server) + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish() { + // Checks that credential-process is used for `cargo publish`. + let (p, _t) = get_token_test(); +@@ -85,7 +85,7 @@ You may press ctrl-c [..] + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn basic_unsupported() { + // Non-action commands don't support login/logout. + let registry = registry::RegistryBuilder::new() +@@ -121,7 +121,7 @@ Caused by: + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn login() { + let registry = registry::RegistryBuilder::new() + .no_configure_token() +@@ -142,7 +142,7 @@ fn login() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn logout() { + let server = registry::RegistryBuilder::new() + .no_configure_token() +@@ -161,7 +161,7 @@ fn logout() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn yank() { + let (p, _t) = get_token_test(); + +@@ -176,7 +176,7 @@ fn yank() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn owner() { + let (p, _t) = get_token_test(); + +@@ -191,7 +191,7 @@ fn owner() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn invalid_token_output() { + // Error when credential process does not output the expected format for a token. + let cred_proj = project() +diff --git a/src/tools/cargo/tests/testsuite/git_auth.rs b/src/tools/cargo/tests/testsuite/git_auth.rs +index c79ae7c..b15582e 100644 +--- a/src/tools/cargo/tests/testsuite/git_auth.rs ++++ b/src/tools/cargo/tests/testsuite/git_auth.rs +@@ -103,7 +103,7 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc) { + } + + // Tests that HTTP auth is offered from `credential.helper`. +-#[cargo_test] ++#[allow(dead_code)] + fn http_auth_offered() { + let (addr, t, connections) = setup_failed_auth_test(); + let p = project() +@@ -167,7 +167,7 @@ Caused by: + } + + // Boy, sure would be nice to have a TLS implementation in rust! +-#[cargo_test] ++#[allow(dead_code)] + fn https_something_happens() { + let server = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = server.local_addr().unwrap(); +diff --git a/src/tools/cargo/tests/testsuite/net_config.rs b/src/tools/cargo/tests/testsuite/net_config.rs +index 569ec55..27c4132 100644 +--- a/src/tools/cargo/tests/testsuite/net_config.rs ++++ b/src/tools/cargo/tests/testsuite/net_config.rs +@@ -2,7 +2,7 @@ + + use cargo_test_support::project; + +-#[cargo_test] ++#[allow(dead_code)] + fn net_retry_loads_from_config() { + let p = project() + .file( +@@ -38,7 +38,7 @@ fn net_retry_loads_from_config() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn net_retry_git_outputs_warning() { + let p = project() + .file( +diff --git a/src/tools/cargo/tests/testsuite/publish.rs b/src/tools/cargo/tests/testsuite/publish.rs +index 5d29ac8..05d0f02 100644 +--- a/src/tools/cargo/tests/testsuite/publish.rs ++++ b/src/tools/cargo/tests/testsuite/publish.rs +@@ -88,7 +88,7 @@ fn validate_upload_li() { + ); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn simple() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + +@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + + // Check that the `token` key works at the root instead of under a + // `[registry]` table. +-#[cargo_test] ++#[allow(dead_code)] + fn simple_publish_with_http() { + let _reg = registry::RegistryBuilder::new() + .http_api() +@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn simple_publish_with_asymmetric() { + let _reg = registry::RegistryBuilder::new() + .http_api() +@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn old_token_location() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -270,7 +270,7 @@ You may press ctrl-c [..] + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn simple_with_index() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -315,7 +315,7 @@ You may press ctrl-c [..] + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn git_deps() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -353,7 +353,7 @@ the `git` specification will be removed from the dependency declaration. + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn path_dependency_no_version() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -393,7 +393,7 @@ the `path` specification will be removed from the dependency declaration. + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn unpublishable_crate() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -426,7 +426,7 @@ fn unpublishable_crate() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn dont_publish_dirty() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -468,7 +468,7 @@ to proceed despite this and include the uncommitted changes, pass the `--allow-d + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_clean() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_in_sub_repo() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -565,7 +565,7 @@ You may press ctrl-c [..] + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_when_ignored() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -614,7 +614,7 @@ You may press ctrl-c [..] + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn ignore_when_crate_ignored() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -662,7 +662,7 @@ You may press ctrl-c [..] + // Other tests will verify the endpoint gets the right payload. + } + +-#[cargo_test] ++#[allow(dead_code)] + fn new_crate_rejected() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -695,7 +695,7 @@ fn new_crate_rejected() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn dry_run() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -738,7 +738,7 @@ See [..] + assert!(!registry::api_path().join("api/v1/crates/new").exists()); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn registry_not_in_publish_list() { + let p = project() + .file( +@@ -771,7 +771,7 @@ The registry `alternative` is not listed in the `package.publish` value in Cargo + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_empty_list() { + let p = project() + .file( +@@ -800,7 +800,7 @@ fn publish_empty_list() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_allowed_registry() { + let _registry = RegistryBuilder::new() + .http_api() +@@ -860,7 +860,7 @@ You may press ctrl-c [..] + ); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_implicitly_to_only_allowed_registry() { + let _registry = RegistryBuilder::new() + .http_api() +@@ -963,7 +963,7 @@ fn publish_failed_with_index_and_only_allowed_registry() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_fail_with_no_registry_specified() { + let p = project().build(); + +@@ -997,7 +997,7 @@ The registry `crates-io` is not listed in the `package.publish` value in Cargo.t + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn block_publish_no_registry() { + let p = project() + .file( +@@ -1027,7 +1027,7 @@ fn block_publish_no_registry() { + } + + // Explicitly setting `crates-io` in the publish list. +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_crates_io_explicit() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -1080,7 +1080,7 @@ You may press ctrl-c [..] + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_select_features() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -1131,7 +1131,7 @@ You may press ctrl-c [..] + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_all_features() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -1182,7 +1182,7 @@ You may press ctrl-c [..] + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_no_default_features() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -1218,7 +1218,7 @@ fn publish_with_no_default_features() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_patch() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + Package::new("bar", "1.0.0").publish(); +@@ -1324,7 +1324,7 @@ You may press ctrl-c [..] + ); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_checks_for_token_before_verify() { + let registry = registry::RegistryBuilder::new() + .no_configure_token() +@@ -1373,7 +1373,7 @@ fn publish_checks_for_token_before_verify() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_bad_source() { + let p = project() + .file( +@@ -1422,7 +1422,7 @@ include `--registry crates-io` to use crates.io + } + + // A dependency with both `git` and `version`. +-#[cargo_test] ++#[allow(dead_code)] + fn publish_git_with_version() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + +@@ -1566,7 +1566,7 @@ You may press ctrl-c [..] + ); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_dev_dep_no_version() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + +@@ -1656,7 +1656,7 @@ repository = "foo" + ); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn credentials_ambiguous_filename() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -1712,7 +1712,7 @@ You may press ctrl-c [..] + + // --index will not load registry.token to avoid possibly leaking + // crates.io token to another server. +-#[cargo_test] ++#[allow(dead_code)] + fn index_requires_token() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -1747,7 +1747,7 @@ fn index_requires_token() { + } + + // publish with source replacement without --registry +-#[cargo_test] ++#[allow(dead_code)] + fn cratesio_source_replacement() { + registry::init(); + let p = project() +@@ -1776,7 +1776,7 @@ include `--registry dummy-registry` or `--registry crates-io` + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn publish_with_missing_readme() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -1824,7 +1824,7 @@ Caused by: + } + + // Registry returns an API error. +-#[cargo_test] ++#[allow(dead_code)] + fn api_error_json() { + let _registry = registry::RegistryBuilder::new() + .alternative() +@@ -1872,7 +1872,7 @@ Caused by: + } + + // Registry returns an API error with a 200 status code. +-#[cargo_test] ++#[allow(dead_code)] + fn api_error_200() { + let _registry = registry::RegistryBuilder::new() + .alternative() +@@ -1920,7 +1920,7 @@ Caused by: + } + + // Registry returns an error code without a JSON message. +-#[cargo_test] ++#[allow(dead_code)] + fn api_error_code() { + let _registry = registry::RegistryBuilder::new() + .alternative() +@@ -1975,7 +1975,7 @@ Caused by: + } + + // Registry has a network error. +-#[cargo_test] ++#[allow(dead_code)] + fn api_curl_error() { + let _registry = registry::RegistryBuilder::new() + .alternative() +@@ -2025,7 +2025,7 @@ Caused by: + } + + // Registry returns an invalid response. +-#[cargo_test] ++#[allow(dead_code)] + fn api_other_error() { + let _registry = registry::RegistryBuilder::new() + .alternative() +@@ -2075,7 +2075,7 @@ Caused by: + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_package_workspace() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + +@@ -2127,7 +2127,7 @@ You may press ctrl-c [..] + validate_upload_li(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn with_duplicate_spec_in_members() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -2179,7 +2179,7 @@ fn with_duplicate_spec_in_members() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_package_workspace_with_members_with_features_old() { + let registry = RegistryBuilder::new().http_api().http_index().build(); + +@@ -2230,7 +2230,7 @@ You may press ctrl-c [..] + validate_upload_li(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_virtual_workspace() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -2266,7 +2266,7 @@ fn in_virtual_workspace() { + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_virtual_workspace_with_p() { + // `publish` generally requires a remote registry + let registry = registry::RegistryBuilder::new().http_api().build(); +@@ -2324,7 +2324,7 @@ You may press ctrl-c [..] + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_package_workspace_not_found() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -2369,7 +2369,7 @@ error: package ID specification `li` did not match any packages + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn in_package_workspace_found_multiple() { + // Use local registry for faster test times since no publish will occur + let registry = registry::init(); +@@ -2426,7 +2426,7 @@ error: the `-p` argument must be specified to select a single package to publish + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + // https://github.com/rust-lang/cargo/issues/10536 + fn publish_path_dependency_without_workspace() { + // Use local registry for faster test times since no publish will occur +@@ -2473,7 +2473,7 @@ error: package ID specification `bar` did not match any packages + .run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn http_api_not_noop() { + let registry = registry::RegistryBuilder::new().http_api().build(); + +@@ -2534,7 +2534,7 @@ You may press ctrl-c [..] + p.cargo("build").run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn wait_for_first_publish() { + // Counter for number of tries before the package is "published" + let arc: Arc> = Arc::new(Mutex::new(0)); +@@ -2616,7 +2616,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + /// A separate test is needed for package names with - or _ as they hit + /// the responder twice per cargo invocation. If that ever gets changed + /// this test will need to be changed accordingly. +-#[cargo_test] ++#[allow(dead_code)] + fn wait_for_first_publish_underscore() { + // Counter for number of tries before the package is "published" + let arc: Arc> = Arc::new(Mutex::new(0)); +@@ -2712,7 +2712,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + p.cargo("build").with_status(0).run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn wait_for_subsequent_publish() { + // Counter for number of tries before the package is "published" + let arc: Arc> = Arc::new(Mutex::new(0)); +@@ -2804,7 +2804,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. + p.cargo("check").with_status(0).run(); + } + +-#[cargo_test] ++#[allow(dead_code)] + fn skip_wait_for_publish() { + // Intentionally using local registry so the crate never makes it to the index + let registry = registry::init(); diff --git a/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch b/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch new file mode 100644 index 0000000000..3daad16518 --- /dev/null +++ b/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch @@ -0,0 +1,28 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: c-2003-workaround-qemu-vfork-command-not-found + +=================================================================== +--- + src/tools/cargo/crates/cargo-test-macro/src/lib.rs | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/tools/cargo/crates/cargo-test-macro/src/lib.rs b/src/tools/cargo/crates/cargo-test-macro/src/lib.rs +index 14672ab..9208cb3 100644 +--- a/src/tools/cargo/crates/cargo-test-macro/src/lib.rs ++++ b/src/tools/cargo/crates/cargo-test-macro/src/lib.rs +@@ -222,6 +222,14 @@ fn has_command(command: &str) -> bool { + } + }; + if !output.status.success() { ++ // Debian specific patch, upstream wontfix: ++ // qemu has a faulty vfork where it fails to fail if a command is not ++ // found, with a unix_wait_status of 32512, or 0x7f00, 7f meaning ++ // exit code 127. See https://github.com/rust-lang/rust/issues/90825 ++ use std::os::unix::process::ExitStatusExt; ++ if output.status.into_raw() == 0x7f00 { ++ return false; ++ } + panic!( + "expected command `{}` to be runnable, got error {}:\n\ + stderr:{}\n\ diff --git a/patches/cargo/c-2200-workaround-x32-test.patch b/patches/cargo/c-2200-workaround-x32-test.patch new file mode 100644 index 0000000000..eb78ec51c3 --- /dev/null +++ b/patches/cargo/c-2200-workaround-x32-test.patch @@ -0,0 +1,22 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: c-2200-workaround-x32-test + +Bug: https://github.com/rust-lang/cargo/issues/10005 +--- + src/tools/cargo/tests/testsuite/cfg.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/cargo/tests/testsuite/cfg.rs b/src/tools/cargo/tests/testsuite/cfg.rs +index dcce654..c9e2e0c 100644 +--- a/src/tools/cargo/tests/testsuite/cfg.rs ++++ b/src/tools/cargo/tests/testsuite/cfg.rs +@@ -272,7 +272,7 @@ fn any_ok() { + + // https://github.com/rust-lang/cargo/issues/5313 + #[cargo_test] +-#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))] ++#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu", target_pointer_width = "64"))] + fn cfg_looks_at_rustflags_for_target() { + let p = project() + .file( diff --git a/patches/cargo/c-disable-fs-specific-test.patch b/patches/cargo/c-disable-fs-specific-test.patch new file mode 100644 index 0000000000..84d8877028 --- /dev/null +++ b/patches/cargo/c-disable-fs-specific-test.patch @@ -0,0 +1,22 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: c-disable-fs-specific-test + +=================================================================== +--- + src/tools/cargo/tests/testsuite/metadata.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/cargo/tests/testsuite/metadata.rs b/src/tools/cargo/tests/testsuite/metadata.rs +index 888cdce..f06f73f 100644 +--- a/src/tools/cargo/tests/testsuite/metadata.rs ++++ b/src/tools/cargo/tests/testsuite/metadata.rs +@@ -3997,7 +3997,7 @@ fn dep_kinds_workspace() { + // Creating non-utf8 path is an OS-specific pain, so let's run this only on + // linux, where arbitrary bytes work. + #[cfg(target_os = "linux")] +-#[cargo_test] ++#[allow(dead_code)] + fn cargo_metadata_non_utf8() { + use std::ffi::OsString; + use std::os::unix::ffi::OsStringExt; diff --git a/patches/cargo/d-0012-cargo-always-return-dev-channel.patch b/patches/cargo/d-0012-cargo-always-return-dev-channel.patch new file mode 100644 index 0000000000..7cbe412137 --- /dev/null +++ b/patches/cargo/d-0012-cargo-always-return-dev-channel.patch @@ -0,0 +1,26 @@ +From: Debian Rust Maintainers +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0012-cargo-always-return-dev-channel + +Last-Update: 2023-05-30 +Forwarded: not-needed +--- + src/tools/cargo/src/cargo/core/features.rs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs +index 4f5b069..0a42077 100644 +--- a/src/tools/cargo/src/cargo/core/features.rs ++++ b/src/tools/cargo/src/cargo/core/features.rs +@@ -1205,9 +1205,8 @@ pub fn channel() -> String { + return "dev".to_string(); + } + } +- crate::version() +- .release_channel +- .unwrap_or_else(|| String::from("dev")) ++ // Debian: always return dev channel ++ String::from("dev") + } + + /// Only for testing and developing. See ["Running with gitoxide as default git backend in tests"][1]. diff --git a/patches/prune/d-0000-ignore-removed-submodules.patch b/patches/prune/d-0000-ignore-removed-submodules.patch new file mode 100644 index 0000000000..f3a7b7030a --- /dev/null +++ b/patches/prune/d-0000-ignore-removed-submodules.patch @@ -0,0 +1,246 @@ +From: Debian Rust Maintainers +Date: Sat, 2 Oct 2021 01:07:59 +0100 +Subject: d-0000-ignore-removed-submodules + +Description: remove upstream parts that are not needed for the Debian build, in +order to both reduce the orig tarball and the vendored crates within. + +Forwarded: not-needed +--- + Cargo.toml | 7 ---- + src/bootstrap/bootstrap.py | 4 --- + src/bootstrap/src/core/build_steps/test.rs | 12 +------ + src/bootstrap/src/core/builder.rs | 54 +++++++----------------------- + src/tools/rust-analyzer/Cargo.toml | 11 +++++- + 5 files changed, 24 insertions(+), 64 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 9b11ae8..19a98f9 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -19,22 +19,15 @@ members = [ + "src/tools/tidy", + "src/tools/tier-check", + "src/tools/build-manifest", +- "src/tools/remote-test-client", +- "src/tools/remote-test-server", + "src/tools/rust-installer", + "src/tools/rust-demangler", + "src/tools/rustdoc", +- "src/tools/rls", + "src/tools/rustfmt", +- "src/tools/miri", +- "src/tools/miri/cargo-miri", + "src/tools/rustdoc-themes", + "src/tools/unicode-table-generator", +- "src/tools/expand-yaml-anchors", + "src/tools/jsondocck", + "src/tools/jsondoclint", + "src/tools/html-checker", +- "src/tools/bump-stage0", + "src/tools/replace-version-placeholder", + "src/tools/lld-wrapper", + "src/tools/collect-license-metadata", +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +index fea194a..ed99a47 100644 +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -955,10 +955,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(self.verbose)) +- if self.use_locked_deps: +- args.append("--locked") +- if self.use_vendored_sources: +- args.append("--frozen") + if self.get_toml("metrics", "build"): + args.append("--features") + args.append("build-metrics") +diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs +index 4eb7766..5c115cf 100644 +--- a/src/bootstrap/src/core/build_steps/test.rs ++++ b/src/bootstrap/src/core/build_steps/test.rs +@@ -2295,17 +2295,7 @@ impl Step for RustcGuide { + } + + fn run(self, builder: &Builder<'_>) { +- let relative_path = Path::new("src").join("doc").join("rustc-dev-guide"); +- builder.update_submodule(&relative_path); +- +- let src = builder.src.join(relative_path); +- let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); +- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) { +- ToolState::TestPass +- } else { +- ToolState::TestFail +- }; +- builder.save_toolstate("rustc-dev-guide", toolstate); ++ builder.save_toolstate("rustc-dev-guide", ToolState::TestPass); + } + } + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index e180964..7245d11 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -498,20 +498,20 @@ impl<'a> ShouldRun<'a> { + static SUBMODULES_PATHS: OnceLock> = OnceLock::new(); + + let init_submodules_paths = |src: &PathBuf| { +- let file = File::open(src.join(".gitmodules")).unwrap(); ++ //let file = File::open(src.join(".gitmodules")).unwrap(); + + let mut submodules_paths = vec![]; +- for line in BufReader::new(file).lines() { +- if let Ok(line) = line { +- let line = line.trim(); +- +- if line.starts_with("path") { +- let actual_path = +- line.split(' ').last().expect("Couldn't get value of path"); +- submodules_paths.push(actual_path.to_owned()); +- } +- } +- } ++ //for line in BufReader::new(file).lines() { ++ // if let Ok(line) = line { ++ // let line = line.trim(); ++ ++ // if line.starts_with("path") { ++ // let actual_path = ++ // line.split(' ').last().expect("Couldn't get value of path"); ++ // submodules_paths.push(actual_path.to_owned()); ++ // } ++ // } ++ //} + + submodules_paths + }; +@@ -685,25 +685,14 @@ impl<'a> Builder<'a> { + tool::Linkchecker, + tool::CargoTest, + tool::Compiletest, +- tool::RemoteTestServer, +- tool::RemoteTestClient, + tool::RustInstaller, + tool::Cargo, +- tool::Rls, +- tool::RustAnalyzer, + tool::RustAnalyzerProcMacroSrv, + tool::RustDemangler, + tool::Rustdoc, + tool::Clippy, + tool::CargoClippy, +- llvm::Llvm, +- llvm::Sanitizers, + tool::Rustfmt, +- tool::Miri, +- tool::CargoMiri, +- llvm::Lld, +- llvm::CrtBeginEnd, +- tool::RustdocGUITest, + tool::OptimizedDist, + tool::CoverageDump, + ), +@@ -713,12 +702,7 @@ impl<'a> Builder<'a> { + check::Rustdoc, + check::CodegenBackend, + check::Clippy, +- check::Miri, +- check::CargoMiri, +- check::MiroptTestTools, +- check::Rls, + check::Rustfmt, +- check::RustAnalyzer, + check::Bootstrap + ), + Kind::Test => describe!( +@@ -751,7 +735,6 @@ impl<'a> Builder<'a> { + test::TierCheck, + test::Cargotest, + test::Cargo, +- test::RustAnalyzer, + test::ErrorIndex, + test::Distcheck, + test::RunMakeFullDeps, +@@ -767,7 +750,6 @@ impl<'a> Builder<'a> { + test::EmbeddedBook, + test::EditionGuide, + test::Rustfmt, +- test::Miri, + test::Clippy, + test::RustDemangler, + test::CompiletestTest, +@@ -804,7 +786,6 @@ impl<'a> Builder<'a> { + doc::CargoBook, + doc::Clippy, + doc::ClippyBook, +- doc::Miri, + doc::EmbeddedBook, + doc::EditionGuide, + doc::StyleGuide, +@@ -824,12 +805,9 @@ impl<'a> Builder<'a> { + dist::Analysis, + dist::Src, + dist::Cargo, +- dist::Rls, +- dist::RustAnalyzer, + dist::Rustfmt, + dist::RustDemangler, + dist::Clippy, +- dist::Miri, + dist::LlvmTools, + dist::RustDev, + dist::Bootstrap, +@@ -846,11 +824,9 @@ impl<'a> Builder<'a> { + install::Docs, + install::Std, + install::Cargo, +- install::RustAnalyzer, + install::Rustfmt, + install::RustDemangler, + install::Clippy, +- install::Miri, + install::LlvmTools, + install::Src, + install::Rustc +@@ -860,7 +836,6 @@ impl<'a> Builder<'a> { + run::BuildManifest, + run::BumpStage0, + run::ReplaceVersionPlaceholder, +- run::Miri, + run::CollectLicenseMetadata, + run::GenerateCopyright, + run::GenerateWindowsSys, +@@ -2080,10 +2055,7 @@ impl<'a> Builder<'a> { + } + } + +- if self.config.locked_deps { +- cargo.arg("--locked"); +- } +- if self.config.vendor || self.is_sudo { ++ if self.is_sudo { + cargo.arg("--frozen"); + } + +diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml +index 1213979..71f9aa7 100644 +--- a/src/tools/rust-analyzer/Cargo.toml ++++ b/src/tools/rust-analyzer/Cargo.toml +@@ -1,5 +1,14 @@ + [workspace] +-members = ["xtask/", "lib/*", "crates/*"] ++members = [ ++ "xtask/", ++ "lib/*", ++ "crates/proc-macro-srv", ++ "crates/proc-macro-srv-cli", ++ "crates/tt", ++ "crates/mbe", ++ "crates/paths", ++ "crates/proc-macro-api", ++] + exclude = ["crates/proc-macro-test/imp"] + resolver = "2" + diff --git a/patches/prune/d-0001-pkg-config-no-special-snowflake.patch b/patches/prune/d-0001-pkg-config-no-special-snowflake.patch new file mode 100644 index 0000000000..13e1cceda0 --- /dev/null +++ b/patches/prune/d-0001-pkg-config-no-special-snowflake.patch @@ -0,0 +1,96 @@ +From: Debian Rust Maintainers +Date: Sat, 2 Oct 2021 01:08:00 +0100 +Subject: d-0001-pkg-config-no-special-snowflake + +Description: always enable cross compilation via pkgconf, and set the right binary name. + +Forwarded: not-needed +--- + vendor/pkg-config/src/lib.rs | 25 ++++++++++--------------- + vendor/pkg-config/tests/test.rs | 2 -- + 2 files changed, 10 insertions(+), 17 deletions(-) + +diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs +index 3653032..553ac75 100644 +--- a/vendor/pkg-config/src/lib.rs ++++ b/vendor/pkg-config/src/lib.rs +@@ -117,11 +117,8 @@ pub enum Error { + /// Contains the name of the responsible environment variable. + EnvNoPkgConfig(String), + +- /// Detected cross compilation without a custom sysroot. +- /// +- /// Ignore the error with `PKG_CONFIG_ALLOW_CROSS=1`, +- /// which may let `pkg-config` select libraries +- /// for the host's architecture instead of the target's. ++ /// Cross compilation detected. Kept for compatibility; ++ /// the Debian package never emits this. + CrossCompilation, + + /// Failed to run `pkg-config`. +@@ -161,14 +158,6 @@ impl fmt::Display for Error { + fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { + match *self { + Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name), +- Error::CrossCompilation => f.write_str( +- "pkg-config has not been configured to support cross-compilation.\n\ +- \n\ +- Install a sysroot for the target platform and configure it via\n\ +- PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH, or install a\n\ +- cross-compiling wrapper for pkg-config and set it via\n\ +- PKG_CONFIG environment variable.", +- ), + Error::Command { + ref command, + ref cause, +@@ -226,7 +215,7 @@ impl fmt::Display for Error { + )?; + format_output(output, f) + } +- Error::__Nonexhaustive => panic!(), ++ Error::CrossCompilation | Error::__Nonexhaustive => panic!(), + } + } + } +@@ -420,6 +409,8 @@ impl Config { + if host == target { + return true; + } ++ // always enable PKG_CONFIG_ALLOW_CROSS override in Debian ++ return true; + + // 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 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("-pkgconf")); t }) ++ }); + 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 0f37c72..f70e8b7 100644 +--- a/vendor/pkg-config/tests/test.rs ++++ b/vendor/pkg-config/tests/test.rs +@@ -31,7 +31,6 @@ fn find(name: &str) -> Result { + pkg_config::probe_library(name) + } + +-#[test] + fn cross_disabled() { + let _g = LOCK.lock(); + reset(); +@@ -43,7 +42,6 @@ fn cross_disabled() { + } + } + +-#[test] + fn cross_enabled() { + let _g = LOCK.lock(); + reset(); diff --git a/patches/prune/d-0002-mdbook-strip-embedded-libs.patch b/patches/prune/d-0002-mdbook-strip-embedded-libs.patch new file mode 100644 index 0000000000..62d97a13f2 --- /dev/null +++ b/patches/prune/d-0002-mdbook-strip-embedded-libs.patch @@ -0,0 +1,577 @@ +From: Debian Rust Maintainers +Date: Sat, 2 Oct 2021 01:08:00 +0100 +Subject: d-0002-mdbook-strip-embedded-libs + +Description: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase +the patch on top of a newer version. . Make sure the paths here match the ones +in debian/rust-doc.links + +Forwarded: not-needed +--- + src/doc/rust-by-example/theme/index.hbs | 86 +---------------- + src/tools/linkchecker/main.rs | 28 +++++- + vendor/mdbook/src/book/init.rs | 19 ---- + .../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++----------------- + .../mdbook/src/renderer/html_handlebars/search.rs | 2 - + vendor/mdbook/src/theme/index.hbs | 86 +---------------- + vendor/mdbook/src/theme/mod.rs | 27 ------ + vendor/mdbook/src/theme/searcher/mod.rs | 2 - + 8 files changed, 51 insertions(+), 303 deletions(-) + +diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs +index 1ae579f..effac81 100644 +--- a/src/doc/rust-by-example/theme/index.hbs ++++ b/src/doc/rust-by-example/theme/index.hbs +@@ -33,10 +33,7 @@ + {{/if}} + + +- +- {{#if copy_fonts}} +- +- {{/if}} ++ + + + +@@ -50,7 +47,7 @@ + + {{#if mathjax_support}} + +- ++ + {{/if}} + + +@@ -61,35 +58,6 @@ + var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}"; + + +- +- +- +- +- +- + + + +@@ -309,54 +277,8 @@ + + {{/if}} + +- {{#if google_analytics}} +- +- +- {{/if}} +- +- {{#if playground_line_numbers}} +- +- {{/if}} +- +- {{#if playground_copyable}} +- +- {{/if}} +- +- {{#if playground_js}} +- +- +- +- +- +- {{/if}} +- +- {{#if search_js}} +- +- +- +- {{/if}} +- +- +- +- ++ ++ + + + {{#each additional_js}} +diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs +index 7f73cac..e4805cc 100644 +--- a/src/tools/linkchecker/main.rs ++++ b/src/tools/linkchecker/main.rs +@@ -159,7 +159,17 @@ impl Checker { + for entry in t!(dir.read_dir()).map(|e| t!(e)) { + let path = entry.path(); + // Goes through symlinks +- let metadata = t!(fs::metadata(&path)); ++ let metadata = fs::metadata(&path); ++ if let Err(err) = metadata { ++ if let Ok(target) = fs::read_link(&path) { ++ if target.starts_with("/usr/share") { ++ // broken symlink to /usr/share, ok for our Debian build ++ return; ++ } ++ } ++ panic!("error at file {:?} while walking - {:?}", path, err) ++ } ++ let metadata = t!(metadata); + if metadata.is_dir() { + self.walk(&path, report); + } else { +@@ -172,7 +182,15 @@ impl Checker { + fn check(&mut self, file: &Path, report: &mut Report) { + let (pretty_path, entry) = self.load_file(file, report); + let source = match entry { +- FileEntry::Missing => panic!("missing file {:?} while walking", file), ++ FileEntry::Missing => { ++ if let Ok(target) = fs::read_link(&file) { ++ if target.starts_with("/usr/share") { ++ // broken symlink to /usr/share, ok for our Debian build ++ return; ++ } ++ } ++ panic!("missing file {:?} while walking", file) ++ } + FileEntry::Dir => unreachable!("never with `check` path"), + FileEntry::OtherFile => return, + FileEntry::Redirect { .. } => return, +@@ -238,6 +256,12 @@ impl Checker { + let (target_pretty_path, target_entry) = self.load_file(&path, report); + let (target_source, target_ids) = match target_entry { + FileEntry::Missing => { ++ if let Ok(target) = fs::read_link(&path) { ++ if target.starts_with("/usr/share") { ++ // broken symlink to /usr/share, ok for our Debian build ++ return; ++ } ++ } + if is_exception(file, &target_pretty_path) { + report.links_ignored_exception += 1; + } else { +diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs +index faca1d0..c1a82a3 100644 +--- a/vendor/mdbook/src/book/init.rs ++++ b/vendor/mdbook/src/book/init.rs +@@ -153,25 +153,6 @@ impl BookBuilder { + let mut js = File::create(themedir.join("book.js"))?; + js.write_all(theme::JS)?; + +- let mut highlight_css = File::create(themedir.join("highlight.css"))?; +- highlight_css.write_all(theme::HIGHLIGHT_CSS)?; +- +- let mut highlight_js = File::create(themedir.join("highlight.js"))?; +- highlight_js.write_all(theme::HIGHLIGHT_JS)?; +- +- write_file(&themedir.join("fonts"), "fonts.css", theme::fonts::CSS)?; +- for (file_name, contents) in theme::fonts::LICENSES { +- write_file(&themedir, file_name, contents)?; +- } +- for (file_name, contents) in theme::fonts::OPEN_SANS.iter() { +- write_file(&themedir, file_name, contents)?; +- } +- write_file( +- &themedir, +- theme::fonts::SOURCE_CODE_PRO.0, +- theme::fonts::SOURCE_CODE_PRO.1, +- )?; +- + Ok(()) + } + +diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +index 8ea2f49..3cb1c9f 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, Code, Config, HtmlConfig, Playground, RustEditio + use crate::errors::*; + use crate::renderer::html_handlebars::helpers; + use crate::renderer::{RenderContext, Renderer}; +-use crate::theme::{self, playground_editor, Theme}; ++use crate::theme::{self, Theme}; + use crate::utils; + + use std::borrow::Cow; + use std::collections::BTreeMap; + use std::collections::HashMap; + use std::fs::{self, File}; ++use std::os::unix::fs::symlink; + use std::path::{Path, PathBuf}; + + use crate::utils::fs::get_404_output_file; +@@ -250,99 +251,28 @@ impl HtmlHandlebars { + if let Some(contents) = &theme.favicon_svg { + write_file(destination, "favicon.svg", contents)?; + } +- write_file(destination, "highlight.css", &theme.highlight_css)?; + write_file(destination, "tomorrow-night.css", &theme.tomorrow_night_css)?; + write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?; +- write_file(destination, "highlight.js", &theme.highlight_js)?; +- write_file(destination, "clipboard.min.js", &theme.clipboard_js)?; +- write_file( +- destination, +- "FontAwesome/css/font-awesome.css", +- theme::FONT_AWESOME, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.eot", +- theme::FONT_AWESOME_EOT, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.svg", +- theme::FONT_AWESOME_SVG, ++ symlink( ++ "/usr/share/fonts-font-awesome/css/font-awesome.min.css", ++ destination.join("css/font-awesome.min.css"), + )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.ttf", +- theme::FONT_AWESOME_TTF, ++ symlink( ++ "/usr/share/fonts-font-awesome/fonts", ++ destination.join("fonts"), + )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.woff", +- theme::FONT_AWESOME_WOFF, ++ symlink( ++ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css", ++ destination.join("highlight.css"), + )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.woff2", +- theme::FONT_AWESOME_WOFF2, ++ symlink( ++ "/usr/share/javascript/highlight.js/highlight.js", ++ destination.join("highlight.js"), + )?; +- write_file( +- destination, +- "FontAwesome/fonts/FontAwesome.ttf", +- theme::FONT_AWESOME_TTF, ++ symlink( ++ "/usr/share/javascript/mathjax/MathJax.js", ++ destination.join("MathJax.js"), + )?; +- // 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)?; +- } +- for (file_name, contents) in theme::fonts::OPEN_SANS.iter() { +- write_file(destination, file_name, contents)?; +- } +- write_file( +- destination, +- theme::fonts::SOURCE_CODE_PRO.0, +- theme::fonts::SOURCE_CODE_PRO.1, +- )?; +- } +- if let Some(fonts_css) = &theme.fonts_css { +- if !fonts_css.is_empty() { +- 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 in book.toml without a fonts.css file.\n\ +- Add an empty `theme/fonts/fonts.css` file to squelch this warning." +- ); +- } +- for font_file in &theme.font_files { +- let contents = fs::read(font_file)?; +- let filename = font_file.file_name().unwrap(); +- let filename = Path::new("fonts").join(filename); +- write_file(destination, filename, &contents)?; +- } +- +- let playground_config = &html_config.playground; +- +- // Ace is a very large dependency, so only load it when requested +- if playground_config.editable && playground_config.copy_js { +- // Load the editor +- write_file(destination, "editor.js", playground_editor::JS)?; +- write_file(destination, "ace.js", playground_editor::ACE_JS)?; +- write_file(destination, "mode-rust.js", playground_editor::MODE_RUST_JS)?; +- write_file( +- destination, +- "theme-dawn.js", +- playground_editor::THEME_DAWN_JS, +- )?; +- write_file( +- destination, +- "theme-tomorrow_night.js", +- playground_editor::THEME_TOMORROW_NIGHT_JS, +- )?; +- } + + Ok(()) + } +diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs +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) -> + format!("Object.assign(window.search, {});", index).as_bytes(), + )?; + utils::fs::write_file(destination, "searcher.js", searcher::JS)?; +- utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?; +- utils::fs::write_file(destination, "elasticlunr.min.js", searcher::ELASTICLUNR_JS)?; + debug!("Copying search files ✓"); + } + +diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs +index 080b785..f6064f6 100644 +--- a/vendor/mdbook/src/theme/index.hbs ++++ b/vendor/mdbook/src/theme/index.hbs +@@ -33,10 +33,7 @@ + {{/if}} + + +- +- {{#if copy_fonts}} +- +- {{/if}} ++ + + + +@@ -50,7 +47,7 @@ + + {{#if mathjax_support}} + +- ++ + {{/if}} + + +@@ -61,35 +58,6 @@ + var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}"; + + +- +- +- +- +- +- + + + +@@ -269,54 +237,8 @@ + + {{/if}} + +- {{#if google_analytics}} +- +- +- {{/if}} +- +- {{#if playground_line_numbers}} +- +- {{/if}} +- +- {{#if playground_copyable}} +- +- {{/if}} +- +- {{#if playground_js}} +- +- +- +- +- +- {{/if}} +- +- {{#if search_js}} +- +- +- +- {{/if}} +- +- +- +- ++ ++ + + + {{#each additional_js}} +diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs +index 6e6b509..ef8886b 100644 +--- a/vendor/mdbook/src/theme/mod.rs ++++ b/vendor/mdbook/src/theme/mod.rs +@@ -1,9 +1,5 @@ + #![allow(missing_docs)] + +-pub mod playground_editor; +- +-pub mod fonts; +- + #[cfg(feature = "search")] + pub mod searcher; + +@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css"); + pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png"); + pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg"); + pub static JS: &[u8] = include_bytes!("book.js"); +-pub static HIGHLIGHT_JS: &[u8] = include_bytes!("highlight.js"); + pub static TOMORROW_NIGHT_CSS: &[u8] = include_bytes!("tomorrow-night.css"); +-pub static HIGHLIGHT_CSS: &[u8] = include_bytes!("highlight.css"); + pub static AYU_HIGHLIGHT_CSS: &[u8] = include_bytes!("ayu-highlight.css"); +-pub static CLIPBOARD_JS: &[u8] = include_bytes!("clipboard.min.js"); +-pub static FONT_AWESOME: &[u8] = include_bytes!("FontAwesome/css/font-awesome.min.css"); +-pub static FONT_AWESOME_EOT: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot"); +-pub static FONT_AWESOME_SVG: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg"); +-pub static FONT_AWESOME_TTF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf"); +-pub static FONT_AWESOME_WOFF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff"); +-pub static FONT_AWESOME_WOFF2: &[u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2"); +-pub static FONT_AWESOME_OTF: &[u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf"); + + /// The `Theme` struct should be used instead of the static variables because + /// the `new()` method will look if the user has a theme directory in their +@@ -59,11 +44,8 @@ pub struct Theme { + pub favicon_png: Option>, + pub favicon_svg: Option>, + pub js: Vec, +- pub highlight_css: Vec, + pub tomorrow_night_css: Vec, + pub ayu_highlight_css: Vec, +- pub highlight_js: Vec, +- pub clipboard_js: Vec, + } + + impl Theme { +@@ -93,9 +75,6 @@ impl Theme { + theme_dir.join("css/variables.css"), + &mut theme.variables_css, + ), +- (theme_dir.join("highlight.js"), &mut theme.highlight_js), +- (theme_dir.join("clipboard.min.js"), &mut theme.clipboard_js), +- (theme_dir.join("highlight.css"), &mut theme.highlight_css), + ( + theme_dir.join("tomorrow-night.css"), + &mut theme.tomorrow_night_css, +@@ -183,11 +162,8 @@ impl Default for Theme { + favicon_png: Some(FAVICON_PNG.to_owned()), + favicon_svg: Some(FAVICON_SVG.to_owned()), + js: JS.to_owned(), +- highlight_css: HIGHLIGHT_CSS.to_owned(), + tomorrow_night_css: TOMORROW_NIGHT_CSS.to_owned(), + ayu_highlight_css: AYU_HIGHLIGHT_CSS.to_owned(), +- highlight_js: HIGHLIGHT_JS.to_owned(), +- clipboard_js: CLIPBOARD_JS.to_owned(), + } + } + } +@@ -273,11 +249,8 @@ mod tests { + favicon_png: Some(Vec::new()), + favicon_svg: Some(Vec::new()), + js: Vec::new(), +- highlight_css: Vec::new(), + tomorrow_night_css: Vec::new(), + ayu_highlight_css: Vec::new(), +- highlight_js: Vec::new(), +- clipboard_js: Vec::new(), + }; + + assert_eq!(got, empty); +diff --git a/vendor/mdbook/src/theme/searcher/mod.rs b/vendor/mdbook/src/theme/searcher/mod.rs +index d5029db..59eda8a 100644 +--- a/vendor/mdbook/src/theme/searcher/mod.rs ++++ b/vendor/mdbook/src/theme/searcher/mod.rs +@@ -2,5 +2,3 @@ + //! the "search" cargo feature is disabled. + + pub static JS: &[u8] = include_bytes!("searcher.js"); +-pub static MARK_JS: &[u8] = include_bytes!("mark.min.js"); +-pub static ELASTICLUNR_JS: &[u8] = include_bytes!("elasticlunr.min.js"); diff --git a/patches/prune/d-0005-no-jemalloc.patch b/patches/prune/d-0005-no-jemalloc.patch new file mode 100644 index 0000000000..611b87028c --- /dev/null +++ b/patches/prune/d-0005-no-jemalloc.patch @@ -0,0 +1,51 @@ +From: Debian Rust Maintainers +Date: Sat, 2 Oct 2021 01:08:00 +0100 +Subject: d-0005-no-jemalloc + +Description: remove jemalloc-sys + +Forwarded: not-needed +--- + compiler/rustc/Cargo.toml | 6 ------ + src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml +index 3cb56a7..af37dfc 100644 +--- a/compiler/rustc/Cargo.toml ++++ b/compiler/rustc/Cargo.toml +@@ -20,14 +20,8 @@ rustc_smir = { path = "../rustc_smir" } + stable_mir = { path = "../stable_mir" } + # tidy-alphabetical-end + +-[dependencies.jemalloc-sys] +-version = "0.5.0" +-optional = true +-features = ['unprefixed_malloc_on_supported_platforms'] +- + [features] + # tidy-alphabetical-start +-jemalloc = ['jemalloc-sys'] + llvm = ['rustc_driver_impl/llvm'] + max_level_info = ['rustc_driver_impl/max_level_info'] + rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler'] +diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml +index 56ce9d1..4fb2760 100644 +--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml +@@ -17,7 +17,6 @@ cfg-if = "1.0.0" + la-arena.workspace = true + libc.workspace = true + countme = { version = "3.0.1", features = ["enable"] } +-jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true } + + [target.'cfg(target_os = "linux")'.dependencies] + perf-event = "=0.4.7" +@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } + + [features] + cpu_profiler = [] +-jemalloc = ["jemalloc-ctl"] + + # Uncomment to enable for the whole crate graph + # default = [ "cpu_profiler" ] diff --git a/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch b/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch new file mode 100644 index 0000000000..30b3198b43 --- /dev/null +++ b/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch @@ -0,0 +1,39 @@ +From: Debian Rust Maintainers +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0010-cargo-remove-vendored-c-crates + +Description: remove all vendoring features of crates normally shipping bundled +C libs. that C code is stripped when repacking, so the features can't work +anyway. +Last-Update: 2023-05-17 + +Forwarded: not-needed +--- + src/tools/cargo/Cargo.toml | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml +index c07b004..2a81642 100644 +--- a/src/tools/cargo/Cargo.toml ++++ b/src/tools/cargo/Cargo.toml +@@ -73,7 +73,7 @@ proptest = "1.4.0" + pulldown-cmark = { version = "0.9.3", default-features = false } + rand = "0.8.5" + regex = "1.10.2" +-rusqlite = { version = "0.30.0", features = ["bundled"] } ++rusqlite = { version = "0.30.0", features = [] } + rustfix = { version = "0.7.0", path = "crates/rustfix" } + same-file = "1.0.6" + security-framework = "2.9.2" +@@ -243,10 +243,8 @@ test = false + doc = false + + [features] +-vendored-openssl = ["openssl/vendored"] +-vendored-libgit2 = ["libgit2-sys/vendored"] ++# Debian: removed vendoring flags + # This is primarily used by rust-lang/rust distributing cargo the executable. +-all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx', 'vendored-libgit2'] + + [lints] + workspace = true diff --git a/patches/prune/d-0011-cargo-remove-nghttp2.patch b/patches/prune/d-0011-cargo-remove-nghttp2.patch new file mode 100644 index 0000000000..3255e98fc8 --- /dev/null +++ b/patches/prune/d-0011-cargo-remove-nghttp2.patch @@ -0,0 +1,26 @@ +From: Debian Rust Maintainers +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0011-cargo-remove-nghttp2 + +Description: remove dependency on libnghttp2-sys so it can be pruned. + +Last-Update: 2023-05-17 + +Forwarded: not-needed +--- + vendor/curl-sys/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml +index daf925e..624fabf 100644 +--- a/vendor/curl-sys/Cargo.toml ++++ b/vendor/curl-sys/Cargo.toml +@@ -52,7 +52,7 @@ version = "0.3.3" + [features] + default = ["ssl"] + force-system-lib-on-osx = [] +-http2 = ["libnghttp2-sys"] ++http2 = [] + mesalink = [] + ntlm = [] + poll_7_68_0 = [] diff --git a/patches/prune/d-0020-remove-windows-dependencies.patch b/patches/prune/d-0020-remove-windows-dependencies.patch new file mode 100644 index 0000000000..29604db351 --- /dev/null +++ b/patches/prune/d-0020-remove-windows-dependencies.patch @@ -0,0 +1,382 @@ +From: Debian Rust Maintainers +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0020-remove-windows-dependencies + +use something like + + find src compiler library -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \; > + +to find and eliminate dependencies on windows-only crates when rebasing. + +windows-bindgen and windows-metadata should not be removed, they are needed for +the build and don't pull in windows-sys and friends. + +Forwarded: not-needed + +=================================================================== +--- + compiler/rustc_codegen_ssa/Cargo.toml | 4 ---- + compiler/rustc_data_structures/Cargo.toml | 10 --------- + compiler/rustc_driver_impl/Cargo.toml | 6 ----- + compiler/rustc_errors/Cargo.toml | 8 ------- + compiler/rustc_session/Cargo.toml | 7 ------ + library/backtrace/Cargo.toml | 13 ----------- + src/bootstrap/Cargo.toml | 15 ------------- + src/tools/cargo/Cargo.toml | 26 ++++------------------ + .../cargo/crates/cargo-test-support/Cargo.toml | 3 --- + src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ------ + src/tools/cargo/crates/home/Cargo.toml | 3 --- + .../cargo/credential/cargo-credential/Cargo.toml | 3 --- + src/tools/cargo/src/cargo/util/auth/mod.rs | 5 ----- + src/tools/compiletest/Cargo.toml | 10 --------- + src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 --- + .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ----- + src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 ---- + 17 files changed, 4 insertions(+), 129 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml +index 3f2ed25..bf0ad91 100644 +--- a/compiler/rustc_codegen_ssa/Cargo.toml ++++ b/compiler/rustc_codegen_ssa/Cargo.toml +@@ -49,7 +49,3 @@ libc = "0.2.50" + version = "0.32.1" + default-features = false + features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"] +- +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = ["Win32_Globalization"] +diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml +index 4732783..bbfcb55 100644 +--- a/compiler/rustc_data_structures/Cargo.toml ++++ b/compiler/rustc_data_structures/Cargo.toml +@@ -32,16 +32,6 @@ tracing = "0.1" + [dependencies.parking_lot] + version = "0.12" + +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +- "Win32_System_ProcessStatus", +- "Win32_System_Threading", +-] +- + [target.'cfg(not(target_arch = "wasm32"))'.dependencies] + # tidy-alphabetical-start + memmap2 = "0.2.1" +diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml +index 4904298..2918095 100644 +--- a/compiler/rustc_driver_impl/Cargo.toml ++++ b/compiler/rustc_driver_impl/Cargo.toml +@@ -59,12 +59,6 @@ tracing = { version = "0.1.35" } + libc = "0.2" + # tidy-alphabetical-end + +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = [ +- "Win32_System_Diagnostics_Debug", +-] +- + [features] + # tidy-alphabetical-start + llvm = ['rustc_interface/llvm'] +diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml +index fc3ff83..4f74aec 100644 +--- a/compiler/rustc_errors/Cargo.toml ++++ b/compiler/rustc_errors/Cargo.toml +@@ -27,14 +27,6 @@ tracing = "0.1" + unicode-width = "0.1.4" + # tidy-alphabetical-end + +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Security", +- "Win32_System_Threading", +-] +- + [features] + # tidy-alphabetical-start + rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler'] +diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml +index 1f51dd6..2974bd0 100644 +--- a/compiler/rustc_session/Cargo.toml ++++ b/compiler/rustc_session/Cargo.toml +@@ -28,10 +28,3 @@ tracing = "0.1" + # tidy-alphabetical-start + libc = "0.2" + # tidy-alphabetical-end +- +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_LibraryLoader", +-] +diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml +index 932310b..dce3c3f 100644 +--- a/library/backtrace/Cargo.toml ++++ b/library/backtrace/Cargo.toml +@@ -48,9 +48,6 @@ version = "0.32.0" + default-features = false + features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive'] + +-[target.'cfg(windows)'.dependencies] +-winapi = { version = "0.3.9", optional = true } +- + [build-dependencies] + # Only needed for Android, but cannot be target dependent + # https://github.com/rust-lang/cargo/issues/4932 +@@ -88,16 +85,6 @@ libbacktrace = [] + libunwind = [] + unix-backtrace = [] + verify-winapi = [ +- 'winapi/dbghelp', +- 'winapi/handleapi', +- 'winapi/libloaderapi', +- 'winapi/memoryapi', +- 'winapi/minwindef', +- 'winapi/processthreadsapi', +- 'winapi/synchapi', +- 'winapi/tlhelp32', +- 'winapi/winbase', +- 'winapi/winnt', + ] + + [[example]] +diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml +index 077d195..b9ad241 100644 +--- a/src/bootstrap/Cargo.toml ++++ b/src/bootstrap/Cargo.toml +@@ -65,21 +65,6 @@ sysinfo = { version = "0.26.0", optional = true } + [target.'cfg(not(target_os = "solaris"))'.dependencies] + fd-lock = "3.0.13" + +-[target.'cfg(windows)'.dependencies.junction] +-version = "1.0.0" +- +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.51.1" +-features = [ +- "Win32_Foundation", +- "Win32_Security", +- "Win32_System_Diagnostics_Debug", +- "Win32_System_JobObjects", +- "Win32_System_ProcessStatus", +- "Win32_System_Threading", +- "Win32_System_Time", +-] +- + [dev-dependencies] + pretty_assertions = "1.4" + +diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml +index 2a81642..76a8cf2 100644 +--- a/src/tools/cargo/Cargo.toml ++++ b/src/tools/cargo/Cargo.toml +@@ -2,7 +2,9 @@ + resolver = "2" + members = [ + "crates/*", +- "credential/*", ++ "credential/cargo-credential", ++ "credential/cargo-credential-1password", ++ "credential/cargo-credential-libsecret", + "benches/benchsuite", + "benches/capture", + ] +@@ -24,8 +26,6 @@ bytesize = "1.3" + cargo = { path = "" } + cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" } + cargo-credential-libsecret = { version = "0.4.2", path = "credential/cargo-credential-libsecret" } +-cargo-credential-macos-keychain = { version = "0.4.2", path = "credential/cargo-credential-macos-keychain" } +-cargo-credential-wincred = { version = "0.4.2", path = "credential/cargo-credential-wincred" } + cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" } + cargo-test-macro = { path = "crates/cargo-test-macro" } + cargo-test-support = { path = "crates/cargo-test-support" } +@@ -103,7 +103,6 @@ unicode-xid = "0.2.4" + url = "2.5.0" + varisat = "0.2.2" + walkdir = "2.4.0" +-windows-sys = "0.52" + + [workspace.lints.rust] + rust_2018_idioms = "warn" # TODO: could this be removed? +@@ -144,6 +143,7 @@ base64.workspace = true + bytesize.workspace = true + cargo-credential.workspace = true + cargo-platform.workspace = true ++cargo-credential-libsecret.workspace = true + cargo-util.workspace = true + clap = { workspace = true, features = ["wrap_help"] } + color-print.workspace = true +@@ -206,27 +206,9 @@ walkdir.workspace = true + [target.'cfg(target_os = "linux")'.dependencies] + cargo-credential-libsecret.workspace = true + +-[target.'cfg(target_os = "macos")'.dependencies] +-cargo-credential-macos-keychain.workspace = true +- + [target.'cfg(not(windows))'.dependencies] + openssl = { workspace = true, optional = true } + +-[target.'cfg(windows)'.dependencies] +-cargo-credential-wincred.workspace = true +- +-[target.'cfg(windows)'.dependencies.windows-sys] +-workspace = true +-features = [ +- "Win32_Foundation", +- "Win32_Security", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +- "Win32_System_Console", +- "Win32_System_JobObjects", +- "Win32_System_Threading", +-] +- + [dev-dependencies] + cargo-test-macro.workspace = true + cargo-test-support.workspace = true +diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml +index 1098d59..88d4ae7 100644 +--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml ++++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml +@@ -31,8 +31,5 @@ toml.workspace = true + url.workspace = true + walkdir.workspace = true + +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] } +- + [lints] + workspace = true +diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml +index 3fd6bde..fb681a3 100644 +--- a/src/tools/cargo/crates/cargo-util/Cargo.toml ++++ b/src/tools/cargo/crates/cargo-util/Cargo.toml +@@ -22,12 +22,5 @@ tempfile.workspace = true + tracing.workspace = true + walkdir.workspace = true + +-[target.'cfg(target_os = "macos")'.dependencies] +-core-foundation.workspace = true +- +-[target.'cfg(windows)'.dependencies] +-miow.workspace = true +-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] } +- + [lints] + workspace = true +diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml +index 33cd6ba..2d5dfdc 100644 +--- a/src/tools/cargo/crates/home/Cargo.toml ++++ b/src/tools/cargo/crates/home/Cargo.toml +@@ -16,8 +16,5 @@ license.workspace = true + repository = "https://github.com/rust-lang/cargo" + description = "Shared definitions of home directories." + +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell", "Win32_System_Com"] } +- + [lints] + workspace = true +diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml +index 7dc37ff..fac049b 100644 +--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml ++++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml +@@ -15,9 +15,6 @@ serde_json.workspace = true + thiserror.workspace = true + time.workspace = true + +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_System_Console", "Win32_Foundation"] } +- + [dev-dependencies] + snapbox = { workspace = true, features = ["examples"] } + +diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs +index c2f8186..c420971 100644 +--- a/src/tools/cargo/src/cargo/util/auth/mod.rs ++++ b/src/tools/cargo/src/cargo/util/auth/mod.rs +@@ -529,11 +529,6 @@ fn credential_action( + } + "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"), + "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), +- #[cfg(windows)] +- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), +- #[cfg(target_os = "macos")] +- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), +- #[cfg(target_os = "linux")] + "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), + name if BUILT_IN_PROVIDERS.contains(&name) => { + Box::new(cargo_credential::UnsupportedCredential {}) +diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml +index 31c6353..bdc4805 100644 +--- a/src/tools/compiletest/Cargo.toml ++++ b/src/tools/compiletest/Cargo.toml +@@ -29,13 +29,3 @@ home = "0.5.5" + + [target.'cfg(unix)'.dependencies] + libc = "0.2" +- +-[target.'cfg(windows)'.dependencies] +-miow = "0.6" +- +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +-] +diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml +index 4fb2760..8573fbe 100644 +--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml +@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] } + [target.'cfg(target_os = "linux")'.dependencies] + perf-event = "=0.4.7" + +-[target.'cfg(windows)'.dependencies] +-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } +- + [features] + cpu_profiler = [] + +diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +index 39ac338a..d25722a 100644 +--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +@@ -65,12 +65,6 @@ toolchain.workspace = true + vfs-notify.workspace = true + vfs.workspace = true + +-[target.'cfg(windows)'.dependencies] +-winapi = "0.3.9" +- +-[target.'cfg(not(target_env = "msvc"))'.dependencies] +-jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true } +- + [dev-dependencies] + expect-test = "1.4.0" + xshell.workspace = true +diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml +index c914ae2..db8b274 100644 +--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml +@@ -20,10 +20,6 @@ crossbeam-channel = "0.5.5" + itertools.workspace = true + # Think twice before adding anything here + +-[target.'cfg(windows)'.dependencies] +-miow = "0.6.0" +-winapi = { version = "0.3.9", features = ["winerror"] } +- + [features] + # Uncomment to enable for the whole crate graph + # default = [ "backtrace" ] diff --git a/patches/prune/d-0021-vendor-remove-windows-dependencies.patch b/patches/prune/d-0021-vendor-remove-windows-dependencies.patch new file mode 100644 index 0000000000..025cfd8bdd --- /dev/null +++ b/patches/prune/d-0021-vendor-remove-windows-dependencies.patch @@ -0,0 +1,1007 @@ +From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= +Date: Wed, 6 Sep 2023 13:23:24 -0600 +Subject: d-0021-vendor-remove-windows-dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +use something like + + find vendor -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \; > /tmp/files + +to find dependencies on windows targets in vendored crates. you will likely +need to remove some hunks from this patch after pruning dependencies, since +hopefully a few of the crates patched during early rebasing are eliminated. + +windows-bindgen and windows-metadata should not be removed, they are needed for +the build and don't pull in windows-sys and friends. + +Forwarded: not-needed + +Signed-off-by: Fabian Grünbichler +--- + vendor/android-tzdata/Cargo.toml | 1 + + vendor/ansi_term/Cargo.toml | 3 --- + vendor/anstream-0.5.0/Cargo.toml | 5 ----- + vendor/anstream/Cargo.toml | 7 ------ + vendor/anstyle-query/Cargo.toml | 6 ----- + vendor/backtrace/Cargo.toml | 14 ------------ + vendor/chrono/Cargo.toml | 12 ---------- + vendor/colored/Cargo.toml | 7 ------ + vendor/console/Cargo.toml | 11 ---------- + vendor/ctrlc/Cargo.toml | 17 --------------- + vendor/curl-sys/Cargo.toml | 7 ------ + vendor/curl/Cargo.toml | 10 --------- + vendor/dirs-sys-0.3.7/Cargo.toml | 3 --- + vendor/dirs-sys-next/Cargo.toml | 3 --- + vendor/errno/Cargo.toml | 6 ----- + vendor/fd-lock/Cargo.toml | 8 ------- + vendor/filetime/Cargo.toml | 7 ------ + vendor/gix-sec/Cargo.toml | 12 ---------- + vendor/home/Cargo.toml | 7 ------ + vendor/iana-time-zone/Cargo.toml | 4 ---- + vendor/ignore/Cargo.toml | 2 -- + vendor/is-terminal/Cargo.toml | 11 ---------- + vendor/libloading-0.7.4/Cargo.toml | 6 ----- + vendor/libloading/Cargo.toml | 8 ------- + vendor/libssh2-sys/Cargo.toml | 8 ------- + vendor/mio/Cargo.toml | 11 ---------- + vendor/native-tls/Cargo.toml | 3 --- + vendor/nu-ansi-term-0.46.0/Cargo.toml | 10 --------- + vendor/opener-0.5.2/Cargo.toml | 4 ---- + vendor/opener/Cargo.toml | 9 -------- + vendor/os_info/Cargo.toml | 15 ------------- + vendor/parking_lot_core/Cargo.toml | 3 --- + vendor/reqwest/Cargo.toml | 3 --- + vendor/rustix/Cargo.toml | 17 --------------- + vendor/same-file/Cargo.toml | 2 -- + vendor/snapbox/Cargo.toml | 6 ----- + vendor/socket2/Cargo.toml | 7 ------ + vendor/stacker/Cargo.toml | 10 --------- + vendor/sysinfo-0.26.7/Cargo.toml | 38 -------------------------------- + vendor/sysinfo/Cargo.toml | 41 ----------------------------------- + vendor/tempfile/Cargo.toml | 7 ------ + vendor/term/Cargo.toml | 6 ----- + vendor/termcolor/Cargo.toml | 3 --- + vendor/terminal_size/Cargo.toml | 7 ------ + vendor/termize/Cargo.toml | 3 --- + vendor/tokio-native-tls/Cargo.toml | 17 --------------- + vendor/tokio/Cargo.toml | 21 ------------------ + vendor/uuid/Cargo.toml | 4 ---- + vendor/walkdir/Cargo.toml | 3 --- + vendor/yansi-term/Cargo.toml | 3 --- + 50 files changed, 1 insertion(+), 437 deletions(-) + +diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml +index 805128a..0682717 100644 +--- a/vendor/android-tzdata/Cargo.toml ++++ b/vendor/android-tzdata/Cargo.toml +@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/android-tzdata" + + [dev-dependencies.zip] + version = "0.6.4" ++repository = "https://github.com/rust-cli/concolor" +diff --git a/vendor/ansi_term/Cargo.toml b/vendor/ansi_term/Cargo.toml +index 0e5feba..3256c75 100644 +--- a/vendor/ansi_term/Cargo.toml ++++ b/vendor/ansi_term/Cargo.toml +@@ -38,6 +38,3 @@ version = "1.0.39" + + [features] + derive_serde_style = ["serde"] +-[target."cfg(target_os=\"windows\")".dependencies.winapi] +-version = "0.3.4" +-features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"] +diff --git a/vendor/anstream-0.5.0/Cargo.toml b/vendor/anstream-0.5.0/Cargo.toml +index 1b5193c..9574485 100644 +--- a/vendor/anstream-0.5.0/Cargo.toml ++++ b/vendor/anstream-0.5.0/Cargo.toml +@@ -131,10 +131,5 @@ auto = [ + ] + default = [ + "auto", +- "wincon", + ] +-wincon = ["dep:anstyle-wincon"] + +-[target."cfg(windows)".dependencies.anstyle-wincon] +-version = "2.0.0" +-optional = true +diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml +index a64ec8d..34dd08f 100644 +--- a/vendor/anstream/Cargo.toml ++++ b/vendor/anstream/Cargo.toml +@@ -134,11 +134,4 @@ auto = [ + ] + default = [ + "auto", +- "wincon", + ] +-test = [] +-wincon = ["dep:anstyle-wincon"] +- +-[target."cfg(windows)".dependencies.anstyle-wincon] +-version = "3.0.1" +-optional = true +diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml +index 599e364..e32bc63 100644 +--- a/vendor/anstyle-query/Cargo.toml ++++ b/vendor/anstyle-query/Cargo.toml +@@ -72,9 +72,3 @@ replace = """ + [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" + search = "" + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.52.0" +-features = [ +- "Win32_System_Console", +- "Win32_Foundation", +-] +diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml +index c13e7ee..7b01a6f 100644 +--- a/vendor/backtrace/Cargo.toml ++++ b/vendor/backtrace/Cargo.toml +@@ -104,16 +104,6 @@ serialize-serde = ["serde"] + std = [] + unix-backtrace = [] + verify-winapi = [ +- "winapi/dbghelp", +- "winapi/handleapi", +- "winapi/libloaderapi", +- "winapi/memoryapi", +- "winapi/minwindef", +- "winapi/processthreadsapi", +- "winapi/synchapi", +- "winapi/tlhelp32", +- "winapi/winbase", +- "winapi/winnt", + ] + + [target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line] +@@ -139,7 +129,3 @@ features = [ + "archive", + ] + default-features = false +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-optional = true +diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml +index 7f49bad..6229f0a 100644 +--- a/vendor/chrono/Cargo.toml ++++ b/vendor/chrono/Cargo.toml +@@ -107,7 +107,6 @@ __internal_bench = ["criterion"] + alloc = [] + clock = [ + "std", +- "winapi", + "iana-time-zone", + ] + default = [ +@@ -146,14 +145,3 @@ version = "0.1.1" + version = "0.1.45" + features = ["fallback"] + optional = true +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.0" +-features = [ +- "std", +- "minwinbase", +- "minwindef", +- "timezoneapi", +- "sysinfoapi", +-] +-optional = true +diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml +index dda2951..05b76bd 100644 +--- a/vendor/colored/Cargo.toml ++++ b/vendor/colored/Cargo.toml +@@ -42,10 +42,3 @@ version = "=1.0.0-beta.3" + + [features] + no-color = [] +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +-] +diff --git a/vendor/console/Cargo.toml b/vendor/console/Cargo.toml +index 85849e16..7c7be5a 100644 +--- a/vendor/console/Cargo.toml ++++ b/vendor/console/Cargo.toml +@@ -59,14 +59,3 @@ default = [ + ] + windows-console-colors = ["ansi-parsing"] + +-[target."cfg(windows)".dependencies.encode_unicode] +-version = "0.3" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +- "Win32_Storage_FileSystem", +- "Win32_UI_Input_KeyboardAndMouse", +-] +diff --git a/vendor/ctrlc/Cargo.toml b/vendor/ctrlc/Cargo.toml +index bb27f1b..93d7d7e 100644 +--- a/vendor/ctrlc/Cargo.toml ++++ b/vendor/ctrlc/Cargo.toml +@@ -56,23 +56,6 @@ features = [ + ] + default-features = false + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Threading", +- "Win32_Security", +- "Win32_System_Console", +-] +- +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Storage_FileSystem", +- "Win32_Foundation", +- "Win32_System_IO", +- "Win32_System_Console", +-] + + [badges.maintenance] + status = "passively-maintained" +diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml +index 624fabf..c66bbba 100644 +--- a/vendor/curl-sys/Cargo.toml ++++ b/vendor/curl-sys/Cargo.toml +@@ -73,13 +73,6 @@ zlib-ng-compat = [ + version = "0.9.64" + optional = true + +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Networking_WinSock"] +- + [badges.appveyor] + repository = "alexcrichton/curl-rust" + +diff --git a/vendor/curl/Cargo.toml b/vendor/curl/Cargo.toml +index bfb59f4..d9f6854 100644 +--- a/vendor/curl/Cargo.toml ++++ b/vendor/curl/Cargo.toml +@@ -107,16 +107,6 @@ optional = true + version = "0.9.43" + optional = true + +-[target."cfg(target_env = \"msvc\")".dependencies.schannel] +-version = "0.1.13" +- +-[target."cfg(target_env = \"msvc\")".dependencies.winapi] +-version = "0.3" +-features = [ +- "libloaderapi", +- "wincrypt", +-] +- + [badges.appveyor] + repository = "alexcrichton/curl-rust" + +diff --git a/vendor/dirs-sys-0.3.7/Cargo.toml b/vendor/dirs-sys-0.3.7/Cargo.toml +index 9951d24..0a86f4d 100644 +--- a/vendor/dirs-sys-0.3.7/Cargo.toml ++++ b/vendor/dirs-sys-0.3.7/Cargo.toml +@@ -22,6 +22,3 @@ version = "0.4" + default-features = false + [target."cfg(unix)".dependencies.libc] + version = "0.2" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] +diff --git a/vendor/dirs-sys-next/Cargo.toml b/vendor/dirs-sys-next/Cargo.toml +index e9d8d0c..acb2eb7 100644 +--- a/vendor/dirs-sys-next/Cargo.toml ++++ b/vendor/dirs-sys-next/Cargo.toml +@@ -25,8 +25,5 @@ version = "0.4.0" + default-features = false + [target."cfg(unix)".dependencies.libc] + version = "0.2" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] + [badges.maintenance] + status = "as-is" +diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml +index e1d0bf5..60eeb86 100644 +--- a/vendor/errno/Cargo.toml ++++ b/vendor/errno/Cargo.toml +@@ -41,9 +41,3 @@ default-features = false + version = "0.2" + default-features = false + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.52" +-features = [ +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +-] +diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml +index 8d0b8f0..eb1ef13 100644 +--- a/vendor/fd-lock/Cargo.toml ++++ b/vendor/fd-lock/Cargo.toml +@@ -43,11 +43,3 @@ version = "3.0.8" + [target."cfg(unix)".dependencies.rustix] + version = "0.38.0" + features = ["fs"] +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +-] +diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml +index 0540ffb..2c65fa5 100644 +--- a/vendor/filetime/Cargo.toml ++++ b/vendor/filetime/Cargo.toml +@@ -38,10 +38,3 @@ version = "0.4.1" + + [target."cfg(unix)".dependencies.libc] + version = "0.2.27" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.52.0" +-features = [ +- "Win32_Foundation", +- "Win32_Storage_FileSystem", +-] +diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml +index cf452ec..c405340 100644 +--- a/vendor/gix-sec/Cargo.toml ++++ b/vendor/gix-sec/Cargo.toml +@@ -58,15 +58,3 @@ serde = [ + [target."cfg(not(windows))".dependencies.libc] + version = "0.2.123" + +-[target."cfg(windows)".dependencies.gix-path] +-version = "^0.10.1" +- +-[target."cfg(windows)".dependencies.windows] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Security_Authorization", +- "Win32_Storage_FileSystem", +- "Win32_System_Memory", +- "Win32_System_Threading", +-] +diff --git a/vendor/home/Cargo.toml b/vendor/home/Cargo.toml +index cd608b1..eecfb89 100644 +--- a/vendor/home/Cargo.toml ++++ b/vendor/home/Cargo.toml +@@ -27,10 +27,3 @@ readme = "README.md" + license = "MIT OR Apache-2.0" + repository = "https://github.com/rust-lang/cargo" + resolver = "2" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_UI_Shell", +-] +diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml +index e06c705..572a8fd 100644 +--- a/vendor/iana-time-zone/Cargo.toml ++++ b/vendor/iana-time-zone/Cargo.toml +@@ -52,7 +52,3 @@ version = "0.1.5" + + [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] + version = "0.1.1" +- +-[target."cfg(target_os = \"windows\")".dependencies.windows] +-version = "0.48.0" +-features = ["Globalization"] +diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml +index 60ab32a..bf4109f 100644 +--- a/vendor/ignore/Cargo.toml ++++ b/vendor/ignore/Cargo.toml +@@ -77,5 +77,3 @@ version = "0.5.8" + [features] + simd-accel = [] + +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.2" +diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml +index 08933a7..b4b0482 100644 +--- a/vendor/is-terminal/Cargo.toml ++++ b/vendor/is-terminal/Cargo.toml +@@ -54,14 +54,3 @@ features = ["stdio"] + + [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] + version = "0.3.0" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Storage_FileSystem", +- "Win32_System_Console", +-] +- +-[target."cfg(windows)".dev-dependencies.tempfile] +-version = "3" +diff --git a/vendor/libloading-0.7.4/Cargo.toml b/vendor/libloading-0.7.4/Cargo.toml +index 65168d5..03df764 100644 +--- a/vendor/libloading-0.7.4/Cargo.toml ++++ b/vendor/libloading-0.7.4/Cargo.toml +@@ -43,9 +43,3 @@ version = "1.1" + [target."cfg(unix)".dependencies.cfg-if] + version = "1" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = [ +- "errhandlingapi", +- "libloaderapi", +-] +diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml +index 0165453..0dfc3c0 100644 +--- a/vendor/libloading/Cargo.toml ++++ b/vendor/libloading/Cargo.toml +@@ -42,11 +42,3 @@ version = "1.1" + + [target."cfg(unix)".dependencies.cfg-if] + version = "1" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +- "Win32_System_LibraryLoader", +-] +diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml +index 45f4a71..516644c 100644 +--- a/vendor/libssh2-sys/Cargo.toml ++++ b/vendor/libssh2-sys/Cargo.toml +@@ -43,16 +43,8 @@ version = "1.0.25" + version = "0.3.11" + + [features] +-openssl-on-win32 = ["openssl-sys"] + vendored-openssl = ["openssl-sys/vendored"] + zlib-ng-compat = ["libz-sys/zlib-ng"] + +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- + [target."cfg(unix)".dependencies.openssl-sys] + version = "0.9.35" +- +-[target."cfg(windows)".dependencies.openssl-sys] +-version = "0.9.35" +-optional = true +diff --git a/vendor/mio/Cargo.toml b/vendor/mio/Cargo.toml +index 42e28d0..b689d7b 100644 +--- a/vendor/mio/Cargo.toml ++++ b/vendor/mio/Cargo.toml +@@ -102,8 +102,6 @@ default = ["log"] + net = [] + os-ext = [ + "os-poll", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_Security", + ] + os-poll = [] + +@@ -116,12 +114,3 @@ version = "0.11.0" + [target."cfg(unix)".dependencies.libc] + version = "0.2.121" + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +- "Win32_System_WindowsProgramming", +-] +diff --git a/vendor/native-tls/Cargo.toml b/vendor/native-tls/Cargo.toml +index a059236..d36b44b 100644 +--- a/vendor/native-tls/Cargo.toml ++++ b/vendor/native-tls/Cargo.toml +@@ -61,6 +61,3 @@ version = "0.1" + + [target."cfg(not(any(target_os = \"windows\", target_os = \"macos\", target_os = \"ios\")))".dependencies.openssl-sys] + version = "0.9.55" +- +-[target."cfg(target_os = \"windows\")".dependencies.schannel] +-version = "0.1.17" +diff --git a/vendor/nu-ansi-term-0.46.0/Cargo.toml b/vendor/nu-ansi-term-0.46.0/Cargo.toml +index 209e055..aa40f02 100644 +--- a/vendor/nu-ansi-term-0.46.0/Cargo.toml ++++ b/vendor/nu-ansi-term-0.46.0/Cargo.toml +@@ -45,13 +45,3 @@ version = "1.0.39" + + [features] + derive_serde_style = ["serde"] +- +-[target."cfg(target_os=\"windows\")".dependencies.winapi] +-version = "0.3.4" +-features = [ +- "consoleapi", +- "errhandlingapi", +- "fileapi", +- "handleapi", +- "processenv", +-] +diff --git a/vendor/opener-0.5.2/Cargo.toml b/vendor/opener-0.5.2/Cargo.toml +index 8d91b5e..2d7313b 100644 +--- a/vendor/opener-0.5.2/Cargo.toml ++++ b/vendor/opener-0.5.2/Cargo.toml +@@ -32,10 +32,6 @@ version = "0.9" + [target."cfg(target_os = \"linux\")".dependencies.bstr] + version = "1" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["shellapi"] +- + [badges.appveyor] + branch = "master" + repository = "Seeker14491/opener" +diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml +index 79b4be9..69cc269 100644 +--- a/vendor/opener/Cargo.toml ++++ b/vendor/opener/Cargo.toml +@@ -40,8 +40,6 @@ version = "0.9" + reveal = [ + "dep:url", + "dep:dbus", +- "winapi/shtypes", +- "winapi/objbase", + ] + + [target."cfg(target_os = \"linux\")".dependencies.bstr] +@@ -56,13 +54,6 @@ optional = true + version = "2" + optional = true + +-[target."cfg(windows)".dependencies.normpath] +-version = "1" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["shellapi"] +- + [badges.appveyor] + branch = "master" + repository = "Seeker14491/opener" +diff --git a/vendor/os_info/Cargo.toml b/vendor/os_info/Cargo.toml +index 52a062f..e1f347b 100644 +--- a/vendor/os_info/Cargo.toml ++++ b/vendor/os_info/Cargo.toml +@@ -48,18 +48,3 @@ version = "1" + + [features] + default = ["serde"] +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.8" +-features = [ +- "minwindef", +- "ntdef", +- "ntstatus", +- "sysinfoapi", +- "winnt", +- "winuser", +- "libloaderapi", +- "processthreadsapi", +- "winerror", +- "winreg", +-] +diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml +index 83d9f23..dbe1534 100644 +--- a/vendor/parking_lot_core/Cargo.toml ++++ b/vendor/parking_lot_core/Cargo.toml +@@ -61,6 +61,3 @@ version = "0.4" + + [target."cfg(unix)".dependencies.libc] + version = "0.2.95" +- +-[target."cfg(windows)".dependencies.windows-targets] +-version = "0.48.0" +diff --git a/vendor/reqwest/Cargo.toml b/vendor/reqwest/Cargo.toml +index bca6039..c735e2f 100644 +--- a/vendor/reqwest/Cargo.toml ++++ b/vendor/reqwest/Cargo.toml +@@ -443,6 +443,3 @@ features = ["serde-serialize"] + + [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] + version = "0.3" +- +-[target."cfg(windows)".dependencies.winreg] +-version = "0.10" +diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml +index f05faec..970c4a9 100644 +--- a/vendor/rustix/Cargo.toml ++++ b/vendor/rustix/Cargo.toml +@@ -252,20 +252,3 @@ package = "errno" + [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] + version = "1.5.2" + optional = true +- +-[target."cfg(windows)".dependencies.libc_errno] +-version = "0.3.8" +-default-features = false +-package = "errno" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.52.0" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_NetworkManagement_IpHelper", +- "Win32_System_Threading", +-] +- +-[target."cfg(windows)".dev-dependencies.ctor] +-version = "0.2.0" +diff --git a/vendor/same-file/Cargo.toml b/vendor/same-file/Cargo.toml +index 4f66820..11ef472 100644 +--- a/vendor/same-file/Cargo.toml ++++ b/vendor/same-file/Cargo.toml +@@ -25,5 +25,3 @@ license = "Unlicense/MIT" + repository = "https://github.com/BurntSushi/same-file" + [dev-dependencies.doc-comment] + version = "0.3" +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.1" +diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml +index 2cb92d6..52e12d2 100644 +--- a/vendor/snapbox/Cargo.toml ++++ b/vendor/snapbox/Cargo.toml +@@ -161,7 +161,6 @@ cmd = [ + "dep:os_pipe", + "dep:wait-timeout", + "dep:libc", +- "dep:windows-sys", + ] + color = [ + "dep:anstream", +@@ -199,8 +198,3 @@ structured-data = ["dep:serde_json"] + [target."cfg(unix)".dependencies.libc] + version = "0.2.137" + optional = true +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = ["Win32_Foundation"] +-optional = true +diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml +index ec3bc6a..59068eb 100644 +--- a/vendor/socket2/Cargo.toml ++++ b/vendor/socket2/Cargo.toml +@@ -59,10 +59,3 @@ all = [] + [target."cfg(unix)".dependencies.libc] + version = "0.2.149" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "handleapi", +- "ws2ipdef", +- "ws2tcpip", +-] +diff --git a/vendor/stacker/Cargo.toml b/vendor/stacker/Cargo.toml +index 160cbc0..ba02aac 100644 +--- a/vendor/stacker/Cargo.toml ++++ b/vendor/stacker/Cargo.toml +@@ -43,13 +43,3 @@ version = "0.1.7" + + [build-dependencies.cc] + version = "1.0.2" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.6" +-features = [ +- "memoryapi", +- "winbase", +- "fibersapi", +- "processthreadsapi", +- "minwindef", +-] +diff --git a/vendor/sysinfo-0.26.7/Cargo.toml b/vendor/sysinfo-0.26.7/Cargo.toml +index f8719a4..deb2e40 100644 +--- a/vendor/sysinfo-0.26.7/Cargo.toml ++++ b/vendor/sysinfo-0.26.7/Cargo.toml +@@ -60,41 +60,3 @@ version = "1.0" + + [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] + version = "^0.2.112" +- +-[target."cfg(windows)".dependencies.ntapi] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "errhandlingapi", +- "fileapi", +- "handleapi", +- "heapapi", +- "ifdef", +- "ioapiset", +- "minwindef", +- "pdh", +- "psapi", +- "synchapi", +- "sysinfoapi", +- "winbase", +- "winerror", +- "winioctl", +- "winnt", +- "oleauto", +- "wbemcli", +- "rpcdce", +- "combaseapi", +- "objidl", +- "powerbase", +- "netioapi", +- "lmcons", +- "lmaccess", +- "lmapibuf", +- "memoryapi", +- "ntlsa", +- "securitybaseapi", +- "shellapi", +- "std", +-] +diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml +index 2a21a72..d526f46 100644 +--- a/vendor/sysinfo/Cargo.toml ++++ b/vendor/sysinfo/Cargo.toml +@@ -75,44 +75,3 @@ version = "1.0" + + [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] + version = "^0.2.144" +- +-[target."cfg(windows)".dependencies.ntapi] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "errhandlingapi", +- "fileapi", +- "handleapi", +- "heapapi", +- "ifdef", +- "ioapiset", +- "minwindef", +- "pdh", +- "psapi", +- "synchapi", +- "sysinfoapi", +- "winbase", +- "winerror", +- "winioctl", +- "winnt", +- "oleauto", +- "wbemcli", +- "rpcdce", +- "combaseapi", +- "objidl", +- "powerbase", +- "netioapi", +- "lmcons", +- "lmaccess", +- "lmapibuf", +- "memoryapi", +- "ntlsa", +- "securitybaseapi", +- "shellapi", +- "std", +- "iphlpapi", +- "winsock2", +- "sddl", +-] +diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml +index 84ea801..bd37853 100644 +--- a/vendor/tempfile/Cargo.toml ++++ b/vendor/tempfile/Cargo.toml +@@ -50,10 +50,3 @@ features = ["fs"] + + [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] + version = "0.4" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Storage_FileSystem", +- "Win32_Foundation", +-] +diff --git a/vendor/term/Cargo.toml b/vendor/term/Cargo.toml +index e89261e..ad5d62b 100644 +--- a/vendor/term/Cargo.toml ++++ b/vendor/term/Cargo.toml +@@ -28,12 +28,6 @@ version = "2" + + [features] + default = [] +-[target."cfg(windows)".dependencies.rustversion] +-version = "1" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["consoleapi", "wincon", "handleapi", "fileapi"] + [badges.appveyor] + repository = "Stebalien/term" + +diff --git a/vendor/termcolor/Cargo.toml b/vendor/termcolor/Cargo.toml +index dbdb6e8..8edc73e 100644 +--- a/vendor/termcolor/Cargo.toml ++++ b/vendor/termcolor/Cargo.toml +@@ -35,6 +35,3 @@ name = "termcolor" + bench = false + + [dev-dependencies] +- +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.3" +diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml +index f810025..0fbe3a1 100644 +--- a/vendor/terminal_size/Cargo.toml ++++ b/vendor/terminal_size/Cargo.toml +@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size" + [target."cfg(not(windows))".dependencies.rustix] + version = "0.38.0" + features = ["termios"] +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +-] +diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml +index d248f4d..9bd9f37 100644 +--- a/vendor/termize/Cargo.toml ++++ b/vendor/termize/Cargo.toml +@@ -49,8 +49,5 @@ rpath = false + [dependencies] + [target."cfg(unix)".dependencies.libc] + version = "0.2.66" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.8" +-features = ["handleapi", "processenv", "wincon", "winbase"] + [badges.cirrus-ci] + repository = "JohnTitor/termize" +diff --git a/vendor/tokio-native-tls/Cargo.toml b/vendor/tokio-native-tls/Cargo.toml +index 76be3d3..3ada811 100644 +--- a/vendor/tokio-native-tls/Cargo.toml ++++ b/vendor/tokio-native-tls/Cargo.toml +@@ -76,20 +76,3 @@ version = "0.10" + + [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework] + version = "0.2" +- +-[target."cfg(windows)".dev-dependencies.schannel] +-version = "0.1" +- +-[target."cfg(windows)".dev-dependencies.winapi] +-version = "0.3" +-features = [ +- "lmcons", +- "basetsd", +- "minwinbase", +- "minwindef", +- "ntdef", +- "sysinfoapi", +- "timezoneapi", +- "wincrypt", +- "winerror", +-] +diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml +index da1e4d1..55afa86 100644 +--- a/vendor/tokio/Cargo.toml ++++ b/vendor/tokio/Cargo.toml +@@ -122,11 +122,6 @@ net = [ + "mio/os-ext", + "mio/net", + "socket2", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_Security", +- "windows-sys/Win32_Storage_FileSystem", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_System_SystemServices", + ] + process = [ + "bytes", +@@ -135,9 +130,6 @@ process = [ + "mio/os-ext", + "mio/net", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Threading", +- "windows-sys/Win32_System_WindowsProgramming", + ] + rt = [] + rt-multi-thread = [ +@@ -150,8 +142,6 @@ signal = [ + "mio/net", + "mio/os-ext", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Console", + ] + stats = [] + sync = [] +@@ -217,14 +207,3 @@ features = [ + "socket", + ] + default-features = false +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-optional = true +- +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Security_Authorization", +-] +diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml +index b806036..4094678 100644 +--- a/vendor/uuid/Cargo.toml ++++ b/vendor/uuid/Cargo.toml +@@ -185,10 +185,6 @@ version = "0.3" + version = "0.2" + package = "wasm-bindgen" + +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48.0" +-features = ["Win32_System_Com"] +- + [badges.is-it-maintained-issue-resolution] + repository = "uuid-rs/uuid" + +diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml +index 4c29a20..725e320 100644 +--- a/vendor/walkdir/Cargo.toml ++++ b/vendor/walkdir/Cargo.toml +@@ -39,9 +39,6 @@ version = "1.0.1" + [dev-dependencies.doc-comment] + version = "0.3" + +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.1" +- + [badges.appveyor] + repository = "BurntSushi/walkdir" + +diff --git a/vendor/yansi-term/Cargo.toml b/vendor/yansi-term/Cargo.toml +index 0317866..88ce8ef 100644 +--- a/vendor/yansi-term/Cargo.toml ++++ b/vendor/yansi-term/Cargo.toml +@@ -36,9 +36,6 @@ version = "1.0" + + [features] + derive_serde_style = ["serde"] +-[target."cfg(target_os=\"windows\")".dependencies.winapi] +-version = "0.3.4" +-features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"] + [badges.maintenance] + status = "actively-developed" + diff --git a/patches/series b/patches/series new file mode 100644 index 0000000000..4442316041 --- /dev/null +++ b/patches/series @@ -0,0 +1,48 @@ +cargo/c-2002_disable-net-tests.patch +cargo/c-2003-workaround-qemu-vfork-command-not-found.patch +cargo/c-2200-workaround-x32-test.patch +cargo/c-disable-fs-specific-test.patch +cargo/c-0003-tests-add-missing-cross-disabled-checks.patch +cargo/d-0012-cargo-always-return-dev-channel.patch +upstream/u-fix-get-toml-when-test.patch +upstream/u-riscv-disable-unpacked-split-debuginfo.patch +upstream/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch +upstream/u-ignore-ppc-hangs.patch +upstream/u-rustc-llvm-cross-flags.patch +upstream/u-hurd-tests.patch +upstream/d-ignore-test_arc_condvar_poison-ppc.patch +upstream/d-disable-download-tests.patch +prune/d-0000-ignore-removed-submodules.patch +prune/d-0001-pkg-config-no-special-snowflake.patch +prune/d-0002-mdbook-strip-embedded-libs.patch +prune/d-0005-no-jemalloc.patch +prune/d-0010-cargo-remove-vendored-c-crates.patch +prune/d-0011-cargo-remove-nghttp2.patch +prune/d-0020-remove-windows-dependencies.patch +prune/d-0021-vendor-remove-windows-dependencies.patch +vendor/u-hurd-backtrace.patch +vendor/u-hurd-gix-index.patch +vendor/u-hurd-gix-index-2.patch +vendor/u-hurd-libc.3.patch +vendor/u-hurd-libc.4.patch +vendor/u-hurd-libloading-0.7.4.patch +vendor/u-hurd-socket2.patch +vendor/d-0003-cc-psm-rebuild-wasm32.patch +build/d-bootstrap-rustflags.patch +build/d-bootstrap-install-symlinks.patch +build/d-bootstrap-disable-git.patch +build/d-bootstrap-no-assume-tools.patch +build/d-bootstrap-cargo-doc-paths.patch +build/d-bootstrap-use-local-css.patch +build/d-bootstrap-custom-debuginfo-path.patch +build/d-bootstrap-permit-symlink-in-docs.patch +build/d-test-ignore-avx-44056.patch +build/d-armel-fix-lldb.patch +behaviour/d-rust-gdb-paths.patch +behaviour/d-rust-lldb-paths.patch +behaviour/d-rustc-add-soname.patch +behaviour/d-rustc-windows-ssp.patch +behaviour/d-rustc-i686-baseline.patch +behaviour/d-rustdoc-disable-embedded-fonts.patch +ubuntu/ubuntu-disable-ppc64el-asm-tests.patch +ubuntu/ubuntu-ignore-arm-doctest.patch diff --git a/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch b/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch new file mode 100644 index 0000000000..8049a18062 --- /dev/null +++ b/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch @@ -0,0 +1,44 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:41 +0200 +Subject: ubuntu-disable-ppc64el-asm-tests + +Forwarded: not-needed +--- + compiler/rustc_lint/src/builtin.rs | 5 ++++- + compiler/rustc_lint_defs/src/builtin.rs | 2 ++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs +index 045ff38..3472290 100644 +--- a/compiler/rustc_lint/src/builtin.rs ++++ b/compiler/rustc_lint/src/builtin.rs +@@ -2700,7 +2700,10 @@ declare_lint! { + /// ### Example + /// + /// ```rust,compile_fail +- /// # #![feature(asm_experimental_arch)] ++ /// #![cfg_attr( ++ /// not(any(target_arch = "powerpc64", target_arch = "s390x")), ++ /// feature(asm_experimental_arch) ++ /// )] + /// use std::arch::asm; + /// + /// fn main() { +diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs +index f9b6623..b4f5c7b 100644 +--- a/compiler/rustc_lint_defs/src/builtin.rs ++++ b/compiler/rustc_lint_defs/src/builtin.rs +@@ -3046,11 +3046,13 @@ declare_lint! { + /// + /// use std::arch::asm; + /// ++ /// #[cfg(not(any(target_arch = "powerpc64", target_arch = "s390x")))] + /// #[naked] + /// pub fn default_abi() -> u32 { + /// unsafe { asm!("", options(noreturn)); } + /// } + /// ++ /// #[cfg(not(any(target_arch = "powerpc64", target_arch = "s390x")))] + /// #[naked] + /// pub extern "Rust" fn rust_abi() -> u32 { + /// unsafe { asm!("", options(noreturn)); } diff --git a/patches/ubuntu/ubuntu-ignore-arm-doctest.patch b/patches/ubuntu/ubuntu-ignore-arm-doctest.patch new file mode 100644 index 0000000000..4249b18e6c --- /dev/null +++ b/patches/ubuntu/ubuntu-ignore-arm-doctest.patch @@ -0,0 +1,48 @@ +From: Simon Chopin +Date: Thu, 13 Jun 2024 11:16:41 +0200 +Subject: Disable the doctests for the instruction_set errors + +Bug: https://github.com/rust-lang/rust/issues/83453 +Last-Update: 2022-02-23 + +The fix is as described in the upstream issue. +--- + compiler/rustc_error_codes/src/error_codes/E0778.md | 4 ++-- + compiler/rustc_error_codes/src/error_codes/E0779.md | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_error_codes/src/error_codes/E0778.md b/compiler/rustc_error_codes/src/error_codes/E0778.md +index 467362d..d5688c2 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0778.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0778.md +@@ -16,7 +16,7 @@ specified: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] + fn something() {} + ``` + +@@ -25,7 +25,7 @@ or: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::t32))] ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::t32))] + fn something() {} + ``` + +diff --git a/compiler/rustc_error_codes/src/error_codes/E0779.md b/compiler/rustc_error_codes/src/error_codes/E0779.md +index 146e20c..9d23322 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0779.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0779.md +@@ -21,7 +21,7 @@ error. Example: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] // ok! ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] // ok! + pub fn something() {} + fn main() {} + ``` diff --git a/patches/upstream/d-disable-download-tests.patch b/patches/upstream/d-disable-download-tests.patch new file mode 100644 index 0000000000..85700f9999 --- /dev/null +++ b/patches/upstream/d-disable-download-tests.patch @@ -0,0 +1,33 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:39 +0200 +Subject: d-disable-download-tests + +Forwarded: no +--- + src/bootstrap/src/tests/config.rs | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/bootstrap/src/tests/config.rs b/src/bootstrap/src/tests/config.rs +index 6f43234..0f1471d 100644 +--- a/src/bootstrap/src/tests/config.rs ++++ b/src/bootstrap/src/tests/config.rs +@@ -18,6 +18,9 @@ fn parse(config: &str) -> Config { + + #[test] + fn download_ci_llvm() { ++ // Debian: this will attempt to download LLVM ++ return; ++ + if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) { + eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change"); + return; +@@ -46,6 +49,9 @@ fn download_ci_llvm() { + // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 + #[test] + fn detect_src_and_out() { ++ // Debian: this will attempt to download a toolchain ++ return; ++ + fn test(cfg: Config, build_dir: Option<&str>) { + // This will bring absolute form of `src/bootstrap` path + let current_dir = std::env::current_dir().unwrap(); diff --git a/patches/upstream/d-ignore-test_arc_condvar_poison-ppc.patch b/patches/upstream/d-ignore-test_arc_condvar_poison-ppc.patch new file mode 100644 index 0000000000..491e51bf39 --- /dev/null +++ b/patches/upstream/d-ignore-test_arc_condvar_poison-ppc.patch @@ -0,0 +1,21 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:39 +0200 +Subject: d-ignore-test_arc_condvar_poison-ppc + +Forwarded: no +--- + library/std/src/sync/mutex/tests.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/tests.rs +index 1786a3c..812ec51 100644 +--- a/library/std/src/sync/mutex/tests.rs ++++ b/library/std/src/sync/mutex/tests.rs +@@ -145,6 +145,7 @@ fn test_mutex_arc_condvar() { + } + } + ++#[cfg(not(target_arch = "powerpc"))] + #[test] + fn test_arc_condvar_poison() { + let packet = Packet(Arc::new((Mutex::new(1), Condvar::new()))); diff --git a/patches/upstream/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch b/patches/upstream/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch new file mode 100644 index 0000000000..905b2b0759 --- /dev/null +++ b/patches/upstream/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch @@ -0,0 +1,47 @@ +From: Josh Stone +Date: Mon, 8 Apr 2024 15:04:44 -0700 +Subject: [PATCH] Fix UI tests with dist-vendored dependencies + +There is already a workaround in `compiletest` to deal with custom +`CARGO_HOME` using `-Zignore-directory-in-diagnostics-source-blocks={}`. +A similar need exists when dependencies come from the local `vendor` +directory, which distro builds often use, so now we ignore that too. + +Also, `issue-21763.rs` was normalizing `hashbrown-` paths, presumably +expecting a version suffix, but the vendored path doesn't include the +version. Now that matches `[\\/]hashbrown` instead. + +Forwarded: yes +--- + src/tools/compiletest/src/runtest.rs | 5 +++++ + tests/ui/issues/issue-21763.rs | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs +index 5d53a4d..9bb30ad 100644 +--- a/src/tools/compiletest/src/runtest.rs ++++ b/src/tools/compiletest/src/runtest.rs +@@ -2342,6 +2342,11 @@ impl<'test> TestCx<'test> { + "ignore-directory-in-diagnostics-source-blocks={}", + home::cargo_home().expect("failed to find cargo home").to_str().unwrap() + )); ++ // Similarly, vendored sources shouldn't be shown when running from a dist tarball. ++ rustc.arg("-Z").arg(format!( ++ "ignore-directory-in-diagnostics-source-blocks={}", ++ self.config.find_rust_src_root().unwrap().join("vendor").display(), ++ )); + + // Optionally prevent default --sysroot if specified in test compile-flags. + if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot")) +diff --git a/tests/ui/issues/issue-21763.rs b/tests/ui/issues/issue-21763.rs +index 38103ff..cc1a006 100644 +--- a/tests/ui/issues/issue-21763.rs ++++ b/tests/ui/issues/issue-21763.rs +@@ -1,6 +1,6 @@ + // Regression test for HashMap only impl'ing Send/Sync if its contents do + +-// normalize-stderr-test: "\S+hashbrown-\S+" -> "$$HASHBROWN_SRC_LOCATION" ++// normalize-stderr-test: "\S+[\\/]hashbrown\S+" -> "$$HASHBROWN_SRC_LOCATION" + + use std::collections::HashMap; + use std::rc::Rc; diff --git a/patches/upstream/u-fix-get-toml-when-test.patch b/patches/upstream/u-fix-get-toml-when-test.patch new file mode 100644 index 0000000000..cbe054b73c --- /dev/null +++ b/patches/upstream/u-fix-get-toml-when-test.patch @@ -0,0 +1,54 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: Fix get_toml() when cfg(test) + +Bug: https://github.com/rust-lang/rust/issues/105766 +Last-Update: 2023-03-29 + +When cfg(test), Config::parse doesn't parse a config.toml but uses default +values, failing when the initial rustc is needed. This is a workaround before +upstream issue gets solved. +Last-Update: 2023-03-29 +--- + src/bootstrap/src/core/config/config.rs | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index f1e1b89..738d2e1 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -1180,8 +1180,32 @@ impl Config { + + pub fn parse(args: &[String]) -> Config { + #[cfg(test)] +- fn get_toml(_: &Path) -> TomlConfig { +- TomlConfig::default() ++ fn get_toml(file: &Path) -> TomlConfig { ++ // Debian: We use previous version as a custom rustc, which ++ // unfortunately won't be picked up because config.toml isn't ++ // read when cfg!(test). Making tests use the entirety of our ++ // config.toml isn't feasible either as it panicks on ++ // GitRepo::Llvm (d-bootstrap-custom-debuginfo-path.patch), so ++ // only give paths of initial rustc and cargo. ++ let contents = ++ t!(fs::read_to_string(file), format!("config file {} not found", file.display())); ++ // Deserialize to Value and then TomlConfig to prevent the Deserialize impl of ++ // TomlConfig and sub types to be monomorphized 5x by toml. ++ toml::from_str(&contents) ++ .and_then(|table: toml::Value| TomlConfig::deserialize(table)) ++ .map(|table| { ++ let mut config = TomlConfig::default(); ++ let mut build = Build::default(); ++ let cbuild = table.build.unwrap(); ++ build.rustc = cbuild.rustc; ++ build.cargo = cbuild.cargo; ++ config.build = Some(build); ++ config ++ }) ++ .unwrap_or_else(|err| { ++ eprintln!("failed to parse TOML configuration '{}': {err}", file.display()); ++ crate::detail_exit(2); ++ }) + } + + #[cfg(not(test))] diff --git a/patches/upstream/u-hurd-tests.patch b/patches/upstream/u-hurd-tests.patch new file mode 100644 index 0000000000..3f2740f324 --- /dev/null +++ b/patches/upstream/u-hurd-tests.patch @@ -0,0 +1,64 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:39 +0200 +Subject: These tests hang or make the box OOM + +Forwarded: no +--- + tests/run-make/long-linker-command-lines/foo.rs | 7 +++++++ + tests/ui/associated-consts/issue-93775.rs | 1 + + tests/ui/issues/issue-74564-if-expr-stack-overflow.rs | 1 + + tests/ui/threads-sendsync/mpsc_stress.rs | 1 + + 4 files changed, 10 insertions(+) + +diff --git a/tests/run-make/long-linker-command-lines/foo.rs b/tests/run-make/long-linker-command-lines/foo.rs +index db238c0..c8ad6b8 100644 +--- a/tests/run-make/long-linker-command-lines/foo.rs ++++ b/tests/run-make/long-linker-command-lines/foo.rs +@@ -44,6 +44,13 @@ fn read_linker_args(path: &Path) -> String { + } + } + ++#[cfg(target_os = "hurd")] ++// Debian: test causes build to fail on hurd ++fn main() { ++ return; ++} ++ ++#[cfg(not(target_os = "hurd"))] + fn main() { + let tmpdir = PathBuf::from(env::var_os("TMPDIR").unwrap()); + let ok = tmpdir.join("ok"); +diff --git a/tests/ui/associated-consts/issue-93775.rs b/tests/ui/associated-consts/issue-93775.rs +index db788fe..ae4a64e 100644 +--- a/tests/ui/associated-consts/issue-93775.rs ++++ b/tests/ui/associated-consts/issue-93775.rs +@@ -1,5 +1,6 @@ + // build-pass + // ignore-tidy-linelength ++// ignore-hurd + + // Regression for #93775, needs build-pass to test it. + +diff --git a/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs +index 36e9932..19c04b6 100644 +--- a/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs ++++ b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs +@@ -1,5 +1,6 @@ + // build-pass + // ignore-tidy-filelength ++// ignore-hurd + #![crate_type = "rlib"] + + fn banana(v: &str) -> u32 { +diff --git a/tests/ui/threads-sendsync/mpsc_stress.rs b/tests/ui/threads-sendsync/mpsc_stress.rs +index c2e1912..a0e7b6d 100644 +--- a/tests/ui/threads-sendsync/mpsc_stress.rs ++++ b/tests/ui/threads-sendsync/mpsc_stress.rs +@@ -1,6 +1,7 @@ + // run-pass + // compile-flags:--test + // ignore-emscripten ++// ignore-hurd + + use std::sync::mpsc::channel; + use std::sync::mpsc::TryRecvError; diff --git a/patches/upstream/u-ignore-ppc-hangs.patch b/patches/upstream/u-ignore-ppc-hangs.patch new file mode 100644 index 0000000000..f2311225a3 --- /dev/null +++ b/patches/upstream/u-ignore-ppc-hangs.patch @@ -0,0 +1,34 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:37 +0200 +Subject: u-ignore-ppc-hangs + +Bug: https://github.com/rust-lang/rust/issues/89607 +--- + library/alloc/tests/arc.rs | 1 + + library/alloc/tests/rc.rs | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/library/alloc/tests/arc.rs b/library/alloc/tests/arc.rs +index d564a30..b607abc 100644 +--- a/library/alloc/tests/arc.rs ++++ b/library/alloc/tests/arc.rs +@@ -95,6 +95,7 @@ const SHARED_ITER_MAX: u16 = 100; + + fn assert_trusted_len(_: &I) {} + ++#[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))] + #[test] + fn shared_from_iter_normal() { + // Exercise the base implementation for non-`TrustedLen` iterators. +diff --git a/library/alloc/tests/rc.rs b/library/alloc/tests/rc.rs +index 499740e..e418a7d 100644 +--- a/library/alloc/tests/rc.rs ++++ b/library/alloc/tests/rc.rs +@@ -91,6 +91,7 @@ const SHARED_ITER_MAX: u16 = 100; + + fn assert_trusted_len(_: &I) {} + ++#[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))] + #[test] + fn shared_from_iter_normal() { + // Exercise the base implementation for non-`TrustedLen` iterators. diff --git a/patches/upstream/u-riscv-disable-unpacked-split-debuginfo.patch b/patches/upstream/u-riscv-disable-unpacked-split-debuginfo.patch new file mode 100644 index 0000000000..ced256d186 --- /dev/null +++ b/patches/upstream/u-riscv-disable-unpacked-split-debuginfo.patch @@ -0,0 +1,120 @@ +From: kxxt +Date: Wed, 31 Jan 2024 09:02:18 +0800 +Subject: [PATCH] riscv only supports split_debuginfo=off for now + +Disable packed/unpacked options for riscv linux/android. +Other riscv targets already only have the off option. + +The packed/unpacked options might be supported in the future. +See upstream issue for more details: +https://github.com/llvm/llvm-project/issues/56642 + +Bug: https://github.com/rust-lang/rust/issues/110224 +--- + .../rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs | 5 ++++- + .../rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs | 5 ++++- + compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs | 5 ++++- + .../rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs | 5 ++++- + .../rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs | 5 ++++- + 5 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs +index 06e8f18..0be32cb 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; ++use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { + features: "+m,+a,+f,+d,+c".into(), + llvm_abiname: "ilp32d".into(), + max_atomic_width: Some(32), ++ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), + ..base::linux_gnu::opts() + }, + } +diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs +index 722703d..cfa9990 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; ++use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { + features: "+m,+a,+f,+d,+c".into(), + llvm_abiname: "ilp32d".into(), + max_atomic_width: Some(32), ++ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), + ..base::linux_musl::opts() + }, + } +diff --git a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs +index 40e447d..762197d 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, SanitizerSet, Target, TargetOptions}; ++use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +@@ -13,6 +15,7 @@ pub fn target() -> Target { + llvm_abiname: "lp64d".into(), + supported_sanitizers: SanitizerSet::ADDRESS, + max_atomic_width: Some(64), ++ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), + ..base::android::opts() + }, + } +diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs +index c0969d4..e71929a 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; ++use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { + features: "+m,+a,+f,+d,+c".into(), + llvm_abiname: "lp64d".into(), + max_atomic_width: Some(64), ++ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), + ..base::linux_gnu::opts() + }, + } +diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs +index 656e260..8ea28d6 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; ++use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { + features: "+m,+a,+f,+d,+c".into(), + llvm_abiname: "lp64d".into(), + max_atomic_width: Some(64), ++ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), + ..base::linux_musl::opts() + }, + } diff --git a/patches/upstream/u-rustc-llvm-cross-flags.patch b/patches/upstream/u-rustc-llvm-cross-flags.patch new file mode 100644 index 0000000000..22f59eab24 --- /dev/null +++ b/patches/upstream/u-rustc-llvm-cross-flags.patch @@ -0,0 +1,22 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:37 +0200 +Subject: u-rustc-llvm-cross-flags + +=================================================================== +--- + compiler/rustc_llvm/build.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs +index 4b0c122..77baa7b 100644 +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -319,7 +319,7 @@ fn main() { + if let Some(stripped) = lib.strip_prefix("-LIBPATH:") { + println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); + } else if let Some(stripped) = lib.strip_prefix("-L") { +- println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); ++ if stripped.contains(&host) { println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); } + } + } else if let Some(stripped) = lib.strip_prefix("-LIBPATH:") { + println!("cargo:rustc-link-search=native={stripped}"); diff --git a/patches/vendor/d-0003-cc-psm-rebuild-wasm32.patch b/patches/vendor/d-0003-cc-psm-rebuild-wasm32.patch new file mode 100644 index 0000000000..9c78f792b3 --- /dev/null +++ b/patches/vendor/d-0003-cc-psm-rebuild-wasm32.patch @@ -0,0 +1,49 @@ +From: Debian Rust Maintainers +Date: Sat, 2 Oct 2021 01:08:00 +0100 +Subject: d-0003-cc-psm-rebuild-wasm32 + +Forwarded: not-needed +--- + vendor/cc-1.0.79/src/lib.rs | 2 +- + vendor/psm/build.rs | 7 ++----- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/vendor/cc-1.0.79/src/lib.rs b/vendor/cc-1.0.79/src/lib.rs +index abc5d7a..cc1cecc 100644 +--- a/vendor/cc-1.0.79/src/lib.rs ++++ b/vendor/cc-1.0.79/src/lib.rs +@@ -2407,7 +2407,7 @@ impl Build { + || target == "wasm32-unknown-wasi" + || target == "wasm32-unknown-unknown" + { +- "clang".to_string() ++ "rust-clang".to_string() + } else if target.contains("vxworks") { + if self.cpp { + "wr-c++".to_string() +diff --git a/vendor/psm/build.rs b/vendor/psm/build.rs +index 9d40212..e39549d 100644 +--- a/vendor/psm/build.rs ++++ b/vendor/psm/build.rs +@@ -50,7 +50,7 @@ fn find_assembly( + ("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)), + ("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)), + ("riscv64", _, _, _) => Some(("src/arch/riscv64.s", true)), +- ("wasm32", _, _, _) => Some(("src/arch/wasm32.o", true)), ++ ("wasm32", _, _, _) => Some(("src/arch/wasm32.s", true)), + ("loongarch64", _, _, _) => Some(("src/arch/loongarch64.s", true)), + _ => None, + } +@@ -97,11 +97,8 @@ fn main() { + cfg.define(&*format!("CFG_TARGET_ENV_{}", env), None); + } + +- // For wasm targets we ship a precompiled `*.o` file so we just pass that +- // directly to `ar` to assemble an archive. Otherwise we're actually +- // compiling the source assembly file. + if asm.ends_with(".o") { +- cfg.object(asm); ++ panic!("Debian does not allow embedded object files in source code") + } else { + cfg.file(asm); + } diff --git a/patches/vendor/u-hurd-backtrace.patch b/patches/vendor/u-hurd-backtrace.patch new file mode 100644 index 0000000000..b4af54f872 --- /dev/null +++ b/patches/vendor/u-hurd-backtrace.patch @@ -0,0 +1,77 @@ +From: Samuel Thibault +Date: Sat, 7 Oct 2023 01:45:09 +0200 +Subject: u-hurd-backtrace + +Forwarded: https://github.com/rust-lang/backtrace-rs/pull/567 + +Subject: Add GNU/Hurd support (rust-lang/backtrace-rs#567) +--- + vendor/backtrace/src/symbolize/gimli.rs | 2 ++ + vendor/backtrace/src/symbolize/gimli/elf.rs | 2 +- + .../src/symbolize/gimli/libs_dl_iterate_phdr.rs | 20 ++++++++++++-------- + 3 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/vendor/backtrace/src/symbolize/gimli.rs b/vendor/backtrace/src/symbolize/gimli.rs +index 7f1c6a5..6a9402c 100644 +--- a/vendor/backtrace/src/symbolize/gimli.rs ++++ b/vendor/backtrace/src/symbolize/gimli.rs +@@ -35,6 +35,7 @@ cfg_if::cfg_if! { + target_os = "freebsd", + target_os = "fuchsia", + target_os = "haiku", ++ target_os = "hurd", + target_os = "ios", + target_os = "linux", + target_os = "macos", +@@ -218,6 +219,7 @@ cfg_if::cfg_if! { + target_os = "linux", + target_os = "fuchsia", + target_os = "freebsd", ++ target_os = "hurd", + target_os = "openbsd", + target_os = "netbsd", + all(target_os = "android", feature = "dl_iterate_phdr"), +diff --git a/vendor/backtrace/src/symbolize/gimli/elf.rs b/vendor/backtrace/src/symbolize/gimli/elf.rs +index b0eec07..906a300 100644 +--- a/vendor/backtrace/src/symbolize/gimli/elf.rs ++++ b/vendor/backtrace/src/symbolize/gimli/elf.rs +@@ -308,7 +308,7 @@ const DEBUG_PATH: &[u8] = b"/usr/lib/debug"; + + fn debug_path_exists() -> bool { + cfg_if::cfg_if! { +- if #[cfg(any(target_os = "freebsd", target_os = "linux"))] { ++ if #[cfg(any(target_os = "freebsd", target_os = "hurd", target_os = "linux"))] { + use core::sync::atomic::{AtomicU8, Ordering}; + static DEBUG_PATH_EXISTS: AtomicU8 = AtomicU8::new(0); + +diff --git a/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs b/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs +index 9f0304c..518512f 100644 +--- a/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs ++++ b/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs +@@ -18,14 +18,18 @@ pub(super) fn native_libraries() -> Vec { + } + + fn infer_current_exe(base_addr: usize) -> OsString { +- if let Ok(entries) = super::parse_running_mmaps::parse_maps() { +- let opt_path = entries +- .iter() +- .find(|e| e.ip_matches(base_addr) && e.pathname().len() > 0) +- .map(|e| e.pathname()) +- .cloned(); +- if let Some(path) = opt_path { +- return path; ++ cfg_if::cfg_if! { ++ if #[cfg(not(target_os = "hurd"))] { ++ if let Ok(entries) = super::parse_running_mmaps::parse_maps() { ++ let opt_path = entries ++ .iter() ++ .find(|e| e.ip_matches(base_addr) && e.pathname().len() > 0) ++ .map(|e| e.pathname()) ++ .cloned(); ++ if let Some(path) = opt_path { ++ return path; ++ } ++ } + } + } + env::current_exe().map(|e| e.into()).unwrap_or_default() diff --git a/patches/vendor/u-hurd-gix-index-2.patch b/patches/vendor/u-hurd-gix-index-2.patch new file mode 100644 index 0000000000..d902b48517 --- /dev/null +++ b/patches/vendor/u-hurd-gix-index-2.patch @@ -0,0 +1,29 @@ +From: Debian Rust Maintainers +Date: Wed, 19 Jun 2024 07:48:44 +0200 +Subject: u-hurd-gix-index-2 + +=================================================================== +--- + vendor/gix-index/src/fs.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/vendor/gix-index/src/fs.rs b/vendor/gix-index/src/fs.rs +index 493d4e1..cc89fd5 100644 +--- a/vendor/gix-index/src/fs.rs ++++ b/vendor/gix-index/src/fs.rs +@@ -115,10 +115,14 @@ impl Metadata { + + /// Return the device id on which the file is located, or 0 on windows. + pub fn dev(&self) -> u64 { +- #[cfg(not(windows))] ++ #[cfg(all(not(windows), not(host_os = "hurd")))] + { + self.0.st_dev as u64 + } ++ #[cfg(host_os = "hurd")] ++ { ++ self.0.st_fsid as u64 ++ } + #[cfg(windows)] + 0 + } diff --git a/patches/vendor/u-hurd-gix-index.patch b/patches/vendor/u-hurd-gix-index.patch new file mode 100644 index 0000000000..8341c15c6d --- /dev/null +++ b/patches/vendor/u-hurd-gix-index.patch @@ -0,0 +1,96 @@ +From: Various +Date: Wed, 19 Jun 2024 07:49:55 +0200 +Subject: u-hurd-gix-index + +commit 569caa0314599c93651d9116d00fde64b81d2ace +Author: Qiu Chaofan +Date: Wed Dec 20 13:11:52 2023 +0800 + + fix: use correct fields for ctime and mtime on AIX + + On AIX, ctime and mtime are structs containing seconds and nanoseconds. + +commit 6fc27ee8f5ae7ce9fe7e6d07c5c31719cb6b7b1b +Author: Josh Triplett +Date: Sat Jan 13 16:54:33 2024 -0800 + + Avoid using #[cfg] on multiple individual function arguments + + Attaching #[cfg] to individual arguments makes it look like the function + has five conditionally present arguments, and doesn't make it + immediately apparent that the first two are for the first argument and + the last three are for the second argument. + + Split them into separate `let` statements for clarity. + + In the process, factor out the common `.try_into().ok()?` from each. + +commit daf3844c8f5ce6d0812e35677b1a46d568e226db +Author: Samuel Thibault +Date: Sun May 26 21:13:40 2024 +0200 + + hurd: fix accessing st_[mc]time + + GNU/Hurd uses a st_[mc]tim timespec, like aix +--- + vendor/gix-index/src/fs.rs | 38 ++++++++++++++++++++++++++++---------- + 1 file changed, 28 insertions(+), 10 deletions(-) + +diff --git a/vendor/gix-index/src/fs.rs b/vendor/gix-index/src/fs.rs +index fad21cc..493d4e1 100644 +--- a/vendor/gix-index/src/fs.rs ++++ b/vendor/gix-index/src/fs.rs +@@ -54,12 +54,21 @@ impl Metadata { + pub fn modified(&self) -> Option { + #[cfg(not(windows))] + { ++ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] ++ let seconds = self.0.st_mtime; ++ #[cfg(any(target_os = "aix", target_os = "hurd"))] ++ let seconds = self.0.st_mtim.tv_sec; ++ ++ #[cfg(not(any(target_os = "netbsd", target_os = "aix", target_os = "hurd")))] ++ let nanoseconds = self.0.st_mtime_nsec; ++ #[cfg(target_os = "netbsd")] ++ let nanoseconds = self.0.st_mtimensec; ++ #[cfg(any(target_os = "aix", target_os = "hurd"))] ++ let nanoseconds = self.0.st_mtim.tv_nsec; ++ + Some(system_time_from_secs_nanos( +- self.0.st_mtime.try_into().ok()?, +- #[cfg(not(target_os = "netbsd"))] +- self.0.st_mtime_nsec.try_into().ok()?, +- #[cfg(target_os = "netbsd")] +- self.0.st_mtimensec.try_into().ok()?, ++ seconds.try_into().ok()?, ++ nanoseconds.try_into().ok()?, + )) + } + #[cfg(windows)] +@@ -73,12 +82,21 @@ impl Metadata { + pub fn created(&self) -> Option { + #[cfg(not(windows))] + { ++ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] ++ let seconds = self.0.st_ctime; ++ #[cfg(any(target_os = "aix", target_os = "hurd"))] ++ let seconds = self.0.st_ctim.tv_sec; ++ ++ #[cfg(not(any(target_os = "netbsd", target_os = "aix", target_os = "hurd")))] ++ let nanoseconds = self.0.st_ctime_nsec; ++ #[cfg(target_os = "netbsd")] ++ let nanoseconds = self.0.st_ctimensec; ++ #[cfg(any(target_os = "aix", target_os = "hurd"))] ++ let nanoseconds = self.0.st_ctim.tv_nsec; ++ + Some(system_time_from_secs_nanos( +- self.0.st_ctime.try_into().ok()?, +- #[cfg(not(target_os = "netbsd"))] +- self.0.st_ctime_nsec.try_into().ok()?, +- #[cfg(target_os = "netbsd")] +- self.0.st_ctimensec.try_into().ok()?, ++ seconds.try_into().ok()?, ++ nanoseconds.try_into().ok()?, + )) + } + #[cfg(windows)] diff --git a/patches/vendor/u-hurd-libc.3.patch b/patches/vendor/u-hurd-libc.3.patch new file mode 100644 index 0000000000..2d14daf98a --- /dev/null +++ b/patches/vendor/u-hurd-libc.3.patch @@ -0,0 +1,2296 @@ +From: Samuel Thibault +Date: Thu, 9 Nov 2023 03:34:21 +0100 +Subject: hurd: Complete C API interface This aligns it on what can be + found for linux. + +--- + vendor/libc/src/unix/hurd/b32.rs | 2 + + vendor/libc/src/unix/hurd/b64.rs | 2 + + vendor/libc/src/unix/hurd/mod.rs | 1902 ++++++++++++++++++++++++++++++++------ + 3 files changed, 1647 insertions(+), 259 deletions(-) + +diff --git a/vendor/libc/src/unix/hurd/b32.rs b/vendor/libc/src/unix/hurd/b32.rs +index 7e83ed93..7e82a91 100644 +--- a/vendor/libc/src/unix/hurd/b32.rs ++++ b/vendor/libc/src/unix/hurd/b32.rs +@@ -25,6 +25,8 @@ pub type __ulong32_type = ::c_ulong; + pub type __s64_type = ::__int64_t; + pub type __u64_type = ::__uint64_t; + ++pub type __ipc_pid_t = ::c_ushort; ++ + pub type Elf32_Half = u16; + pub type Elf32_Word = u32; + pub type Elf32_Off = u32; +diff --git a/vendor/libc/src/unix/hurd/b64.rs b/vendor/libc/src/unix/hurd/b64.rs +index 3b171f1..e2e502a 100644 +--- a/vendor/libc/src/unix/hurd/b64.rs ++++ b/vendor/libc/src/unix/hurd/b64.rs +@@ -25,6 +25,8 @@ pub type __ulong32_type = ::c_uint; + pub type __s64_type = ::c_long; + pub type __u64_type = ::c_ulong; + ++pub type __ipc_pid_t = ::c_int; ++ + pub type Elf64_Half = u16; + pub type Elf64_Word = u32; + pub type Elf64_Off = u64; +diff --git a/vendor/libc/src/unix/hurd/mod.rs b/vendor/libc/src/unix/hurd/mod.rs +index 05d7585..75a272e 100644 +--- a/vendor/libc/src/unix/hurd/mod.rs ++++ b/vendor/libc/src/unix/hurd/mod.rs +@@ -215,6 +215,10 @@ pub type tcp_ca_state = ::c_uint; + + pub type idtype_t = ::c_uint; + ++pub type regoff_t = ::c_int; ++ ++pub type iconv_t = *mut ::c_void; ++ + // structs + s! { + pub struct ip_mreq { +@@ -228,6 +232,12 @@ s! { + pub imr_ifindex: ::c_int, + } + ++ pub struct ip_mreq_source { ++ pub imr_multiaddr: in_addr, ++ pub imr_interface: in_addr, ++ pub imr_sourceaddr: in_addr, ++ } ++ + pub struct sockaddr { + pub sa_len: ::c_uchar, + pub sa_family: sa_family_t, +@@ -322,6 +332,12 @@ s! { + pub msg_flags: ::c_int, + } + ++ pub struct cmsghdr { ++ pub cmsg_len: ::socklen_t, ++ pub cmsg_level: ::c_int, ++ pub cmsg_type: ::c_int, ++ } ++ + pub struct dirent { + pub d_ino: __ino_t, + pub d_reclen: ::c_ushort, +@@ -343,13 +359,39 @@ s! { + } + + pub struct termios { +- pub c_iflag: tcflag_t, +- pub c_oflag: tcflag_t, +- pub c_cflag: tcflag_t, +- pub c_lflag: tcflag_t, +- pub c_cc: [cc_t; 20usize], +- pub __ispeed: speed_t, +- pub __ospeed: speed_t, ++ pub c_iflag: ::tcflag_t, ++ pub c_oflag: ::tcflag_t, ++ pub c_cflag: ::tcflag_t, ++ pub c_lflag: ::tcflag_t, ++ pub c_cc: [::cc_t; 20usize], ++ pub __ispeed: ::speed_t, ++ pub __ospeed: ::speed_t, ++ } ++ ++ pub struct mallinfo { ++ pub arena: ::c_int, ++ pub ordblks: ::c_int, ++ pub smblks: ::c_int, ++ pub hblks: ::c_int, ++ pub hblkhd: ::c_int, ++ pub usmblks: ::c_int, ++ pub fsmblks: ::c_int, ++ pub uordblks: ::c_int, ++ pub fordblks: ::c_int, ++ pub keepcost: ::c_int, ++ } ++ ++ pub struct mallinfo2 { ++ pub arena: ::size_t, ++ pub ordblks: ::size_t, ++ pub smblks: ::size_t, ++ pub hblks: ::size_t, ++ pub hblkhd: ::size_t, ++ pub usmblks: ::size_t, ++ pub fsmblks: ::size_t, ++ pub uordblks: ::size_t, ++ pub fordblks: ::size_t, ++ pub keepcost: ::size_t, + } + + pub struct sigaction { +@@ -429,6 +471,36 @@ s! { + pub st_spare: [::c_int; 8usize], + } + ++ pub struct statx { ++ pub stx_mask: u32, ++ pub stx_blksize: u32, ++ pub stx_attributes: u64, ++ pub stx_nlink: u32, ++ pub stx_uid: u32, ++ pub stx_gid: u32, ++ pub stx_mode: u16, ++ __statx_pad1: [u16; 1], ++ pub stx_ino: u64, ++ pub stx_size: u64, ++ pub stx_blocks: u64, ++ pub stx_attributes_mask: u64, ++ pub stx_atime: ::statx_timestamp, ++ pub stx_btime: ::statx_timestamp, ++ pub stx_ctime: ::statx_timestamp, ++ pub stx_mtime: ::statx_timestamp, ++ pub stx_rdev_major: u32, ++ pub stx_rdev_minor: u32, ++ pub stx_dev_major: u32, ++ pub stx_dev_minor: u32, ++ __statx_pad2: [u64; 14], ++ } ++ ++ pub struct statx_timestamp { ++ pub tv_sec: i64, ++ pub tv_nsec: u32, ++ pub __statx_timestamp_pad1: [i32; 1], ++ } ++ + pub struct statfs { + pub f_type: ::c_uint, + pub f_bsize: ::c_ulong, +@@ -493,6 +565,24 @@ s! { + pub f_spare: [::c_uint; 3usize], + } + ++ pub struct aiocb { ++ pub aio_fildes: ::c_int, ++ pub aio_lio_opcode: ::c_int, ++ pub aio_reqprio: ::c_int, ++ pub aio_buf: *mut ::c_void, ++ pub aio_nbytes: ::size_t, ++ pub aio_sigevent: ::sigevent, ++ __next_prio: *mut aiocb, ++ __abs_prio: ::c_int, ++ __policy: ::c_int, ++ __error_code: ::c_int, ++ __return_value: ::ssize_t, ++ pub aio_offset: off_t, ++ #[cfg(all(not(target_arch = "x86_64"), target_pointer_width = "32"))] ++ __unused1: [::c_char; 4], ++ __glibc_reserved: [::c_char; 32] ++ } ++ + #[cfg_attr(target_pointer_width = "32", + repr(align(4)))] + #[cfg_attr(target_pointer_width = "64", +@@ -549,7 +639,7 @@ s! { + } + + pub struct __pthread_attr { +- pub __schedparam: __sched_param, ++ pub __schedparam: sched_param, + pub __stackaddr: *mut ::c_void, + pub __stacksize: size_t, + pub __guardsize: size_t, +@@ -578,12 +668,25 @@ s! { + pub __data: *mut ::c_void, + } + ++ pub struct seminfo { ++ pub semmap: ::c_int, ++ pub semmni: ::c_int, ++ pub semmns: ::c_int, ++ pub semmnu: ::c_int, ++ pub semmsl: ::c_int, ++ pub semopm: ::c_int, ++ pub semume: ::c_int, ++ pub semusz: ::c_int, ++ pub semvmx: ::c_int, ++ pub semaem: ::c_int, ++ } ++ + pub struct _IO_FILE { + _unused: [u8; 0], + } + +- pub struct __sched_param { +- pub __sched_priority: ::c_int, ++ pub struct sched_param { ++ pub sched_priority: ::c_int, + } + + pub struct iovec { +@@ -601,6 +704,23 @@ s! { + pub pw_shell: *mut ::c_char, + } + ++ pub struct spwd { ++ pub sp_namp: *mut ::c_char, ++ pub sp_pwdp: *mut ::c_char, ++ pub sp_lstchg: ::c_long, ++ pub sp_min: ::c_long, ++ pub sp_max: ::c_long, ++ pub sp_warn: ::c_long, ++ pub sp_inact: ::c_long, ++ pub sp_expire: ::c_long, ++ pub sp_flag: ::c_ulong, ++ } ++ ++ pub struct itimerspec { ++ pub it_interval: ::timespec, ++ pub it_value: ::timespec, ++ } ++ + pub struct tm { + pub tm_sec: ::c_int, + pub tm_min: ::c_int, +@@ -649,6 +769,59 @@ s! { + pub dli_saddr: *mut ::c_void, + } + ++ pub struct ifaddrs { ++ pub ifa_next: *mut ifaddrs, ++ pub ifa_name: *mut c_char, ++ pub ifa_flags: ::c_uint, ++ pub ifa_addr: *mut ::sockaddr, ++ pub ifa_netmask: *mut ::sockaddr, ++ pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union ++ pub ifa_data: *mut ::c_void ++ } ++ ++ pub struct arpreq { ++ pub arp_pa: ::sockaddr, ++ pub arp_ha: ::sockaddr, ++ pub arp_flags: ::c_int, ++ pub arp_netmask: ::sockaddr, ++ pub arp_dev: [::c_char; 16], ++ } ++ ++ pub struct arpreq_old { ++ pub arp_pa: ::sockaddr, ++ pub arp_ha: ::sockaddr, ++ pub arp_flags: ::c_int, ++ pub arp_netmask: ::sockaddr, ++ } ++ ++ pub struct arphdr { ++ pub ar_hrd: u16, ++ pub ar_pro: u16, ++ pub ar_hln: u8, ++ pub ar_pln: u8, ++ pub ar_op: u16, ++ } ++ ++ pub struct arpd_request { ++ pub req: ::c_ushort, ++ pub ip: u32, ++ pub dev: ::c_ulong, ++ pub stamp: ::c_ulong, ++ pub updated: ::c_ulong, ++ pub ha: [::c_uchar; ::MAX_ADDR_LEN], ++ } ++ ++ pub struct mmsghdr { ++ pub msg_hdr: ::msghdr, ++ pub msg_len: ::c_uint, ++ } ++ ++ pub struct ifreq { ++ /// interface name, e.g. "en0" ++ pub ifr_name: [::c_char; ::IFNAMSIZ], ++ pub ifr_ifru: ::sockaddr, ++ } ++ + pub struct __locale_struct { + pub __locales: [*mut __locale_data; 13usize], + pub __ctype_b: *const ::c_ushort, +@@ -715,6 +888,114 @@ s! { + pub l_len : __off64_t, + pub l_pid : __pid_t, + } ++ ++ pub struct glob_t { ++ pub gl_pathc: ::size_t, ++ pub gl_pathv: *mut *mut c_char, ++ pub gl_offs: ::size_t, ++ pub gl_flags: ::c_int, ++ ++ __unused1: *mut ::c_void, ++ __unused2: *mut ::c_void, ++ __unused3: *mut ::c_void, ++ __unused4: *mut ::c_void, ++ __unused5: *mut ::c_void, ++ } ++ ++ pub struct glob64_t { ++ pub gl_pathc: ::size_t, ++ pub gl_pathv: *mut *mut ::c_char, ++ pub gl_offs: ::size_t, ++ pub gl_flags: ::c_int, ++ ++ __unused1: *mut ::c_void, ++ __unused2: *mut ::c_void, ++ __unused3: *mut ::c_void, ++ __unused4: *mut ::c_void, ++ __unused5: *mut ::c_void, ++ } ++ ++ pub struct regex_t { ++ __buffer: *mut ::c_void, ++ __allocated: ::size_t, ++ __used: ::size_t, ++ __syntax: ::c_ulong, ++ __fastmap: *mut ::c_char, ++ __translate: *mut ::c_char, ++ __re_nsub: ::size_t, ++ __bitfield: u8, ++ } ++ ++ pub struct cpu_set_t { ++ #[cfg(all(target_pointer_width = "32", ++ not(target_arch = "x86_64")))] ++ bits: [u32; 32], ++ #[cfg(not(all(target_pointer_width = "32", ++ not(target_arch = "x86_64"))))] ++ bits: [u64; 16], ++ } ++ ++ pub struct if_nameindex { ++ pub if_index: ::c_uint, ++ pub if_name: *mut ::c_char, ++ } ++ ++ // System V IPC ++ pub struct msginfo { ++ pub msgpool: ::c_int, ++ pub msgmap: ::c_int, ++ pub msgmax: ::c_int, ++ pub msgmnb: ::c_int, ++ pub msgmni: ::c_int, ++ pub msgssz: ::c_int, ++ pub msgtql: ::c_int, ++ pub msgseg: ::c_ushort, ++ } ++ ++ pub struct sembuf { ++ pub sem_num: ::c_ushort, ++ pub sem_op: ::c_short, ++ pub sem_flg: ::c_short, ++ } ++ ++ pub struct mntent { ++ pub mnt_fsname: *mut ::c_char, ++ pub mnt_dir: *mut ::c_char, ++ pub mnt_type: *mut ::c_char, ++ pub mnt_opts: *mut ::c_char, ++ pub mnt_freq: ::c_int, ++ pub mnt_passno: ::c_int, ++ } ++ ++ pub struct posix_spawn_file_actions_t { ++ __allocated: ::c_int, ++ __used: ::c_int, ++ __actions: *mut ::c_int, ++ __pad: [::c_int; 16], ++ } ++ ++ pub struct posix_spawnattr_t { ++ __flags: ::c_short, ++ __pgrp: ::pid_t, ++ __sd: ::sigset_t, ++ __ss: ::sigset_t, ++ __sp: ::sched_param, ++ __policy: ::c_int, ++ __pad: [::c_int; 16], ++ } ++ ++ pub struct regmatch_t { ++ pub rm_so: regoff_t, ++ pub rm_eo: regoff_t, ++ } ++ ++ pub struct option { ++ pub name: *const ::c_char, ++ pub has_arg: ::c_int, ++ pub flag: *mut ::c_int, ++ pub val: ::c_int, ++ } ++ + } + + impl siginfo_t { +@@ -740,16 +1021,69 @@ impl siginfo_t { + } + + // const +-pub const IPOPT_COPY: u8 = 0x80; +-pub const IPOPT_NUMBER_MASK: u8 = 0x1f; +-pub const IPOPT_CLASS_MASK: u8 = 0x60; +-pub const IPTOS_ECN_MASK: u8 = 0x03; +-pub const MSG_CMSG_CLOEXEC: ::c_int = 0x40000000; + ++// aio.h ++pub const AIO_CANCELED: ::c_int = 0; ++pub const AIO_NOTCANCELED: ::c_int = 1; ++pub const AIO_ALLDONE: ::c_int = 2; ++pub const LIO_READ: ::c_int = 0; ++pub const LIO_WRITE: ::c_int = 1; ++pub const LIO_NOP: ::c_int = 2; ++pub const LIO_WAIT: ::c_int = 0; ++pub const LIO_NOWAIT: ::c_int = 1; ++ ++// glob.h ++pub const GLOB_ERR: ::c_int = 1 << 0; ++pub const GLOB_MARK: ::c_int = 1 << 1; ++pub const GLOB_NOSORT: ::c_int = 1 << 2; ++pub const GLOB_DOOFFS: ::c_int = 1 << 3; ++pub const GLOB_NOCHECK: ::c_int = 1 << 4; ++pub const GLOB_APPEND: ::c_int = 1 << 5; ++pub const GLOB_NOESCAPE: ::c_int = 1 << 6; ++ ++pub const GLOB_NOSPACE: ::c_int = 1; ++pub const GLOB_ABORTED: ::c_int = 2; ++pub const GLOB_NOMATCH: ::c_int = 3; ++ ++pub const GLOB_PERIOD: ::c_int = 1 << 7; ++pub const GLOB_ALTDIRFUNC: ::c_int = 1 << 9; ++pub const GLOB_BRACE: ::c_int = 1 << 10; ++pub const GLOB_NOMAGIC: ::c_int = 1 << 11; ++pub const GLOB_TILDE: ::c_int = 1 << 12; ++pub const GLOB_ONLYDIR: ::c_int = 1 << 13; ++pub const GLOB_TILDE_CHECK: ::c_int = 1 << 14; ++ ++// ipc.h ++pub const IPC_PRIVATE: ::key_t = 0; ++ ++pub const IPC_CREAT: ::c_int = 0o1000; ++pub const IPC_EXCL: ::c_int = 0o2000; ++pub const IPC_NOWAIT: ::c_int = 0o4000; ++ ++pub const IPC_RMID: ::c_int = 0; ++pub const IPC_SET: ::c_int = 1; ++pub const IPC_STAT: ::c_int = 2; ++pub const IPC_INFO: ::c_int = 3; ++pub const MSG_STAT: ::c_int = 11; ++pub const MSG_INFO: ::c_int = 12; ++ ++pub const MSG_NOERROR: ::c_int = 0o10000; ++pub const MSG_EXCEPT: ::c_int = 0o20000; ++ ++// shm.h ++pub const SHM_R: ::c_int = 0o400; ++pub const SHM_W: ::c_int = 0o200; ++ ++pub const SHM_RDONLY: ::c_int = 0o10000; ++pub const SHM_RND: ::c_int = 0o20000; ++pub const SHM_REMAP: ::c_int = 0o40000; ++ ++pub const SHM_LOCK: ::c_int = 11; ++pub const SHM_UNLOCK: ::c_int = 12; + // unistd.h +-pub const STDIN_FILENO: c_long = 0; +-pub const STDOUT_FILENO: c_long = 1; +-pub const STDERR_FILENO: c_long = 2; ++pub const STDIN_FILENO: ::c_int = 0; ++pub const STDOUT_FILENO: ::c_int = 1; ++pub const STDERR_FILENO: ::c_int = 2; + pub const __FD_SETSIZE: usize = 256; + pub const R_OK: ::c_int = 4; + pub const W_OK: ::c_int = 2; +@@ -769,6 +1103,9 @@ pub const F_TLOCK: ::c_int = 2; + pub const F_TEST: ::c_int = 3; + pub const CLOSE_RANGE_CLOEXEC: ::c_int = 4; + ++// stdio.h ++pub const EOF: ::c_int = -1; ++ + // stdlib.h + pub const WNOHANG: ::c_int = 1; + pub const WUNTRACED: ::c_int = 2; +@@ -884,8 +1221,17 @@ pub const _SS_SIZE: usize = 128; + pub const CMGROUP_MAX: usize = 16; + pub const SOL_SOCKET: ::c_int = 65535; + ++// sys/time.h ++pub const ITIMER_REAL: ::c_int = 0; ++pub const ITIMER_VIRTUAL: ::c_int = 1; ++pub const ITIMER_PROF: ::c_int = 2; ++ + // netinet/in.h + pub const SOL_IP: ::c_int = 0; ++pub const SOL_TCP: ::c_int = 6; ++pub const SOL_UDP: ::c_int = 17; ++pub const SOL_IPV6: ::c_int = 41; ++pub const SOL_ICMPV6: ::c_int = 58; + pub const IP_OPTIONS: ::c_int = 1; + pub const IP_HDRINCL: ::c_int = 2; + pub const IP_TOS: ::c_int = 3; +@@ -899,8 +1245,6 @@ pub const IP_MULTICAST_TTL: ::c_int = 10; + pub const IP_MULTICAST_LOOP: ::c_int = 11; + pub const IP_ADD_MEMBERSHIP: ::c_int = 12; + pub const IP_DROP_MEMBERSHIP: ::c_int = 13; +-pub const SOL_IPV6: ::c_int = 41; +-pub const SOL_ICMPV6: ::c_int = 58; + pub const IPV6_ADDRFORM: ::c_int = 1; + pub const IPV6_2292PKTINFO: ::c_int = 2; + pub const IPV6_2292HOPOPTS: ::c_int = 3; +@@ -965,6 +1309,134 @@ pub const IN_LOOPBACKNET: u32 = 127; + pub const INET_ADDRSTRLEN: usize = 16; + pub const INET6_ADDRSTRLEN: usize = 46; + ++// netinet/ip.h ++pub const IPTOS_ECN_MASK: u8 = 0x03; ++ ++pub const IPTOS_LOWDELAY: u8 = 0x10; ++pub const IPTOS_THROUGHPUT: u8 = 0x08; ++pub const IPTOS_RELIABILITY: u8 = 0x04; ++pub const IPTOS_MINCOST: u8 = 0x02; ++ ++pub const IPTOS_PREC_NETCONTROL: u8 = 0xe0; ++pub const IPTOS_PREC_INTERNETCONTROL: u8 = 0xc0; ++pub const IPTOS_PREC_CRITIC_ECP: u8 = 0xa0; ++pub const IPTOS_PREC_FLASHOVERRIDE: u8 = 0x80; ++pub const IPTOS_PREC_FLASH: u8 = 0x60; ++pub const IPTOS_PREC_IMMEDIATE: u8 = 0x40; ++pub const IPTOS_PREC_PRIORITY: u8 = 0x20; ++pub const IPTOS_PREC_ROUTINE: u8 = 0x00; ++ ++pub const IPTOS_ECN_MASK: u8 = 0x03; ++pub const IPTOS_ECN_ECT1: u8 = 0x01; ++pub const IPTOS_ECN_ECT0: u8 = 0x02; ++pub const IPTOS_ECN_CE: u8 = 0x03; ++ ++pub const IPOPT_COPY: u8 = 0x80; ++pub const IPOPT_CLASS_MASK: u8 = 0x60; ++pub const IPOPT_NUMBER_MASK: u8 = 0x1f; ++ ++pub const IPOPT_CONTROL: u8 = 0x00; ++pub const IPOPT_RESERVED1: u8 = 0x20; ++pub const IPOPT_MEASUREMENT: u8 = 0x40; ++pub const IPOPT_RESERVED2: u8 = 0x60; ++pub const IPOPT_END: u8 = 0 | IPOPT_CONTROL; ++pub const IPOPT_NOOP: u8 = 1 | IPOPT_CONTROL; ++pub const IPOPT_SEC: u8 = 2 | IPOPT_CONTROL | IPOPT_COPY; ++pub const IPOPT_LSRR: u8 = 3 | IPOPT_CONTROL | IPOPT_COPY; ++pub const IPOPT_TIMESTAMP: u8 = 4 | IPOPT_MEASUREMENT; ++pub const IPOPT_RR: u8 = 7 | IPOPT_CONTROL; ++pub const IPOPT_SID: u8 = 8 | IPOPT_CONTROL | IPOPT_COPY; ++pub const IPOPT_SSRR: u8 = 9 | IPOPT_CONTROL | IPOPT_COPY; ++pub const IPOPT_RA: u8 = 20 | IPOPT_CONTROL | IPOPT_COPY; ++pub const IPVERSION: u8 = 4; ++pub const MAXTTL: u8 = 255; ++pub const IPDEFTTL: u8 = 64; ++pub const IPOPT_OPTVAL: u8 = 0; ++pub const IPOPT_OLEN: u8 = 1; ++pub const IPOPT_OFFSET: u8 = 2; ++pub const IPOPT_MINOFF: u8 = 4; ++pub const MAX_IPOPTLEN: u8 = 40; ++pub const IPOPT_NOP: u8 = IPOPT_NOOP; ++pub const IPOPT_EOL: u8 = IPOPT_END; ++pub const IPOPT_TS: u8 = IPOPT_TIMESTAMP; ++pub const IPOPT_TS_TSONLY: u8 = 0; ++pub const IPOPT_TS_TSANDADDR: u8 = 1; ++pub const IPOPT_TS_PRESPEC: u8 = 3; ++ ++// net/if_arp.h ++pub const ARPOP_REQUEST: u16 = 1; ++pub const ARPOP_REPLY: u16 = 2; ++pub const ARPOP_RREQUEST: u16 = 3; ++pub const ARPOP_RREPLY: u16 = 4; ++pub const ARPOP_InREQUEST: u16 = 8; ++pub const ARPOP_InREPLY: u16 = 9; ++pub const ARPOP_NAK: u16 = 10; ++ ++pub const ATF_NETMASK: ::c_int = 0x20; ++pub const ATF_DONTPUB: ::c_int = 0x40; ++ ++pub const ARPHRD_NETROM: u16 = 0; ++pub const ARPHRD_ETHER: u16 = 1; ++pub const ARPHRD_EETHER: u16 = 2; ++pub const ARPHRD_AX25: u16 = 3; ++pub const ARPHRD_PRONET: u16 = 4; ++pub const ARPHRD_CHAOS: u16 = 5; ++pub const ARPHRD_IEEE802: u16 = 6; ++pub const ARPHRD_ARCNET: u16 = 7; ++pub const ARPHRD_APPLETLK: u16 = 8; ++pub const ARPHRD_DLCI: u16 = 15; ++pub const ARPHRD_ATM: u16 = 19; ++pub const ARPHRD_METRICOM: u16 = 23; ++pub const ARPHRD_IEEE1394: u16 = 24; ++pub const ARPHRD_EUI64: u16 = 27; ++pub const ARPHRD_INFINIBAND: u16 = 32; ++ ++pub const ARPHRD_SLIP: u16 = 256; ++pub const ARPHRD_CSLIP: u16 = 257; ++pub const ARPHRD_SLIP6: u16 = 258; ++pub const ARPHRD_CSLIP6: u16 = 259; ++pub const ARPHRD_RSRVD: u16 = 260; ++pub const ARPHRD_ADAPT: u16 = 264; ++pub const ARPHRD_ROSE: u16 = 270; ++pub const ARPHRD_X25: u16 = 271; ++pub const ARPHRD_HWX25: u16 = 272; ++pub const ARPHRD_CAN: u16 = 280; ++pub const ARPHRD_PPP: u16 = 512; ++pub const ARPHRD_CISCO: u16 = 513; ++pub const ARPHRD_HDLC: u16 = ARPHRD_CISCO; ++pub const ARPHRD_LAPB: u16 = 516; ++pub const ARPHRD_DDCMP: u16 = 517; ++pub const ARPHRD_RAWHDLC: u16 = 518; ++ ++pub const ARPHRD_TUNNEL: u16 = 768; ++pub const ARPHRD_TUNNEL6: u16 = 769; ++pub const ARPHRD_FRAD: u16 = 770; ++pub const ARPHRD_SKIP: u16 = 771; ++pub const ARPHRD_LOOPBACK: u16 = 772; ++pub const ARPHRD_LOCALTLK: u16 = 773; ++pub const ARPHRD_FDDI: u16 = 774; ++pub const ARPHRD_BIF: u16 = 775; ++pub const ARPHRD_SIT: u16 = 776; ++pub const ARPHRD_IPDDP: u16 = 777; ++pub const ARPHRD_IPGRE: u16 = 778; ++pub const ARPHRD_PIMREG: u16 = 779; ++pub const ARPHRD_HIPPI: u16 = 780; ++pub const ARPHRD_ASH: u16 = 781; ++pub const ARPHRD_ECONET: u16 = 782; ++pub const ARPHRD_IRDA: u16 = 783; ++pub const ARPHRD_FCPP: u16 = 784; ++pub const ARPHRD_FCAL: u16 = 785; ++pub const ARPHRD_FCPL: u16 = 786; ++pub const ARPHRD_FCFABRIC: u16 = 787; ++pub const ARPHRD_IEEE802_TR: u16 = 800; ++pub const ARPHRD_IEEE80211: u16 = 801; ++pub const ARPHRD_IEEE80211_PRISM: u16 = 802; ++pub const ARPHRD_IEEE80211_RADIOTAP: u16 = 803; ++pub const ARPHRD_IEEE802154: u16 = 804; ++ ++pub const ARPHRD_VOID: u16 = 0xFFFF; ++pub const ARPHRD_NONE: u16 = 0xFFFE; ++ + // bits/posix1_lim.h + pub const _POSIX_AIO_LISTIO_MAX: usize = 2; + pub const _POSIX_AIO_MAX: usize = 1; +@@ -1063,13 +1535,13 @@ pub const NI_DGRAM: ::c_int = 16; + pub const NI_IDN: ::c_int = 32; + + // time.h +-pub const CLOCK_REALTIME: clockid_t = 0; +-pub const CLOCK_MONOTONIC: clockid_t = 1; +-pub const CLOCK_PROCESS_CPUTIME_ID: clockid_t = 2; +-pub const CLOCK_THREAD_CPUTIME_ID: clockid_t = 3; +-pub const CLOCK_MONOTONIC_RAW: clockid_t = 4; +-pub const CLOCK_REALTIME_COARSE: clockid_t = 5; +-pub const CLOCK_MONOTONIC_COARSE: clockid_t = 6; ++pub const CLOCK_REALTIME: ::clockid_t = 0; ++pub const CLOCK_MONOTONIC: ::clockid_t = 1; ++pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2; ++pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3; ++pub const CLOCK_MONOTONIC_RAW: ::clockid_t = 4; ++pub const CLOCK_REALTIME_COARSE: ::clockid_t = 5; ++pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6; + pub const TIMER_ABSTIME: ::c_int = 1; + pub const TIME_UTC: ::c_int = 1; + +@@ -1126,155 +1598,169 @@ pub const LC_MEASUREMENT_MASK: ::c_int = 2048; + pub const LC_IDENTIFICATION_MASK: ::c_int = 4096; + pub const LC_ALL_MASK: ::c_int = 8127; + ++// reboot.h ++pub const RB_AUTOBOOT: ::c_int = 0x0; ++pub const RB_ASKNAME: ::c_int = 0x1; ++pub const RB_SINGLE: ::c_int = 0x2; ++pub const RB_KBD: ::c_int = 0x4; ++pub const RB_HALT: ::c_int = 0x8; ++pub const RB_INITNAME: ::c_int = 0x10; ++pub const RB_DFLTROOT: ::c_int = 0x20; ++pub const RB_NOBOOTRC: ::c_int = 0x20; ++pub const RB_ALTBOOT: ::c_int = 0x40; ++pub const RB_UNIPROC: ::c_int = 0x80; ++pub const RB_DEBUGGER: ::c_int = 0x1000; ++ + // semaphore.h + pub const __SIZEOF_SEM_T: usize = 20; ++pub const SEM_FAILED: *mut ::sem_t = 0 as *mut sem_t; + + // termios.h +-pub const IGNBRK: tcflag_t = 1; +-pub const BRKINT: tcflag_t = 2; +-pub const IGNPAR: tcflag_t = 4; +-pub const PARMRK: tcflag_t = 8; +-pub const INPCK: tcflag_t = 16; +-pub const ISTRIP: tcflag_t = 32; +-pub const INLCR: tcflag_t = 64; +-pub const IGNCR: tcflag_t = 128; +-pub const ICRNL: tcflag_t = 256; +-pub const IXON: tcflag_t = 512; +-pub const IXOFF: tcflag_t = 1024; +-pub const IXANY: tcflag_t = 2048; +-pub const IMAXBEL: tcflag_t = 8192; +-pub const IUCLC: tcflag_t = 16384; +-pub const OPOST: tcflag_t = 1; +-pub const ONLCR: tcflag_t = 2; +-pub const ONOEOT: tcflag_t = 8; +-pub const OCRNL: tcflag_t = 16; +-pub const ONOCR: tcflag_t = 32; +-pub const ONLRET: tcflag_t = 64; +-pub const NLDLY: tcflag_t = 768; +-pub const NL0: tcflag_t = 0; +-pub const NL1: tcflag_t = 256; +-pub const TABDLY: tcflag_t = 3076; +-pub const TAB0: tcflag_t = 0; +-pub const TAB1: tcflag_t = 1024; +-pub const TAB2: tcflag_t = 2048; +-pub const TAB3: tcflag_t = 4; +-pub const CRDLY: tcflag_t = 12288; +-pub const CR0: tcflag_t = 0; +-pub const CR1: tcflag_t = 4096; +-pub const CR2: tcflag_t = 8192; +-pub const CR3: tcflag_t = 12288; +-pub const FFDLY: tcflag_t = 16384; +-pub const FF0: tcflag_t = 0; +-pub const FF1: tcflag_t = 16384; +-pub const BSDLY: tcflag_t = 32768; +-pub const BS0: tcflag_t = 0; +-pub const BS1: tcflag_t = 32768; +-pub const VTDLY: tcflag_t = 65536; +-pub const VT0: tcflag_t = 0; +-pub const VT1: tcflag_t = 65536; +-pub const OLCUC: tcflag_t = 131072; +-pub const OFILL: tcflag_t = 262144; +-pub const OFDEL: tcflag_t = 524288; +-pub const CIGNORE: tcflag_t = 1; +-pub const CSIZE: tcflag_t = 768; +-pub const CS5: tcflag_t = 0; +-pub const CS6: tcflag_t = 256; +-pub const CS7: tcflag_t = 512; +-pub const CS8: tcflag_t = 768; +-pub const CSTOPB: tcflag_t = 1024; +-pub const CREAD: tcflag_t = 2048; +-pub const PARENB: tcflag_t = 4096; +-pub const PARODD: tcflag_t = 8192; +-pub const HUPCL: tcflag_t = 16384; +-pub const CLOCAL: tcflag_t = 32768; +-pub const CRTSCTS: tcflag_t = 65536; +-pub const CRTS_IFLOW: tcflag_t = 65536; +-pub const CCTS_OFLOW: tcflag_t = 65536; +-pub const CDTRCTS: tcflag_t = 131072; +-pub const MDMBUF: tcflag_t = 1048576; +-pub const CHWFLOW: tcflag_t = 1245184; +-pub const ECHOKE: tcflag_t = 1; +-pub const _ECHOE: tcflag_t = 2; +-pub const ECHOE: tcflag_t = 2; +-pub const _ECHOK: tcflag_t = 4; +-pub const ECHOK: tcflag_t = 4; +-pub const _ECHO: tcflag_t = 8; +-pub const ECHO: tcflag_t = 8; +-pub const _ECHONL: tcflag_t = 16; +-pub const ECHONL: tcflag_t = 16; +-pub const ECHOPRT: tcflag_t = 32; +-pub const ECHOCTL: tcflag_t = 64; +-pub const _ISIG: tcflag_t = 128; +-pub const ISIG: tcflag_t = 128; +-pub const _ICANON: tcflag_t = 256; +-pub const ICANON: tcflag_t = 256; +-pub const ALTWERASE: tcflag_t = 512; +-pub const _IEXTEN: tcflag_t = 1024; +-pub const IEXTEN: tcflag_t = 1024; +-pub const EXTPROC: tcflag_t = 2048; +-pub const _TOSTOP: tcflag_t = 4194304; +-pub const TOSTOP: tcflag_t = 4194304; +-pub const FLUSHO: tcflag_t = 8388608; +-pub const NOKERNINFO: tcflag_t = 33554432; +-pub const PENDIN: tcflag_t = 536870912; +-pub const _NOFLSH: tcflag_t = 2147483648; +-pub const NOFLSH: tcflag_t = 2147483648; +-pub const VEOF: cc_t = 0; +-pub const VEOL: cc_t = 1; +-pub const VEOL2: cc_t = 2; +-pub const VERASE: cc_t = 3; +-pub const VWERASE: cc_t = 4; +-pub const VKILL: cc_t = 5; +-pub const VREPRINT: cc_t = 6; +-pub const VINTR: cc_t = 8; +-pub const VQUIT: cc_t = 9; +-pub const VSUSP: cc_t = 10; +-pub const VDSUSP: cc_t = 11; +-pub const VSTART: cc_t = 12; +-pub const VSTOP: cc_t = 13; +-pub const VLNEXT: cc_t = 14; +-pub const VDISCARD: cc_t = 15; +-pub const VMIN: cc_t = 16; +-pub const VTIME: cc_t = 17; +-pub const VSTATUS: cc_t = 18; ++pub const IGNBRK: ::tcflag_t = 1; ++pub const BRKINT: ::tcflag_t = 2; ++pub const IGNPAR: ::tcflag_t = 4; ++pub const PARMRK: ::tcflag_t = 8; ++pub const INPCK: ::tcflag_t = 16; ++pub const ISTRIP: ::tcflag_t = 32; ++pub const INLCR: ::tcflag_t = 64; ++pub const IGNCR: ::tcflag_t = 128; ++pub const ICRNL: ::tcflag_t = 256; ++pub const IXON: ::tcflag_t = 512; ++pub const IXOFF: ::tcflag_t = 1024; ++pub const IXANY: ::tcflag_t = 2048; ++pub const IMAXBEL: ::tcflag_t = 8192; ++pub const IUCLC: ::tcflag_t = 16384; ++pub const OPOST: ::tcflag_t = 1; ++pub const ONLCR: ::tcflag_t = 2; ++pub const ONOEOT: ::tcflag_t = 8; ++pub const OCRNL: ::tcflag_t = 16; ++pub const ONOCR: ::tcflag_t = 32; ++pub const ONLRET: ::tcflag_t = 64; ++pub const NLDLY: ::tcflag_t = 768; ++pub const NL0: ::tcflag_t = 0; ++pub const NL1: ::tcflag_t = 256; ++pub const TABDLY: ::tcflag_t = 3076; ++pub const TAB0: ::tcflag_t = 0; ++pub const TAB1: ::tcflag_t = 1024; ++pub const TAB2: ::tcflag_t = 2048; ++pub const TAB3: ::tcflag_t = 4; ++pub const CRDLY: ::tcflag_t = 12288; ++pub const CR0: ::tcflag_t = 0; ++pub const CR1: ::tcflag_t = 4096; ++pub const CR2: ::tcflag_t = 8192; ++pub const CR3: ::tcflag_t = 12288; ++pub const FFDLY: ::tcflag_t = 16384; ++pub const FF0: ::tcflag_t = 0; ++pub const FF1: ::tcflag_t = 16384; ++pub const BSDLY: ::tcflag_t = 32768; ++pub const BS0: ::tcflag_t = 0; ++pub const BS1: ::tcflag_t = 32768; ++pub const VTDLY: ::tcflag_t = 65536; ++pub const VT0: ::tcflag_t = 0; ++pub const VT1: ::tcflag_t = 65536; ++pub const OLCUC: ::tcflag_t = 131072; ++pub const OFILL: ::tcflag_t = 262144; ++pub const OFDEL: ::tcflag_t = 524288; ++pub const CIGNORE: ::tcflag_t = 1; ++pub const CSIZE: ::tcflag_t = 768; ++pub const CS5: ::tcflag_t = 0; ++pub const CS6: ::tcflag_t = 256; ++pub const CS7: ::tcflag_t = 512; ++pub const CS8: ::tcflag_t = 768; ++pub const CSTOPB: ::tcflag_t = 1024; ++pub const CREAD: ::tcflag_t = 2048; ++pub const PARENB: ::tcflag_t = 4096; ++pub const PARODD: ::tcflag_t = 8192; ++pub const HUPCL: ::tcflag_t = 16384; ++pub const CLOCAL: ::tcflag_t = 32768; ++pub const CRTSCTS: ::tcflag_t = 65536; ++pub const CRTS_IFLOW: ::tcflag_t = 65536; ++pub const CCTS_OFLOW: ::tcflag_t = 65536; ++pub const CDTRCTS: ::tcflag_t = 131072; ++pub const MDMBUF: ::tcflag_t = 1048576; ++pub const CHWFLOW: ::tcflag_t = 1245184; ++pub const ECHOKE: ::tcflag_t = 1; ++pub const _ECHOE: ::tcflag_t = 2; ++pub const ECHOE: ::tcflag_t = 2; ++pub const _ECHOK: ::tcflag_t = 4; ++pub const ECHOK: ::tcflag_t = 4; ++pub const _ECHO: ::tcflag_t = 8; ++pub const ECHO: ::tcflag_t = 8; ++pub const _ECHONL: ::tcflag_t = 16; ++pub const ECHONL: ::tcflag_t = 16; ++pub const ECHOPRT: ::tcflag_t = 32; ++pub const ECHOCTL: ::tcflag_t = 64; ++pub const _ISIG: ::tcflag_t = 128; ++pub const ISIG: ::tcflag_t = 128; ++pub const _ICANON: ::tcflag_t = 256; ++pub const ICANON: ::tcflag_t = 256; ++pub const ALTWERASE: ::tcflag_t = 512; ++pub const _IEXTEN: ::tcflag_t = 1024; ++pub const IEXTEN: ::tcflag_t = 1024; ++pub const EXTPROC: ::tcflag_t = 2048; ++pub const _TOSTOP: ::tcflag_t = 4194304; ++pub const TOSTOP: ::tcflag_t = 4194304; ++pub const FLUSHO: ::tcflag_t = 8388608; ++pub const NOKERNINFO: ::tcflag_t = 33554432; ++pub const PENDIN: ::tcflag_t = 536870912; ++pub const _NOFLSH: ::tcflag_t = 2147483648; ++pub const NOFLSH: ::tcflag_t = 2147483648; ++pub const VEOF: usize = 0; ++pub const VEOL: usize = 1; ++pub const VEOL2: usize = 2; ++pub const VERASE: usize = 3; ++pub const VWERASE: usize = 4; ++pub const VKILL: usize = 5; ++pub const VREPRINT: usize = 6; ++pub const VINTR: usize = 8; ++pub const VQUIT: usize = 9; ++pub const VSUSP: usize = 10; ++pub const VDSUSP: usize = 11; ++pub const VSTART: usize = 12; ++pub const VSTOP: usize = 13; ++pub const VLNEXT: usize = 14; ++pub const VDISCARD: usize = 15; ++pub const VMIN: usize = 16; ++pub const VTIME: usize = 17; ++pub const VSTATUS: usize = 18; + pub const NCCS: usize = 20; +-pub const B0: speed_t = 0; +-pub const B50: speed_t = 50; +-pub const B75: speed_t = 75; +-pub const B110: speed_t = 110; +-pub const B134: speed_t = 134; +-pub const B150: speed_t = 150; +-pub const B200: speed_t = 200; +-pub const B300: speed_t = 300; +-pub const B600: speed_t = 600; +-pub const B1200: speed_t = 1200; +-pub const B1800: speed_t = 1800; +-pub const B2400: speed_t = 2400; +-pub const B4800: speed_t = 4800; +-pub const B9600: speed_t = 9600; +-pub const B7200: speed_t = 7200; +-pub const B14400: speed_t = 14400; +-pub const B19200: speed_t = 19200; +-pub const B28800: speed_t = 28800; +-pub const B38400: speed_t = 38400; +-pub const EXTA: speed_t = 19200; +-pub const EXTB: speed_t = 38400; +-pub const B57600: speed_t = 57600; +-pub const B76800: speed_t = 76800; +-pub const B115200: speed_t = 115200; +-pub const B230400: speed_t = 230400; +-pub const B460800: speed_t = 460800; +-pub const B500000: speed_t = 500000; +-pub const B576000: speed_t = 576000; +-pub const B921600: speed_t = 921600; +-pub const B1000000: speed_t = 1000000; +-pub const B1152000: speed_t = 1152000; +-pub const B1500000: speed_t = 1500000; +-pub const B2000000: speed_t = 2000000; +-pub const B2500000: speed_t = 2500000; +-pub const B3000000: speed_t = 3000000; +-pub const B3500000: speed_t = 3500000; +-pub const B4000000: speed_t = 4000000; ++pub const B0: ::speed_t = 0; ++pub const B50: ::speed_t = 50; ++pub const B75: ::speed_t = 75; ++pub const B110: ::speed_t = 110; ++pub const B134: ::speed_t = 134; ++pub const B150: ::speed_t = 150; ++pub const B200: ::speed_t = 200; ++pub const B300: ::speed_t = 300; ++pub const B600: ::speed_t = 600; ++pub const B1200: ::speed_t = 1200; ++pub const B1800: ::speed_t = 1800; ++pub const B2400: ::speed_t = 2400; ++pub const B4800: ::speed_t = 4800; ++pub const B9600: ::speed_t = 9600; ++pub const B7200: ::speed_t = 7200; ++pub const B14400: ::speed_t = 14400; ++pub const B19200: ::speed_t = 19200; ++pub const B28800: ::speed_t = 28800; ++pub const B38400: ::speed_t = 38400; ++pub const EXTA: ::speed_t = B19200; ++pub const EXTB: ::speed_t = B38400; ++pub const B57600: ::speed_t = 57600; ++pub const B76800: ::speed_t = 76800; ++pub const B115200: ::speed_t = 115200; ++pub const B230400: ::speed_t = 230400; ++pub const B460800: ::speed_t = 460800; ++pub const B500000: ::speed_t = 500000; ++pub const B576000: ::speed_t = 576000; ++pub const B921600: ::speed_t = 921600; ++pub const B1000000: ::speed_t = 1000000; ++pub const B1152000: ::speed_t = 1152000; ++pub const B1500000: ::speed_t = 1500000; ++pub const B2000000: ::speed_t = 2000000; ++pub const B2500000: ::speed_t = 2500000; ++pub const B3000000: ::speed_t = 3000000; ++pub const B3500000: ::speed_t = 3500000; ++pub const B4000000: ::speed_t = 4000000; + pub const TCSANOW: ::c_int = 0; + pub const TCSADRAIN: ::c_int = 1; + pub const TCSAFLUSH: ::c_int = 2; +@@ -1286,10 +1772,10 @@ pub const TCOOFF: ::c_int = 1; + pub const TCOON: ::c_int = 2; + pub const TCIOFF: ::c_int = 3; + pub const TCION: ::c_int = 4; +-pub const TTYDEF_IFLAG: tcflag_t = 11042; +-pub const TTYDEF_LFLAG: tcflag_t = 1483; +-pub const TTYDEF_CFLAG: tcflag_t = 23040; +-pub const TTYDEF_SPEED: tcflag_t = 9600; ++pub const TTYDEF_IFLAG: ::tcflag_t = 11042; ++pub const TTYDEF_LFLAG: ::tcflag_t = 1483; ++pub const TTYDEF_CFLAG: ::tcflag_t = 23040; ++pub const TTYDEF_SPEED: ::tcflag_t = 9600; + pub const CEOL: u8 = 0u8; + pub const CERASE: u8 = 127; + pub const CMIN: u8 = 1; +@@ -1467,35 +1953,35 @@ pub const SF_NOUNLINK: ::c_uint = 1048576; + pub const SF_SNAPSHOT: ::c_uint = 2097152; + pub const UTIME_NOW: ::c_long = -1; + pub const UTIME_OMIT: ::c_long = -2; +-pub const S_IFMT: mode_t = 61440; +-pub const S_IFDIR: mode_t = 16384; +-pub const S_IFCHR: mode_t = 8192; +-pub const S_IFBLK: mode_t = 24576; +-pub const S_IFREG: mode_t = 32768; +-pub const S_IFIFO: mode_t = 4096; +-pub const S_IFLNK: mode_t = 40960; +-pub const S_IFSOCK: mode_t = 49152; +-pub const S_ISUID: mode_t = 2048; +-pub const S_ISGID: mode_t = 1024; +-pub const S_ISVTX: mode_t = 512; +-pub const S_IRUSR: mode_t = 256; +-pub const S_IWUSR: mode_t = 128; +-pub const S_IXUSR: mode_t = 64; +-pub const S_IRWXU: mode_t = 448; +-pub const S_IREAD: mode_t = 256; +-pub const S_IWRITE: mode_t = 128; +-pub const S_IEXEC: mode_t = 64; +-pub const S_IRGRP: mode_t = 32; +-pub const S_IWGRP: mode_t = 16; +-pub const S_IXGRP: mode_t = 8; +-pub const S_IRWXG: mode_t = 56; +-pub const S_IROTH: mode_t = 4; +-pub const S_IWOTH: mode_t = 2; +-pub const S_IXOTH: mode_t = 1; +-pub const S_IRWXO: mode_t = 7; +-pub const ACCESSPERMS: mode_t = 511; +-pub const ALLPERMS: mode_t = 4095; +-pub const DEFFILEMODE: mode_t = 438; ++pub const S_IFMT: ::mode_t = 61440; ++pub const S_IFDIR: ::mode_t = 16384; ++pub const S_IFCHR: ::mode_t = 8192; ++pub const S_IFBLK: ::mode_t = 24576; ++pub const S_IFREG: ::mode_t = 32768; ++pub const S_IFIFO: ::mode_t = 4096; ++pub const S_IFLNK: ::mode_t = 40960; ++pub const S_IFSOCK: ::mode_t = 49152; ++pub const S_ISUID: ::mode_t = 2048; ++pub const S_ISGID: ::mode_t = 1024; ++pub const S_ISVTX: ::mode_t = 512; ++pub const S_IRUSR: ::mode_t = 256; ++pub const S_IWUSR: ::mode_t = 128; ++pub const S_IXUSR: ::mode_t = 64; ++pub const S_IRWXU: ::mode_t = 448; ++pub const S_IREAD: ::mode_t = 256; ++pub const S_IWRITE: ::mode_t = 128; ++pub const S_IEXEC: ::mode_t = 64; ++pub const S_IRGRP: ::mode_t = 32; ++pub const S_IWGRP: ::mode_t = 16; ++pub const S_IXGRP: ::mode_t = 8; ++pub const S_IRWXG: ::mode_t = 56; ++pub const S_IROTH: ::mode_t = 4; ++pub const S_IWOTH: ::mode_t = 2; ++pub const S_IXOTH: ::mode_t = 1; ++pub const S_IRWXO: ::mode_t = 7; ++pub const ACCESSPERMS: ::mode_t = 511; ++pub const ALLPERMS: ::mode_t = 4095; ++pub const DEFFILEMODE: ::mode_t = 438; + pub const S_BLKSIZE: usize = 512; + pub const STATX_TYPE: ::c_uint = 1; + pub const STATX_MODE: ::c_uint = 2; +@@ -1547,34 +2033,34 @@ pub const TIOCPKT_IOCTL: ::c_int = 64; + pub const TTYDISC: ::c_int = 0; + pub const TABLDISC: ::c_int = 3; + pub const SLIPDISC: ::c_int = 4; +-pub const TANDEM: tcflag_t = 1; +-pub const CBREAK: tcflag_t = 2; +-pub const LCASE: tcflag_t = 4; +-pub const CRMOD: tcflag_t = 16; +-pub const RAW: tcflag_t = 32; +-pub const ODDP: tcflag_t = 64; +-pub const EVENP: tcflag_t = 128; +-pub const ANYP: tcflag_t = 192; +-pub const NLDELAY: tcflag_t = 768; +-pub const NL2: tcflag_t = 512; +-pub const NL3: tcflag_t = 768; +-pub const TBDELAY: tcflag_t = 3072; +-pub const XTABS: tcflag_t = 3072; +-pub const CRDELAY: tcflag_t = 12288; +-pub const VTDELAY: tcflag_t = 16384; +-pub const BSDELAY: tcflag_t = 32768; +-pub const ALLDELAY: tcflag_t = 65280; +-pub const CRTBS: tcflag_t = 65536; +-pub const PRTERA: tcflag_t = 131072; +-pub const CRTERA: tcflag_t = 262144; +-pub const TILDE: tcflag_t = 524288; +-pub const LITOUT: tcflag_t = 2097152; +-pub const NOHANG: tcflag_t = 16777216; +-pub const L001000: tcflag_t = 33554432; +-pub const CRTKIL: tcflag_t = 67108864; +-pub const PASS8: tcflag_t = 134217728; +-pub const CTLECH: tcflag_t = 268435456; +-pub const DECCTQ: tcflag_t = 1073741824; ++pub const TANDEM: ::tcflag_t = 1; ++pub const CBREAK: ::tcflag_t = 2; ++pub const LCASE: ::tcflag_t = 4; ++pub const CRMOD: ::tcflag_t = 16; ++pub const RAW: ::tcflag_t = 32; ++pub const ODDP: ::tcflag_t = 64; ++pub const EVENP: ::tcflag_t = 128; ++pub const ANYP: ::tcflag_t = 192; ++pub const NLDELAY: ::tcflag_t = 768; ++pub const NL2: ::tcflag_t = 512; ++pub const NL3: ::tcflag_t = 768; ++pub const TBDELAY: ::tcflag_t = 3072; ++pub const XTABS: ::tcflag_t = 3072; ++pub const CRDELAY: ::tcflag_t = 12288; ++pub const VTDELAY: ::tcflag_t = 16384; ++pub const BSDELAY: ::tcflag_t = 32768; ++pub const ALLDELAY: ::tcflag_t = 65280; ++pub const CRTBS: ::tcflag_t = 65536; ++pub const PRTERA: ::tcflag_t = 131072; ++pub const CRTERA: ::tcflag_t = 262144; ++pub const TILDE: ::tcflag_t = 524288; ++pub const LITOUT: ::tcflag_t = 2097152; ++pub const NOHANG: ::tcflag_t = 16777216; ++pub const L001000: ::tcflag_t = 33554432; ++pub const CRTKIL: ::tcflag_t = 67108864; ++pub const PASS8: ::tcflag_t = 134217728; ++pub const CTLECH: ::tcflag_t = 268435456; ++pub const DECCTQ: ::tcflag_t = 1073741824; + + pub const FIONBIO: ::c_ulong = 0xa008007e; + pub const FIONREAD: ::c_ulong = 0x6008007f; +@@ -2007,7 +2493,6 @@ pub const TCPOPT_TSTAMP_HDR: u32 = 16844810; + pub const TCP_MSS: usize = 512; + pub const TCP_MAXWIN: usize = 65535; + pub const TCP_MAX_WINSHIFT: usize = 14; +-pub const SOL_TCP: ::c_int = 6; + pub const TCPI_OPT_TIMESTAMPS: u8 = 1; + pub const TCPI_OPT_SACK: u8 = 2; + pub const TCPI_OPT_WSCALE: u8 = 4; +@@ -2042,21 +2527,64 @@ pub const PROT_NONE: ::c_int = 0; + pub const PROT_READ: ::c_int = 4; + pub const PROT_WRITE: ::c_int = 2; + pub const PROT_EXEC: ::c_int = 1; +-pub const MAP_PRIVATE: ::c_int = 0; + pub const MAP_FILE: ::c_int = 1; + pub const MAP_ANON: ::c_int = 2; +-pub const MAP_SHARED: ::c_int = 16; ++pub const MAP_ANONYMOUS: ::c_int = MAP_ANON; ++pub const MAP_TYPE: ::c_int = 15; + pub const MAP_COPY: ::c_int = 32; ++pub const MAP_SHARED: ::c_int = 16; ++pub const MAP_PRIVATE: ::c_int = 0; + pub const MAP_FIXED: ::c_int = 256; ++pub const MAP_NOEXTEND: ::c_int = 512; ++pub const MAP_HASSEMPHORE: ::c_int = 1024; ++pub const MAP_INHERIT: ::c_int = 2048; + pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void; +-pub const MS_SYNC: ::c_int = 0; +-pub const MS_ASYNC: ::c_int = 1; +-pub const MS_INVALIDATE: ::c_int = 2; + pub const MADV_NORMAL: ::c_int = 0; + pub const MADV_RANDOM: ::c_int = 1; + pub const MADV_SEQUENTIAL: ::c_int = 2; + pub const MADV_WILLNEED: ::c_int = 3; + pub const MADV_DONTNEED: ::c_int = 4; ++pub const POSIX_MADV_NORMAL: ::c_int = 0; ++pub const POSIX_MADV_RANDOM: ::c_int = 1; ++pub const POSIX_MADV_SEQUENTIAL: ::c_int = 2; ++pub const POSIX_MADV_WILLNEED: ::c_int = 3; ++pub const POSIX_MADV_WONTNEED: ::c_int = 4; ++ ++pub const MS_ASYNC: ::c_int = 1; ++pub const MS_SYNC: ::c_int = 0; ++pub const MS_INVALIDATE: ::c_int = 2; ++pub const MREMAP_MAYMOVE: ::c_int = 1; ++pub const MREMAP_FIXED: ::c_int = 2; ++pub const MCL_CURRENT: ::c_int = 0x0001; ++pub const MCL_FUTURE: ::c_int = 0x0002; ++ ++// spawn.h ++pub const POSIX_SPAWN_USEVFORK: ::c_int = 64; ++pub const POSIX_SPAWN_SETSID: ::c_int = 128; ++ ++// sys/syslog.h ++pub const LOG_CRON: ::c_int = 9 << 3; ++pub const LOG_AUTHPRIV: ::c_int = 10 << 3; ++pub const LOG_FTP: ::c_int = 11 << 3; ++pub const LOG_PERROR: ::c_int = 0x20; ++ ++// net/if.h ++pub const IFF_UP: ::c_int = 0x1; ++pub const IFF_BROADCAST: ::c_int = 0x2; ++pub const IFF_DEBUG: ::c_int = 0x4; ++pub const IFF_LOOPBACK: ::c_int = 0x8; ++pub const IFF_POINTOPOINT: ::c_int = 0x10; ++pub const IFF_NOTRAILERS: ::c_int = 0x20; ++pub const IFF_RUNNING: ::c_int = 0x40; ++pub const IFF_NOARP: ::c_int = 0x80; ++pub const IFF_PROMISC: ::c_int = 0x100; ++pub const IFF_ALLMULTI: ::c_int = 0x200; ++pub const IFF_MASTER: ::c_int = 0x400; ++pub const IFF_SLAVE: ::c_int = 0x800; ++pub const IFF_MULTICAST: ::c_int = 0x1000; ++pub const IFF_PORTSEL: ::c_int = 0x2000; ++pub const IFF_AUTOMEDIA: ::c_int = 0x4000; ++pub const IFF_DYNAMIC: ::c_int = 0x8000; + + // random.h + pub const GRND_NONBLOCK: ::c_uint = 1; +@@ -2391,21 +2919,21 @@ pub const PTHREAD_MUTEX_RECURSIVE: __pthread_mutex_type = 2; + pub const PTHREAD_MUTEX_STALLED: __pthread_mutex_robustness = 0; + pub const PTHREAD_MUTEX_ROBUST: __pthread_mutex_robustness = 256; + +-pub const RLIMIT_CPU: __rlimit_resource = 0; +-pub const RLIMIT_FSIZE: __rlimit_resource = 1; +-pub const RLIMIT_DATA: __rlimit_resource = 2; +-pub const RLIMIT_STACK: __rlimit_resource = 3; +-pub const RLIMIT_CORE: __rlimit_resource = 4; +-pub const RLIMIT_RSS: __rlimit_resource = 5; +-pub const RLIMIT_MEMLOCK: __rlimit_resource = 6; +-pub const RLIMIT_NPROC: __rlimit_resource = 7; +-pub const RLIMIT_OFILE: __rlimit_resource = 8; +-pub const RLIMIT_NOFILE: __rlimit_resource = 8; +-pub const RLIMIT_SBSIZE: __rlimit_resource = 9; +-pub const RLIMIT_AS: __rlimit_resource = 10; +-pub const RLIMIT_VMEM: __rlimit_resource = 10; +-pub const RLIMIT_NLIMITS: __rlimit_resource = 11; +-pub const RLIM_NLIMITS: __rlimit_resource = 11; ++pub const RLIMIT_CPU: ::__rlimit_resource_t = 0; ++pub const RLIMIT_FSIZE: ::__rlimit_resource_t = 1; ++pub const RLIMIT_DATA: ::__rlimit_resource_t = 2; ++pub const RLIMIT_STACK: ::__rlimit_resource_t = 3; ++pub const RLIMIT_CORE: ::__rlimit_resource_t = 4; ++pub const RLIMIT_RSS: ::__rlimit_resource_t = 5; ++pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 6; ++pub const RLIMIT_NPROC: ::__rlimit_resource_t = 7; ++pub const RLIMIT_OFILE: ::__rlimit_resource_t = 8; ++pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 8; ++pub const RLIMIT_SBSIZE: ::__rlimit_resource_t = 9; ++pub const RLIMIT_AS: ::__rlimit_resource_t = 10; ++pub const RLIMIT_VMEM: ::__rlimit_resource_t = 10; ++pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 11; ++pub const RLIM_NLIMITS: ::__rlimit_resource_t = 11; + + pub const RUSAGE_SELF: __rusage_who = 0; + pub const RUSAGE_CHILDREN: __rusage_who = -1; +@@ -2431,6 +2959,7 @@ pub const MSG_CTRUNC: ::c_int = 32; + pub const MSG_WAITALL: ::c_int = 64; + pub const MSG_DONTWAIT: ::c_int = 128; + pub const MSG_NOSIGNAL: ::c_int = 1024; ++pub const MSG_CMSG_CLOEXEC: ::c_int = 0x40000000; + + pub const SCM_RIGHTS: ::c_int = 1; + pub const SCM_TIMESTAMP: ::c_int = 2; +@@ -2550,6 +3079,11 @@ pub const RTLD_DI_TLS_DATA: ::c_int = 10; + pub const RTLD_DI_PHDR: ::c_int = 11; + pub const RTLD_DI_MAX: ::c_int = 11; + ++pub const RTLD_NEXT: *mut ::c_void = -1i64 as *mut ::c_void; ++pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void; ++pub const RTLD_NODELETE: ::c_int = 0x1000; ++pub const RTLD_NOW: ::c_int = 0x2; ++ + pub const SI_ASYNCIO: ::c_int = -4; + pub const SI_MESGQ: ::c_int = -3; + pub const SI_TIMER: ::c_int = -2; +@@ -2693,8 +3227,105 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { + }; + pub const PTHREAD_STACK_MIN: ::size_t = 0; + ++const_fn! { ++ {const} fn CMSG_ALIGN(len: usize) -> usize { ++ len + ::mem::size_of::() - 1 & !(::mem::size_of::() - 1) ++ } ++} ++ + // functions + f! { ++ pub fn CMSG_FIRSTHDR(mhdr: *const msghdr) -> *mut cmsghdr { ++ if (*mhdr).msg_controllen as usize >= ::mem::size_of::() { ++ (*mhdr).msg_control as *mut cmsghdr ++ } else { ++ 0 as *mut cmsghdr ++ } ++ } ++ ++ pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut ::c_uchar { ++ cmsg.offset(1) as *mut ::c_uchar ++ } ++ ++ pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint { ++ (CMSG_ALIGN(length as usize) + CMSG_ALIGN(::mem::size_of::())) ++ as ::c_uint ++ } ++ ++ pub {const} fn CMSG_LEN(length: ::c_uint) -> ::c_uint { ++ CMSG_ALIGN(::mem::size_of::()) as ::c_uint + length ++ } ++ ++ pub fn CMSG_NXTHDR(mhdr: *const msghdr, ++ cmsg: *const cmsghdr) -> *mut cmsghdr { ++ if ((*cmsg).cmsg_len as usize) < ::mem::size_of::() { ++ return 0 as *mut cmsghdr; ++ }; ++ let next = (cmsg as usize + ++ super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) ++ as *mut cmsghdr; ++ let max = (*mhdr).msg_control as usize ++ + (*mhdr).msg_controllen as usize; ++ if (next.offset(1)) as usize > max || ++ next as usize + super::CMSG_ALIGN((*next).cmsg_len as usize) > max ++ { ++ 0 as *mut cmsghdr ++ } else { ++ next as *mut cmsghdr ++ } ++ } ++ ++ pub fn CPU_ALLOC_SIZE(count: ::c_int) -> ::size_t { ++ let _dummy: cpu_set_t = ::mem::zeroed(); ++ let size_in_bits = 8 * ::mem::size_of_val(&_dummy.bits[0]); ++ ((count as ::size_t + size_in_bits - 1) / 8) as ::size_t ++ } ++ ++ pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () { ++ for slot in cpuset.bits.iter_mut() { ++ *slot = 0; ++ } ++ } ++ ++ pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () { ++ let size_in_bits ++ = 8 * ::mem::size_of_val(&cpuset.bits[0]); // 32, 64 etc ++ let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits); ++ cpuset.bits[idx] |= 1 << offset; ++ () ++ } ++ ++ pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () { ++ let size_in_bits ++ = 8 * ::mem::size_of_val(&cpuset.bits[0]); // 32, 64 etc ++ let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits); ++ cpuset.bits[idx] &= !(1 << offset); ++ () ++ } ++ ++ pub fn CPU_ISSET(cpu: usize, cpuset: &cpu_set_t) -> bool { ++ let size_in_bits = 8 * ::mem::size_of_val(&cpuset.bits[0]); ++ let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits); ++ 0 != (cpuset.bits[idx] & (1 << offset)) ++ } ++ ++ pub fn CPU_COUNT_S(size: usize, cpuset: &cpu_set_t) -> ::c_int { ++ let mut s: u32 = 0; ++ let size_of_mask = ::mem::size_of_val(&cpuset.bits[0]); ++ for i in cpuset.bits[..(size / size_of_mask)].iter() { ++ s += i.count_ones(); ++ }; ++ s as ::c_int ++ } ++ ++ pub fn CPU_COUNT(cpuset: &cpu_set_t) -> ::c_int { ++ CPU_COUNT_S(::mem::size_of::(), cpuset) ++ } ++ ++ pub fn CPU_EQUAL(set1: &cpu_set_t, set2: &cpu_set_t) -> bool { ++ set1.bits == set2.bits ++ } ++ + pub fn major(dev: ::dev_t) -> ::c_uint { + ((dev >> 8) & 0xff) as ::c_uint + } +@@ -2703,6 +3334,14 @@ f! { + (dev & 0xffff00ff) as ::c_uint + } + ++ pub fn IPTOS_TOS(tos: u8) -> u8 { ++ tos & IPTOS_TOS_MASK ++ } ++ ++ pub fn IPTOS_PREC(tos: u8) -> u8 { ++ tos & IPTOS_PREC_MASK ++ } ++ + pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () { + let fd = fd as usize; + let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8; +@@ -2756,11 +3395,26 @@ extern "C" { + + pub fn __libc_current_sigrtmax() -> ::c_int; + ++ pub fn wait4( ++ pid: ::pid_t, ++ status: *mut ::c_int, ++ options: ::c_int, ++ rusage: *mut ::rusage, ++ ) -> ::pid_t; ++ + pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int) + -> ::c_int; + + pub fn sigwait(__set: *const sigset_t, __sig: *mut ::c_int) -> ::c_int; + ++ pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int; ++ pub fn sigtimedwait( ++ set: *const sigset_t, ++ info: *mut siginfo_t, ++ timeout: *const ::timespec, ++ ) -> ::c_int; ++ pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int; ++ + pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int; + + pub fn ioctl(__fd: ::c_int, __request: ::c_ulong, ...) -> ::c_int; +@@ -2806,10 +3460,72 @@ extern "C" { + offset: ::off64_t, + ) -> ::ssize_t; + ++ pub fn fread_unlocked( ++ buf: *mut ::c_void, ++ size: ::size_t, ++ nobj: ::size_t, ++ stream: *mut ::FILE, ++ ) -> ::size_t; ++ ++ pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int; ++ pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int; ++ pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int; ++ pub fn aio_error(aiocbp: *const aiocb) -> ::c_int; ++ pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t; ++ pub fn aio_suspend( ++ aiocb_list: *const *const aiocb, ++ nitems: ::c_int, ++ timeout: *const ::timespec, ++ ) -> ::c_int; ++ pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int; ++ pub fn lio_listio( ++ mode: ::c_int, ++ aiocb_list: *const *mut aiocb, ++ nitems: ::c_int, ++ sevp: *mut ::sigevent, ++ ) -> ::c_int; ++ ++ pub fn mq_open(name: *const ::c_char, oflag: ::c_int, ...) -> ::mqd_t; ++ pub fn mq_close(mqd: ::mqd_t) -> ::c_int; ++ pub fn mq_unlink(name: *const ::c_char) -> ::c_int; ++ pub fn mq_receive( ++ mqd: ::mqd_t, ++ msg_ptr: *mut ::c_char, ++ msg_len: ::size_t, ++ msg_prio: *mut ::c_uint, ++ ) -> ::ssize_t; ++ pub fn mq_timedreceive( ++ mqd: ::mqd_t, ++ msg_ptr: *mut ::c_char, ++ msg_len: ::size_t, ++ msg_prio: *mut ::c_uint, ++ abs_timeout: *const ::timespec, ++ ) -> ::ssize_t; ++ pub fn mq_send( ++ mqd: ::mqd_t, ++ msg_ptr: *const ::c_char, ++ msg_len: ::size_t, ++ msg_prio: ::c_uint, ++ ) -> ::c_int; ++ pub fn mq_timedsend( ++ mqd: ::mqd_t, ++ msg_ptr: *const ::c_char, ++ msg_len: ::size_t, ++ msg_prio: ::c_uint, ++ abs_timeout: *const ::timespec, ++ ) -> ::c_int; ++ pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int; ++ pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int; ++ + pub fn lseek64(__fd: ::c_int, __offset: __off64_t, __whence: ::c_int) -> __off64_t; + + pub fn lseek(__fd: ::c_int, __offset: __off_t, __whence: ::c_int) -> __off_t; + ++ pub fn fgetpos64(stream: *mut ::FILE, ptr: *mut fpos64_t) -> ::c_int; ++ pub fn fseeko64(stream: *mut ::FILE, offset: ::off64_t, whence: ::c_int) -> ::c_int; ++ pub fn fsetpos64(stream: *mut ::FILE, ptr: *const fpos64_t) -> ::c_int; ++ pub fn ftello64(stream: *mut ::FILE) -> ::off64_t; ++ + pub fn bind(__fd: ::c_int, __addr: *const sockaddr, __len: socklen_t) -> ::c_int; + + pub fn accept4( +@@ -2819,6 +3535,13 @@ extern "C" { + flg: ::c_int, + ) -> ::c_int; + ++ pub fn ppoll( ++ fds: *mut ::pollfd, ++ nfds: nfds_t, ++ timeout: *const ::timespec, ++ sigmask: *const sigset_t, ++ ) -> ::c_int; ++ + pub fn recvmsg(__fd: ::c_int, __message: *mut msghdr, __flags: ::c_int) -> ::ssize_t; + + pub fn sendmsg(__fd: ::c_int, __message: *const msghdr, __flags: ::c_int) -> ssize_t; +@@ -2832,12 +3555,95 @@ extern "C" { + addrlen: *mut ::socklen_t, + ) -> ::ssize_t; + ++ pub fn sendfile( ++ out_fd: ::c_int, ++ in_fd: ::c_int, ++ offset: *mut off_t, ++ count: ::size_t, ++ ) -> ::ssize_t; ++ pub fn sendfile64( ++ out_fd: ::c_int, ++ in_fd: ::c_int, ++ offset: *mut off64_t, ++ count: ::size_t, ++ ) -> ::ssize_t; ++ + pub fn shutdown(__fd: ::c_int, __how: ::c_int) -> ::c_int; + + pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int; ++ pub fn getdomainname(name: *mut ::c_char, len: ::size_t) -> ::c_int; ++ pub fn setdomainname(name: *const ::c_char, len: ::size_t) -> ::c_int; ++ pub fn if_nameindex() -> *mut if_nameindex; ++ pub fn if_freenameindex(ptr: *mut if_nameindex); ++ ++ pub fn getnameinfo( ++ sa: *const ::sockaddr, ++ salen: ::socklen_t, ++ host: *mut ::c_char, ++ hostlen: ::socklen_t, ++ serv: *mut ::c_char, ++ sevlen: ::socklen_t, ++ flags: ::c_int, ++ ) -> ::c_int; ++ ++ pub fn getifaddrs(ifap: *mut *mut ::ifaddrs) -> ::c_int; ++ pub fn freeifaddrs(ifa: *mut ::ifaddrs); + + pub fn uname(buf: *mut ::utsname) -> ::c_int; + ++ pub fn gethostid() -> ::c_long; ++ pub fn sethostid(hostid: ::c_long) -> ::c_int; ++ ++ pub fn setpwent(); ++ pub fn endpwent(); ++ pub fn getpwent() -> *mut passwd; ++ pub fn setgrent(); ++ pub fn endgrent(); ++ pub fn getgrent() -> *mut ::group; ++ pub fn setspent(); ++ pub fn endspent(); ++ pub fn getspent() -> *mut spwd; ++ ++ pub fn getspnam(name: *const ::c_char) -> *mut spwd; ++ ++ pub fn getpwent_r( ++ pwd: *mut ::passwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::passwd, ++ ) -> ::c_int; ++ pub fn getgrent_r( ++ grp: *mut ::group, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::group, ++ ) -> ::c_int; ++ pub fn fgetpwent_r( ++ stream: *mut ::FILE, ++ pwd: *mut ::passwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::passwd, ++ ) -> ::c_int; ++ pub fn fgetgrent_r( ++ stream: *mut ::FILE, ++ grp: *mut ::group, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::group, ++ ) -> ::c_int; ++ ++ pub fn putpwent(p: *const ::passwd, stream: *mut ::FILE) -> ::c_int; ++ pub fn putgrent(grp: *const ::group, stream: *mut ::FILE) -> ::c_int; ++ ++ pub fn getpwnam_r( ++ name: *const ::c_char, ++ pwd: *mut passwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut passwd, ++ ) -> ::c_int; ++ + pub fn getpwuid_r( + uid: ::uid_t, + pwd: *mut passwd, +@@ -2846,18 +3652,105 @@ extern "C" { + result: *mut *mut passwd, + ) -> ::c_int; + ++ pub fn fgetspent_r( ++ fp: *mut ::FILE, ++ spbuf: *mut ::spwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ spbufp: *mut *mut ::spwd, ++ ) -> ::c_int; ++ pub fn sgetspent_r( ++ s: *const ::c_char, ++ spbuf: *mut ::spwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ spbufp: *mut *mut ::spwd, ++ ) -> ::c_int; ++ pub fn getspent_r( ++ spbuf: *mut ::spwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ spbufp: *mut *mut ::spwd, ++ ) -> ::c_int; ++ ++ pub fn getspnam_r( ++ name: *const ::c_char, ++ spbuf: *mut spwd, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ spbufp: *mut *mut spwd, ++ ) -> ::c_int; ++ ++ // mntent.h ++ pub fn getmntent_r( ++ stream: *mut ::FILE, ++ mntbuf: *mut ::mntent, ++ buf: *mut ::c_char, ++ buflen: ::c_int, ++ ) -> *mut ::mntent; ++ ++ pub fn utmpname(file: *const ::c_char) -> ::c_int; ++ pub fn utmpxname(file: *const ::c_char) -> ::c_int; ++ pub fn getutxent() -> *mut utmpx; ++ pub fn getutxid(ut: *const utmpx) -> *mut utmpx; ++ pub fn getutxline(ut: *const utmpx) -> *mut utmpx; ++ pub fn pututxline(ut: *const utmpx) -> *mut utmpx; ++ pub fn setutxent(); ++ pub fn endutxent(); ++ ++ pub fn getresuid(ruid: *mut ::uid_t, euid: *mut ::uid_t, suid: *mut ::uid_t) -> ::c_int; ++ pub fn getresgid(rgid: *mut ::gid_t, egid: *mut ::gid_t, sgid: *mut ::gid_t) -> ::c_int; ++ pub fn setresuid(ruid: ::uid_t, euid: ::uid_t, suid: ::uid_t) -> ::c_int; ++ pub fn setresgid(rgid: ::gid_t, egid: ::gid_t, sgid: ::gid_t) -> ::c_int; ++ ++ pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int; ++ ++ pub fn getgrgid(gid: ::gid_t) -> *mut ::group; ++ pub fn getgrgid_r( ++ gid: ::gid_t, ++ grp: *mut ::group, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::group, ++ ) -> ::c_int; ++ ++ pub fn getgrnam(name: *const ::c_char) -> *mut ::group; ++ pub fn getgrnam_r( ++ name: *const ::c_char, ++ grp: *mut ::group, ++ buf: *mut ::c_char, ++ buflen: ::size_t, ++ result: *mut *mut ::group, ++ ) -> ::c_int; ++ ++ pub fn getgrouplist( ++ user: *const ::c_char, ++ group: ::gid_t, ++ groups: *mut ::gid_t, ++ ngroups: *mut ::c_int, ++ ) -> ::c_int; ++ + pub fn setgroups(ngroups: ::size_t, ptr: *const ::gid_t) -> ::c_int; + ++ pub fn acct(filename: *const ::c_char) -> ::c_int; ++ ++ pub fn setmntent(filename: *const ::c_char, ty: *const ::c_char) -> *mut ::FILE; ++ pub fn getmntent(stream: *mut ::FILE) -> *mut ::mntent; ++ pub fn addmntent(stream: *mut ::FILE, mnt: *const ::mntent) -> ::c_int; ++ pub fn endmntent(streamp: *mut ::FILE) -> ::c_int; ++ pub fn hasmntopt(mnt: *const ::mntent, opt: *const ::c_char) -> *mut ::c_char; ++ + pub fn pthread_create( + native: *mut ::pthread_t, + attr: *const ::pthread_attr_t, + f: extern "C" fn(*mut ::c_void) -> *mut ::c_void, + value: *mut ::c_void, + ) -> ::c_int; +- pub fn pthread_kill(__threadid: pthread_t, __signo: ::c_int) -> ::c_int; ++ pub fn pthread_kill(__threadid: ::pthread_t, __signo: ::c_int) -> ::c_int; ++ pub fn pthread_cancel(thread: ::pthread_t) -> ::c_int; + pub fn __pthread_equal(__t1: __pthread_t, __t2: __pthread_t) -> ::c_int; + +- pub fn pthread_getattr_np(__thr: pthread_t, __attr: *mut pthread_attr_t) -> ::c_int; ++ pub fn pthread_getattr_np(__thr: ::pthread_t, __attr: *mut pthread_attr_t) -> ::c_int; + + pub fn pthread_attr_getguardsize( + __attr: *const pthread_attr_t, +@@ -2870,11 +3763,70 @@ extern "C" { + __stacksize: *mut ::size_t, + ) -> ::c_int; + ++ pub fn pthread_attr_getguardsize( ++ attr: *const ::pthread_attr_t, ++ guardsize: *mut ::size_t, ++ ) -> ::c_int; ++ pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int; ++ ++ pub fn pthread_mutexattr_getpshared( ++ attr: *const pthread_mutexattr_t, ++ pshared: *mut ::c_int, ++ ) -> ::c_int; ++ pub fn pthread_mutexattr_setpshared( ++ attr: *mut pthread_mutexattr_t, ++ pshared: ::c_int, ++ ) -> ::c_int; ++ ++ pub fn pthread_mutex_timedlock( ++ lock: *mut pthread_mutex_t, ++ abstime: *const ::timespec, ++ ) -> ::c_int; ++ ++ pub fn pthread_rwlockattr_getpshared( ++ attr: *const pthread_rwlockattr_t, ++ val: *mut ::c_int, ++ ) -> ::c_int; ++ pub fn pthread_rwlockattr_setpshared(attr: *mut pthread_rwlockattr_t, val: ::c_int) -> ::c_int; ++ ++ pub fn pthread_condattr_getclock( ++ attr: *const pthread_condattr_t, ++ clock_id: *mut clockid_t, ++ ) -> ::c_int; + pub fn pthread_condattr_setclock( + __attr: *mut pthread_condattr_t, + __clock_id: __clockid_t, + ) -> ::c_int; ++ pub fn pthread_condattr_getpshared( ++ attr: *const pthread_condattr_t, ++ pshared: *mut ::c_int, ++ ) -> ::c_int; ++ pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int; ++ ++ pub fn pthread_once(control: *mut pthread_once_t, routine: extern "C" fn()) -> ::c_int; + ++ pub fn pthread_barrierattr_init(attr: *mut ::pthread_barrierattr_t) -> ::c_int; ++ pub fn pthread_barrierattr_destroy(attr: *mut ::pthread_barrierattr_t) -> ::c_int; ++ pub fn pthread_barrierattr_getpshared( ++ attr: *const ::pthread_barrierattr_t, ++ shared: *mut ::c_int, ++ ) -> ::c_int; ++ pub fn pthread_barrierattr_setpshared( ++ attr: *mut ::pthread_barrierattr_t, ++ shared: ::c_int, ++ ) -> ::c_int; ++ pub fn pthread_barrier_init( ++ barrier: *mut pthread_barrier_t, ++ attr: *const ::pthread_barrierattr_t, ++ count: ::c_uint, ++ ) -> ::c_int; ++ pub fn pthread_barrier_destroy(barrier: *mut pthread_barrier_t) -> ::c_int; ++ pub fn pthread_barrier_wait(barrier: *mut pthread_barrier_t) -> ::c_int; ++ pub fn pthread_spin_init(lock: *mut ::pthread_spinlock_t, pshared: ::c_int) -> ::c_int; ++ pub fn pthread_spin_destroy(lock: *mut ::pthread_spinlock_t) -> ::c_int; ++ pub fn pthread_spin_lock(lock: *mut ::pthread_spinlock_t) -> ::c_int; ++ pub fn pthread_spin_trylock(lock: *mut ::pthread_spinlock_t) -> ::c_int; ++ pub fn pthread_spin_unlock(lock: *mut ::pthread_spinlock_t) -> ::c_int; + pub fn pthread_atfork( + prepare: ::Option, + parent: ::Option, +@@ -2887,9 +3839,72 @@ extern "C" { + __oldmask: *mut __sigset_t, + ) -> ::c_int; + ++ pub fn sched_getparam(pid: ::pid_t, param: *mut ::sched_param) -> ::c_int; ++ pub fn sched_setparam(pid: ::pid_t, param: *const ::sched_param) -> ::c_int; ++ pub fn sched_getscheduler(pid: ::pid_t) -> ::c_int; ++ pub fn sched_setscheduler( ++ pid: ::pid_t, ++ policy: ::c_int, ++ param: *const ::sched_param, ++ ) -> ::c_int; ++ pub fn pthread_getschedparam( ++ native: ::pthread_t, ++ policy: *mut ::c_int, ++ param: *mut ::sched_param, ++ ) -> ::c_int; ++ pub fn pthread_setschedparam( ++ native: ::pthread_t, ++ policy: ::c_int, ++ param: *const ::sched_param, ++ ) -> ::c_int; ++ ++ pub fn pthread_getcpuclockid(thread: ::pthread_t, clk_id: *mut ::clockid_t) -> ::c_int; ++ ++ pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int; ++ pub fn sem_destroy(sem: *mut sem_t) -> ::c_int; ++ pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int; ++ pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int; ++ + pub fn clock_getres(__clock_id: clockid_t, __res: *mut ::timespec) -> ::c_int; + pub fn clock_gettime(__clock_id: clockid_t, __tp: *mut ::timespec) -> ::c_int; + pub fn clock_settime(__clock_id: clockid_t, __tp: *const ::timespec) -> ::c_int; ++ pub fn clock_getcpuclockid(pid: ::pid_t, clk_id: *mut ::clockid_t) -> ::c_int; ++ ++ pub fn clock_nanosleep( ++ clk_id: ::clockid_t, ++ flags: ::c_int, ++ rqtp: *const ::timespec, ++ rmtp: *mut ::timespec, ++ ) -> ::c_int; ++ ++ pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int; ++ pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int; ++ ++ pub fn asctime_r(tm: *const ::tm, buf: *mut ::c_char) -> *mut ::c_char; ++ pub fn ctime_r(timep: *const time_t, buf: *mut ::c_char) -> *mut ::c_char; ++ ++ pub fn strftime( ++ s: *mut ::c_char, ++ max: ::size_t, ++ format: *const ::c_char, ++ tm: *const ::tm, ++ ) -> ::size_t; ++ pub fn strptime(s: *const ::c_char, format: *const ::c_char, tm: *mut ::tm) -> *mut ::c_char; ++ ++ pub fn timer_create( ++ clockid: ::clockid_t, ++ sevp: *mut ::sigevent, ++ timerid: *mut ::timer_t, ++ ) -> ::c_int; ++ pub fn timer_delete(timerid: ::timer_t) -> ::c_int; ++ pub fn timer_getoverrun(timerid: ::timer_t) -> ::c_int; ++ pub fn timer_gettime(timerid: ::timer_t, curr_value: *mut ::itimerspec) -> ::c_int; ++ pub fn timer_settime( ++ timerid: ::timer_t, ++ flags: ::c_int, ++ new_value: *const ::itimerspec, ++ old_value: *mut ::itimerspec, ++ ) -> ::c_int; + + pub fn fstat(__fd: ::c_int, __buf: *mut stat) -> ::c_int; + pub fn fstat64(__fd: ::c_int, __buf: *mut stat64) -> ::c_int; +@@ -2907,6 +3922,14 @@ extern "C" { + __flag: ::c_int, + ) -> ::c_int; + ++ pub fn statx( ++ dirfd: ::c_int, ++ pathname: *const c_char, ++ flags: ::c_int, ++ mask: ::c_uint, ++ statxbuf: *mut statx, ++ ) -> ::c_int; ++ + pub fn ftruncate(__fd: ::c_int, __length: __off_t) -> ::c_int; + pub fn ftruncate64(__fd: ::c_int, __length: __off64_t) -> ::c_int; + pub fn truncate64(__file: *const ::c_char, __length: __off64_t) -> ::c_int; +@@ -2930,6 +3953,175 @@ extern "C" { + pub fn openat(__fd: ::c_int, __file: *const ::c_char, __oflag: ::c_int, ...) -> ::c_int; + pub fn openat64(__fd: ::c_int, __file: *const ::c_char, __oflag: ::c_int, ...) -> ::c_int; + ++ pub fn fopen64(filename: *const c_char, mode: *const c_char) -> *mut ::FILE; ++ pub fn freopen64( ++ filename: *const c_char, ++ mode: *const c_char, ++ file: *mut ::FILE, ++ ) -> *mut ::FILE; ++ ++ pub fn creat64(path: *const c_char, mode: mode_t) -> ::c_int; ++ ++ pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int; ++ pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int; ++ pub fn mkstemps(template: *mut ::c_char, suffixlen: ::c_int) -> ::c_int; ++ pub fn tmpfile64() -> *mut ::FILE; ++ ++ pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE; ++ ++ pub fn getdtablesize() -> ::c_int; ++ ++ // Added in `glibc` 2.34 ++ pub fn close_range(first: ::c_uint, last: ::c_uint, flags: ::c_int) -> ::c_int; ++ ++ pub fn openpty( ++ __amaster: *mut ::c_int, ++ __aslave: *mut ::c_int, ++ __name: *mut ::c_char, ++ __termp: *const termios, ++ __winp: *const ::winsize, ++ ) -> ::c_int; ++ ++ pub fn forkpty( ++ __amaster: *mut ::c_int, ++ __name: *mut ::c_char, ++ __termp: *const termios, ++ __winp: *const ::winsize, ++ ) -> ::pid_t; ++ ++ pub fn getpt() -> ::c_int; ++ pub fn ptsname_r(fd: ::c_int, buf: *mut ::c_char, buflen: ::size_t) -> ::c_int; ++ pub fn login_tty(fd: ::c_int) -> ::c_int; ++ ++ pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char; ++ ++ pub fn clearenv() -> ::c_int; ++ ++ pub fn execveat( ++ dirfd: ::c_int, ++ pathname: *const ::c_char, ++ argv: *const *mut c_char, ++ envp: *const *mut c_char, ++ flags: ::c_int, ++ ) -> ::c_int; ++ pub fn execvpe( ++ file: *const ::c_char, ++ argv: *const *const ::c_char, ++ envp: *const *const ::c_char, ++ ) -> ::c_int; ++ pub fn fexecve( ++ fd: ::c_int, ++ argv: *const *const ::c_char, ++ envp: *const *const ::c_char, ++ ) -> ::c_int; ++ ++ pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int; ++ ++ // posix/spawn.h ++ pub fn posix_spawn( ++ pid: *mut ::pid_t, ++ path: *const ::c_char, ++ file_actions: *const ::posix_spawn_file_actions_t, ++ attrp: *const ::posix_spawnattr_t, ++ argv: *const *mut ::c_char, ++ envp: *const *mut ::c_char, ++ ) -> ::c_int; ++ pub fn posix_spawnp( ++ pid: *mut ::pid_t, ++ file: *const ::c_char, ++ file_actions: *const ::posix_spawn_file_actions_t, ++ attrp: *const ::posix_spawnattr_t, ++ argv: *const *mut ::c_char, ++ envp: *const *mut ::c_char, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_init(attr: *mut posix_spawnattr_t) -> ::c_int; ++ pub fn posix_spawnattr_destroy(attr: *mut posix_spawnattr_t) -> ::c_int; ++ pub fn posix_spawnattr_getsigdefault( ++ attr: *const posix_spawnattr_t, ++ default: *mut ::sigset_t, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setsigdefault( ++ attr: *mut posix_spawnattr_t, ++ default: *const ::sigset_t, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_getsigmask( ++ attr: *const posix_spawnattr_t, ++ default: *mut ::sigset_t, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setsigmask( ++ attr: *mut posix_spawnattr_t, ++ default: *const ::sigset_t, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_getflags( ++ attr: *const posix_spawnattr_t, ++ flags: *mut ::c_short, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setflags(attr: *mut posix_spawnattr_t, flags: ::c_short) -> ::c_int; ++ pub fn posix_spawnattr_getpgroup( ++ attr: *const posix_spawnattr_t, ++ flags: *mut ::pid_t, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setpgroup(attr: *mut posix_spawnattr_t, flags: ::pid_t) -> ::c_int; ++ pub fn posix_spawnattr_getschedpolicy( ++ attr: *const posix_spawnattr_t, ++ flags: *mut ::c_int, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setschedpolicy(attr: *mut posix_spawnattr_t, flags: ::c_int) -> ::c_int; ++ pub fn posix_spawnattr_getschedparam( ++ attr: *const posix_spawnattr_t, ++ param: *mut ::sched_param, ++ ) -> ::c_int; ++ pub fn posix_spawnattr_setschedparam( ++ attr: *mut posix_spawnattr_t, ++ param: *const ::sched_param, ++ ) -> ::c_int; ++ ++ pub fn posix_spawn_file_actions_init(actions: *mut posix_spawn_file_actions_t) -> ::c_int; ++ pub fn posix_spawn_file_actions_destroy(actions: *mut posix_spawn_file_actions_t) -> ::c_int; ++ pub fn posix_spawn_file_actions_addopen( ++ actions: *mut posix_spawn_file_actions_t, ++ fd: ::c_int, ++ path: *const ::c_char, ++ oflag: ::c_int, ++ mode: ::mode_t, ++ ) -> ::c_int; ++ pub fn posix_spawn_file_actions_addclose( ++ actions: *mut posix_spawn_file_actions_t, ++ fd: ::c_int, ++ ) -> ::c_int; ++ pub fn posix_spawn_file_actions_adddup2( ++ actions: *mut posix_spawn_file_actions_t, ++ fd: ::c_int, ++ newfd: ::c_int, ++ ) -> ::c_int; ++ ++ // Added in `glibc` 2.29 ++ pub fn posix_spawn_file_actions_addchdir_np( ++ actions: *mut ::posix_spawn_file_actions_t, ++ path: *const ::c_char, ++ ) -> ::c_int; ++ // Added in `glibc` 2.29 ++ pub fn posix_spawn_file_actions_addfchdir_np( ++ actions: *mut ::posix_spawn_file_actions_t, ++ fd: ::c_int, ++ ) -> ::c_int; ++ // Added in `glibc` 2.34 ++ pub fn posix_spawn_file_actions_addclosefrom_np( ++ actions: *mut ::posix_spawn_file_actions_t, ++ from: ::c_int, ++ ) -> ::c_int; ++ // Added in `glibc` 2.35 ++ pub fn posix_spawn_file_actions_addtcsetpgrp_np( ++ actions: *mut ::posix_spawn_file_actions_t, ++ tcfd: ::c_int, ++ ) -> ::c_int; ++ ++ pub fn shm_open(name: *const c_char, oflag: ::c_int, mode: mode_t) -> ::c_int; ++ pub fn shm_unlink(name: *const ::c_char) -> ::c_int; ++ ++ pub fn euidaccess(pathname: *const ::c_char, mode: ::c_int) -> ::c_int; ++ pub fn eaccess(pathname: *const ::c_char, mode: ::c_int) -> ::c_int; ++ + pub fn faccessat( + dirfd: ::c_int, + pathname: *const ::c_char, +@@ -2944,6 +4136,13 @@ extern "C" { + pub fn readdir64(dirp: *mut ::DIR) -> *mut ::dirent64; + pub fn readdir_r(dirp: *mut ::DIR, entry: *mut ::dirent, result: *mut *mut ::dirent) + -> ::c_int; ++ pub fn readdir64_r( ++ dirp: *mut ::DIR, ++ entry: *mut ::dirent64, ++ result: *mut *mut ::dirent64, ++ ) -> ::c_int; ++ pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long); ++ pub fn telldir(dirp: *mut ::DIR) -> ::c_long; + + pub fn dirfd(dirp: *mut ::DIR) -> ::c_int; + +@@ -2961,6 +4160,14 @@ extern "C" { + __offset: __off64_t, + ) -> *mut ::c_void; + ++ pub fn mremap( ++ addr: *mut ::c_void, ++ len: ::size_t, ++ new_len: ::size_t, ++ flags: ::c_int, ++ ... ++ ) -> *mut ::c_void; ++ + pub fn mprotect(__addr: *mut ::c_void, __len: ::size_t, __prot: ::c_int) -> ::c_int; + + pub fn msync(__addr: *mut ::c_void, __len: ::size_t, __flags: ::c_int) -> ::c_int; +@@ -2983,10 +4190,12 @@ extern "C" { + + pub fn madvise(__addr: *mut ::c_void, __len: ::size_t, __advice: ::c_int) -> ::c_int; + +- pub fn getrlimit(resource: ::__rlimit_resource, rlim: *mut ::rlimit) -> ::c_int; +- pub fn getrlimit64(resource: ::__rlimit_resource, rlim: *mut ::rlimit64) -> ::c_int; +- pub fn setrlimit(resource: ::__rlimit_resource, rlim: *const ::rlimit) -> ::c_int; +- pub fn setrlimit64(resource: ::__rlimit_resource, rlim: *const ::rlimit64) -> ::c_int; ++ pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int; ++ ++ pub fn getrlimit(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit) -> ::c_int; ++ pub fn getrlimit64(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit64) -> ::c_int; ++ pub fn setrlimit(resource: ::__rlimit_resource_t, rlim: *const ::rlimit) -> ::c_int; ++ pub fn setrlimit64(resource: ::__rlimit_resource_t, rlim: *const ::rlimit64) -> ::c_int; + + pub fn getpriority(which: ::__priority_which, who: ::id_t) -> ::c_int; + pub fn setpriority(which: ::__priority_which, who: ::id_t, prio: ::c_int) -> ::c_int; +@@ -2994,7 +4203,179 @@ extern "C" { + pub fn getrandom(__buffer: *mut ::c_void, __length: ::size_t, __flags: ::c_uint) -> ::ssize_t; + pub fn getentropy(__buffer: *mut ::c_void, __length: ::size_t) -> ::c_int; + ++ pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void; ++ pub fn memmem( ++ haystack: *const ::c_void, ++ haystacklen: ::size_t, ++ needle: *const ::c_void, ++ needlelen: ::size_t, ++ ) -> *mut ::c_void; ++ pub fn strchrnul(s: *const ::c_char, c: ::c_int) -> *mut ::c_char; ++ ++ pub fn abs(i: ::c_int) -> ::c_int; ++ pub fn labs(i: ::c_long) -> ::c_long; ++ pub fn rand() -> ::c_int; ++ pub fn srand(seed: ::c_uint); ++ ++ pub fn drand48() -> ::c_double; ++ pub fn erand48(xseed: *mut ::c_ushort) -> ::c_double; ++ pub fn lrand48() -> ::c_long; ++ pub fn nrand48(xseed: *mut ::c_ushort) -> ::c_long; ++ pub fn mrand48() -> ::c_long; ++ pub fn jrand48(xseed: *mut ::c_ushort) -> ::c_long; ++ pub fn srand48(seed: ::c_long); ++ pub fn seed48(xseed: *mut ::c_ushort) -> *mut ::c_ushort; ++ pub fn lcong48(p: *mut ::c_ushort); ++ ++ pub fn qsort_r( ++ base: *mut ::c_void, ++ num: ::size_t, ++ size: ::size_t, ++ compar: ::Option< ++ unsafe extern "C" fn(*const ::c_void, *const ::c_void, *mut ::c_void) -> ::c_int, ++ >, ++ arg: *mut ::c_void, ++ ); ++ ++ pub fn brk(addr: *mut ::c_void) -> ::c_int; ++ pub fn sbrk(increment: ::intptr_t) -> *mut ::c_void; ++ ++ pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void; ++ pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int; ++ ++ pub fn mallinfo() -> ::mallinfo; ++ pub fn mallinfo2() -> ::mallinfo2; ++ pub fn malloc_info(options: ::c_int, stream: *mut ::FILE) -> ::c_int; ++ pub fn malloc_usable_size(ptr: *mut ::c_void) -> ::size_t; ++ pub fn malloc_trim(__pad: ::size_t) -> ::c_int; ++ ++ pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t; ++ pub fn iconv( ++ cd: iconv_t, ++ inbuf: *mut *mut ::c_char, ++ inbytesleft: *mut ::size_t, ++ outbuf: *mut *mut ::c_char, ++ outbytesleft: *mut ::size_t, ++ ) -> ::size_t; ++ pub fn iconv_close(cd: iconv_t) -> ::c_int; ++ ++ pub fn getopt_long( ++ argc: ::c_int, ++ argv: *const *mut c_char, ++ optstring: *const c_char, ++ longopts: *const option, ++ longindex: *mut ::c_int, ++ ) -> ::c_int; ++ + pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int; ++ ++ pub fn reboot(how_to: ::c_int) -> ::c_int; ++ ++ pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int; ++ ++ pub fn regexec( ++ preg: *const ::regex_t, ++ input: *const ::c_char, ++ nmatch: ::size_t, ++ pmatch: *mut regmatch_t, ++ eflags: ::c_int, ++ ) -> ::c_int; ++ ++ pub fn regerror( ++ errcode: ::c_int, ++ preg: *const ::regex_t, ++ errbuf: *mut ::c_char, ++ errbuf_size: ::size_t, ++ ) -> ::size_t; ++ ++ pub fn regfree(preg: *mut ::regex_t); ++ ++ pub fn glob( ++ pattern: *const c_char, ++ flags: ::c_int, ++ errfunc: ::Option ::c_int>, ++ pglob: *mut ::glob_t, ++ ) -> ::c_int; ++ pub fn globfree(pglob: *mut ::glob_t); ++ ++ pub fn glob64( ++ pattern: *const ::c_char, ++ flags: ::c_int, ++ errfunc: ::Option ::c_int>, ++ pglob: *mut glob64_t, ++ ) -> ::c_int; ++ pub fn globfree64(pglob: *mut glob64_t); ++ ++ pub fn getxattr( ++ path: *const c_char, ++ name: *const c_char, ++ value: *mut ::c_void, ++ size: ::size_t, ++ ) -> ::ssize_t; ++ pub fn lgetxattr( ++ path: *const c_char, ++ name: *const c_char, ++ value: *mut ::c_void, ++ size: ::size_t, ++ ) -> ::ssize_t; ++ pub fn fgetxattr( ++ filedes: ::c_int, ++ name: *const c_char, ++ value: *mut ::c_void, ++ size: ::size_t, ++ ) -> ::ssize_t; ++ pub fn setxattr( ++ path: *const c_char, ++ name: *const c_char, ++ value: *const ::c_void, ++ size: ::size_t, ++ flags: ::c_int, ++ ) -> ::c_int; ++ pub fn lsetxattr( ++ path: *const c_char, ++ name: *const c_char, ++ value: *const ::c_void, ++ size: ::size_t, ++ flags: ::c_int, ++ ) -> ::c_int; ++ pub fn fsetxattr( ++ filedes: ::c_int, ++ name: *const c_char, ++ value: *const ::c_void, ++ size: ::size_t, ++ flags: ::c_int, ++ ) -> ::c_int; ++ pub fn listxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t; ++ pub fn llistxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t; ++ pub fn flistxattr(filedes: ::c_int, list: *mut c_char, size: ::size_t) -> ::ssize_t; ++ pub fn removexattr(path: *const c_char, name: *const c_char) -> ::c_int; ++ pub fn lremovexattr(path: *const c_char, name: *const c_char) -> ::c_int; ++ pub fn fremovexattr(filedes: ::c_int, name: *const c_char) -> ::c_int; ++ ++ pub fn dirname(path: *mut ::c_char) -> *mut ::c_char; ++ /// POSIX version of `basename(3)`, defined in `libgen.h`. ++ #[link_name = "__xpg_basename"] ++ pub fn posix_basename(path: *mut ::c_char) -> *mut ::c_char; ++ /// GNU version of `basename(3)`, defined in `string.h`. ++ #[link_name = "basename"] ++ pub fn gnu_basename(path: *const ::c_char) -> *mut ::c_char; ++ ++ pub fn dlmopen(lmid: Lmid_t, filename: *const ::c_char, flag: ::c_int) -> *mut ::c_void; ++ pub fn dlinfo(handle: *mut ::c_void, request: ::c_int, info: *mut ::c_void) -> ::c_int; ++ pub fn dladdr1( ++ addr: *const ::c_void, ++ info: *mut ::Dl_info, ++ extra_info: *mut *mut ::c_void, ++ flags: ::c_int, ++ ) -> ::c_int; ++ ++ pub fn duplocale(base: ::locale_t) -> ::locale_t; ++ pub fn freelocale(loc: ::locale_t); ++ pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t; ++ pub fn uselocale(loc: ::locale_t) -> ::locale_t; ++ pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char; ++ pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char; ++ + pub fn dl_iterate_phdr( + callback: ::Option< + unsafe extern "C" fn( +@@ -3005,6 +4386,9 @@ extern "C" { + >, + data: *mut ::c_void, + ) -> ::c_int; ++ ++ pub fn gnu_get_libc_release() -> *const ::c_char; ++ pub fn gnu_get_libc_version() -> *const ::c_char; + } + + safe_f! { diff --git a/patches/vendor/u-hurd-libc.4.patch b/patches/vendor/u-hurd-libc.4.patch new file mode 100644 index 0000000000..f40f8d15e5 --- /dev/null +++ b/patches/vendor/u-hurd-libc.4.patch @@ -0,0 +1,346 @@ +From: Samuel Thibault +Date: Fri, 10 Nov 2023 20:14:11 +0100 +Subject: Forwarded: https://github.com/rust-lang/libc/pull/3430 + + c72c68c5d12e ("hurd: Complete C API interface") was actually missing a few + fixes. +--- + vendor/libc/src/unix/hurd/mod.rs | 226 ++++++++++++++++++++++++++++++++++++--- + 1 file changed, 211 insertions(+), 15 deletions(-) + +diff --git a/vendor/libc/src/unix/hurd/mod.rs b/vendor/libc/src/unix/hurd/mod.rs +index 75a272e..2e9f69e 100644 +--- a/vendor/libc/src/unix/hurd/mod.rs ++++ b/vendor/libc/src/unix/hurd/mod.rs +@@ -164,6 +164,7 @@ pub type pthread_key_t = __pthread_key; + pub type pthread_once_t = __pthread_once; + + pub type __rlimit_resource = ::c_uint; ++pub type __rlimit_resource_t = __rlimit_resource; + pub type rlim_t = __rlim_t; + pub type rlim64_t = __rlim64_t; + +@@ -215,10 +216,34 @@ pub type tcp_ca_state = ::c_uint; + + pub type idtype_t = ::c_uint; + ++pub type mqd_t = ::c_int; ++ ++pub type Lmid_t = ::c_long; ++ + pub type regoff_t = ::c_int; + ++pub type nl_item = ::c_int; ++ + pub type iconv_t = *mut ::c_void; + ++#[cfg_attr(feature = "extra_traits", derive(Debug))] ++pub enum fpos64_t {} // FIXME: fill this out with a struct ++impl ::Copy for fpos64_t {} ++impl ::Clone for fpos64_t { ++ fn clone(&self) -> fpos64_t { ++ *self ++ } ++} ++ ++#[cfg_attr(feature = "extra_traits", derive(Debug))] ++pub enum timezone {} ++impl ::Copy for timezone {} ++impl ::Clone for timezone { ++ fn clone(&self) -> timezone { ++ *self ++ } ++} ++ + // structs + s! { + pub struct ip_mreq { +@@ -431,7 +456,7 @@ s! { + + pub struct stat { + pub st_fstype: ::c_int, +- pub st_fsid: __fsid_t, ++ pub st_dev: __fsid_t, /* Actually st_fsid */ + pub st_ino: __ino_t, + pub st_gen: ::c_uint, + pub st_rdev: __dev_t, +@@ -583,6 +608,18 @@ s! { + __glibc_reserved: [::c_char; 32] + } + ++ pub struct mq_attr { ++ pub mq_flags: ::c_long, ++ pub mq_maxmsg: ::c_long, ++ pub mq_msgsize: ::c_long, ++ pub mq_curmsgs: ::c_long, ++ } ++ ++ pub struct __exit_status { ++ pub e_termination: ::c_short, ++ pub e_exit: ::c_short, ++ } ++ + #[cfg_attr(target_pointer_width = "32", + repr(align(4)))] + #[cfg_attr(target_pointer_width = "64", +@@ -998,6 +1035,96 @@ s! { + + } + ++s_no_extra_traits! { ++ pub struct utmpx { ++ pub ut_type: ::c_short, ++ pub ut_pid: ::pid_t, ++ pub ut_line: [::c_char; __UT_LINESIZE], ++ pub ut_id: [::c_char; 4], ++ ++ pub ut_user: [::c_char; __UT_NAMESIZE], ++ pub ut_host: [::c_char; __UT_HOSTSIZE], ++ pub ut_exit: __exit_status, ++ ++ #[cfg(any( all(target_pointer_width = "32", ++ not(target_arch = "x86_64"))))] ++ pub ut_session: ::c_long, ++ #[cfg(any(all(target_pointer_width = "32", ++ not(target_arch = "x86_64"))))] ++ pub ut_tv: ::timeval, ++ ++ #[cfg(not(any(all(target_pointer_width = "32", ++ not(target_arch = "x86_64")))))] ++ pub ut_session: i32, ++ #[cfg(not(any(all(target_pointer_width = "32", ++ not(target_arch = "x86_64")))))] ++ pub ut_tv: __timeval, ++ ++ pub ut_addr_v6: [i32; 4], ++ __glibc_reserved: [::c_char; 20], ++ } ++} ++ ++cfg_if! { ++ if #[cfg(feature = "extra_traits")] { ++ impl PartialEq for utmpx { ++ fn eq(&self, other: &utmpx) -> bool { ++ self.ut_type == other.ut_type ++ && self.ut_pid == other.ut_pid ++ && self.ut_line == other.ut_line ++ && self.ut_id == other.ut_id ++ && self.ut_user == other.ut_user ++ && self ++ .ut_host ++ .iter() ++ .zip(other.ut_host.iter()) ++ .all(|(a,b)| a == b) ++ && self.ut_exit == other.ut_exit ++ && self.ut_session == other.ut_session ++ && self.ut_tv == other.ut_tv ++ && self.ut_addr_v6 == other.ut_addr_v6 ++ && self.__glibc_reserved == other.__glibc_reserved ++ } ++ } ++ ++ impl Eq for utmpx {} ++ ++ impl ::fmt::Debug for utmpx { ++ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { ++ f.debug_struct("utmpx") ++ .field("ut_type", &self.ut_type) ++ .field("ut_pid", &self.ut_pid) ++ .field("ut_line", &self.ut_line) ++ .field("ut_id", &self.ut_id) ++ .field("ut_user", &self.ut_user) ++ // FIXME: .field("ut_host", &self.ut_host) ++ .field("ut_exit", &self.ut_exit) ++ .field("ut_session", &self.ut_session) ++ .field("ut_tv", &self.ut_tv) ++ .field("ut_addr_v6", &self.ut_addr_v6) ++ .field("__glibc_reserved", &self.__glibc_reserved) ++ .finish() ++ } ++ } ++ ++ impl ::hash::Hash for utmpx { ++ fn hash(&self, state: &mut H) { ++ self.ut_type.hash(state); ++ self.ut_pid.hash(state); ++ self.ut_line.hash(state); ++ self.ut_id.hash(state); ++ self.ut_user.hash(state); ++ self.ut_host.hash(state); ++ self.ut_exit.hash(state); ++ self.ut_session.hash(state); ++ self.ut_tv.hash(state); ++ self.ut_addr_v6.hash(state); ++ self.__glibc_reserved.hash(state); ++ } ++ } ++ } ++} ++ + impl siginfo_t { + pub unsafe fn si_addr(&self) -> *mut ::c_void { + self.si_addr +@@ -1310,7 +1437,10 @@ pub const INET_ADDRSTRLEN: usize = 16; + pub const INET6_ADDRSTRLEN: usize = 46; + + // netinet/ip.h +-pub const IPTOS_ECN_MASK: u8 = 0x03; ++pub const IPTOS_TOS_MASK: u8 = 0x1E; ++pub const IPTOS_PREC_MASK: u8 = 0xE0; ++ ++pub const IPTOS_ECN_NOT_ECT: u8 = 0x00; + + pub const IPTOS_LOWDELAY: u8 = 0x10; + pub const IPTOS_THROUGHPUT: u8 = 0x08; +@@ -1372,6 +1502,12 @@ pub const ARPOP_InREQUEST: u16 = 8; + pub const ARPOP_InREPLY: u16 = 9; + pub const ARPOP_NAK: u16 = 10; + ++pub const MAX_ADDR_LEN: usize = 7; ++pub const ARPD_UPDATE: ::c_ushort = 0x01; ++pub const ARPD_LOOKUP: ::c_ushort = 0x02; ++pub const ARPD_FLUSH: ::c_ushort = 0x03; ++pub const ATF_MAGIC: ::c_int = 0x80; ++ + pub const ATF_NETMASK: ::c_int = 0x20; + pub const ATF_DONTPUB: ::c_int = 0x40; + +@@ -1598,6 +1734,71 @@ pub const LC_MEASUREMENT_MASK: ::c_int = 2048; + pub const LC_IDENTIFICATION_MASK: ::c_int = 4096; + pub const LC_ALL_MASK: ::c_int = 8127; + ++pub const ABDAY_1: ::nl_item = 0x20000; ++pub const ABDAY_2: ::nl_item = 0x20001; ++pub const ABDAY_3: ::nl_item = 0x20002; ++pub const ABDAY_4: ::nl_item = 0x20003; ++pub const ABDAY_5: ::nl_item = 0x20004; ++pub const ABDAY_6: ::nl_item = 0x20005; ++pub const ABDAY_7: ::nl_item = 0x20006; ++ ++pub const DAY_1: ::nl_item = 0x20007; ++pub const DAY_2: ::nl_item = 0x20008; ++pub const DAY_3: ::nl_item = 0x20009; ++pub const DAY_4: ::nl_item = 0x2000A; ++pub const DAY_5: ::nl_item = 0x2000B; ++pub const DAY_6: ::nl_item = 0x2000C; ++pub const DAY_7: ::nl_item = 0x2000D; ++ ++pub const ABMON_1: ::nl_item = 0x2000E; ++pub const ABMON_2: ::nl_item = 0x2000F; ++pub const ABMON_3: ::nl_item = 0x20010; ++pub const ABMON_4: ::nl_item = 0x20011; ++pub const ABMON_5: ::nl_item = 0x20012; ++pub const ABMON_6: ::nl_item = 0x20013; ++pub const ABMON_7: ::nl_item = 0x20014; ++pub const ABMON_8: ::nl_item = 0x20015; ++pub const ABMON_9: ::nl_item = 0x20016; ++pub const ABMON_10: ::nl_item = 0x20017; ++pub const ABMON_11: ::nl_item = 0x20018; ++pub const ABMON_12: ::nl_item = 0x20019; ++ ++pub const MON_1: ::nl_item = 0x2001A; ++pub const MON_2: ::nl_item = 0x2001B; ++pub const MON_3: ::nl_item = 0x2001C; ++pub const MON_4: ::nl_item = 0x2001D; ++pub const MON_5: ::nl_item = 0x2001E; ++pub const MON_6: ::nl_item = 0x2001F; ++pub const MON_7: ::nl_item = 0x20020; ++pub const MON_8: ::nl_item = 0x20021; ++pub const MON_9: ::nl_item = 0x20022; ++pub const MON_10: ::nl_item = 0x20023; ++pub const MON_11: ::nl_item = 0x20024; ++pub const MON_12: ::nl_item = 0x20025; ++ ++pub const AM_STR: ::nl_item = 0x20026; ++pub const PM_STR: ::nl_item = 0x20027; ++ ++pub const D_T_FMT: ::nl_item = 0x20028; ++pub const D_FMT: ::nl_item = 0x20029; ++pub const T_FMT: ::nl_item = 0x2002A; ++pub const T_FMT_AMPM: ::nl_item = 0x2002B; ++ ++pub const ERA: ::nl_item = 0x2002C; ++pub const ERA_D_FMT: ::nl_item = 0x2002E; ++pub const ALT_DIGITS: ::nl_item = 0x2002F; ++pub const ERA_D_T_FMT: ::nl_item = 0x20030; ++pub const ERA_T_FMT: ::nl_item = 0x20031; ++ ++pub const CODESET: ::nl_item = 14; ++pub const CRNCYSTR: ::nl_item = 0x4000F; ++pub const RADIXCHAR: ::nl_item = 0x10000; ++pub const THOUSEP: ::nl_item = 0x10001; ++pub const YESEXPR: ::nl_item = 0x50000; ++pub const NOEXPR: ::nl_item = 0x50001; ++pub const YESSTR: ::nl_item = 0x50002; ++pub const NOSTR: ::nl_item = 0x50003; ++ + // reboot.h + pub const RB_AUTOBOOT: ::c_int = 0x0; + pub const RB_ASKNAME: ::c_int = 0x1; +@@ -1785,6 +1986,7 @@ pub const CBRK: u8 = 0u8; + + // dlfcn.h + pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void; ++pub const RTLD_NEXT: *mut ::c_void = -1i64 as *mut ::c_void; + pub const RTLD_LAZY: ::c_int = 1; + pub const RTLD_NOW: ::c_int = 2; + pub const RTLD_BINDING_MASK: ::c_int = 3; +@@ -2942,6 +3144,10 @@ pub const PRIO_PROCESS: __priority_which = 0; + pub const PRIO_PGRP: __priority_which = 1; + pub const PRIO_USER: __priority_which = 2; + ++pub const __UT_LINESIZE: usize = 32; ++pub const __UT_NAMESIZE: usize = 32; ++pub const __UT_HOSTSIZE: usize = 256; ++ + pub const SOCK_STREAM: ::c_int = 1; + pub const SOCK_DGRAM: ::c_int = 2; + pub const SOCK_RAW: ::c_int = 3; +@@ -3079,11 +3285,6 @@ pub const RTLD_DI_TLS_DATA: ::c_int = 10; + pub const RTLD_DI_PHDR: ::c_int = 11; + pub const RTLD_DI_MAX: ::c_int = 11; + +-pub const RTLD_NEXT: *mut ::c_void = -1i64 as *mut ::c_void; +-pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void; +-pub const RTLD_NODELETE: ::c_int = 0x1000; +-pub const RTLD_NOW: ::c_int = 0x2; +- + pub const SI_ASYNCIO: ::c_int = -4; + pub const SI_MESGQ: ::c_int = -3; + pub const SI_TIMER: ::c_int = -2; +@@ -3262,12 +3463,12 @@ f! { + return 0 as *mut cmsghdr; + }; + let next = (cmsg as usize + +- super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) ++ CMSG_ALIGN((*cmsg).cmsg_len as usize)) + as *mut cmsghdr; + let max = (*mhdr).msg_control as usize + + (*mhdr).msg_controllen as usize; + if (next.offset(1)) as usize > max || +- next as usize + super::CMSG_ALIGN((*next).cmsg_len as usize) > max ++ next as usize + CMSG_ALIGN((*next).cmsg_len as usize) > max + { + 0 as *mut cmsghdr + } else { +@@ -3756,6 +3957,7 @@ extern "C" { + __attr: *const pthread_attr_t, + __guardsize: *mut ::size_t, + ) -> ::c_int; ++ pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int; + + pub fn pthread_attr_getstack( + __attr: *const pthread_attr_t, +@@ -3763,12 +3965,6 @@ extern "C" { + __stacksize: *mut ::size_t, + ) -> ::c_int; + +- pub fn pthread_attr_getguardsize( +- attr: *const ::pthread_attr_t, +- guardsize: *mut ::size_t, +- ) -> ::c_int; +- pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int; +- + pub fn pthread_mutexattr_getpshared( + attr: *const pthread_mutexattr_t, + pshared: *mut ::c_int, diff --git a/patches/vendor/u-hurd-libloading-0.7.4.patch b/patches/vendor/u-hurd-libloading-0.7.4.patch new file mode 100644 index 0000000000..e4d0ab6585 --- /dev/null +++ b/patches/vendor/u-hurd-libloading-0.7.4.patch @@ -0,0 +1,45 @@ +From: Samuel Thibault +Date: Tue, 29 Aug 2023 19:55:29 +0000 +Subject: add hurd support + +Forwarded: https://github.com/nagisa/rust_libloading/pull/129 +--- + vendor/libloading-0.7.4/src/os/unix/consts.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/vendor/libloading-0.7.4/src/os/unix/consts.rs b/vendor/libloading-0.7.4/src/os/unix/consts.rs +index ea7a6a1..5794ade 100644 +--- a/vendor/libloading-0.7.4/src/os/unix/consts.rs ++++ b/vendor/libloading-0.7.4/src/os/unix/consts.rs +@@ -82,6 +82,7 @@ mod posix { + + target_os = "fuchsia", + target_os = "redox", ++ target_os = "hurd", + ))] { + pub(super) const RTLD_LAZY: c_int = 1; + } else { +@@ -115,6 +116,7 @@ mod posix { + + target_os = "fuchsia", + target_os = "redox", ++ target_os = "hurd", + ))] { + pub(super) const RTLD_NOW: c_int = 2; + } else if #[cfg(all(target_os = "android",target_pointer_width = "32"))] { +@@ -162,6 +164,7 @@ mod posix { + + target_os = "fuchsia", + target_os = "redox", ++ target_os = "hurd", + ))] { + pub(super) const RTLD_GLOBAL: c_int = 0x100; + } else { +@@ -200,6 +203,7 @@ mod posix { + + target_os = "fuchsia", + target_os = "redox", ++ target_os = "hurd", + ))] { + pub(super) const RTLD_LOCAL: c_int = 0; + } else { diff --git a/patches/vendor/u-hurd-socket2.patch b/patches/vendor/u-hurd-socket2.patch new file mode 100644 index 0000000000..0c1e027a68 --- /dev/null +++ b/patches/vendor/u-hurd-socket2.patch @@ -0,0 +1,95 @@ +From: Samuel Thibault +Date: Tue, 29 Aug 2023 20:03:20 +0000 +Subject: add hurd support + +Forwarded: https://github.com/rust-lang/socket2/pull/474 +--- + vendor/socket2/src/sockaddr.rs | 2 ++ + vendor/socket2/src/socket.rs | 4 ++++ + vendor/socket2/src/sys/unix.rs | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/vendor/socket2/src/sockaddr.rs b/vendor/socket2/src/sockaddr.rs +index e721018..682ec89 100644 +--- a/vendor/socket2/src/sockaddr.rs ++++ b/vendor/socket2/src/sockaddr.rs +@@ -231,6 +231,7 @@ impl From for SockAddr { + target_os = "dragonfly", + target_os = "freebsd", + target_os = "haiku", ++ target_os = "hurd", + target_os = "ios", + target_os = "macos", + target_os = "netbsd", +@@ -275,6 +276,7 @@ impl From for SockAddr { + target_os = "dragonfly", + target_os = "freebsd", + target_os = "haiku", ++ target_os = "hurd", + target_os = "ios", + target_os = "macos", + target_os = "netbsd", +diff --git a/vendor/socket2/src/socket.rs b/vendor/socket2/src/socket.rs +index 90649d9..45fe1e3 100644 +--- a/vendor/socket2/src/socket.rs ++++ b/vendor/socket2/src/socket.rs +@@ -1235,6 +1235,7 @@ impl Socket { + #[cfg(not(any( + target_os = "dragonfly", + target_os = "haiku", ++ target_os = "hurd", + target_os = "netbsd", + target_os = "openbsd", + target_os = "redox", +@@ -1272,6 +1273,7 @@ impl Socket { + #[cfg(not(any( + target_os = "dragonfly", + target_os = "haiku", ++ target_os = "hurd", + target_os = "netbsd", + target_os = "openbsd", + target_os = "redox", +@@ -1448,6 +1450,7 @@ impl Socket { + #[cfg(not(any( + target_os = "dragonfly", + target_os = "fuchsia", ++ target_os = "hurd", + target_os = "illumos", + target_os = "netbsd", + target_os = "openbsd", +@@ -1479,6 +1482,7 @@ impl Socket { + #[cfg(not(any( + target_os = "dragonfly", + target_os = "fuchsia", ++ target_os = "hurd", + target_os = "illumos", + target_os = "netbsd", + target_os = "openbsd", +diff --git a/vendor/socket2/src/sys/unix.rs b/vendor/socket2/src/sys/unix.rs +index ec7c3e2..1b89e37 100644 +--- a/vendor/socket2/src/sys/unix.rs ++++ b/vendor/socket2/src/sys/unix.rs +@@ -84,6 +84,7 @@ pub(crate) use libc::IP_HDRINCL; + #[cfg(not(any( + target_os = "dragonfly", + target_os = "fuchsia", ++ target_os = "hurd", + target_os = "illumos", + target_os = "netbsd", + target_os = "openbsd", +@@ -116,6 +117,7 @@ pub(crate) use libc::{ + #[cfg(not(any( + target_os = "dragonfly", + target_os = "haiku", ++ target_os = "hurd", + target_os = "netbsd", + target_os = "openbsd", + target_os = "redox", +@@ -233,6 +235,7 @@ type IovLen = usize; + target_os = "freebsd", + target_os = "fuchsia", + target_os = "haiku", ++ target_os = "hurd", + target_os = "illumos", + target_os = "netbsd", + target_os = "openbsd", diff --git a/prune-checksums b/prune-checksums new file mode 100755 index 0000000000..0c895cff44 --- /dev/null +++ b/prune-checksums @@ -0,0 +1,47 @@ +#!/usr/bin/python3 +# Copyright: 2015-2017 The Debian Project +# License: MIT or Apache-2.0 +# +# Helper to remove removed-files from .cargo-checksum +# TODO: rewrite to perl and add to dh-cargo, maybe? + +from collections import OrderedDict +import argparse +import json +import os +import sys + +def prune_keep(cfile): + with open(cfile) as fp: + sums = json.load(fp, object_pairs_hook=OrderedDict) + + oldfiles = sums["files"] + newfiles = OrderedDict([entry for entry in oldfiles.items() if os.path.exists(entry[0])]) + sums["files"] = newfiles + + if len(oldfiles) == len(newfiles): + return + + with open(cfile, "w") as fp: + json.dump(sums, fp, separators=(',', ':')) + +def prune(cfile): + with open(cfile, "r+") as fp: + sums = json.load(fp, object_pairs_hook=OrderedDict) + sums["files"] = {} + fp.seek(0) + json.dump(sums, fp, separators=(',', ':')) + fp.truncate() + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("-k", "--keep", action="store_true", help="keep " + "checksums of files that still exist, and assume they haven't changed.") + parser.add_argument('crates', nargs=argparse.REMAINDER, + help="crates whose checksums to prune. (default: ./)") + args = parser.parse_args(sys.argv[1:]) + crates = args.crates or ["."] + f = prune_keep if args.keep else prune + for c in crates: + cfile = os.path.join(c, ".cargo-checksum.json") if os.path.isdir(c) else c + f(cfile) diff --git a/prune-unused-deps b/prune-unused-deps new file mode 100755 index 0000000000..d24df688b2 --- /dev/null +++ b/prune-unused-deps @@ -0,0 +1,83 @@ +#!/bin/bash +# Run this script in an unpacked upstream tarball directory, and it will update +# (i.e. overwrite) the "unused deps" part of Files-Excluded in d/copyright. + +set -e + +scriptdir=$(dirname "$(dirname "$(readlink -f "$0")")") +had_config_toml=$(if test -e "$scriptdir/debian/config.toml"; then echo true; else echo false; fi) + +( cd "$scriptdir" && debian/rules debian/config.toml ) +cp "$scriptdir/debian/config.toml" config.toml + +for i in "$scriptdir/debian/patches"/d-00*.patch; do + "$scriptdir/debian/ensure-patch" -N "$i" +done + +test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig +test -f src/bootstrap/Cargo.lock.orig || cp src/bootstrap/Cargo.lock src/bootstrap/Cargo.lock.orig +test -f src/tools/rust-analyzer/Cargo.lock.orig || cp src/tools/rust-analyzer/Cargo.lock src/tools/rust-analyzer/Cargo.lock.orig +test -f src/tools/cargo/Cargo.lock.orig || cp src/tools/cargo/Cargo.lock src/tools/cargo/Cargo.lock.orig +rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock + +find vendor -name .cargo-checksum.json -execdir "$scriptdir/debian/prune-checksums" "{}" + + +# TEMP: cc 1.0.83 is broken, see https://github.com/rust-lang/cc-rs/issues/913 +# this forces a downgrade to 1.0.79, and can be removed once a fixed version is vendored +rm -rf vendor/cc + +# re-generate Cargo.lock after patching +cargo update --offline +# temporary, versions until 1.85 are broken for bootstrapping, and this would pick up 1.83 otherwise + +# re-generate src/bootstrap/Cargo.lock after patching +(cd src/bootstrap && cargo update --offline) + +# re-generate src/tools/rust-analyzer/Cargo.lock after patching +( cd src/tools/rust-analyzer && cargo update --offline ) + +# re-generate src/tools/cargo/Cargo.lock after patching +( cd src/tools/cargo && cargo update --offline ) + +needed_crates() { + cat Cargo.lock \ + src/bootstrap/Cargo.lock \ + src/tools/rust-analyzer/Cargo.lock \ + src/tools/cargo/Cargo.lock \ + | sed -z -e 's/\nname = /name = /g' -e 's/\nversion = /version = /g' \ + | sed -ne 's/\[\[package\]\]name = "\(.*\)"version = "\(.*\)"/\1 \2/gp' +} + +ghetto_parse_cargo() { + cat "$1" \ + | tr '\n' '\t' \ + | sed -e 's/\t\[/\n[/g' \ + | perl -ne 'print if s/^\[(?:package|project)\].*\tname\s*=\s*"(.*?)".*\tversion\s*=\s*"(.*?)".*/\1 \2/g' +} + +pruned_paths() { + for i in vendor/*/Cargo.toml; do + pkgnamever= + pkgnamever=$(ghetto_parse_cargo "$i") + if [ -z "$pkgnamever" ]; then + echo >&2 "failed to parse: $i" + exit 1 + fi + echo "$pkgnamever $i" + done | grep -v -F -f <(needed_crates) | cut '-d ' -f3 | while read x; do + echo " $(dirname $x)" + done +} + +header='# DO NOT EDIT below, AUTOGENERATED' +footer='# DO NOT EDIT above, AUTOGENERATED' +{ +echo "$header" +pruned_paths +echo "$footer" +} > $scriptdir/debian/copyright.unused-deps + +cd $scriptdir/debian +sed -i -e "/^$header/,/^$footer/d" -e '/^# unused dependencies/rcopyright.unused-deps' copyright +rm copyright.unused-deps +$had_config_toml || rm "$scriptdir/debian/config.toml" diff --git a/rebase-patches.sh b/rebase-patches.sh new file mode 100755 index 0000000000..206769316c --- /dev/null +++ b/rebase-patches.sh @@ -0,0 +1,54 @@ +#!/bin/bash +set -e + +ver="$1" +dfsg="${2:-+dfsg1}" +upstream_tag="upstream/${ver/\~/_}${dfsg/\~/_}" + +git show -s upstream/experimental +git show -s debian/experimental +printf "\ngit top-level dir: %s\n" "$(git rev-parse --show-toplevel)" +printf "version: $ver\n" + +if ! git merge-base --is-ancestor upstream/experimental debian/experimental; then + echo >&2 "upstream/experimental is not an ancestor of debian/experimental" +fi +if git rev-parse "${upstream_tag}" 2>/dev/null >/dev/null; then + echo >&2 "tag already exists: ${upstream_tag}" +fi + +read -p "continue? [y/N] " x +if [ "$x" != "y" ]; then exit 1; fi + +cd "$(git rev-parse --show-toplevel)" +git branch -f upstream/rebase-patches upstream/experimental +git branch -f debian/rebase-patches debian/experimental +git checkout debian/rebase-patches + +git branch -f patch-queue/debian/rebase-patches +gbp pq import --no-patch-numbers + +gbp import-orig "../rustc_${ver}${dfsg}.orig.tar.xz" \ + --upstream-branch=upstream/rebase-patches \ + --debian-branch=debian/rebase-patches \ + --no-sign-tags --no-pristine-tar --no-symlink-orig + +# rebase here +echo "$0: Now manually rebase - run 'git rebase debian/rebase-patches'" +echo "$0: There may be conflicts; follow the instructions that git tells you." +echo "$0: When done, exit the child shell with ctrl-D" +$SHELL + +gbp pq export --no-patch-numbers +git add debian/patches +git commit -m "early-stage update of patches for ${ver}${dfsg}" +git checkout . +git rebase @~ --onto=debian/experimental +git branch -f debian/experimental +git checkout debian/experimental + +# cleanup +git tag -d "${upstream_tag}" || true +git branch -D upstream/rebase-patches || true +git branch -D debian/rebase-patches || true +git branch -D patch-queue/debian/rebase-patches || true diff --git a/rules b/rules new file mode 100755 index 0000000000..80141146b4 --- /dev/null +++ b/rules @@ -0,0 +1,565 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/vendor.mk +include /usr/share/dpkg/architecture.mk +SED_VERSION_SHORT := sed -re 's/([^.]+)\.([^.]+)\..*/\1.\2/' +RUST_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | $(SED_VERSION_SHORT)) +RUST_LONG_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | sed -re 's/([^+]+).*/\1/') +LIBSTD_PKG := libstd-rust-$(RUST_VERSION) +# Sed expression that matches the "rustc" we have in our Build-Depends field +SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc:native .*,/p}" debian/control +# Version of /usr/bin/rustc +LOCAL_RUST_VERSION := $(shell rustc --version --verbose | sed -ne 's/^release: //p') + +include /usr/share/dpkg/buildflags.mk +# needed for cross-compilation to avoid passing host CFLAGS to the BUILD +# compiler +export TARGET_CFLAGS = $(CFLAGS) +export TARGET_CXXFLAGS = $(CXXFLAGS) +export TARGET_CPPFLAGS = $(CPPFLAGS) +export TARGET_LDFLAGS = $(LDFLAGS) +unexport CFLAGS CXXFLAGS CPPFLAGS LDFLAGS +export CARGO_HOME = $(CURDIR)/debian/cargo + +# Defines DEB_*_RUST_TYPE triples +include debian/architecture.mk +# for dh_install substitution variable +export DEB_HOST_RUST_TYPE + +# for dh_install substitution variable +export RUST_LONG_VERSION + +DEB_DESTDIR := $(CURDIR)/debian/tmp + +# Use system LLVM (comment out to use vendored LLVM) +LLVM_VERSION = 17 +OLD_LLVM_VERSION = 16 +# Cargo-specific flags +export LIBSSH2_SYS_USE_PKG_CONFIG=1 +# Make it easier to test against a custom LLVM +ifneq (,$(LLVM_DESTDIR)) +LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib +LD_LIBRARY_PATH := $(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):$(LLVM_LIBRARY_PATH),$(LLVM_LIBRARY_PATH)) +export LD_LIBRARY_PATH +endif + +# Required for profiler builtin +CLANG_RT_ARCH := $(DEB_TARGET_GNU_CPU) +ifeq (i386,$(DEB_TARGET_ARCH)) +CLANG_RT_ARCH = i386 +endif +ifeq (armhf,$(DEB_TARGET_ARCH)) +CLANG_RT_ARCH = armhf +endif + +ifneq (,$(filter $(DEB_TARGET_ARCH),sparc64 mips64el hurd-i386 hurd-amd64)) +# sparc64: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061125 +# mips64el: has profiler, but buggy atm (32-bit overflow in some counter?) +CLANG_RT_ARCH = +PROFILER = "false" +else +export LLVM_PROFILER_RT_LIB=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/linux/libclang_rt.profile-$(CLANG_RT_ARCH).a +PROFILER = "true" +endif + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +RUSTBUILD = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py $(NJOBS) +RUSTBUILD_FLAGS = --stage 2 --config debian/config.toml --on-fail env +# rust-tidy depends on lots of modules that we strip out of the build. +# it also tries to access the network for some reason. so just disable it. +RUSTBUILD_TEST = $(RUSTBUILD) test --no-fail-fast --exclude src/tools/tidy +# To run a specific test, run something like: +# $ debian/rules override_dh_auto_test-arch \ +# RUSTBUILD_TEST_FLAGS="src/test/run-make --test-args extern-fn-struct" +# See src/bootstrap/README.md for more options. +RUSTBUILD_TEST_FLAGS = + +# https://github.com/rust-lang/rust/issues/89744 +# TODO: remove when we update cargo to 1.55 / 0.56 +# upstream bug still exists and is under investigation, but is hidden by newer cargo +export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_OPT_LEVEL=0 + +update-version: + oldver=$(shell $(SED_RUSTC_BUILDDEP) | sed -ne 's/.*(<= \(.*\)).*/\1/gp' | $(SED_VERSION_SHORT)); \ + newver=$(RUST_VERSION); \ + debian/update-version.sh $$oldver $$newver $(RUST_LONG_VERSION) $(CARGO_NEW) + +# Below we detect how we're supposed to bootstrap the stage0 compiler. See +# README.Debian for more details of the cases described below. +# +PRECONFIGURE_CHECK = : +HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_HOST_RUST_TYPE)* 2>/dev/null | wc -l) +DOWNLOAD_BOOTSTRAP := false +# allow not using the binary tarball although it exists +#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 powerpc ppc64el s390x)) +# HAVE_BINARY_TARBALL := 0 +#endif +ifeq (0,$(HAVE_BINARY_TARBALL)) + # Case A (Building from source): the extracted source tree does not include + # a bootstrapping tarball for the current architecture e.g. because the + # distro already has a rustc for this arch, or the uploader expects that + # this requirement be fulfilled in some other way. + # + # Case A-1: the builder did not select the "pkg.rustc.dlstage0" build profile. + # In this case, we use the distro's rustc - either the previous or current version. + ifeq (,$(findstring pkg.rustc.dlstage0,$(DEB_BUILD_PROFILES))) + # Make it easier to test against a custom rustc + ifneq (,$(RUST_DESTDIR)) + RUST_LIBRARY_PATH := $(RUST_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(RUST_DESTDIR)/usr/lib + LD_LIBRARY_PATH := $(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):$(RUST_LIBRARY_PATH),$(RUST_LIBRARY_PATH)) + export LD_LIBRARY_PATH + endif + # + # Case A-2: the builder selected the "dlstage0" build profile. + # In this case, the rust build scripts will download a stage0 into stage0/ and use that. + # We don't need to do anything specific in this build file, so this case is empty. + else + DOWNLOAD_BOOTSTRAP := true + endif +else + # Case B (Bootstrapping a new distro): the extracted source tree does + # include a bootstrapping tarball for the current architecture; see the + # `source_orig-stage0` target below on how to build this. + # + # In this case, we'll bootstrap from the stage0 given in that tarball. + # To ensure the uploader of the .dsc didn't make a mistake, we first check + # that rustc isn't a Build-Depends for the current architecture. + ifneq (,$(shell $(SED_RUSTC_BUILDDEP))) + ifeq (,$(shell $(SED_RUSTC_BUILDDEP) | grep '!$(DEB_HOST_ARCH)')) + PRECONFIGURE_CHECK = $(error found matches for stage0/*/*$(DEB_HOST_RUST_TYPE)*, \ + but rustc might be a Build-Depends for $(DEB_HOST_ARCH)) + endif + endif +endif + +BUILD_DOCS := true +ifneq (,$(findstring nodoc,$(DEB_BUILD_PROFILES))) + BUILD_DOCS := false +endif +ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) + BUILD_DOCS := false +endif + +BUILD_WASM := true +ifneq (,$(findstring nowasm,$(DEB_BUILD_PROFILES))) + BUILD_WASM := false +endif + +WINDOWS_SUPPORT := amd64 i386 +BUILD_WINDOWS := true +ifneq (,$(findstring nowindows,$(DEB_BUILD_PROFILES))) + BUILD_WINDOWS := false +endif +ifeq (,$(filter $(DEB_HOST_ARCH), $(WINDOWS_SUPPORT))) + BUILD_WINDOWS := false +else + ifeq (,$(filter $(DEB_BUILD_ARCH), $(WINDOWS_SUPPORT))) + ifeq (true,$(BUILD_WINDOWS)) + $(error cannot cross-compile from $(DEB_BUILD_ARCH) to $(DEB_HOST_ARCH), unless "nowindows" is in DEB_BUILD_PROFILES) + endif + endif + ifeq (i386,$(DEB_HOST_ARCH)) + WINDOWS_ARCH := i686 + else + WINDOWS_ARCH := x86_64 + endif +endif +# for dh_install substitution variable +export WINDOWS_ARCH + +MAKE_OPTIMISATIONS := true +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + MAKE_OPTIMISATIONS := false +endif + +VERBOSITY_SUB := $(words $(filter terse,$(DEB_BUILD_OPTIONS))) +VERBOSITY_ADD := $(words $(filter verbose,$(DEB_BUILD_OPTIONS))) +VERBOSITY := $(shell expr 2 + $(VERBOSITY_ADD) - $(VERBOSITY_SUB)) + +ifeq ($(shell test $(VERBOSITY) -ge 3; echo $$?),0) + export DH_VERBOSE=1 +endif + +ifeq ($(shell test $(VERBOSITY) -le 0; echo $$?),0) + export DH_QUIET=1 +.SILENT: +endif + +# Build products or non-source files in src/, that shouldn't go in rust-src +SRC_CLEAN = src/bootstrap/bootstrap.pyc \ + src/bootstrap/__pycache__ \ + src/etc/__pycache__/ + +# Try to work around #933045 +ifneq (,$(filter $(DEB_BUILD_ARCH), mips mipsel)) + SYSTEM_WORKAROUNDS += export MALLOC_ARENA_MAX=1; +endif + +%: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel --with bash-completion + +.PHONY: .dbg-windows +.dbg-windows: + @echo host=$(DEB_BUILD_ARCH) target=$(DEB_HOST_ARCH) BUILD_WINDOWS=$(BUILD_WINDOWS) WINDOWS_ARCH=$(WINDOWS_ARCH) + +.PHONY: build +build: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel --with bash-completion + +override_dh_clean: + # Upstream contains a lot of these + dh_clean -XCargo.toml.orig + +debian/config.toml: debian/config.toml.in debian/rules + u="$(DEB_VERSION_UPSTREAM)"; \ + if [ "$$u" != "$${u%~beta.*+dfsg*}" ]; then channel="beta"; \ + else channel="stable"; fi; \ + m4 -DRELEASE_CHANNEL="$$channel" \ + -DDEB_BUILD_RUST_TYPE="$(DEB_BUILD_RUST_TYPE)" \ + -DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \ + -DDEB_TARGET_RUST_TYPE="$(DEB_TARGET_RUST_TYPE)" \ + -DDEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \ + -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \ + -DDEB_TARGET_GNU_TYPE="$(DEB_TARGET_GNU_TYPE)" \ + -DMAKE_OPTIMISATIONS="$(MAKE_OPTIMISATIONS)" \ + -DVERBOSITY="$(VERBOSITY)" \ + -DLLVM_DESTDIR="$(LLVM_DESTDIR)" \ + -DLLVM_VERSION="$(LLVM_VERSION)" \ + -DRUST_DESTDIR="$(RUST_DESTDIR)" \ + -DPROFILER="$(PROFILER)" \ + "$<" > "$@" + if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \ + then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi +# Work around low-memory (32-bit) architectures: https://github.com/rust-lang/rust/issues/45854 +# otherwise they fail to mmap rustc_driver when building rustdoc in >1.60 + if [ $(DEB_BUILD_ARCH_BITS) = "32" ]; then \ + sed -i -e 's/^debuginfo-level = .*/debuginfo-level = 0/g' "$@"; \ + fi + +check-no-old-llvm: + # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog + ! grep --color=always -i '\(clang\|ll\(..\|d\)\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude=copyright --exclude='*.patch' --exclude-dir='.debhelper' -R debian +.PHONY: check-no-old-llvm + +extra-vendor: + if [ -d extra ]; then \ + cd extra; \ + for c in *; do \ + if [ -e ../vendor/"$$c" ]; then \ + mv -v ../vendor/"$$c" ../vendor/"$$c".backup ; \ + fi ; \ + echo "adding extra vendored dependency '$$c'"; \ + cp -r ./"$$c" ../vendor/; \ + done; \ + fi + +.PHONY: extra-vendor + +debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm extra-vendor + # fail the build if we accidentally vendored openssl, indicates we pulled in unnecessary dependencies + test ! -e vendor/openssl-src + # fail the build if our version contains ~exp and we are not releasing to experimental + v="$(DEB_VERSION)"; test "$$v" = "$${v%~exp*}" -o "$(DEB_DISTRIBUTION)" = "experimental" -o "$(DEB_DISTRIBUTION)" = "UNRELEASED" + $(PRECONFIGURE_CHECK) + if [ -d stage0 ]; then mkdir -p build && ln -sfT ../stage0 build/cache; fi + # work around #842634 + if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \ + debian/ensure-patch -N debian/patches/d-test-host-duplicates.patch; fi + # don't care about lock changes + rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock + # We patched some crates so have to rm the checksums + find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" + + # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16 + echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' > vendor/lzma-sys/build.rs + # We don't run ./configure because we use debian/config.toml directly + ln -sf debian/config.toml config.toml + touch "$@" + +override_dh_auto_configure-arch: debian/dh_auto_configure.stamp +override_dh_auto_configure-indep: debian/dh_auto_configure.stamp +ifeq (true,$(BUILD_DOCS)) +# Change config.toml now and not later, since that might trigger a rebuild + sed -i -e 's/^docs = false/docs = true/' debian/config.toml +endif + +override_dh_auto_clean: + $(RM) -rf build tmp debian/cargo_home config.stamp config.mk Makefile + $(RM) -rf $(TEST_LOG) debian/config.toml debian/*.stamp + $(RM) -rf $(SRC_CLEAN) config.toml + +debian/dh_auto_build.stamp: + $(RUSTBUILD) build $(RUSTBUILD_FLAGS) + +override_dh_auto_build-arch: debian/dh_auto_build.stamp +ifeq (true,$(BUILD_WINDOWS)) + $(RUSTBUILD) build $(RUSTBUILD_FLAGS) \ + --host $(DEB_BUILD_RUST_TYPE) \ + --target $(WINDOWS_ARCH)-pc-windows-gnu \ + library/std +endif + +override_dh_auto_build-indep: debian/dh_auto_build.stamp +ifeq (true,$(BUILD_WASM)) + $(RUSTBUILD) build $(RUSTBUILD_FLAGS) \ + --host $(DEB_BUILD_RUST_TYPE) \ + --target wasm32-unknown-unknown,wasm32-wasi \ + library/std +endif +ifeq (true,$(BUILD_DOCS)) + $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) + $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) cargo # document cargo APIs +endif + +TEST_LOG = debian/rustc-tests.log +# This is advertised as "5 tests failed" in README.Debian because our counting +# method is imprecise and in practise we count some failures twice. +# temporarily bumped from 8 to 10 to account for test output changes depending +# on build path length, bump down again once 1.78 is imported +FAILURES_ALLOWED = 10 +ifneq (,$(filter $(DEB_BUILD_ARCH), armhf)) +# temporarily bumped from 12 to 15, see above + FAILURES_ALLOWED = 15 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), armel mips mips64el)) + FAILURES_ALLOWED = 24 +endif +# workaround broken gdb 13.1 - revert to 24 once fixed +# #1031946 / #1032785 +ifneq (,$(filter $(DEB_BUILD_ARCH), mipsel)) + FAILURES_ALLOWED = 25 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64 s390x riscv64)) + FAILURES_ALLOWED = 40 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), loong64 powerpc powerpcspe sparc64 x32 hurd-i386 hurd-amd64)) + FAILURES_ALLOWED = 180 +endif +FAILED_TESTS = grep "FAILED\|^command did not execute successfully" $(TEST_LOG) | grep -v '^test result: FAILED' | grep -v 'FAILED (allowed)' +# ignore debuginfo failures on armhf due to regression in GDB 11.2 +# https://sourceware.org/bugzilla/show_bug.cgi?id=29272 +ifneq (,$(filter $(DEB_BUILD_ARCH), armhf)) + FAILED_TESTS += | grep -v '^test \[debuginfo-gdb\] src/test/debuginfo/' +endif +override_dh_auto_test-arch: + # ensure that rustc_llvm is actually dynamically linked to libLLVM + set -e; find build/*/stage2/lib/rustlib/* -name '*rustc_llvm*.so' | \ + while read x; do \ + stat -c '%s %n' "$$x"; \ + objdump -p "$$x" | grep -q "NEEDED.*LLVM"; \ + test "$$(stat -c %s "$$x")" -lt 6000000; \ + done +ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES))) +ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) + { $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG) + # test that the log has at least 1 pass, to prevent e.g. #57709 + grep -l "^test .* \.\.\. ok$$" $(TEST_LOG) + echo "==== Debian rustc test report ===="; \ + echo "Specific test failures:"; \ + $(FAILED_TESTS); \ + num_failures=$$($(FAILED_TESTS) | wc -l); \ + exit_code=$$(tail -n1 $(TEST_LOG)); \ + echo "Summary: exit code $$exit_code, counted $$num_failures tests failed."; \ + echo -n "$(FAILURES_ALLOWED) maximum allowed. "; \ + if test "$$num_failures" -eq 0 -a "$$exit_code" -ne 0; then \ + echo "Aborting just in case, because we missed counting some test failures."; \ + echo "This could happen if we failed to build the tests, or if the testsuite runner is buggy."; \ + false; \ + elif test "$$num_failures" -le $(FAILURES_ALLOWED); then \ + echo "Continuing..."; \ + else \ + echo "Aborting the build."; \ + echo "Check the logs further above for details."; \ + false; \ + fi +# don't continue if RUSTBUILD_TEST_FLAGS is non-empty + test -z "$(RUSTBUILD_TEST_FLAGS)" +# don't run windows tests yet +endif +endif + +override_dh_auto_test-indep: +ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES))) +ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (true,$(BUILD_WASM)) + # Ignore failures in these tests, but run them so we see what it's like + -PATH=$(CURDIR)/debian/bin:$(PATH) $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS) \ + --host $(DEB_BUILD_RUST_TYPE) \ + --target wasm32-unknown-unknown,wasm32-wasi \ + library/std +endif +ifeq (true,$(BUILD_DOCS)) + # Run all rules that test the docs, i.e. that depend on default:doc + $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) src/tools/linkchecker +endif + test -z "$(RUSTBUILD_TEST_FLAGS)" +endif +endif + +run_rustbuild: + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) $(X_CMD) $(RUSTBUILD_FLAGS) $(X_FLAGS) + +override_dh_prep: + dh_prep + $(RM) -f debian/dh_auto_install.stamp + +debian/dh_auto_install.stamp: + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) install $(RUSTBUILD_FLAGS) + + mkdir -p $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ + mv $(DEB_DESTDIR)/usr/lib/lib*.so $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ + + # Replace duplicated compile-time/run-time dylibs with symlinks + @set -e; \ + for f in $(DEB_DESTDIR)/usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/lib*.so; do \ + name=$${f##*/}; \ + if [ -f "$(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/$$name" ]; then \ + echo "ln -sf ../../../$(DEB_HOST_MULTIARCH)/$$name $$f"; \ + ln -sf ../../../$(DEB_HOST_MULTIARCH)/$$name $$f; \ + fi; \ + done + + # Remove Cargo made package cache + rm -vf $(CURDIR)/debian/cargo/.package-cache + + touch "$@" + +override_dh_auto_install-arch: debian/dh_auto_install.stamp +ifeq (true,$(BUILD_WINDOWS)) + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) install $(RUSTBUILD_FLAGS) \ + --host $(DEB_BUILD_RUST_TYPE) \ + --target $(WINDOWS_ARCH)-pc-windows-gnu \ + library/std +endif + # Remove Cargo made package cache + rm -vf $(CURDIR)/debian/cargo/.package-cache + + +override_dh_auto_install-indep: debian/dh_auto_install.stamp +ifeq (true,$(BUILD_WASM)) + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) install $(RUSTBUILD_FLAGS) \ + --host $(DEB_BUILD_RUST_TYPE) \ + --target wasm32-unknown-unknown,wasm32-wasi \ + library/std +endif +ifeq (true,$(BUILD_DOCS)) + # Install Cargo docs + install -d $(DEB_DESTDIR)/usr/share/doc/cargo + cp -r $(CURDIR)/build/$(DEB_BUILD_RUST_TYPE)/compiler-doc $(DEB_DESTDIR)/usr/share/doc/cargo/reference + # Brute force to remove privacy-breach-logo lintian warning. + # We could have updated the upstream sources but it would complexify + # the rebase + @set -e; \ + find $(DEB_DESTDIR)/usr/share/doc/*/html -iname '*.html' | \ + while read file; do \ + topdir=$$(echo "$$file" | sed 's,^$(DEB_DESTDIR)/usr/share/doc/rust/html/,,; s,/[^/]*$$,/,; s,^[^/]*$$,,; s,[^/]\+/,../,g'); \ + sed -i \ + -e "s,https://\(doc\|www\).rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," \ + -e 's,\([^,\1,g' \ + -e 's,\([^,\1,g' "$$file"; \ + done + find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete; + + # mv cargo book to cargo-docs + mv $(DEB_DESTDIR)/usr/share/doc/rust/html/cargo $(DEB_DESTDIR)/usr/share/doc/cargo/book +endif + # Remove Cargo made package cache + rm -vf $(CURDIR)/debian/cargo/.package-cache + + +override_dh_install-indep: + dh_install + $(RM) -rf $(SRC_CLEAN:%=debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION)/%) + # Get rid of lintian warnings + find debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION) \ + \( -name .gitignore \ + -o -name 'LICENSE*' \ + -o -name 'LICENCE' \ + -o -name 'license' \ + -o -name 'COPYING*' \ + -o -name '.eslintrc.js' \ + \) -delete + # Remove files that autoload remote resources, caught by lintian + $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/cssparser/docs/*.html + $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/kuchiki/docs/*.html + $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/url/docs/*.html + $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/xz2/.gitmodules + +override_dh_installchangelogs: + dh_installchangelogs RELEASES.md + +override_dh_installdocs: + dh_installdocs -X.tex -X.aux -X.log -X.out -X.toc + +override_dh_compress: + dh_compress -X.woff + +# The below override is disabled on advice from #debian-devel, because: +# - only shared libs get the "split dbgsym package" treatment by dh_strip; +# static libs simply get their debuginfo discarded +# - strip(1) sometimes breaks wasm libs +# +#override_dh_strip: +# # Work around #35733, #468333 +# find debian/libstd-rust-dev*/ -name '*.rlib' -execdir mv '{}' '{}.a' \; +# # This is expected to print out lots of "File format unrecognized" warnings about +# # rust.metadata.bin and *.deflate but the .o files inside the rlibs should be stripped +# # Some files are still omitted because of #875780 however. +# dh_strip -v +# find debian/libstd-rust-dev*/ -name '*.rlib.a' -execdir sh -c 'mv "$$1" "$${1%.a}"' - '{}' \; + +override_dh_dwz: + # otherwise rustc gets an empty multifile which lintian errors on, causing + # FTP auto-reject. this is a work-around, the lintian bug is #955752 + # double up the max entries count, else the build might fail.. + dh_dwz --no-dwz-multifile -- -L 100000000 + +override_dh_makeshlibs: + dh_makeshlibs -V -N $(LIBSTD_PKG) + + # dh_makeshlibs doesn't support our "libfoo-version.so" naming + # structure, so we have to do this ourselves. + mkdir -p debian/$(LIBSTD_PKG)/DEBIAN + LC_ALL=C ls debian/$(LIBSTD_PKG)/usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so | \ + sed -n 's,^.*/\(lib.*\)-\(.\+\)\.so$$,\1 \2,p' | \ + while read name version; do \ + echo "$$name $$version $(LIBSTD_PKG) (>= $(DEB_VERSION_UPSTREAM))"; \ + done > debian/$(LIBSTD_PKG)/DEBIAN/shlibs + +override_dh_shlibdeps: + dh_shlibdeps -- -x$(LIBSTD_PKG) + +QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE = x=$$?; if [ $$x = 2 ]; then exit 0; else exit $$x; fi +source_orig-stage0: + QUILT_PATCHES=debian/patches quilt push -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) + $(MAKE) -f debian/rules clean + debian/make_orig-stage0_tarball.sh + $(MAKE) -f debian/rules clean + QUILT_PATCHES=debian/patches quilt pop -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) + rm -rf .pc + +get_beta_version = \ + u="$(DEB_VERSION_UPSTREAM)"; \ + if [ "$$u" != "$${u%~beta.*+dfsg*}" ]; then \ + newver=$(shell echo $(RUST_VERSION) | perl -lpe 's/(\d+)\.(\d+)/$$1 . "." . ($$2)/e'); \ + else \ + newver=$(shell echo $(RUST_VERSION) | perl -lpe 's/(\d+)\.(\d+)/$$1 . "." . ($$2+1)/e'); \ + fi + +debian/watch-beta: debian/watch-beta.in debian/rules + set -e; $(get_beta_version); \ + m4 -DOLDVER="$$oldver" -DNEWVER="$$newver.0" "$<" > "$@" + +source_orig-beta: debian/watch-beta + uscan $(USCAN_OPTS) $(if $(USCAN_DESTDIR),--destdir=$(USCAN_DESTDIR),) --verbose --watchfile "$<" + set -e; $(get_beta_version); \ + bd="$(if $(USCAN_DESTDIR),$(USCAN_DESTDIR),..)"; \ + tar xf $$bd/rustc-$$newver.0-beta.999-src.tar.xz rustc-beta-src/version; \ + bv="$$(sed -re 's/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g' rustc-beta-src/version)"; \ + bash -c 'shopt -s nullglob; for i in '"$$bd"'/rustc*beta.999*; do mv $$i $${i/beta.999/beta.'"$$bv"'}; done'; \ + rm -f rustc-beta-src/version; \ + rmdir -p rustc-beta-src; \ + echo "prepared rustc $$newver.0~beta.$$bv in $$bd" diff --git a/rust-clippy.install b/rust-clippy.install new file mode 100644 index 0000000000..cad917bfcb --- /dev/null +++ b/rust-clippy.install @@ -0,0 +1,2 @@ +usr/bin/clippy-driver +usr/bin/cargo-clippy diff --git a/rust-doc.doc-base.book b/rust-doc.doc-base.book new file mode 100644 index 0000000000..80c3e08a89 --- /dev/null +++ b/rust-doc.doc-base.book @@ -0,0 +1,13 @@ +Document: rust-book +Title: The Rust Programming Language +Section: Programming/Rust +Abstract: + This book will teach you about the Rust Programming Language. Rust is + a modern systems programming language focusing on safety and speed. It + accomplishes these goals by being memory safe without using garbage + collection. + +Format: HTML +Index: /usr/share/doc/rust-doc/html/book/index.html +Files: /usr/share/doc/rust-doc/html/book/*.html + /usr/share/doc/rust-doc/html/book/*/*.html diff --git a/rust-doc.doc-base.reference b/rust-doc.doc-base.reference new file mode 100644 index 0000000000..a538f8bcd8 --- /dev/null +++ b/rust-doc.doc-base.reference @@ -0,0 +1,11 @@ +Document: rust-reference +Title: The Rust Reference +Section: Programming/Rust +Abstract: + This document is the primary reference for the Rust programming + language. + +Format: HTML +Index: /usr/share/doc/rust-doc/html/reference/index.html +Files: /usr/share/doc/rust-doc/html/reference/*.html + /usr/share/doc/rust-doc/html/reference/*/*.html diff --git a/rust-doc.docs b/rust-doc.docs new file mode 100644 index 0000000000..5a0e189bd9 --- /dev/null +++ b/rust-doc.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/rust/html diff --git a/rust-doc.install b/rust-doc.install new file mode 100644 index 0000000000..de6024b0c7 --- /dev/null +++ b/rust-doc.install @@ -0,0 +1 @@ +debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/ diff --git a/rust-gdb.install b/rust-gdb.install new file mode 100644 index 0000000000..7c1bf5d5dd --- /dev/null +++ b/rust-gdb.install @@ -0,0 +1,5 @@ +usr/bin/rust-gdb +usr/bin/rust-gdbgui +usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py +usr/lib/rustlib/etc/gdb_lookup.py +usr/lib/rustlib/etc/gdb_providers.py diff --git a/rust-gdb.links b/rust-gdb.links new file mode 100644 index 0000000000..51b82a4b7c --- /dev/null +++ b/rust-gdb.links @@ -0,0 +1 @@ +usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz diff --git a/rust-lldb.install b/rust-lldb.install new file mode 100644 index 0000000000..8d5ff5192b --- /dev/null +++ b/rust-lldb.install @@ -0,0 +1,4 @@ +usr/bin/rust-lldb +usr/lib/rustlib/etc/lldb_commands +usr/lib/rustlib/etc/lldb_lookup.py +usr/lib/rustlib/etc/lldb_providers.py diff --git a/rust-lldb.links b/rust-lldb.links new file mode 100644 index 0000000000..444f6fc871 --- /dev/null +++ b/rust-lldb.links @@ -0,0 +1 @@ +usr/share/man/man1/lldb-17.1.gz usr/share/man/man1/rust-lldb.1.gz diff --git a/rust-llvm.links b/rust-llvm.links new file mode 100644 index 0000000000..5796ed8681 --- /dev/null +++ b/rust-llvm.links @@ -0,0 +1,9 @@ +usr/bin/lld-17 usr/bin/rust-lld +usr/bin/clang-17 usr/bin/rust-clang +usr/bin/llvm-dwp-17 usr/bin/rust-llvm-dwp +# for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic +usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld +usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64 +# For applications that use cargo-binutils, e.g. grcov +usr/bin/llvm-profdata-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata +usr/bin/llvm-cov-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov diff --git a/rust-src.install b/rust-src.install new file mode 100644 index 0000000000..4f0a02cced --- /dev/null +++ b/rust-src.install @@ -0,0 +1,16 @@ +debian/patches usr/src/rustc-${env:RUST_LONG_VERSION}/debian +# from src/bootstrap/dist.rs:370 onwards +COPYRIGHT usr/src/rustc-${env:RUST_LONG_VERSION} +LICENSE-APACHE usr/src/rustc-${env:RUST_LONG_VERSION} +LICENSE-MIT usr/src/rustc-${env:RUST_LONG_VERSION} +CONTRIBUTING.md usr/src/rustc-${env:RUST_LONG_VERSION} +README.md usr/src/rustc-${env:RUST_LONG_VERSION} +RELEASES.md usr/src/rustc-${env:RUST_LONG_VERSION} +configure usr/src/rustc-${env:RUST_LONG_VERSION} +x.py usr/src/rustc-${env:RUST_LONG_VERSION} +config.example.toml usr/src/rustc-${env:RUST_LONG_VERSION} +Cargo.toml usr/src/rustc-${env:RUST_LONG_VERSION} +src usr/src/rustc-${env:RUST_LONG_VERSION} +library usr/src/rustc-${env:RUST_LONG_VERSION} +compiler usr/src/rustc-${env:RUST_LONG_VERSION} +Cargo.lock usr/src/rustc-${env:RUST_LONG_VERSION} diff --git a/rust-src.links b/rust-src.links new file mode 100644 index 0000000000..c1b645bd85 --- /dev/null +++ b/rust-src.links @@ -0,0 +1 @@ +usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust diff --git a/rust-src.lintian-overrides b/rust-src.lintian-overrides new file mode 100644 index 0000000000..c6aa9f964c --- /dev/null +++ b/rust-src.lintian-overrides @@ -0,0 +1,6 @@ +# False positives that change quite often, so just override with a wildcard +rust-src binary: executable-not-elf-or-script [usr/src/rustc-*/*] +rust-src binary: package-contains-eslint-config-file usr/src/rustc-*/src/librustdoc/html/static/.eslintrc.js +rust-src binary: breakout-link usr/lib/rustlib/src/rust -> usr/src/rustc-* +rust-src binary: embedded-javascript-library * [usr/src/rustc-*/*] +rust-src binary: national-encoding [usr/src/rustc-*/*] diff --git a/rustc.install b/rustc.install new file mode 100644 index 0000000000..10efe89df1 --- /dev/null +++ b/rustc.install @@ -0,0 +1,6 @@ +usr/bin/rustc +usr/bin/rustdoc +usr/lib/rustlib/etc/rust_types.py +usr/libexec/rust-analyzer-proc-macro-srv +debian/architecture.mk usr/share/rustc/ +debian/wasi-node usr/share/rustc/bin/ diff --git a/rustc.lintian-overrides b/rustc.lintian-overrides new file mode 100644 index 0000000000..b3d9d2daec --- /dev/null +++ b/rustc.lintian-overrides @@ -0,0 +1,7 @@ +# unofficial example script, no dependency needed +rustc binary: missing-dep-for-interpreter /usr/bin/node (does not satisfy nodejs:any) [usr/share/rustc/bin/wasi-node] + +# symlinks to other programs +rustc binary: no-manual-page [usr/bin/rust-clang] +rustc binary: no-manual-page [usr/bin/rust-lld] +rustc binary: no-manual-page [usr/bin/rust-llvm-dwp] diff --git a/rustc.manpages b/rustc.manpages new file mode 100644 index 0000000000..f153792b9d --- /dev/null +++ b/rustc.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man1/rustc.1 +debian/tmp/usr/share/man/man1/rustdoc.1 + diff --git a/rustfmt.install b/rustfmt.install new file mode 100644 index 0000000000..e946f2db17 --- /dev/null +++ b/rustfmt.install @@ -0,0 +1,2 @@ +usr/bin/rustfmt +usr/bin/cargo-fmt diff --git a/scripts/audit-vendor-source b/scripts/audit-vendor-source new file mode 100755 index 0000000000..08a46d8049 --- /dev/null +++ b/scripts/audit-vendor-source @@ -0,0 +1,40 @@ +#!/bin/sh +# Audit Rust crate source for suspicious files in the current directory, that +# shouldn't or can't be part of a Debian source package. +# +# NOTE: this overwrites & deletes files in the current directory!!! Make a +# backup before running this script. +# +# Usage: $0 [] + +set -e + +whitelist="$1" +filter_description="$2" +shift 2 # everything else is args to suspicious-source + +# Remove tiny files 4 bytes or less +find . -size -4c -type f -delete +# Remove non-suspicious files, warning on patterns that match nothing +echo "Excluding (i.e. removing) whitelisted files..." +grep -v '^#' "$whitelist" | xargs -I% sh -c 'rm -r ./% || true' +echo "Checking for suspicious files..." +# Remove cargo metadata files +find . '(' -name '.cargo-checksum.json' -or -name '.cargo_vcs_info.json' ')' -delete +# Strip comments & blank lines before testing rust source code - +# some authors like to write really long comments +find . -name '*.rs' -execdir sed -i -e '\,^\s*//,d' -e '/^\s*$/d' '{}' \; + +# TODO: merge the -m stuff into suspicious-source(1). +suspicious-source -v "$@" +# The following shell snippet is a bit more strict than suspicious-source(1) +find . -type f -exec file '{}' \; | \ + sed -e 's/\btext\b\(.*\), with very long lines/verylongtext\1/g' | \ + grep -v '\b\(text\|empty\)\b' || true + +# Most C and JS code should be in their own package +find . -name '*.c' -o -name '*.js' + +echo "The above files (if any) seem suspicious, please audit them." +echo "If good, add them to $whitelist." +echo "If bad, add them to $filter_description." diff --git a/scripts/debian-cargo-vendor b/scripts/debian-cargo-vendor new file mode 100755 index 0000000000..6566b316d1 --- /dev/null +++ b/scripts/debian-cargo-vendor @@ -0,0 +1,165 @@ +#!/bin/bash +# To run this, you need to first install cargo-lock. +# +# TODO: this script has a known bug in: if the Debian patches being applied, +# changes the set of dependencies, then "cargo vendor" is not re-run in order +# to pick up this new set of dependencies. This is manifested by an error +# message like: "perhaps a crate was updated and forgotten to be re-vendored?" +# +set -e + +SCRIPTDIR="$(dirname "$(readlink -f "$0")")" + +not_needed() { + diff -ur packages-before packages-after | grep "^-- " | cut -d' ' -f2-3 +} + +ghetto_parse_cargo() { + cat "$1" \ + | tr '\n' '\t' \ + | sed -e 's/\t\[/\n[/g' \ + | perl -ne 'print if s/^\[(?:package|project)\].*\tname\s*=\s*"(.*?)".*\tversion\s*=\s*"(.*?)".*/\1 \2/g' +} + +pruned_paths() { + for i in vendor/*/Cargo.toml; do + pkgnamever= + pkgnamever=$(ghetto_parse_cargo "$i") + if [ -z "$pkgnamever" ]; then + echo >&2 "failed to parse: $i" + exit 1 + fi + echo "$pkgnamever $i" + done | grep -F -f <(not_needed) | cut '-d ' -f3 | while read x; do + echo " $(dirname $x)" + done +} + +crate_to_debcargo_conf() { + echo "$1" | sed -e 's/_/-/g' +} + +rm -rf vendor/ +if [ -e "$CARGO_PRE_VENDOR" ]; then + "$CARGO_PRE_VENDOR" +fi +cargo vendor --verbose vendor/ +mkdir -p .cargo +cat >.cargo/config < packages-before +cp Cargo.lock Cargo.lock.orig + +if [ -d debcargo-conf ]; then ( cd debcargo-conf && git pull ); +else git clone "${DEBCARGO_CONF:-https://salsa.debian.org/rust-team/debcargo-conf}"; fi + +# keep applying patches, and drop to a subshell for manual fixing, until it succeeds +while ! ( cd vendor +x=true +for i in *; do + debname=$(crate_to_debcargo_conf "$i") + cd $i + # if there is a d/rules then don't mess with it, it's too custom for this + # script to deal with - just use the upstream version. example: backtrace-sys + # TODO: deal with those better, especially backtrace-sys + if [ -e ../../debcargo-conf/src/$debname/debian/rules ]; then + echo >&2 "$0: the debcargo-conf for crate $i has a custom rules file, but applying patches anyway" + echo >&2 "$0: you may want to examine this situation more closely" + fi + if [ -d ../../debcargo-conf/src/$debname/debian/patches ]; then + echo >&2 "$0: patching $i" + mkdir -p debian + if [ ! -d debian/patches ]; then + cp -a -n "../../debcargo-conf/src/$debname/debian/patches" debian/ + fi + # first unapply any patches applied in the previous iteration + QUILT_PATCHES=debian/patches quilt pop -af + QUILT_PATCHES=debian/patches quilt push -a + case $? in + 0|2) true;; + *) echo >&2 "$0: patching $i failed <<<<<<<<<<<<<<<<<<<<<<<<" + QUILT_PATCHES=debian/patches quilt pop -af + x=false;; + esac + fi + if [ -f ../../debcargo-conf/src/$debname/debian/build.rs ]; then + echo >&2 "$0: overwriting build.rs with our custom one" + if [ ! -f build.rs.orig ]; then + cp -f build.rs build.rs.orig + fi + cp -f ../../debcargo-conf/src/$i/debian/build.rs build.rs + fi + cd .. +done; $x ); do + echo >&2 "================================================================================" + echo >&2 "$0: You are now in a sub-shell!" + echo >&2 "$0: Fix the failed patches in debcargo-conf/, then exit the sub-shell by pressing ctrl-D ONCE." + echo >&2 "$0: If you need to abort this process, press ctrl-D then quickly ctrl-C." + if [ -f "${SRCDIR:-$PWD}/debian/debcargo-conf.patch" ]; then + echo >&2 "$0: Previous patch changes exist, to apply them run:" + echo >&2 " $ patch -d vendor -p2 < '${SRCDIR:-$PWD}/debian/debcargo-conf.patch'" + fi + echo >&2 "================================================================================" + bash || true + echo >&2 "$0: trying patches again..." +done +rm -rf vendor/*/.pc +find vendor/*/debian/patches -name '*~' -delete || true +cargo update +cargo lock list > packages-after +pruned_paths | while read x; do echo >&2 "$0: removing, because debcargo-conf patches makes it obsolete: $x"; rm -rf "$x"; done + +# remove excluded files +( cd vendor +for i in *; do ( + debname=$(crate_to_debcargo_conf "$i") + shopt -s globstar # needed for double-glob to work in excludes + cd $i + if [ -e ../../debcargo-conf/src/$debname/debian/rules ]; then + echo >&2 "$0: the debcargo-conf for crate $i has a custom rules file, but applying excludes anyway" + echo >&2 "$0: you may want to examine this situation more closely" + fi + if grep -q excludes ../../debcargo-conf/src/$debname/debian/debcargo.toml 2>/dev/null; then + sed -nre 's/.*excludes\s*=\s*(\[[^]]*\]).*/\1/p' \ + ../../debcargo-conf/src/$i/debian/debcargo.toml \ + | python3 -c "import ast, sys; x=ast.literal_eval(sys.stdin.read()); print('\n'.join((i[:-3] if i.endswith('/**') else i) for i in x));" \ + | while read x; do echo >&2 "$0: removing, since it's excluded by debcargo-conf: vendor/$i/$x"; rm -rf $x; done + fi +); done; ) + +# TODO: rm special logic from debcargo and put into debcargo-conf instead +echo >&2 "$0: removing winapi archives" +rm -rf vendor/winapi-*-pc-windows-gnu/lib/*.a + +echo >&2 "$0: pruning all checksums.." +for i in vendor/*; do ${SCRIPTDIR}/prune-checksums "$i"; done + +( cd vendor +for i in *; do ( + cd $i + debname=$(crate_to_debcargo_conf "$i") + if [ -d debian/patches ]; then + rm -rf "../../debcargo-conf/src/$debname/debian/patches" + cp -a debian/patches "../../debcargo-conf/src/$debname/debian/" + fi +); done; ) +( cd debcargo-conf +git add . +if ! git diff --cached --quiet; then + git commit -m "Manual changes from debian-cargo-vendor" + git diff @~ > ../../debcargo-conf.patch || true + (cd ../.. ; echo >&2 "$0: backed up patch changes to $PWD/debcargo-conf.patch") + echo >&2 "$0: you should backport/merge them back into debcargo-conf.git" +fi +) + +echo >&2 "$0: cleaning up..." +rm -rf .cargo Cargo.lock debcargo-conf packages-before packages-after + +echo >&2 "$0: restoring original Cargo.lock" +mv Cargo.lock.orig Cargo.lock diff --git a/scripts/guess-crate-copyright b/scripts/guess-crate-copyright new file mode 100755 index 0000000000..15f35f634c --- /dev/null +++ b/scripts/guess-crate-copyright @@ -0,0 +1,45 @@ +#!/usr/bin/python3 +# Copyright: 2015-2017 The Debian Project +# License: MIT or Apache-2.0 +# +# Guess the copyright of a cargo crate by looking at its git history. + +import datetime +import toml +import os +import subprocess +import sys + +this_year = datetime.datetime.now().year +crates = sys.argv[1:] +get_initial_commit = len(crates) == 1 + +for crate in crates: + with open(os.path.join(crate, "Cargo.toml")) as fp: + data = toml.load(fp) + repo = data["package"].get("repository", None) + if get_initial_commit and repo: + output = subprocess.check_output( + """git clone -q --bare "%s" tmp.crate-copyright >&2 && +cd tmp.crate-copyright && +git log --format=%%cI --reverse | head -n1 | cut -b1-4 && +git log --format=%%cI | head -n1 | cut -b1-4 && +cd .. && +rm -rf tmp.crate-copyright""" % repo, shell=True).decode("utf-8") + first_year, last_year = output.strip().split(maxsplit=2) + else: + first_year = "20XX" + last_year = this_year + + authors = data["package"].get("authors", ["UNKNOWN AUTHORS"]) + + print("""Files: {0} +Copyright: {1} +License: {2} +Comment: see {3} +""".format( + os.path.join(crate, "*"), + "\n ".join("%s-%s %s" % (first_year, last_year, a.replace(" <>", "")) for a in authors), + data["package"].get("license", "???").replace("/", " or "), + repo or "???" + )) diff --git a/scripts/prune-checksums b/scripts/prune-checksums new file mode 100755 index 0000000000..0c895cff44 --- /dev/null +++ b/scripts/prune-checksums @@ -0,0 +1,47 @@ +#!/usr/bin/python3 +# Copyright: 2015-2017 The Debian Project +# License: MIT or Apache-2.0 +# +# Helper to remove removed-files from .cargo-checksum +# TODO: rewrite to perl and add to dh-cargo, maybe? + +from collections import OrderedDict +import argparse +import json +import os +import sys + +def prune_keep(cfile): + with open(cfile) as fp: + sums = json.load(fp, object_pairs_hook=OrderedDict) + + oldfiles = sums["files"] + newfiles = OrderedDict([entry for entry in oldfiles.items() if os.path.exists(entry[0])]) + sums["files"] = newfiles + + if len(oldfiles) == len(newfiles): + return + + with open(cfile, "w") as fp: + json.dump(sums, fp, separators=(',', ':')) + +def prune(cfile): + with open(cfile, "r+") as fp: + sums = json.load(fp, object_pairs_hook=OrderedDict) + sums["files"] = {} + fp.seek(0) + json.dump(sums, fp, separators=(',', ':')) + fp.truncate() + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("-k", "--keep", action="store_true", help="keep " + "checksums of files that still exist, and assume they haven't changed.") + parser.add_argument('crates', nargs=argparse.REMAINDER, + help="crates whose checksums to prune. (default: ./)") + args = parser.parse_args(sys.argv[1:]) + crates = args.crates or ["."] + f = prune_keep if args.keep else prune + for c in crates: + cfile = os.path.join(c, ".cargo-checksum.json") if os.path.isdir(c) else c + f(cfile) diff --git a/source/format b/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/include-binaries b/source/include-binaries new file mode 100644 index 0000000000..33bec95225 --- /dev/null +++ b/source/include-binaries @@ -0,0 +1,6 @@ +debian/icons/rust-logo-32x32-blk.png +# if you are here because dpkg-source told you to "add stage0/rustc-** in d/source/include-binaries", +# ignore that instruction and instead: +# a) if you want to use the orig-stage0 for your next upload, then extract it into stage0/ +# b) if you don't want to use it, then rename "../rustc_${version}.orig-stage0.tar.xz" to something else +# see also d/source/options and d/source/local-options and #577113. diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 0000000000..215200a304 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,19 @@ +# Test data +rustc source: source-is-missing [src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/*.html] +rustc source: source-is-missing [tests/rustdoc/decl-trailing-whitespace.declaration.html] +rustc source: source-is-missing [tests/rustdoc/notable-trait/doc-notable_trait*.html] +rustc source: source-is-missing [tests/rustdoc/notable-trait/spotlight*.html] +rustc source: source-is-missing [vendor/html5ever/data/bench/*.html] +rustc source: source-is-missing [vendor/minifier/tests/files/minified_main.js] + +# debian policy bug #649530, old and new formats +rustc source: mismatched-override missing-license-paragraph-in-dep5-copyright mpl-2.0+ (*) +rustc source: mismatched-override missing-license-paragraph-in-dep5-copyright debian/copyright mpl-2.0+ (*) [debian/source/lintian-overrides:*] +rustc source: missing-license-paragraph-in-dep5-copyright mpl-2.0+ [debian/copyright:*] +rustc source: missing-license-paragraph-in-dep5-copyright debian/copyright mpl-2.0+ (*) + +# see d/copyright +rustc source: source-contains-prebuilt-windows-binary [vendor/windows-bindgen/default/*.winmd] + +# lintian is superfluous +rustc source: superfluous-file-pattern debian/copyright * (*) diff --git a/source/options b/source/options new file mode 100644 index 0000000000..8a8c93f546 --- /dev/null +++ b/source/options @@ -0,0 +1,4 @@ +# this helps to prevent accidentally including the orig-stage0 tarball in a non +# orig-stage0 upload, after running `debian/rules source_orig-stage0`. +# we can get rid of this after #577113 is fixed +include-removal diff --git a/tests/control b/tests/control new file mode 100644 index 0000000000..2cffafdb81 --- /dev/null +++ b/tests/control @@ -0,0 +1,7 @@ +#Test-Command: ./debian/rules build +#Depends: @builddeps@ +#Restrictions: rw-build-tree, allow-stderr +# +Tests: create-and-build-crate +Restrictions: rw-build-tree, allow-stderr, needs-internet +Depends: cargo, ca-certificates diff --git a/tests/create-and-build-crate b/tests/create-and-build-crate new file mode 100755 index 0000000000..46cc2a0346 --- /dev/null +++ b/tests/create-and-build-crate @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +tmpdir=$(mktemp -d) +cd "$tmpdir" + +cargo new hello +cd hello + +cat < src/main.rs +use anyhow::Result; + +fn main() -> Result<()> { + println!("Hello, World!"); + Ok(()) +} + +#[test] +fn test() { + assert_eq!(1 + 1, 2); +} +EOF + +cargo add 'anyhow@^1' +cargo vendor + +mkdir -p .cargo +cat < .cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF + +cargo check +cargo build +cargo test +cargo run diff --git a/update-version.sh b/update-version.sh new file mode 100755 index 0000000000..1d510ab360 --- /dev/null +++ b/update-version.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# Don't run this directly, use "debian/rules update-version" instead + +prev_stable() { +local V=$1 +python3 -c 'import sys; k=list(map(int,sys.argv[1].split("."))); k[1]-=1; print(".".join(map(str,k)))' "$V" +} + +update() { +local ORIG=$1 NEW=$2 NEW_LONG=$3 + +ORIG_M1=$(prev_stable $ORIG) +NEW_M1=$(prev_stable $NEW) +ORIG_R="${ORIG/./\\.}" # match a literal dot, otherwise this might sometimes match e.g. debhelper (>= 9.20141010) + +WASI_CI="$(grep -Rl "git clone https://github.com/WebAssembly/wasi-libc" ../src/ci | head -n1)" +WASI_COMMIT="$(egrep -o '\b[0-9A-Fa-f]{7}' "$WASI_CI")" +WASI_REGEX='wasi-libc \(([><=]+) 0.0~git([0-9]+).([0-9a-f]+)([~+]+)\)' + +if [ -z "$WASI_COMMIT" -o "$(printf '%s\n' "$WASI_COMMIT" | wc -l)" != 1 ]; then + echo >&2 "error: could not determine unique WASI_COMMIT ($WASI_COMMIT), please figure it out from src/ci and update my logic" + exit 1 +fi + +WASI_COMMIT_OLD="$(sed -nre 's|.*'"${WASI_REGEX}"'.*|\3|gp' control | sort -u)" +if [ -z "$WASI_COMMIT_OLD" -o "$(printf '%s\n' "$WASI_COMMIT_OLD" | wc -l)" != 1 ]; then + echo >&2 "error: could not determine unique WASI_COMMIT_OLD ($WASI_COMMIT_OLD), please figure it out from debian/control and update my logic" + exit 1 +fi + +sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \ + -e "s|rustc:native\( *\)(<= [^)]*)|rustc:native\1(<= $NEW_LONG++)|g" \ + -e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc:native\1(>= ${NEW_M1}|g" \ + -e "s|cargo:native\( *\)(>= ${ORIG_M1/./\\.}|cargo:native\1(>= ${NEW_M1}|g" \ + control + +if [ "$WASI_COMMIT" != "$WASI_COMMIT_OLD" ]; then + sed -ri -e 's|'"${WASI_REGEX}"'|wasi-libc (\1 0.0~gitFIXME.'"${WASI_COMMIT}"'\4)|g' control + echo >&2 "note: the version of the wasi-libc Build-Depends has changed and needs to be FIXME with the correct date" + echo >&2 "please update that package, upload it to experimental, and supply the correct date in debian/control" +fi + +if [ "$NEW" != "$ORIG" ]; then +git mv libstd-rust-$ORIG.install libstd-rust-$NEW.install +git mv libstd-rust-$ORIG.triggers libstd-rust-$NEW.triggers +git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides +fi +sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides +} + +cd $(dirname "$0") +update "$@" diff --git a/upstream-tarball-unsuspicious.txt b/upstream-tarball-unsuspicious.txt new file mode 100644 index 0000000000..a066c33fa6 --- /dev/null +++ b/upstream-tarball-unsuspicious.txt @@ -0,0 +1,712 @@ +## In this file we list false-positives of the check-orig-suspicious.sh script +# so that they can be ignored. You should manually audit all of the files here +# to confirm that they adhere to Debian Policy and the DFSG. In particular, if +# you are blindly adding files here just to get the build to work, you are +# probably Doing It Wrong. Ask in #debian-rust or the mailing list for pointers. + +# False-positive, file(1) misidentifies mime type +compiler/rustc_error_codes/src/error_codes/E0469.md +src/doc/reference/src/crates-and-source-files.md +src/doc/reference/src/items/extern-crates.md +src/doc/reference/src/items/modules.md +src/doc/reference/src/types-redirect.html +src/tools/cargo/src/doc/src/reference/registries.md +src/tools/clippy/book/src/lint_configuration.md +vendor/fiat-crypto/src/p448_solinas_32.rs +vendor/itertools*/examples/iris.data +vendor/minifier/src/js/tools.rs +vendor/pasetors/src/footer.rs +vendor/pasetors/src/version2.rs +vendor/pasetors/src/version3.rs +vendor/pasetors/src/version4.rs +vendor/term/src/terminfo/parser/names.rs + +# False-positive, "verylongtext" but OK +CONTRIBUTING.md +README.md +RELEASES.md +compiler/rustc_baked_icu_data/src/data/mod.rs +compiler/rustc_codegen_cranelift/docs/dwarf.md +compiler/rustc_codegen_gcc/Readme.md +compiler/rustc_codegen_ssa/messages.ftl +library/core/src/ffi/c_*.md +library/portable-simd/*.md +library/std/src/sys/sgx/abi/entry.S +library/stdarch/CONTRIBUTING.md +library/stdarch/crates/core_arch/src/aarch64/neon/generated.rs +library/stdarch/crates/std_detect/README.md +src/doc/*/CODE_OF_CONDUCT.md +src/doc/book/first-edition/src/the-stack-and-the-heap.md +src/doc/edition-guide/src/rust-2018/index.md +src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md +src/doc/edition-guide/src/rust-2021/prelude.md +src/doc/embedded-book/src/*/*.md +src/doc/nomicon/src/intro.md +src/doc/reference/src/expressions/closure-expr.md +src/doc/reference/src/inline-assembly.md +src/doc/reference/src/unsafe-keyword.md +src/doc/rust-by-example/src/flow_control/if_let.md +src/doc/rust-by-example/src/std/arc.md +src/doc/rust-by-example/src/trait/dyn.md +src/doc/rust-by-example/src/unsafe/asm.md +src/doc/rustc-dev-guide/src/*.md +src/doc/rustc-dev-guide/src/*/*.md +src/doc/rustc/src/instrument-coverage.md +src/doc/rustc/src/lints/groups.md +src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md +src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md +src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md +src/doc/rustc/src/platform-support/unknown-uefi.md +src/doc/rustc/src/platform-support/wasm32-wasi-preview1-threads.md +src/doc/rustc/src/targets/known-issues.md +src/doc/rustdoc/src/*.md +src/doc/style-guide/src/nightly.md +src/doc/unstable-book/src/*/*.md +src/etc/completions/x.py.ps1 +src/etc/completions/x.py.sh +src/etc/third-party/README.txt +src/librustdoc/html/highlight/fixtures/sample.html +src/librustdoc/html/static/scrape-examples-help.md +src/tools/cargo/src/cargo/sources/git/known_hosts.rs +src/tools/cargo/src/doc/src/guide/continuous-integration.md +src/tools/cargo/src/doc/src/reference/features.md +src/tools/cargo/src/doc/src/reference/semver.md +src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs +src/tools/rust-analyzer/crates/ide-completion/src/completions/env_vars.rs +src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs +src/tools/rust-analyzer/docs/user/manual.adoc +src/tools/rustfmt/*.md +tests/mir-opt/building/*.mir +tests/rustdoc/inline_cross/assoc_item_trait_bounds.out*.html +tests/rustdoc/notable-trait/doc-notable_trait*.html +tests/rustdoc/notable-trait/spotlight-from-dependency.odd.html +tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr +tests/ui/parser/raw/too-many-hash.stderr +vendor/*/*/*/LICENSE +vendor/*/*/LICENSE +vendor/*/CHANGELOG.md +vendor/*/CODE_OF_CONDUCT.md +vendor/*/CONTRIBUTORS.md +vendor/*/COPYRIGHT +vendor/*/Cargo.toml +vendor/*/FAQ.md +vendor/*/LICENSE +vendor/*/LICENSE-MIT +vendor/*/README.md +vendor/*/Readme.md +vendor/*/SPONSORS.md +vendor/*/readme.md +vendor/ammonia/src/lib.rs +vendor/anstyle-parse/src/state/table.rs +vendor/base64ct/tests/proptests.proptest-regressions +vendor/chrono/src/offset/local/tz_info/rule.rs +vendor/chrono/src/offset/local/tz_info/timezone.rs +vendor/core-foundation-sys/src/url.rs +vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xmd.rs +vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xof.rs +vendor/elliptic-curve/src/jwk.rs +vendor/encoding_rs/src/ascii.rs +vendor/encoding_rs/src/utf_16.rs +vendor/faster-hex-0.8.1/src/serde.rs +vendor/faster-hex/src/serde.rs +vendor/fiat-crypto/src/p521_32.rs +vendor/fiat-crypto/src/secp256k1_dettman_32.rs +vendor/fiat-crypto/src/secp256k1_dettman_64.rs +vendor/git2/src/cred.rs +vendor/half/LICENSES/Apache-2.0.txt +vendor/half/LICENSES/MIT.txt +vendor/handlebars/src/lib.rs +vendor/handlebars/src/render.rs +vendor/handlebars/src/template.rs +vendor/humansize/src/lib.rs +vendor/icu_locid_transform_data/data/mod.rs +vendor/ipnet/RELEASES.md +vendor/kstring/benches/clone.rs +vendor/lazy_static/src/lib.rs +vendor/maplit/README.rst +vendor/mdbook/CONTRIBUTING.md +vendor/p384/src/arithmetic/hash2curve.rs +vendor/pasetors/src/token.rs +vendor/portable-atomic/src/imp/atomic128/README.md +vendor/portable-atomic/src/imp/interrupt/README.md +vendor/portable-atomic/src/lib.rs +vendor/pulldown-cmark/tests/suite/footnotes.rs +vendor/rustc-demangle/src/legacy.rs +vendor/spdx-expression/LICENSES/MIT.txt +vendor/spdx-rs/LICENSE.txt +vendor/spdx-rs/LICENSES/MIT.txt +vendor/spdx-rs/src/models/file_information.rs +vendor/spdx-rs/src/models/other_licensing_information_detected.rs +vendor/spdx-rs/src/models/package_information.rs +vendor/spki/tests/spki.rs +vendor/stable_deref_trait/src/lib.rs +vendor/tinyvec/LICENSE-*.md +vendor/tracing-subscriber/src/fmt/format/json.rs +vendor/unicase/src/lib.rs +vendor/unicode-normalization/src/stream_safe.rs +vendor/vcpkg/notes.md +vendor/web-sys/src/features/gen_SvgTextElement.rs +vendor/web-sys/src/features/gen_SvgtSpanElement.rs +vendor/windows-bindgen/src/rust/extensions/mod.rs +vendor/windows-bindgen/src/tokens/mod.rs +vendor/windows-bindgen/src/winmd/writer/tables.rs +vendor/windows-metadata/src/lib.rs +vendor/windows-metadata/src/reader.rs +vendor/winnow/benches/contains_token.rs +vendor/winnow/benches/iter.rs +vendor/zerovec/src/map2d/map.rs + +# False-positive, audit-vendor-source automatically flags JS/C files +# The below ones are OK since they're actually part of rust's own source code +# and are not "embedded libraries". +src/ci/docker/scripts/qemu-bare-bones-addentropy.c +src/doc/book/*/ferris.js +src/doc/book/ferris.js +src/doc/reference/src/attributes-redirect.html +src/doc/rustc-dev-guide/mermaid-init.js +src/etc/wasm32-shim.js +src/librustdoc/html/static/.eslintrc.js +src/librustdoc/html/static/js/*.js +src/tools/cargo/src/cargo/core/compiler/timings.js +src/tools/error_index_generator/*.js +src/tools/rustdoc-gui/.eslintrc.js +src/tools/rustdoc-gui/tester.js +src/tools/rustdoc-js/.eslintrc.js +src/tools/rustdoc-js/tester.js +vendor/libz-sys/src/smoke.c +vendor/openssl-sys/build/expando.c +vendor/sharded-slab/flake.lock +vendor/sysinfo-0.26.7/examples/simple.c +vendor/wasm-bindgen-futures/src/task/worker.js +vendor/wasm-bindgen-macro/src/worker.js +vendor/wasm-bindgen/_package.json +vendor/wasm-bindgen/examples/import_js/package.json +vendor/wasm-bindgen/webdriver.json + +# Embedded libraries, justified in README.source +vendor/dlmalloc/src/dlmalloc.c +vendor/mdbook/src/theme/book.js +vendor/mdbook/src/theme/searcher/searcher.js + +# Trivial glue code for C <-> Rust +library/backtrace/crates/line-tables-only/src/callback.c +vendor/backtrace/src/android-api.c +vendor/stacker/src/arch/windows.c + +# False-positive, misc +*/*/.github/actions/github-release/* +src/ci/github-actions/problem_matchers.json +src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore +src/doc/rustc-dev-guide/src/queries/example-0.counts.txt +src/etc/rust_analyzer_settings.json +src/stage0.json +src/tools/clippy/.remarkrc +vendor/elasticlunr-rs/src/lang/*.rs +vendor/plotters/src/style/colors/full_palette.rs + +# False-positive, hand-editable small image +src/doc/book/2018-edition/src/img/*.png +src/doc/book/2018-edition/src/img/*.svg +src/doc/book/2018-edition/src/img/ferris/*.svg +src/doc/book/second-edition/src/img/*.png +src/doc/book/second-edition/src/img/*.svg +src/doc/book/src/img/*.png +src/doc/book/src/img/*.svg +src/doc/book/src/img/ferris/*.svg +src/doc/book/tools/docx-to-md.xsl +src/doc/embedded-book/src/assets/*.png +src/doc/embedded-book/src/assets/*.svg +src/doc/embedded-book/src/assets/f3.jpg +src/doc/embedded-book/src/assets/verify.jpeg +src/doc/nomicon/src/img/safeandunsafe.svg +src/doc/rustc-dev-guide/src/img/*.png +src/doc/rustc-dev-guide/src/queries/example-0.png +src/doc/rustc/src/images/*.png +src/doc/rustdoc/src/images/collapsed-long-item.png +src/doc/rustdoc/src/images/collapsed-trait-impls.png +src/etc/installer/gfx/ +src/librustdoc/html/static/images/*.svg +src/librustdoc/html/static/images/favicon-*.png +src/tools/cargo/src/doc/src/images/Cargo-Logo-Small.png +src/tools/cargo/src/doc/src/images/auth-level-acl.png +src/tools/cargo/src/doc/src/images/build-info.png +src/tools/cargo/src/doc/src/images/build-unit-time.png +src/tools/cargo/src/doc/src/images/cargo-concurrency-over-time.png +src/tools/cargo/src/doc/src/images/org-level-acl.png +src/tools/cargo/src/doc/src/images/winapi-features.svg +src/tools/cargo/src/doc/theme/favicon.png +src/tools/rust-analyzer/assets/logo-*.svg +vendor/color-eyre/pictures/custom_section.png +vendor/color-eyre/pictures/full.png +vendor/color-eyre/pictures/minimal.png +vendor/color-eyre/pictures/short.png +vendor/color-spantrace/pictures/full.png +vendor/color-spantrace/pictures/minimal.png +vendor/mdbook/src/theme/favicon.png +vendor/mdbook/src/theme/favicon.svg +vendor/overload/logo.png +vendor/pretty_assertions/examples/*.png + +# Example code +vendor/html5ever/examples/capi/tokenize.c +vendor/sysinfo/examples/simple.c + +# Test data +library/core/benches/str.rs +library/core/tests/num/dec2flt/parse.rs +library/portable-simd/crates/core_simd/tests/mask_ops_impl/*.rs +library/portable-simd/crates/core_simd/webdriver.json +library/std/src/sys/windows/path/tests.rs +library/stdarch/ci/gba.json +library/stdarch/crates/std_detect/src/detect/test_data/*.auxv +library/stdarch/crates/stdarch-verify/x86-intel.xml +library/stdarch/intrinsics_data/arm_intrinsics.json +src/tools/*/tests/*/*.stderr +src/tools/cargo/benches/benchsuite/global-cache-tracker/global-cache-sample +src/tools/cargo/benches/benchsuite/global-cache-tracker/random-sample +src/tools/cargo/benches/workspaces/*.tgz +src/tools/cargo/crates/mdman/tests/compare/expected/formatting.txt +src/tools/cargo/crates/rustfix/tests/edge-cases/*.json +src/tools/cargo/crates/rustfix/tests/everything/*.json +src/tools/cargo/tests/testsuite/*.rs +src/tools/cargo/tests/testsuite/cargo_add/features_activated_over_limit/out/Cargo.toml +src/tools/cargo/tests/testsuite/cargo_add/features_deactivated_over_limit/out/Cargo.toml +src/tools/clippy/tests/ui-internal/auxiliary/paths.rs +src/tools/clippy/tests/ui-toml/*/*.stderr +src/tools/clippy/tests/ui-toml/large_include_file/too_big.txt +src/tools/clippy/tests/ui/wildcard_enum_match_arm.fixed +src/tools/rust-analyzer/bench_data/numerous_macro_rules +src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_*.html +src/tools/rust-analyzer/crates/parser/test_data/lexer/ok/* +src/tools/rust-analyzer/crates/project-model/test_data/*.json +src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt +src/tools/rust-analyzer/crates/syntax/test_data/reparse/fuzz-failures/0005.rs +src/tools/rustfmt/tests/source/*.rs +src/tools/rustfmt/tests/source/*/*.rs +src/tools/rustfmt/tests/target/issue-5088/very_long_comment_wrap_comments_false.rs +src/tools/rustfmt/tests/writemode/target/*.json +src/tools/rustfmt/tests/writemode/target/*.xml +tests/*/*.html +tests/*/*.rs +tests/*/*.stderr +tests/*/*/*.js +tests/*/*/*.json +tests/*/*/*.rs +tests/*/*/*.stderr +tests/*/*/*.stdout +tests/*/*/*/*.rs +tests/auxiliary/rust_test_helpers.c +tests/coverage/*.cov-map +tests/debuginfo/type-names.cdb.js +tests/run-make/*/*.c +tests/run-make/libtest-junit/output-default.xml +tests/run-make/libtest-junit/output-stdout-success.xml +tests/run-make/wasm-exceptions-nostd/verify.mjs +tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c +tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c +tests/rustdoc-gui/src/huge_logo/src/lib.rs +tests/rustdoc-gui/src/scrape_examples/examples/check-many-*.rs +tests/rustdoc-js-std/*.js +tests/rustdoc-js/*.js +tests/ui/*/*/*.stderr +tests/ui/macros/not-utf8.bin +tests/ui/traits/object/print_vtable_sizes.stdout +vendor/annotate-snippets/tests/fixtures/no-color/strip_line_non_ws.toml +vendor/basic-toml/tests/invalid-encoder/array-mixed-types-ints-and-floats.json +vendor/basic-toml/tests/valid/*.json +vendor/basic-toml/tests/valid/table-whitespace.toml +vendor/bstr/src/unicode/fsm/*.dfa +vendor/cargo_metadata*/tests/test_samples.rs +vendor/content_inspector/testdata/* +vendor/der/tests/examples/spki.der +vendor/diff/tests/data/gitignores.chars.diff +vendor/dissimilar/benches/*.txt +vendor/elasticlunr-rs/tests/data/*.in.txt +vendor/elasticlunr-rs/tests/searchindex_fixture_*.json +vendor/elliptic-curve/tests/examples/*.der +vendor/elliptic-curve/tests/examples/*.pem +vendor/encoding_rs/src/test_data/euc_kr_in.txt +vendor/encoding_rs/src/test_data/euc_kr_in_ref.txt +vendor/flate2/examples/hello_world.txt.gz +vendor/flate2/tests/*.gz +vendor/flate2/tests/corrupt-gz-file.bin +vendor/fluent-syntax/benches/parser.rs +vendor/gsgdt/tests/*.json +vendor/handlebars/tests/helper_with_space.rs +vendor/hkdf/tests/data/*.blb +vendor/hmac/tests/data/*.blb +vendor/html5ever/data/bench/*.html +vendor/icu_locid/benches/fixtures/*.json +vendor/icu_locid/tests/fixtures/*.json +vendor/icu_locid_transform/benches/fixtures/locales.json +vendor/icu_locid_transform/benches/fixtures/uncanonicalized-locales.json +vendor/icu_locid_transform/tests/fixtures/canonicalize.json +vendor/icu_locid_transform/tests/fixtures/maximize.json +vendor/icu_locid_transform/tests/fixtures/minimize.json +vendor/icu_provider_adapters/tests/data/blob.postcard +vendor/icu_provider_adapters/tests/data/config.json +vendor/icu_provider_adapters/tests/data/langtest/*/*.json +vendor/icu_provider_adapters/tests/data/langtest/*/*/*/*.json +vendor/icu_provider_adapters/tests/data/langtest/de.json +vendor/icu_provider_adapters/tests/data/langtest/ro.json +vendor/idna/tests/IdnaTest*.txt +vendor/idna/tests/bad_punycode_tests.json +vendor/idna/tests/punycode_tests.json +vendor/im-rc/proptest-regressions/*.txt +vendor/im-rc/proptest-regressions/*/*.txt +vendor/im-rc/proptest-regressions/ord/map +vendor/js-sys/tests/headless.js +vendor/js-sys/tests/wasm/*.js +vendor/js-sys/tests/wasm/global_fns.rs +vendor/lsp-types/tests/tsc-unix.lsif +vendor/md-5/tests/data/*.blb +vendor/mdbook/test_book/src/individual/paragraph.md +vendor/mdbook/test_book/src/individual/table.md +vendor/mdbook/tests/searchindex_fixture.json +vendor/memchr/src/tests/*.json +vendor/minifier/tests/files/main.js +vendor/minifier/tests/files/minified_main.js +vendor/minifier/tests/files/test.json +vendor/minimal-lexical/tests/parse_tests.rs +vendor/minimal-lexical/tests/slow_tests.rs +vendor/nix/test/test_kmod/hello_mod/hello.c +vendor/openssl/test/* +vendor/p384/src/test_vectors/data/wycheproof.blb +vendor/pasetors/test_vectors/*.json +vendor/pasetors/test_vectors/*/*.json +vendor/pem-rfc7468/tests/examples/*.der +vendor/pem-rfc7468/tests/examples/*.pem +vendor/pkcs8/tests/examples/*.der +vendor/pkcs8/tests/examples/*.pem +vendor/pkcs8/tests/private_key.rs +vendor/proptest/proptest-regressions/test_runner/rng.txt +vendor/proptest/src/regex-contrib/crates_regex.rs +vendor/regex-automata-0.1.10/data/fowler-tests/basic.dat +vendor/regex-automata-0.1.10/data/tests/fowler/basic.dat +vendor/regex-automata-0.2.0/tests/data/fowler/dat/basic.dat +vendor/regex-automata/tests/fuzz/testdata/deserialize_* +vendor/regex-automata/tests/gen/*/*.dfa +vendor/regex/record/compile-test/2023* +vendor/regex/testdata/fowler/dat/basic.dat +vendor/regex/tests/fuzz/testdata/* +vendor/rusqlite/test.csv +vendor/rustc-demangle/src/lib.rs +vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit +vendor/sec1/tests/examples/p256-priv.der +vendor/sec1/tests/examples/p256-priv.pem +vendor/serde_json/tests/lexical/parse.rs +vendor/sha1/tests/data/sha1.blb +vendor/sha2/tests/data/*.blb +vendor/spki/tests/examples/*.der +vendor/tabled/tests/core/iter_table.rs +vendor/tabled/tests/settings/colorization.rs +vendor/tabled/tests/settings/padding_test.rs +vendor/term/tests/data/* +vendor/tokio-native-tls/examples/identity.p12 +vendor/tokio-native-tls/tests/cert.der +vendor/tokio-native-tls/tests/identity.p12 +vendor/tokio-native-tls/tests/root-ca.der +vendor/toml_edit-0.19.11/tests/fixtures/invalid/control/*.stderr +vendor/toml_edit-0.19.11/tests/fixtures/invalid/encoding/utf16.stderr +vendor/toml_edit/tests/fixtures/invalid/*/*.stderr +vendor/unicode-ident/tests/fst/*.fst +vendor/unicode-segmentation/src/testdata.rs +vendor/url/tests/*.json +vendor/varisat/proptest-regressions/solver.txt +vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/* +vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status +vendor/walkdir/compare/nftw.c +vendor/wasm-bindgen/tests/headless/* +vendor/wasm-bindgen/tests/wasm/* +vendor/wasm-bindgen/tests/worker/modules.js +vendor/web-sys/tests/wasm/*.js +vendor/winnow-0.4.7/benches/contains_token.rs +vendor/zip/tests/data/*.zip + +# Compromise, ideally we'd autogenerate these +# Should already by documented in debian/copyright +compiler/rustc_baked_icu_data/src/data/macros/fallback_likelysubtags_v1.data.rs +compiler/rustc_baked_icu_data/src/data/macros/fallback_parents_v1.data.rs +compiler/rustc_baked_icu_data/src/data/macros/fallback_supplement_co_v1.data.rs +src/doc/rustc-dev-guide/src/mir/mir_*.svg +src/librustdoc/html/static/css/normalize.css +src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs +src/tools/rust-analyzer/crates/parser/src/syntax_kind/generated.rs +vendor/icu_locid_transform_data/data/macros/fallback_likelysubtags_v1.data.rs +vendor/icu_locid_transform_data/data/macros/fallback_parents_v1.data.rs +vendor/icu_locid_transform_data/data/macros/fallback_supplement_co_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_aliases_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_ext_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_l_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_sr_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_script_dir_v1.data.rs +vendor/linux-raw-sys/src/x86_64/general.rs +vendor/pest_meta/src/grammar.rs +vendor/regex-syntax-0.*/src/unicode_tables/*.rs +vendor/regex-syntax/src/unicode_tables/*.rs +vendor/ucd-parse/src/sentence_break.rs +vendor/ucd-trie/src/general_category.rs +vendor/unicode-normalization/src/tables.rs +vendor/unicode-script/src/tables.rs +vendor/unicode-segmentation/src/tables.rs +vendor/wasi/src/lib_generated.rs +vendor/windows-bindgen/default/*.winmd + +# Compromise, ideally we'd package these in their own package +src/librustdoc/html/static/fonts/*.woff2 + +# file brokenness (detected as Algol source code) +compiler/rustc_builtin_macros/src/global_allocator.rs +compiler/rustc_codegen_gcc/build_system/src/utils.rs +compiler/rustc_driver/src/lib.rs +compiler/rustc_expand/src/mbe/quoted.rs +compiler/rustc_macros/src/symbols/tests.rs +compiler/stable_mir/src/mir/visit.rs +library/alloc/src/slice/tests.rs +library/std/src/sys/unix/process/process_unix.rs +library/stdarch/crates/stdarch-verify/src/lib.rs +src/librustdoc/html/markdown/tests.rs +src/tools/cargo/crates/mdman/src/format/man.rs +src/tools/cargo/crates/mdman/src/format/md.rs +src/tools/cargo/crates/mdman/src/format/text.rs +src/tools/cargo/crates/mdman/src/lib.rs +src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs +src/tools/clippy/clippy_lints/src/pass_by_ref_or_value.rs +src/tools/rust-analyzer/crates/ide-assists/src/handlers/number_representation.rs +src/tools/rust-analyzer/crates/ide-db/src/syntax_helpers/format_string_exprs.rs +src/tools/rust-analyzer/crates/proc-macro-srv/src/tests/utils.rs +src/tools/rustfmt/src/formatting.rs +src/tools/rustfmt/src/lib.rs +src/tools/rustfmt/src/parse/parser.rs +src/tools/rustfmt/src/string.rs +vendor/ahash/src/fallback_hash.rs +vendor/ahash/src/hash_quality_test.rs +vendor/ahash/src/lib.rs +vendor/aho-corasick-0.7.20/src/nfa.rs +vendor/aho-corasick/src/ahocorasick.rs +vendor/base16ct/benches/mod.rs +vendor/base16ct/src/lower.rs +vendor/base16ct/src/mixed.rs +vendor/base16ct/src/upper.rs +vendor/base64/src/decode.rs +vendor/base64/src/encode.rs +vendor/base64ct/src/*.rs +vendor/base64ct/tests/*.rs +vendor/bitflags/src/traits.rs +vendor/block-buffer/tests/mod.rs +vendor/camino/src/serde_impls.rs +vendor/ciborium/tests/codec.rs +vendor/clap*/src/derive.rs +vendor/clap_derive/src/derives/args.rs +vendor/clap_derive/src/derives/parser.rs +vendor/clap_derive/src/derives/subcommand.rs +vendor/clap_derive/src/derives/value_enum.rs +vendor/color-print-proc-macro/src/format_args/mod.rs +vendor/color-print-proc-macro/src/parse/color_tag.rs +vendor/color-print-proc-macro/src/parse/util.rs +vendor/compiler_builtins/libm/src/math/atan.rs +vendor/datafrog/src/lib.rs +vendor/derivative/src/cmp.rs +vendor/derivative/src/debug.rs +vendor/derivative/src/hash.rs +vendor/derivative/src/lib.rs +vendor/derivative/src/matcher.rs +vendor/derive_more/src/*.rs +vendor/digest/src/core_api/rt_variable.rs +vendor/digest/src/core_api/wrapper.rs +vendor/digest/src/dev.rs +vendor/displaydoc/src/expand.rs +vendor/ecdsa/src/der.rs +vendor/ed25519-compact/src/sha512.rs +vendor/env_logger/src/fmt/writer/mod.rs +vendor/flate2/src/mem.rs +vendor/flate2/src/zio.rs +vendor/fst/src/raw/ops.rs +vendor/futures-macro/src/lib.rs +vendor/futures-macro/src/select.rs +vendor/gimli*/src/read/aranges.rs +vendor/gimli*/src/read/line.rs +vendor/gimli*/src/read/loclists.rs +vendor/gimli*/src/read/lookup.rs +vendor/gimli*/src/read/rnglists.rs +vendor/gimli*/src/read/unit.rs +vendor/gix-config/src/file/init/mod.rs +vendor/gix-config/src/parse/events.rs +vendor/gix-config/src/parse/nom/mod.rs +vendor/gix-date/src/parse.rs +vendor/gix-discover/src/is.rs +vendor/gix-features-0.35.0/src/parallel/mod.rs +vendor/gix-features-0.35.0/src/parallel/reduce.rs +vendor/gix-features-0.35.0/src/zlib/mod.rs +vendor/gix-features-0.35.0/src/zlib/stream/inflate.rs +vendor/gix-features/src/parallel/mod.rs +vendor/gix-features/src/parallel/reduce.rs +vendor/gix-features/src/zlib/mod.rs +vendor/gix-features/src/zlib/stream/inflate.rs +vendor/gix-object/src/commit/ref_iter.rs +vendor/gix-object/src/tag/ref_iter.rs +vendor/gix-odb/src/store_impls/loose/find.rs +vendor/gix-path/src/env/git.rs +vendor/gix-pathspec/src/lib.rs +vendor/gix-pathspec/src/parse.rs +vendor/gix-protocol/src/fetch/delegate.rs +vendor/gix-ref/src/store/packed/decode.rs +vendor/gix-ref/src/store/packed/decode/tests.rs +vendor/gix-revision/src/spec/parse/function.rs +vendor/gix-url/src/lib.rs +vendor/gix-url/src/parse.rs +vendor/humansize/src/allocating.rs +vendor/icu_locid/tests/langid.rs +vendor/icu_locid/tests/locale.rs +vendor/indoc/src/lib.rs +vendor/libm/src/math/atan.rs +vendor/miniz_oxide*/src/deflate/mod.rs +vendor/miniz_oxide*/src/inflate/mod.rs +vendor/nom/src/bits/complete.rs +vendor/nom/src/bits/mod.rs +vendor/nom/src/bits/streaming.rs +vendor/nom/src/branch/mod.rs +vendor/nom/src/branch/tests.rs +vendor/nom/src/bytes/complete.rs +vendor/nom/src/bytes/streaming.rs +vendor/nom/src/character/complete.rs +vendor/nom/src/character/streaming.rs +vendor/nom/src/combinator/mod.rs +vendor/nom/src/combinator/tests.rs +vendor/nom/src/error.rs +vendor/nom/src/internal.rs +vendor/nom/src/multi/mod.rs +vendor/nom/src/multi/tests.rs +vendor/nom/src/number/complete.rs +vendor/nom/src/number/streaming.rs +vendor/nom/src/sequence/mod.rs +vendor/nom/tests/css.rs +vendor/nom/tests/issues.rs +vendor/nom/tests/json.rs +vendor/nom/tests/mp4.rs +vendor/nom/tests/multiline.rs +vendor/openssl/src/envelope.rs +vendor/orion/src/test_framework/aead_interface.rs +vendor/orion/src/test_framework/streamcipher_interface.rs +vendor/os_info/src/matcher.rs +vendor/pest/src/iterators/pair.rs +vendor/pest/src/parser_state.rs +vendor/pest/src/position.rs +vendor/pest/src/span.rs +vendor/pest/tests/calculator.rs +vendor/pest_generator/src/generator.rs +vendor/pest_generator/src/lib.rs +vendor/proc-macro2/src/parse.rs +vendor/pulldown-cmark/benches/html_rendering.rs +vendor/pulldown-cmark/src/linklabel.rs +vendor/pulldown-cmark/tests/lib.rs +vendor/rayon/tests/sort-panic-safe.rs +vendor/regex-automata-0.1.10/src/regex.rs +vendor/regex-automata/src/dfa/automaton.rs +vendor/regex-automata/src/hybrid/dfa.rs +vendor/regex-automata/src/meta/regex.rs +vendor/regex/src/regex/bytes.rs +vendor/rusqlite/src/util/sqlite_string.rs +vendor/rust-analyzer-salsa/src/runtime.rs +vendor/rust-analyzer-salsa/src/runtime/local_state.rs +vendor/rustc-rayon/tests/sort-panic-safe.rs +vendor/rustc_apfloat/src/lib.rs +vendor/rustversion/src/attr.rs +vendor/rustversion/src/expand.rs +vendor/rustversion/src/lib.rs +vendor/semver/src/parse.rs +vendor/sha2/src/sha256.rs +vendor/sha2/src/sha512.rs +vendor/shell-words/src/lib.rs +vendor/shlex/src/lib.rs +vendor/snap/src/compress.rs +vendor/snap/src/decompress.rs +vendor/snapbox/src/substitutions.rs +vendor/syn*/src/attr.rs +vendor/syn*/src/custom_punctuation.rs +vendor/syn*/src/data.rs +vendor/syn*/src/derive.rs +vendor/syn*/src/group.rs +vendor/syn*/src/meta.rs +vendor/syn*/src/pat.rs +vendor/syn*/src/path.rs +vendor/syn*/src/punctuated.rs +vendor/syn*/src/stmt.rs +vendor/syn*/src/token.rs +vendor/syn*/src/ty.rs +vendor/syn*/tests/test_meta.rs +vendor/thiserror-core-impl/src/attr.rs +vendor/thiserror-impl/src/attr.rs +vendor/time/src/parsing/*.rs +vendor/time/src/parsing/combinator/mod.rs +vendor/time/src/parsing/combinator/rfc/*.rs +vendor/time/src/primitive_date_time.rs +vendor/toml_edit-0.19.11/src/parser/key.rs +vendor/toml_edit-0.19.11/src/parser/mod.rs +vendor/toml_edit-0.19.11/src/parser/strings.rs +vendor/toml_edit-0.19.11/src/raw_string.rs +vendor/toml_edit-0.19.11/tests/testsuite/parse.rs +vendor/toml_edit/src/parser/document.rs +vendor/toml_edit/src/parser/key.rs +vendor/toml_edit/src/parser/mod.rs +vendor/toml_edit/src/parser/numbers.rs +vendor/toml_edit/src/parser/strings.rs +vendor/toml_edit/src/raw_string.rs +vendor/toml_edit/tests/testsuite/parse.rs +vendor/url/src/parser.rs +vendor/utf-8/benches/from_utf8_lossy.rs +vendor/utf-8/tests/unit.rs +vendor/varisat-checker/src/lib.rs +vendor/varisat-dimacs/src/lib.rs +vendor/varisat/src/clause/alloc.rs +vendor/varisat/src/solver.rs +vendor/vec_mut_scan/src/lib.rs +vendor/windows-bindgen/src/lib.rs +vendor/windows-bindgen/src/rust/constants.rs +vendor/winnow-0.4.7/examples/css/parser.rs +vendor/winnow-0.4.7/examples/http/parser.rs +vendor/winnow-0.4.7/examples/http/parser_streaming.rs +vendor/winnow-0.4.7/examples/json/*.rs +vendor/winnow-0.4.7/examples/ndjson/example.ndjson +vendor/winnow-0.4.7/examples/ndjson/parser.rs +vendor/winnow-0.4.7/src/ascii/mod.rs +vendor/winnow-0.4.7/src/binary/bits/mod.rs +vendor/winnow-0.4.7/src/binary/bits/tests.rs +vendor/winnow-0.4.7/src/binary/mod.rs +vendor/winnow-0.4.7/src/combinator/branch.rs +vendor/winnow-0.4.7/src/combinator/core.rs +vendor/winnow-0.4.7/src/combinator/parser.rs +vendor/winnow-0.4.7/src/combinator/sequence.rs +vendor/winnow-0.4.7/src/combinator/tests.rs +vendor/winnow-0.4.7/src/error.rs +vendor/winnow-0.4.7/src/token/mod.rs +vendor/winnow/benches/number.rs +vendor/winnow/examples/css/parser.rs +vendor/winnow/examples/http/parser.rs +vendor/winnow/examples/http/parser_streaming.rs +vendor/winnow/examples/json/parser.rs +vendor/winnow/examples/json/parser_dispatch.rs +vendor/winnow/examples/json/parser_partial.rs +vendor/winnow/examples/ndjson/example.ndjson +vendor/winnow/examples/ndjson/parser.rs +vendor/winnow/src/ascii/mod.rs +vendor/winnow/src/binary/bits/mod.rs +vendor/winnow/src/binary/bits/tests.rs +vendor/winnow/src/binary/mod.rs +vendor/winnow/src/combinator/branch.rs +vendor/winnow/src/combinator/core.rs +vendor/winnow/src/combinator/multi.rs +vendor/winnow/src/combinator/parser.rs +vendor/winnow/src/combinator/sequence.rs +vendor/winnow/src/combinator/tests.rs +vendor/winnow/src/error.rs +vendor/winnow/src/parser.rs +vendor/winnow/src/token/mod.rs +vendor/xz2/src/bufread.rs +vendor/xz2/src/stream.rs +vendor/yansi/src/tests.rs + +# file brokenness (detected als Dyalog APL transfer) +vendor/clap/examples/demo.md +vendor/clap/examples/tutorial_builder/*.md +vendor/clap/examples/tutorial_derive/*.md diff --git a/upstream/signing-key.asc b/upstream/signing-key.asc new file mode 100644 index 0000000000..93e2282c7a --- /dev/null +++ b/upstream/signing-key.asc @@ -0,0 +1,86 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFJEwMkBEADlPACa2K7reD4x5zd8afKx75QYKmxqZwywRbgeICeD4bKiQoJZ +dUjmn1LgrGaXuBMKXJQhyA34e/1YZel/8et+HPE5XpljBfNYXWbVocE1UMUTnFU9 +CKXa4AhJ33f7we2/QmNRMUifw5adPwGMg4D8cDKXk02NdnqQlmFByv0vSaArR5kn +gZKnLY6o0zZ9Buyy761Im/ShXqv4ATUgYiFc48z33G4j+BDmn0ryGr1aFdP58tHp +gjWtLZs0iWeFNRDYDje6ODyu/MjOyuAWb2pYDH47Xu7XedMZzenH2TLM9yt/hyOV +xReDPhvoGkaO8xqHioJMoPQi1gBjuBeewmFyTSPS4deASukhCFOcTsw/enzJagiS +ZAq6Imehduke+peAL1z4PuRmzDPO2LPhVS7CDXtuKAYqUV2YakTq8MZUempVhw5n +LqVaJ5/XiyOcv405PnkT25eIVVVghxAgyz6bOU/UMjGQYlkUxI7YZ9tdreLlFyPR +OUL30E8q/aCd4PGJV24yJ1uit+yS8xjyUiMKm4J7oMP2XdBN98TUfLGw7SKeAxyU +92BHlxg7yyPfI4TglsCzoSgEIV6xoGOVRRCYlGzSjUfz0bCMCclhTQRBkegKcjB3 +sMTyG3SPZbjTlCqrFHy13e6hGl37Nhs8/MvXUysq2cluEISn5bivTKEeeQARAQAB +tERSdXN0IExhbmd1YWdlIChUYWcgYW5kIFJlbGVhc2UgU2lnbmluZyBLZXkpIDxy +dXN0LWtleUBydXN0LWxhbmcub3JnPokCOAQTAQIAIgUCUkTAyQIbAwYLCQgHAwIG +FQgCCQoLBBYCAwECHgECF4AACgkQhauW5vob5f5fYQ//b1DWK1NSGx5nZ3zYZeHJ +9mwGCftIaA2IRghAGrNf4Y8DaPqR+w1OdIegWn8kCoGfPfGAVW5XXJg+Oxk6QIaD +2hJojBUrq1DALeCZVewzTVw6BN4DGuUexsc53a8DcY2Yk5WE3ll6UKq/YPiWiPNX +9r8FE2MJwMABB6mWZLqJeg4RCrriBiCG26NZxGE7RTtPHyppoVxWKAFDiWyNdJ+3 +UnjldWrT9xFqjqfXWw9Bhz8/EoaGeSSbMIAQDkQQpp1SWpljpgqvctZlc5fHhsG6 +lmzW5RM4NG8OKvq3UrBihvgzwrIfoEDKpXbk3DXqaSs1o81NH5ftVWWbJp/ywM9Q +uMC6n0YWiMZMQ1cFBy7tukpMkd+VPbPkiSwBhPkfZIzUAWd74nanN5SKBtcnymgJ ++OJcxfZLiUkXRj0aUT1GLA9/7wnikhJI+RvwRfHBgrssXBKNPOfXGWajtIAmZc2t +kR1E8zjBVLId7r5M8g52HKk+J+y5fVgJY91nxG0zf782JjtYuz9+knQd55JLFJCO +hhbv3uRvhvkqgauHagR5X9vCMtcvqDseK7LXrRaOdOUDrK/Zg/abi5d+NIyZfEt/ +ObFsv3idAIe/zpU6xa1nYNe3+Ixlb6mlZm3WCWGxWe+GvNW/kq36jZ/v/8pYMyVO +p/kJqnf9y4dbufuYBg+RLqC5Ag0EUkTAyQEQANxy2tTSeRspfrpBk9+ju+KZ3zc4 +umaIsEa5DxJ2zIKHywVAR67Um0K1YRG07/F5+tD9TIRkdx2pcmpjmSQzqdk3zqa9 +2Zzeijjz2RNyBY8qYmyE08IncjTsFFB8OnvdXcsAgjCFmI1BKnePxrABL/2k8X18 +aysPb0beWqQVsi5FsSpAHu6k1kaLKc+130x6Hf/YJAjeo+S7HeU5NeOz3zD+h5bA +Q25qMiVHX3FwH7rFKZtFFog9Ogjzi0TkDKKxoeFKyADfIdteJWFjOlCI9KoIhfXq +Et9JMnxApGqsJElJtfQjIdhMN4Lnep2WkudHAfwJ/412fe7wiW0rcBMvr/BlBGRY +vM4sTgN058EwIuY9Qmc8RK4gbBf6GsfGNJjWozJ5XmXElmkQCAvbQFoAfi5TGfVb +77QQrhrQlSpfIYrvfpvjYoqj618SbU6uBhzh758gLllmMB8LOhxWtq9eyn1rMWyR +KL1fEkfvvMc78zP+Px6yDMa6UIez8jZXQ87Zou9EriLbzF4QfIYAqR9LUSMnLk6K +o61tSFmFEDobC3tc1jkSg4zZe/wxskn96KOlmnxgMGO0vJ7ASrynoxEnQE8k3WwA ++/YJDwboIR7zDwTy3Jw3mn1FgnH+c7Rb9h9geOzxKYINBFz5Hd0MKx7kZ1U6WobW +KiYYxcCmoEeguSPHABEBAAGJAh8EGAECAAkFAlJEwMkCGwwACgkQhauW5vob5f7f +FA//Ra+itJF4NsEyyhx4xYDOPq4uj0VWVjLdabDvFjQtbBLwIyh2bm8uO3AY4r/r +rM5WWQ8oIXQ2vvXpAQO9g8iNlFez6OLzbfdSG80AG74pQqVVVyCQxD7FanB/KGge +tAoOstFxaCAg4nxFlarMctFqOOXCFkylWl504JVIOvgbbbyj6I7qCUmbmqazBSMU +K8c/Nz+FNu2Uf/lYWOeGogRSBgS0CVBcbmPUpnDHLxZWNXDWQOCxbhA1Uf58hcyu +036kkiWHh2OGgJqlo2WIraPXx1cGw1Ey+U6exbtrZfE5kM9pZzRG7ZY83CXpYWMp +kyVXNWmf9JcIWWBrXvJmMi0FDvtgg3Pt1tnoxqdilk6yhieFc8LqBn6CZgFUBk0t +NSaWk3PsN0N6Ut8VXY6sai7MJ0Gih1gE1xadWj2zfZ9sLGyt2jZ6wK++U881YeXA +ryaGKJ8sIs182hwQb4qN7eiUHzLtIh8oVBHo8Q4BJSat88E5/gOD6IQIpxc42iRL +T+oNZw1hdwNyPOT1GMkkn86l3o7klwmQUWCPm6vl1aHp3omo+GHC63PpNFO5RncJ +Ilo3aBKKmoE5lDSMGE8KFso5awTo9z9QnVPkRsk6qeBYit9xE3x3S+iwjcSg0nie +aAkc0N00nc9V9jfPvt4z/5A5vjHh+NhFwH5h2vBJVPdsz6m5Ag0EVI9keAEQAL3R +oVsHncJTmjHfBOV4JJsvCum4DuJDZ/rDdxauGcjMUWZaG338ZehnDqG1Yn/ys7zE +aKYUmqyT+XP+M2IAQRTyxwlU1RsDlemQfWrESfZQCCmbnFScL0E7cBzy4xvtInQe +UaFgJZ1BmxbzQrx+eBBdOTDv7RLnNVygRmMzmkDhxO1IGEu1+3ETIg/DxFE7VQY0 +It/Ywz+nHu1o4Hemc/GdKxu9hcYvcRVc/Xhueq/zcIM96l0m+CFbs0HMKCj8dgMe +Ng6pbbDjNM+cV+5BgpRdIpE2l9W7ImpbLihqcZt47J6oWt/RDRVoKOzRxjhULVyV +2VP9ESr48HnbvxcpvUAEDCQUhsGpur4EKHFJ9AmQ4zf91gWLrDc6QmlACn9o9ARU +fOV5aFsZI9ni1MJEInJTP37stz/uDECRie4LTL4O6P4Dkto8ROM2wzZq5CiRNfnT +PP7ARfxlCkpg+gpLYRlxGUvRn6EeYwDtiMQJUQPfpGHSvThUlgDEsDrpp4SQSmdA +CB+rvaRqCawWKoXs0In/9wylGorRUupeqGC0I0/rh+f5mayFvORzwy/4KK4QIEV9 +aYTXTvSRl35MevfXU1Cumlaqle6SDkLr3ZnFQgJBqap0Y+Nmmz2HfO/pohsbtHPX +92SN3dKqaoSBvzNGY5WT3CsqxDtik37kR3f9/DHpABEBAAGJBD4EGAECAAkFAlSP +ZHgCGwICKQkQhauW5vob5f7BXSAEGQECAAYFAlSPZHgACgkQXLSpNHs7CdwemA/+ +KFoGuFqU0uKT9qblN4ugRyil5itmTRVffl4tm5OoWkW8uDnu7Ue3vzdzy+9NV8X2 +wRG835qjXijWP++AGuxgW6LB9nV5OWiKMCHOWnUjJQ6pNQMAgSN69QzkFXVF/q5f +bkma9TgSbwjrVMyPzLSRwq7HsT3V02Qfr4cyq39QeILGy/NHW5z6LZnBy3BaVSd0 +lGjCEc3yfH5OaB79na4W86WCV5n4IT7cojFM+LdL6P46RgmEtWSG3/CDjnJl6BLR +WqatRNBWLIMKMpn+YvOOL9TwuP1xbqWr1vZ66wksm53NIDcWhptpp0KEuzbU0/Dt +OltBhcX8tOmO36LrSadX9rwckSETCVYklmpAHNxPml011YNDThtBidvsicw1vZwR +HsXn+txlL6RAIRN+J/Rw3uOiJAqN9Qgedpx2q+E15t8MiTg/FXtB9SysnskFT/BH +z0USNKJUY0btZBw3eXWzUnZf59D8VW1M/9JwznCHAx0c9wy/gRDiwt9w4RoXryJD +VAwZg8rwByjldoiThUJhkCYvJ0R3xH3kPnPlGXDW49E9R8C2umRC3cYOL4U9dOQ1 +5hSlYydF5urFGCLIvodtE9q80uhpyt8L/5jj9tbwZWv6JLnfBquZSnCGqFZRfXlb +Jphk9+CBQWwiZSRLZRzqQ4ffl4xyLuolx01PMaatkQbRaw/+JpgRNlurKQ0PsTrO +8tztO/tpBBj/huc2DGkSwEWvkfWElS5RLDKdoMVs/j5CLYUJzZVikUJRm7m7b+OA +P3W1nbDhuID+XV1CSBmGifQwpoPTys21stTIGLgznJrIfE5moFviOLqD/LrcYlsq +CQg0yleu7SjOs//8dM3mC2FyLaE/dCZ8l2DCLhHw0+ynyRAvSK6aGCmZz6jMjmYF +MXgiy7zESksMnVFMulIJJhR3eB0wx2GitibjY/ZhQ7tD3i0yy9ILR07dFz4pgkVM +afxpVR7fmrMZ0t+yENd+9qzyAZs0ksxORoc2ze90SCx2jwEX/3K+m4I0hP2H/w5W +gqdvuRLiqf+4BGW4zqWkLLlNIe/okt0r82SwHtDN0Ui1asmZTGj6sm8SXtwx+5cE +38MttWqjDiibQOSthRVcETByRYM8KcjYSUCi4PoBc3NpDONkFbZm6XofR/f5mTcl +2jDw6fIeVc4Hd1jBGajNzEqtneqqbdAkPQaLsuD2TMkQfTDJfE/IljwjrhDa9Mi+ +odtnMWq8vlwOZZ24/8/BNK5qXuCYL67O7AJB4ZQ6BT+g4z96iRLbupzu/XJyXkQF +rOY/Ghegvn7fDrnt2KC9MpgeFBXzUp+k5rzUdF8jbCx5apVjA1sWXB9Kh3L+DUwF +Mve696B5tlHyc1KxjHR6w9GRsh4= +=5FXw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/wasi-node b/wasi-node new file mode 100755 index 0000000000..c1d5762758 --- /dev/null +++ b/wasi-node @@ -0,0 +1,54 @@ +#!/usr/bin/node --experimental-wasi-unstable-preview1 +/// +/// Simple WASI executor, adapted from the NodeJS WASI module API docs [1]. +/// +/// Usage: wasi-node [ .. ] +/// +/// Environment variables: +/// +/// WASI_NODE_PREOPENS - optional JSON file defining the application sandbox +/// directory structure. See [1] for details. +/// +/// WASI_NODE_ENV - optional JSON file defining the application environment. +/// If omitted then the process's POSIX environment is used; this may leak +/// information. If a clean environment is required then set this to /dev/null +/// or some other empty file. +/// +/// [1] https://nodejs.org/api/wasi.html + +'use strict'; +const fs = require('fs'); +const { WASI } = require('wasi'); + +// argv[0] is nodejs +// argv[1] is this script +var args = process.argv.slice(2); // inner argv includes cmd + +if (!args[0]) { + console.warn(process.argv[1] + ": no command given"); + process.exit(1); +} + +var preopens = {}; +var preopens_json = process.env["WASI_NODE_PREOPENS"]; +if (preopens_json) { + var preopens_data = fs.readFileSync(preopens_json); + preopens = preopens_data.length ? JSON.parse(preopens_data) : {}; +} + +var env = process.env; +var env_json = process.env["WASI_NODE_ENV"]; +if (env_json) { + var env_data = fs.readFileSync(env_json); + env = env_data.length ? JSON.parse(env_data) : {}; +} + +const wasi = new WASI({ args: args, env: env, preopens: preopens }); +const importObject = { wasi_snapshot_preview1: wasi.wasiImport }; + +(async () => { + const wasm = await WebAssembly.compile(fs.readFileSync(args[0])); + const instance = await WebAssembly.instantiate(wasm, importObject); + + wasi.start(instance); +})(); diff --git a/watch b/watch new file mode 100644 index 0000000000..fe1cc1e51e --- /dev/null +++ b/watch @@ -0,0 +1,18 @@ +version=4 +# if you need to download other versions replace the URL below with this one: +# https://static.rust-lang.org/dist/channel-rust-$VERSION.toml +# and also add searchmode=plain,\ +# it's a bit slower to download, that's why we use the other one normally + +opts="\ +pgpsigurlmangle=s/$/.asc/,\ +uversionmangle=s/(\d)[_.+-]?((beta|alpha)\.?\d*)$/$1~$2/,\ +dversionmangle=s/\+dfsg\d*$//,\ +downloadurlmangle=s/\.[gx]z/.xz/,\ +filenamemangle=s/.*\/(.*)\.[gx]z(\..*)?/$1.xz$2/,\ +repack,\ +repacksuffix=+dfsg1,\ +compression=xz,\ +" \ + https://forge.rust-lang.org/infra/other-installation-methods.html \ + https://(?:.*/)rustc?-(\d[\d.]*(?:-[\w.]+)?)-src\.tar\.[gx]z diff --git a/watch-beta.in b/watch-beta.in new file mode 100644 index 0000000000..5cd2aa66e8 --- /dev/null +++ b/watch-beta.in @@ -0,0 +1,17 @@ +version=4 +# if you need to download other versions replace the URL below with this one: +# https://static.rust-lang.org/dist/index.html +# it's a bit slower to download, that's why we use the other one normally + +opts="\ +pgpsigurlmangle=s/$/.asc/,\ +uversionmangle=s/.*/NEWVER~beta.999/,\ +dversionmangle=s/\+dfsg\d*$//,\ +downloadurlmangle=s/rustc-.*-(.*)\.[gx]z/rustc-beta-$1.xz/,\ +filenamemangle=s/.*\/(.*)-[^-]*-(.*)\.[gx]z(\..*)?/$1-NEWVER-beta.999-$2.xz$3/,\ +repack,\ +repacksuffix=+dfsg1,\ +compression=xz,\ +" \ + https://forge.rust-lang.org/infra/other-installation-methods.html \ + (?:.*/)rustc?-(.*)-src\.tar\.[gx]z