From d6f2d57942bb1cd78e91abff4339754648bc4f5d Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Thu, 30 May 2019 05:52:37 +0100 Subject: [PATCH 1/1] Import rustc_1.34.2+dfsg1-1.debian.tar.xz [dgit import tarball rustc 1.34.2+dfsg1-1 rustc_1.34.2+dfsg1-1.debian.tar.xz] --- NEWS | 29 + README.Debian | 213 +++ README.source | 237 +++ TODO.Debian | 12 + architecture-test.mk | 16 + architecture.mk | 17 + changelog | 1034 +++++++++++ check-orig-suspicious.sh | 16 + compat | 1 + config.toml.in | 60 + control | 194 ++ copyright | 1642 +++++++++++++++++ docs | 1 + ensure-patch | 15 + gbp.conf | 7 + get-stage0.py | 31 + icons/rust-logo-32x32-blk.png | Bin 0 -> 691 bytes libstd-rust-1.34.lintian-overrides | 12 + libstd-rust-dev.lintian-overrides | 8 + lintian-to-copyright.sh | 5 + llvm-upstream-patch.sh | 9 + make_orig-stage0_tarball.sh | 48 + .../d-0000-ignore-removed-submodules.patch | 104 ++ patches/d-0001-disable-miniz.patch | 36 + ...0002-pkg-config-no-special-snowflake.patch | 98 + .../d-0003-mdbook-strip-embedded-libs.patch | 347 ++++ patches/d-0004-mdbook-2-1-compat.patch | 140 ++ patches/d-add-soname.patch | 36 + patches/d-disable-cargo-vendor.patch | 18 + patches/d-dont-download-stage0.patch | 49 + patches/d-fix-mips64el-bootstrap.patch | 12 + patches/d-host-duplicates.patch | 30 + patches/d-i686-baseline.patch | 13 + patches/d-ignore-avx-44056.patch | 12 + patches/d-ignore-error-detail-diff.patch | 34 + patches/d-no-jemalloc.patch | 16 + patches/d-prefer-dynamic.patch | 18 + patches/d-read-beta-version-from-file.patch | 50 + patches/d-rust-gdb-paths | 21 + patches/d-rust-lldb-paths | 41 + patches/gcc-4.8-aarch64-ice.diff | 25 + patches/series | 41 + ...it-internalization-in-LLVM-8-ThinLTO.patch | 29 + patches/u-make-tests-work-without-rpath.patch | 12 + patches/u-mips-fixes.diff | 19 + patches/u-prefer-local-css.patch | 14 + patches/u-reproducible-build.patch | 18 + patches/u-reproducible-dl-stage0.patch | 11 + prune-checksums | 47 + prune-unused-deps | 54 + rules | 401 ++++ rust-doc.doc-base.book | 13 + rust-doc.doc-base.reference | 11 + rust-doc.docs | 1 + rust-doc.install | 1 + rust-doc.links | 10 + rust-gdb.install | 3 + rust-gdb.links | 1 + rust-lldb.install | 3 + rust-lldb.links | 1 + rust-src.install.in | 13 + rust-src.links.in | 1 + rust-src.lintian-overrides | 4 + rustc.install | 3 + rustc.manpages | 3 + source/format | 1 + source/include-binaries | 6 + source/lintian-overrides | 1 + source/options | 4 + update-version.sh | 37 + upstream-tarball-unsuspicious.txt | 174 ++ upstream/signing-key.asc | 86 + watch | 17 + watch-beta.in | 17 + 74 files changed, 5764 insertions(+) create mode 100644 NEWS create mode 100644 README.Debian create mode 100644 README.source create mode 100644 TODO.Debian create mode 100644 architecture-test.mk create mode 100644 architecture.mk create mode 100644 changelog create mode 100755 check-orig-suspicious.sh create mode 100644 compat create mode 100644 config.toml.in create mode 100644 control create mode 100644 copyright create mode 100644 docs create mode 100755 ensure-patch create mode 100644 gbp.conf create mode 100755 get-stage0.py create mode 100644 icons/rust-logo-32x32-blk.png create mode 100644 libstd-rust-1.34.lintian-overrides create mode 100644 libstd-rust-dev.lintian-overrides create mode 100755 lintian-to-copyright.sh create mode 100755 llvm-upstream-patch.sh create mode 100755 make_orig-stage0_tarball.sh create mode 100644 patches/d-0000-ignore-removed-submodules.patch create mode 100644 patches/d-0001-disable-miniz.patch create mode 100644 patches/d-0002-pkg-config-no-special-snowflake.patch create mode 100644 patches/d-0003-mdbook-strip-embedded-libs.patch create mode 100644 patches/d-0004-mdbook-2-1-compat.patch create mode 100644 patches/d-add-soname.patch create mode 100644 patches/d-disable-cargo-vendor.patch create mode 100644 patches/d-dont-download-stage0.patch create mode 100644 patches/d-fix-mips64el-bootstrap.patch create mode 100644 patches/d-host-duplicates.patch create mode 100644 patches/d-i686-baseline.patch create mode 100644 patches/d-ignore-avx-44056.patch create mode 100644 patches/d-ignore-error-detail-diff.patch create mode 100644 patches/d-no-jemalloc.patch create mode 100644 patches/d-prefer-dynamic.patch create mode 100644 patches/d-read-beta-version-from-file.patch create mode 100644 patches/d-rust-gdb-paths create mode 100644 patches/d-rust-lldb-paths create mode 100644 patches/gcc-4.8-aarch64-ice.diff create mode 100644 patches/series create mode 100644 patches/u-0001-Limit-internalization-in-LLVM-8-ThinLTO.patch create mode 100644 patches/u-make-tests-work-without-rpath.patch create mode 100644 patches/u-mips-fixes.diff create mode 100644 patches/u-prefer-local-css.patch create mode 100644 patches/u-reproducible-build.patch create mode 100644 patches/u-reproducible-dl-stage0.patch create mode 100755 prune-checksums create mode 100755 prune-unused-deps create mode 100755 rules create mode 100644 rust-doc.doc-base.book create mode 100644 rust-doc.doc-base.reference create mode 100644 rust-doc.docs create mode 100644 rust-doc.install create mode 100644 rust-doc.links create mode 100644 rust-gdb.install create mode 100644 rust-gdb.links create mode 100644 rust-lldb.install create mode 100644 rust-lldb.links create mode 100644 rust-src.install.in create mode 100644 rust-src.links.in create mode 100644 rust-src.lintian-overrides create mode 100644 rustc.install create mode 100644 rustc.manpages create mode 100644 source/format create mode 100644 source/include-binaries create mode 100644 source/lintian-overrides create mode 100644 source/options create mode 100755 update-version.sh create mode 100644 upstream-tarball-unsuspicious.txt create mode 100644 upstream/signing-key.asc create mode 100644 watch create mode 100644 watch-beta.in 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..c2627dee19 --- /dev/null +++ b/README.Debian @@ -0,0 +1,213 @@ +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 + + +Architecture-specific notes +=========================== + +armhf +----- + +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 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. All you need to do is +install the standard libraries for each target architecture you want to compile +to. For rustc, this is libstd-rust-dev, 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. + +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 +--------------------------------------- --------------- ------------------------ + + +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. + diff --git a/README.source b/README.source new file mode 100644 index 0000000000..e0e6dc6fc2 --- /dev/null +++ b/README.source @@ -0,0 +1,237 @@ +Document by Ximin Luo, Luca Bruno & Sylvestre Ledru + +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: + + * compiler-rt from https://github.com/rust-lang/compiler-rt + -> system-wide compiler-rt fails during linkage + + Bug reported upstream, still to be fixed, see: + - https://github.com/rust-lang/rust/issues/15054 + - https://github.com/rust-lang/rust/issues/15708 + + * vendor/backtrace-sys, vendor/dlmalloc, vendor/walkdir + + 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 + # 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. + +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 +$ tar xf ../rustc-${ver/\~/-}-src.tar.xz && ( cd rustc-${ver/*~*/beta}-src/ && pwd && ../debian/prune-unused-deps ) && rm -rf rustc-${ver/*~*/beta}-src/ +# ^ If this fails, you probably need to refresh patches (QUILT_PATCHES=../debian/patches/ quilt push -a --fuzz=0) +# or edit debian/prune-unused-deps +$ 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 +# might also need to bump the version of the cargo Build-Depends +# then refresh patches, etc etc +# Use /usr/share/cargo/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.Debian b/TODO.Debian new file mode 100644 index 0000000000..ed9f05bc11 --- /dev/null +++ b/TODO.Debian @@ -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..e7aeabade5 --- /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 -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..9a71eb996a --- /dev/null +++ b/architecture.mk @@ -0,0 +1,17 @@ +# 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 -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\ +$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\ +$(1)))) +rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM) + +$(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/changelog b/changelog new file mode 100644 index 0000000000..e301349684 --- /dev/null +++ b/changelog @@ -0,0 +1,1034 @@ +rustc (1.34.2+dfsg1-1) unstable; urgency=medium + + * Don't use system compiler-rt, there are issues with that for now. + * Downgrade back to LLVM 7, easier for the 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..b0bf28cce0 --- /dev/null +++ b/check-orig-suspicious.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -e + +ver="$1" +test -n "$ver" || exit 2 + +SUS_WHITELIST=$(find "${PWD}/debian" -name upstream-tarball-unsuspicious.txt -type f) + +rm -rf rustc-${ver/*~*/beta}-src/ +tar xf ../rustc_$ver+dfsg1.orig.tar.xz && cd rustc-${ver/*~*/beta}-src/ + +/usr/share/cargo/scripts/audit-vendor-source \ + "$SUS_WHITELIST" \ + "Files-Excluded: in debian/copyright and run a repack." + +echo "Artifacts left in rustc-$ver-src, please remove them yourself." diff --git a/compat b/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/config.toml.in b/config.toml.in new file mode 100644 index 0000000000..4cbb74c021 --- /dev/null +++ b/config.toml.in @@ -0,0 +1,60 @@ +[build] +submodules = false +vendor = true +locked-deps = false +verbose = 2 + +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 + +[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 +[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 = true +debuginfo-lines = true +debuginfo-only-std = false +rpath = false + +verbose-tests = true +backtrace-on-ice = true diff --git a/control b/control new file mode 100644 index 0000000000..601ae7e3fc --- /dev/null +++ b/control @@ -0,0 +1,194 @@ +Source: rustc +Section: devel +Priority: optional +Maintainer: Debian Rust Maintainers +Uploaders: + Ximin Luo , + Sylvestre Ledru +# :native annotations are to support cross-compiling, see README.Debian +Build-Depends: debhelper (>= 9), + dpkg-dev (>= 1.17.14), + python:native, + cargo:native (>= 0.31.0) , + rustc:native (>= 1.33.0+dfsg) , + rustc:native (<= 1.34.2++) , + llvm-7-dev:native, + llvm-7-tools:native, + libllvm7 (>= 1:7.0.1-3), + autotools-dev, + cmake (>= 3.0) | cmake3, +# needed by some vendor crates + pkg-config, +# this is sometimes needed by rustc_llvm + zlib1g-dev:native, + zlib1g-dev, +# used by rust-installer + liblzma-dev:native, +# test dependencies: + binutils (>= 2.26) | binutils-2.26 , + git , + procps , +# below are optional tools even for 'make check' + gdb (>= 7.12) , +# Work around #864741. The version constraint for gdb above should already do +# that, but this will keep things covered even in the case that they change +# gdb-minimal to do a versioned Provides: gdb. +# Extra build-deps needed for x.py to download stuff in pkg.rustc.dlstage0. + curl , + ca-certificates , +Build-Conflicts: gdb-minimal +# ^ That version of rustc is broken +Standards-Version: 4.2.1 +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 (>= 0.35.0~~), cargo (<< 0.36.0~~), rust-gdb | rust-lldb +Suggests: rust-doc, rust-src +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.34 +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. + +Package: libstd-rust-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-1.34 (= ${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 necessary to use the standard + Rust libraries. + +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-7, ${misc:Depends}, python-lldb-7 +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-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. diff --git a/copyright b/copyright new file mode 100644 index 0000000000..9a93d00b69 --- /dev/null +++ b/copyright @@ -0,0 +1,1642 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rust +Source: https://www.rust-lang.org +Files-Excluded: + *.min.js + src/llvm-emscripten + src/llvm-project + vendor/jemalloc-sys + vendor/mdbook/src/theme/FontAwesome + vendor/mdbook/src/theme/highlight.js + vendor/mdbook/src/theme/highlight.css +# 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/clippy + src/tools/rls + src/tools/remote-test-client + src/tools/remote-test-server + src/tools/rustfmt + src/tools/miri +# Extraneous stuff from compiler-rt that's not needed by Rust + vendor/compiler_builtins/compiler-rt/cmake + vendor/compiler_builtins/compiler-rt/docs + vendor/compiler_builtins/compiler-rt/include + vendor/compiler_builtins/compiler-rt/lib/*san + vendor/compiler_builtins/compiler-rt/lib/fuzzer + vendor/compiler_builtins/compiler-rt/lib/interception + vendor/compiler_builtins/compiler-rt/lib/profile + vendor/compiler_builtins/compiler-rt/lib/sanitizer_common + vendor/compiler_builtins/compiler-rt/lib/scudo + vendor/compiler_builtins/compiler-rt/lib/xray + vendor/compiler_builtins/compiler-rt/test + vendor/compiler_builtins/compiler-rt/unittests + vendor/compiler_builtins/compiler-rt/www +# Embedded C libraries + vendor/libz-sys/src/zlib* + vendor/lzma-sys*/xz-* +# Embedded binary blobs + vendor/winapi-*/*/*.a + vendor/mdbook/src/theme/playpen_editor +# unused dependencies, generated by debian/prune-unused-deps +# DO NOT EDIT below, AUTOGENERATED + vendor/adler32 + vendor/arc-swap + vendor/argon2rs + vendor/bit-set + vendor/bit-vec + vendor/blake2-rfc + vendor/bufstream + vendor/build_const + vendor/bytecount + vendor/bytes + vendor/bytesize + vendor/cargo_metadata-0.6.2 + vendor/cargo_metadata + vendor/colored + vendor/commoncrypto + vendor/commoncrypto-sys + vendor/compiletest_rs + vendor/constant_time_eq + vendor/core-foundation + vendor/core-foundation-sys + vendor/crc + vendor/crossbeam-channel + vendor/crossbeam-deque + vendor/crossbeam-epoch + vendor/crossbeam-utils + vendor/crypto-hash + vendor/curl + vendor/curl-sys + vendor/derive_more + vendor/derive-new + vendor/directories + vendor/dirs + vendor/env_logger + vendor/error-chain-0.11.0 + vendor/fnv + vendor/foreign-types + vendor/foreign-types-shared + vendor/fs2 + vendor/fst + vendor/futures + vendor/fwdansi + vendor/git2 + vendor/git2-curl + vendor/glob + vendor/globset + vendor/handlebars-0.32.4 + vendor/hex + vendor/home + vendor/http + vendor/if_chain + vendor/ignore + vendor/im-rc + vendor/iovec + vendor/itertools + vendor/json + vendor/jsonrpc-core + vendor/kernel32-sys + vendor/lazycell + vendor/libgit2-sys + vendor/libnghttp2-sys + vendor/libssh2-sys + vendor/lsp-codec + vendor/lsp-types + vendor/mdbook-0.1.7 + vendor/miniz_oxide_c_api + vendor/miniz_oxide + vendor/miniz-sys + vendor/mio + vendor/mio-named-pipes + vendor/mio-uds + vendor/miow-0.2.1 + vendor/net2 + vendor/num-derive + vendor/opener + vendor/openssl + vendor/openssl-probe + vendor/openssl-src + vendor/openssl-sys + vendor/ordslice + vendor/packed_simd + vendor/parking_lot-0.6.4 + vendor/parking_lot_core-0.3.0 + vendor/pest-1.0.6 + vendor/pest_derive-1.0.8 + vendor/pretty_env_logger + vendor/proptest + vendor/pulldown-cmark + vendor/quine-mc_cluskey + vendor/quote-0.3.15 + vendor/racer + vendor/redox_users + vendor/regex-0.2.11 + vendor/regex-syntax-0.5.6 + vendor/rls-analysis + vendor/rls-blacklist + vendor/rls-rustc + vendor/rls-vfs + vendor/rustc-ap-arena + vendor/rustc-ap-graphviz + vendor/rustc-ap-rustc_cratesio_shim + vendor/rustc-ap-rustc_data_structures + vendor/rustc-ap-rustc_errors + vendor/rustc-ap-rustc_target + vendor/rustc-ap-serialize + vendor/rustc-ap-syntax + vendor/rustc-ap-syntax_pos + vendor/rustc_tools_util + vendor/rusty-fork + vendor/schannel + vendor/scoped_threadpool + vendor/serde_ignored + vendor/shell-escape + vendor/signal-hook + vendor/slab + vendor/syn-0.11.11 + vendor/synom + vendor/term + vendor/tokio + vendor/tokio-codec + vendor/tokio-current-thread + vendor/tokio-executor + vendor/tokio-fs + vendor/tokio-io + vendor/tokio-process + vendor/tokio-reactor + vendor/tokio-signal + vendor/tokio-tcp + vendor/tokio-threadpool + vendor/tokio-timer + vendor/tokio-udp + vendor/tokio-uds + vendor/toml-query-0.6.0 + vendor/unicode_categories + vendor/unicode-xid-0.0.4 + vendor/url_serde + vendor/vergen + vendor/wait-timeout + vendor/winapi-0.2.8 + vendor/winapi-build + vendor/ws2_32-sys +# DO NOT EDIT above, AUTOGENERATED + +Files: C*.md + R*.md + Cargo.lock + Cargo.toml + COPYRIGHT + LICENSE* + configure + config.toml.example + git-commit-hash + src/Cargo.* + src/README.md + src/bootstrap/* + src/build_helper/* + src/ci/* + src/doc/* + src/etc/* + src/grammar/* + src/lib* + src/rt* + src/rust* + src/stage0.txt + src/stdsimd/* + src/tools/* + src/test/* + version + x.py +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: 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/compiler_builtins/compiler-rt/* +Copyright: 2009-2015 Howard Hinnant + 2009-2015 The CompileRT Developers (see src/compiler-rt/CREDITS.TXT) +License: BSD-3-clause or MIT + +Files: vendor/compiler_builtins/compiler-rt/lib/BlocksRuntime/* +Copyright: 2008-2010 Apple, Inc. +License: MIT + +Files: src/librustdoc/html/static/FiraSans* +Copyright: 2014, Mozilla Foundation, 2014, Telefonica S.A. +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/Heuristica* +Copyright: 1989, 1991 Adobe Systems Incorporated, + 2006 Han The Thanh, Vntopia font family, + 2008-2012, Andrey V. Panov +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/SourceCodePro* +Copyright: 2010, 2012 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/SourceSerifPro* +Copyright: 2014 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/main.js +Copyright: 2014 The Rust Project Developers +License: MIT or Apache-2.0 + +Files: src/libstd/memchr.rs +Copyright: 2015 Andrew Gallant, bluss and Nicolas Koch +License: MIT or Apache-2.0 + +Files: src/libstd/sync/mpsc/mpsc_queue.rs + src/libstd/sync/mpsc/spsc_queue.rs +Copyright: 2010-2011 Dmitry Vyukov +License: BSD-2-Clause + +Files: vendor/bitflags/* + vendor/bitflags-0* + vendor/cc/* + vendor/cmake/* + vendor/env_logger/* + vendor/env_logger-0*/* + vendor/getopts/* + vendor/libc/* + vendor/log/* + vendor/regex/* + vendor/regex-0*/* + vendor/regex-syntax/* + vendor/regex-syntax-0*/* + vendor/rustc-hash/* + vendor/rustc-serialize/* + vendor/time/* +Copyright: 2010-2018 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/num-integer/* + 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/string_cache_shared/* + 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/rand/* + vendor/rand-0*/* + vendor/rand_core/* + vendor/rand_chacha/* + vendor/rand_core-0.2.2/* + vendor/rand_hc/* + vendor/rand_isaac/* + vendor/rand_pcg/* + vendor/rand_xorshift/* +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/rand + see https://github.com/rust-random/small-rngs + +Files: vendor/backtrace/* + vendor/backtrace-sys/* + vendor/cfg-if/* + vendor/filetime/* + vendor/flate2/* + vendor/jobserver/* + vendor/libz-sys/* + vendor/lzma-sys/* + vendor/miow/* + vendor/miniz-sys/* + vendor/pkg-config/* + vendor/proc-macro2/* + vendor/proc-macro2-0*/* + vendor/rustc-demangle/* + vendor/scoped-tls/* + vendor/socket2/* + vendor/tar/* + vendor/toml/* + vendor/xz2/* +Copyright: 2014-2019 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/backtrace-sys/src/libbacktrace/* +Copyright: 2012-2016 Free Software Foundation, Inc. +License: BSD-3-Clause +Comment: written by Ian Lance Taylor, Google. + +Files: + vendor/backtrace-sys/src/libbacktrace/filenames.h + vendor/backtrace-sys/src/libbacktrace/ltmain.sh +Copyright: 2000, 2001, 2007, 2010 Free Software Foundation, Inc. +License: GPL-2+ + +Files: vendor/ammonia/* +Copyright: 2015-2018 Michael Howell +License: MIT or Apache-2.0 +Comment: see https://github.com/notriddle/ammonia + +Files: vendor/ansi_term/* +Copyright: 2014-2016 ogham@bsago.me + 2014-2016 Ryan Scheel (Havvy) +License: MIT +Comment: see https://github.com/ogham/rust-ansi-term + +Files: vendor/aho-corasick/* + vendor/memchr/* + vendor/utf8-ranges/* +Copyright: 2015 Andrew Gallant + 2015-2018 bluss +License: MIT or Unlicense +Comment: see upstream projects, + * https://github.com/docopt/docopt.rs + * https://github.com/BurntSushi/aho-corasick + * https://github.com/BurntSushi/rust-memchr + * https://github.com/BurntSushi/utf8-ranges + +Files: vendor/arrayref/* +Copyright: 2015-2018 David Roundy +License: BSD-2-Clause +Comment: see https://github.com/droundy/arrayref + +Files: vendor/atty/* +Copyright: 2015-2017 softprops +License: MIT +Comment: see https://github.com/softprops/atty + +Files: + vendor/block-buffer/* + vendor/byte-tools/* + vendor/digest/* + vendor/fake-simd/* + vendor/sha-1/* +Copyright: 2016-2019 RustCrypto Project Developers +License: MIT or Apache-2.0 +Comment: + see https://github.com/RustCrypto/traits + see https://github.com/RustCrypto/utils + +Files: + vendor/byteorder/* + vendor/same-file/* + vendor/termcolor/* + vendor/walkdir/* + vendor/winapi-util/* + vendor/wincolor/* +Copyright: 2015-2018 Andrew Gallant +License: Unlicense or MIT +Comment: + see https://github.com/BurntSushi/byteorder + 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/termcolor + see https://github.com/BurntSushi/ripgrep/tree/master/wincolor + +Files: vendor/log_settings/* +Copyright: 2016-2018 Oliver Schneider +License: MIT +Comment: see https://github.com/oli-obk/log_settings + +Files: + vendor/chalk-engine/* + vendor/chalk-macros/* +Copyright: 2015-2018 Rust Compiler Team + 2015-2018 Chalk developers +License: Apache-2.0 or MIT +Comment: see https://github.com/rust-lang-nursery/chalk + +Files: vendor/chrono/* +Copyright: 2014-2018 Kang Seonghoon +License: MIT or Apache-2.0 +Comment: see https://github.com/chronotope/chrono + +Files: vendor/clap/* +Copyright: 2015-2017 Kevin K. +License: MIT +Comment: see https://github.com/kbknapp/clap-rs.git + +Files: vendor/cloudabi/* +Copyright: 2016-2018 Nuxi (https://nuxi.nl/) and contributors +License: BSD-2-Clause +Comment: see https://github.com/nuxinl/cloudabi + +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/crossbeam-deque/* + vendor/crossbeam-deque-0*/* + vendor/crossbeam-epoch-0*/* + vendor/crossbeam-utils-0*/* +Copyright: 2017-2018 The Crossbeam Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/crossbeam-rs/crossbeam-deque + +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/diff/* +Copyright: 2015-2017 Utkarsh Kukreti +License: MIT or Apache-2.0 +Comment: see https://github.com/utkarshkukreti/diff.rs + +Files: + vendor/itoa/* + vendor/quote/* + vendor/quote-0*/* + vendor/syn/* + vendor/syn-0*/* + vendor/synom/* +Copyright: 2016-2018 David Tolnay +License: MIT or Apache-2.0 +Comment: + see https://github.com/dtolnay/itoa + see https://github.com/dtolnay/quote + see https://github.com/dtolnay/syn + see https://github.com/dtolnay/synom + +Files: vendor/arrayvec/* + vendor/either/* + vendor/fixedbitset/* + vendor/itertools/* + vendor/itertools-0*/* + vendor/maplit/* + vendor/nodrop/* + vendor/ordermap/* + vendor/scopeguard/* +Copyright: 2014-2019 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/ordermap + see https://github.com/bluss/scopeguard + +Files: vendor/difference/* +Copyright: 2015-2018 Johann Hofmann +License: MIT +Comment: see https://github.com/johannhof/difference.rs + +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/ena/* +Copyright: 2015-2018 Niko Matsakis +License: MIT or Apache-2.0 +Comment: see https://github.com/nikomatsakis/ena + +Files: + vendor/error-chain/* + vendor/error-chain-0*/* +Copyright: 2016-2017 Brian Anderson + 2016-2017 Paul Colomiets + 2016-2017 Colin Kiegel + 2016-2017 Yamakaky +License: MIT or Apache-2.0 +Comment: see https://github.com/brson/error-chain + +Files: + vendor/failure/* + vendor/failure_derive/* +Copyright: 2017-2018 Without Boats +License: MIT OR Apache-2.0 +Comment: + see https://github.com/withoutboats/failure + see https://github.com/withoutboats/failure_derive + +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_extra/* +Copyright: 2017-2018 Denis Kurilenko +License: MIT +Comment: see https://github.com/webdesus/fs_extra + +Files: vendor/fuchsia-zircon/* + vendor/fuchsia-zircon-sys/* +Copyright: 2014-2018 Raph Levien +License: BSD-3-Clause +Comment: see https://fuchsia.googlesource.com/garnet/ + +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-2019 Bartłomiej Kamiński +License: MIT +Comment: see https://github.com/fizyk20/generic-array.git + +Files: vendor/handlebars/* +Copyright: 2014-2017 Ning Sun +License: MIT +Comment: see https://github.com/sunng87/handlebars-rust + +Files: vendor/heck/* +Copyright: 2017-2018 Without Boats +License: MIT OR Apache-2.0 +Comment: see https://github.com/withoutboats/heck + +Files: + vendor/html5ever/* + vendor/markup5ever/* +Copyright: 2014-2018 The html5ever Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/html5ever + +Files: vendor/humantime/* +Copyright: 2016-2018 Paul Colomiets +License: MIT or Apache-2.0 +Comment: see https://github.com/tailhook/humantime + +Files: vendor/idna/* + vendor/percent-encoding/* + vendor/url/* +Copyright: 2013-2017 The rust-url developers +License: MIT or Apache-2.0 +Comment: see https://github.com/servo/rust-url/ + +Files: vendor/is-match/* + vendor/toml-query/* +Copyright: 2017-2018 Matthias Beyer +License: MPL-2.0 +Comment: see https://github.com/matthiasbeyer/is-match + see https://github.com/matthiasbeyer/toml-query + +Files: vendor/matches/* +Copyright: 2014-2017 Simon Sapin +License: MIT +Comment: see https://github.com/SimonSapin + +Files: + vendor/lazy_static/* + vendor/lazy_static-0*/* + vendor/owning_ref/* +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/mdbook/* +Copyright: 2015-2017 Mathieu David +License: MPL-2.0 +Comment: see https://github.com/azerupi/mdBook + +Files: vendor/memmap/* +Copyright: 2015-2018 Dan Burkert +License: MIT or Apache-2.0 +Comment: see https://github.com/danburkert/memmap-rs + +Files: vendor/memoffset/* +Copyright: 2017-2018 Gilad Naaman +License: MIT +Comment: see https://github.com/Gilnaa/memoffset + +Files: + vendor/macro-utils/* + vendor/minifier/* +Copyright: 2017-2018 Guillaume Gomez +License: MIT +Comment: + see https://github.com/GuillaumeGomez/macro_utils + see https://github.com/GuillaumeGomez/minifier-rs + +Files: vendor/miniz-sys/miniz.c +Copyright: 1996-2012 Rich Geldreich +License: Unlicense + +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/num_cpus/* +Copyright: 2015 Sean McArthur +License: MIT +Comment: see https://github.com/seanmonstar/num_cpus + +Files: vendor/open/* +Copyright: 2015-2017 Sebastian Thiel +License: MIT +Comment: see https://github.com/Byron/open-rs + +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/pulldown-cmark/* + vendor/pulldown-cmark-0*/* +Copyright: 2015-2017 Raph Levien +License: MIT +Comment: see https://github.com/google/pulldown-cmark + +Files: vendor/quick-error/* +Copyright: 2015-2017 Paul Colomiets + 2015-2017 Colin Kiegel +License: MIT or Apache-2.0 +Comment: see http://github.com/tailhook/quick-error + +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/redox_syscall/* + vendor/redox_termios/* +Copyright: 2016-2017 Jeremy Soller +License: MIT +Comment: see https://github.com/redox-os/syscall + see https://github.com/redox-os/termios + +Files: vendor/remove_dir_all/* +Copyright: 2017-2018 Aaronepower +License: MIT or Apache-2.0 +Comment: see https://github.com/Aaronepower/remove_dir_all.git + +Files: vendor/rls-data/* + vendor/rls-span/* +Copyright: 2016-2017 Nick Cameron +License: Apache-2.0 or MIT +Comment: see https://github.com/nrc/rls-span + see https://github.com/nrc/rls-data + +Files: vendor/rustc_version/* +Copyright: 2015-2018 Marvin Löbel +License: MIT or Apache-2.0 +Comment: see https://github.com/Kimundi/rustc-version-rs + +Files: vendor/rustfix/* +Copyright: 2016-2018 Pascal Hertleif + 2016-2018 Oliver Schneider +License: Apache-2.0 or MIT +Comment: see https://github.com/killercup/rustfix + +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/semver/* + vendor/semver-parser/* +Copyright: + 2014-2018 Steve Klabnik + 2014-2018 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/steveklabnik/semver + +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/siphasher/* +Copyright: 2016-2018 Frank Denis +License: MIT or Apache-2.0 +Comment: see https://github.com/jedisct1/rust-siphash + +Files: vendor/shlex/* +Copyright: 2015-2015 comex +License: MIT or Apache-2.0 +Comment: see https://github.com/comex/rust-shlex + +Files: vendor/smallvec/* +Copyright: 2015-2018 Simon Sapin +License: MPL-2.0 +Comment: see https://github.com/servo/rust-smallvec + +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/strsim/* +Copyright: 2015 Danny Guo +License: MIT +Comment: see https://github.com/dguo/strsim-rs + +Files: + vendor/strum/* + vendor/strum_macros/* +Copyright: 2015-2018 Peter Glotfelty +License: MIT + +Files: vendor/synstructure/* +Copyright: 2016-2018 Michael Layzell +License: MIT +Comment: see https://github.com/mystor/synstructure + +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/termion/* +Copyright: 2016-2017 ticki + 2016-2017 gycos + 2016-2017 IGI-111 +License: MIT +Comment: see https://github.com/ticki/termion + +Files: vendor/textwrap/* +Copyright: 2016-2017 Martin Geisler +License: MIT +Comment: see https://github.com/mgeisler/textwrap + +Files: + vendor/lock_api/* + vendor/thread_local/* + vendor/parking_lot/* + vendor/parking_lot_core/* + vendor/parking_lot_core-0*/* +Copyright: 2016-2018 Amanieu d'Antras +License: MIT or Apache-2.0 +Comment: + see https://github.com/Amanieu/thread_local-rs + see https://github.com/Amanieu/parking_lot + +Files: vendor/petgraph/* +Copyright: 2014-2018 bluss + 2014-2018 mitchmindtree +License: MIT or Apache-2.0 +Comment: see https://github.com/bluss/petgraph + +Files: + vendor/phf/* + vendor/phf_codegen/* + vendor/phf_generator/* + vendor/phf_shared/* +Copyright: 2014-2018 Steven Fackler +License: MIT +Comment: see https://github.com/sfackler/rust-phf + +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-2018 Colin Kiegel + 2017-2018 Florent Fayolle +License: MIT or Apache-2.0 +Comment: see https://github.com/colin-kiegel/rust-pretty-assertions + +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/version_check/* +Copyright: 2017-2018 Sergio Benitez +License: MIT or Apache-2.0 +Comment: see https://github.com/SergioBenitez/version_check + +Files: + vendor/ucd-trie/* + vendor/ucd-util/* +Copyright: 2017-2018 Andrew Gallant +License: MIT or Apache-2.0 +Comment: see https://github.com/BurntSushi/rucd + +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/* + vendor/unicode-xid-0*/* +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/vcpkg/* +Copyright: 2017-2019 Jim McGrath +License: MIT or Apache-2.0 +Comment: see https://github.com/mcgoo/vcpkg-rs + +Files: vendor/vec_map/* +Copyright: 2015-2017 Alexis Beingessner + 2015-2017 Andrew Paseltiner + 2015-2017 contain-rs developers + 2015-2017 The Rust Project Developers +License: MIT or Apache-2.0 +Comment: see https://github.com/contain-rs/vec-map + +Files: + vendor/mac/* + vendor/unreachable/* + vendor/void/* +Copyright: 2014-2017 Jonathan Reem +License: MIT +Comment: + see https://github.com/reem/rust-mac.git + see https://github.com/reem/rust-unreachable.git + see https://github.com/reem/rust-void.git + +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/winapi/* +Copyright: 2014-2018 Peter Atashian + 2014-2018 winapi-rs developers +License: MIT +Comment: see https://github.com/retep998/winapi-rs + +Files: vendor/winapi-*-pc-windows-gnu/* +Copyright: 2014-2018 Peter Atashian +License: MIT or Apache-2.0 +Comment: see https://github.com/retep998/winapi-rs + +Files: vendor/xattr/* +Copyright: 2015-2017 Steven Allen +License: MIT or Apache-2.0 +Comment: see https://github.com/Stebalien/xattr + +Files: vendor/yaml-rust/* +Copyright: 2015-2017 Yuheng Chen +License: MIT or Apache-2.0 +Comment: see https://github.com/chyh1990/yaml-rust + +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: 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: 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: 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: GPL-3+ with GCC Runtime Library exception + GCC 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 3, or (at your option) any later + version. + . + GCC 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. + . + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + . + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . + +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. 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..d568e69c44 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +pristine-tar = True +ignore-branch = True + +[import-orig] +upstream-branch = upstream/experimental +debian-branch = debian/experimental diff --git a/get-stage0.py b/get-stage0.py new file mode 100755 index 0000000000..ae7bef6a68 --- /dev/null +++ b/get-stage0.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# 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 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 + bootstrap.bootstrap(False) + +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 0000000000000000000000000000000000000000..9cc1452e370229d30ec7902a0ecf7699c2a19b61 GIT binary patch literal 691 zcmV;k0!;mhP)it`e(UktU?L z6d`aa(j+=HsDMpQ_aYbvFTsK8Q>8E0MnFk9 z`30WIxZ?Q|2c8EPMEhm%6#P^^N=*eY=0)}8JK%Q8@`paR*jLU(QLc#~0R{mV6ez%gR;@65!By$}cd_-@uQg zB8+b?$}ixfusIC^xV`!+pL1*7_v0DlSS`4ou=m*hj_)mq9WyHhxT51H@D}{G5OB4L z0F%Zq)E?nV0co+H8{UAM{xl^F!K@Hy7Wa~{nX%GRKuN9sYcf?548CjzP_xvnHzqAW z8hcw5V3-zz_k)K~0(1!OM+sot6>=TC4iHcm0;ZJhuMoIVyI+h&*u|99A|}BASP!td zVQFZc>lCqO(XTNL)kb73AZ(^0aN4#Ni@}G$QOtg|u)`>)(y?N5`USPKaPgWRMih}( zO20Ejw@i#<)&Up623Y0!f2@4wZ3~iZ@R*K rL"$i".patch +done diff --git a/make_orig-stage0_tarball.sh b/make_orig-stage0_tarball.sh new file mode 100755 index 0000000000..c6593f25b9 --- /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 mips64 mips64el powerpc ppc64 ppc64el 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 < +Forwarded: not-needed +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -6,7 +6,6 @@ + "src/libtest", + "src/librustc_codegen_llvm", + "src/tools/cargotest", +- "src/tools/clippy", + "src/tools/compiletest", + "src/tools/error_index_generator", + "src/tools/linkchecker", +@@ -14,14 +13,8 @@ + "src/tools/unstable-book-gen", + "src/tools/tidy", + "src/tools/build-manifest", +- "src/tools/remote-test-client", +- "src/tools/remote-test-server", + "src/tools/rust-installer", +- "src/tools/cargo", + "src/tools/rustdoc", +- "src/tools/rls", +- "src/tools/rustfmt", +- "src/tools/miri", + "src/tools/rustdoc-themes", + ] + exclude = [ +@@ -46,19 +39,7 @@ + debug = false + debug-assertions = false + +-# We want the RLS to use the version of Cargo that we've got vendored in this +-# repository to ensure that the same exact version of Cargo is used by both the +-# RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository +-# so we use a `[patch]` here to override the github repository with our local +-# vendored copy. +-[patch."https://github.com/rust-lang/cargo"] +-cargo = { path = "src/tools/cargo" } +- + [patch.crates-io] +-# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt` +-# that we're shipping as well (to ensure that the rustfmt in RLS and the +-# `rustfmt` executable are the same exact version). +-rustfmt-nightly = { path = "src/tools/rustfmt" } + + # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on + # here +@@ -67,6 +48,3 @@ + # See comments in `tools/rustc-std-workspace-core/README.md` for what's going on + # here + rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' } +- +-[patch."https://github.com/rust-lang/rust-clippy"] +-clippy_lints = { path = "src/tools/clippy/clippy_lints" } +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -638,10 +638,6 @@ + os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] + for _ in range(1, self.verbose): + args.append("--verbose") +- if self.use_locked_deps: +- args.append("--locked") +- if self.use_vendored_sources: +- args.append("--frozen") + run(args, env=env, verbose=self.verbose) + + def build_triple(self): +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -1149,10 +1149,7 @@ + } + } + +- if self.config.locked_deps { +- cargo.arg("--locked"); +- } +- if self.config.vendor || self.is_sudo { ++ if self.is_sudo { + cargo.arg("--frozen"); + } + +--- a/src/bootstrap/doc.rs ++++ b/src/bootstrap/doc.rs +@@ -147,7 +147,7 @@ + + impl Step for CargoBook { + type Output = (); +- const DEFAULT: bool = true; ++ const DEFAULT: bool = false; + + fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { + let builder = run.builder; +--- a/src/doc/index.md ++++ b/src/doc/index.md +@@ -87,7 +87,7 @@ + + ## The Cargo Book + +-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager. ++[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and dependency manager. + + ## The Rustdoc Book + diff --git a/patches/d-0001-disable-miniz.patch b/patches/d-0001-disable-miniz.patch new file mode 100644 index 0000000000..71edac1306 --- /dev/null +++ b/patches/d-0001-disable-miniz.patch @@ -0,0 +1,36 @@ +--- a/vendor/flate2/Cargo.toml ++++ b/vendor/flate2/Cargo.toml +@@ -36,15 +36,6 @@ + version = "1.0" + optional = true + +-[dependencies.miniz-sys] +-version = "0.1.11" +-optional = true +- +-[dependencies.miniz_oxide_c_api] +-version = "0.2" +-features = ["no_c_export"] +-optional = true +- + [dependencies.tokio-io] + version = "0.1" + optional = true +@@ -59,13 +50,12 @@ + version = "0.1" + + [features] +-default = ["miniz-sys"] +-rust_backend = ["miniz_oxide_c_api"] ++default = ["zlib"] ++miniz-sys = ["zlib"] ++miniz_oxide_c_api = ["zlib"] ++rust_backend = ["zlib"] + tokio = ["tokio-io", "futures"] + zlib = ["libz-sys"] +-[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide_c_api] +-version = "0.2" +-features = ["no_c_export"] + [badges.appveyor] + repository = "alexcrichton/flate2-rs" + diff --git a/patches/d-0002-pkg-config-no-special-snowflake.patch b/patches/d-0002-pkg-config-no-special-snowflake.patch new file mode 100644 index 0000000000..1560f69267 --- /dev/null +++ b/patches/d-0002-pkg-config-no-special-snowflake.patch @@ -0,0 +1,98 @@ +--- a/vendor/pkg-config/src/lib.rs ++++ b/vendor/pkg-config/src/lib.rs +@@ -9,8 +9,6 @@ + //! A number of environment variables are available to globally configure how + //! this crate will invoke `pkg-config`: + //! +-//! * `PKG_CONFIG_ALLOW_CROSS` - if this variable is not set, then `pkg-config` +-//! will automatically be disabled for all cross compiles. + //! * `FOO_NO_PKG_CONFIG` - if set, this will disable running `pkg-config` when + //! probing for the library named `foo`. + //! +@@ -81,7 +79,7 @@ + + // Only use pkg-config in host == target situations by default (allowing an + // override). +- (host == target || env::var_os("PKG_CONFIG_ALLOW_CROSS").is_some()) ++ (host == target || true) + } + + #[derive(Clone, Default)] +@@ -113,9 +111,8 @@ + /// Contains the name of the responsible environment variable. + EnvNoPkgConfig(String), + +- /// Cross compilation detected. +- /// +- /// Override with `PKG_CONFIG_ALLOW_CROSS=1`. ++ /// Cross compilation detected. Kept for compatibility; ++ /// the Debian package never emits this. + CrossCompilation, + + /// Failed to run `pkg-config`. +@@ -137,13 +134,9 @@ + fn description(&self) -> &str { + match *self { + Error::EnvNoPkgConfig(_) => "pkg-config requested to be aborted", +- Error::CrossCompilation => { +- "pkg-config doesn't handle cross compilation. \ +- Use PKG_CONFIG_ALLOW_CROSS=1 to override" +- } + Error::Command { .. } => "failed to run pkg-config", + Error::Failure { .. } => "pkg-config did not exit sucessfully", +- Error::__Nonexhaustive => panic!(), ++ Error::CrossCompilation | Error::__Nonexhaustive => panic!(), + } + } + +@@ -214,10 +207,6 @@ + Error::EnvNoPkgConfig(ref name) => { + write!(f, "Aborted because {} is set", name) + } +- Error::CrossCompilation => { +- write!(f, "Cross compilation detected. \ +- Use PKG_CONFIG_ALLOW_CROSS=1 to override") +- } + Error::Command { ref command, ref cause } => { + write!(f, "Failed to run `{}`: {}", command, cause) + } +@@ -233,7 +222,7 @@ + } + Ok(()) + } +- Error::__Nonexhaustive => panic!(), ++ Error::CrossCompilation | Error::__Nonexhaustive => panic!(), + } + } + } +@@ -388,7 +377,11 @@ + } + + fn command(&self, name: &str, args: &[&str]) -> Command { +- let exe = self.env_var("PKG_CONFIG").unwrap_or_else(|_| String::from("pkg-config")); ++ let exe = self.env_var("PKG_CONFIG").unwrap_or_else(|_| { ++ self.env_var("DEB_HOST_GNU_TYPE") ++ .map(|t| t.to_string() + "-pkg-config") ++ .unwrap_or_else(|_| String::from("pkg-config")) ++ }); + let mut cmd = Command::new(exe); + if self.is_static(name) { + cmd.arg("--static"); +--- a/vendor/pkg-config/tests/test.rs ++++ b/vendor/pkg-config/tests/test.rs +@@ -29,7 +29,6 @@ + pkg_config::probe_library(name) + } + +-#[test] + fn cross_disabled() { + let _g = LOCK.lock(); + reset(); +@@ -41,7 +40,6 @@ + } + } + +-#[test] + fn cross_enabled() { + let _g = LOCK.lock(); + reset(); diff --git a/patches/d-0003-mdbook-strip-embedded-libs.patch b/patches/d-0003-mdbook-strip-embedded-libs.patch new file mode 100644 index 0000000000..acaaf2a7ce --- /dev/null +++ b/patches/d-0003-mdbook-strip-embedded-libs.patch @@ -0,0 +1,347 @@ +Description: Use local web resources instead of remote ones +Author: Matthijs van Otterdijk +Author: Ximin Luo +Bug: https://github.com/azerupi/mdBook/issues/271 +Comment: + 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 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/tools/linkchecker/main.rs ++++ b/src/tools/linkchecker/main.rs +@@ -173,6 +173,11 @@ + url.starts_with("irc:") || url.starts_with("data:") { + return; + } ++ // Ignore parent URLs, so that the package installation process can ++ // provide a symbolic link later ++ if url.starts_with("../") { ++ return; ++ } + let mut parts = url.splitn(2, "#"); + let url = parts.next().unwrap(); + let fragment = parts.next(); +--- a/vendor/mdbook/src/book/init.rs ++++ b/vendor/mdbook/src/book/init.rs +@@ -149,12 +149,6 @@ + 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)?; +- + Ok(()) + } + +--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs ++++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +@@ -3,7 +3,7 @@ + use errors::*; + use renderer::html_handlebars::helpers; + use renderer::{RenderContext, Renderer}; +-use theme::{self, playpen_editor, Theme}; ++use theme::{self, Theme}; + use utils; + + use std::collections::BTreeMap; +@@ -107,7 +107,7 @@ + &self, + destination: &Path, + theme: &Theme, +- html_config: &HtmlConfig, ++ _html_config: &HtmlConfig, + ) -> Result<()> { + use utils::fs::write_file; + +@@ -123,62 +123,8 @@ + write_file(destination, "css/print.css", &theme.print_css)?; + write_file(destination, "css/variables.css", &theme.variables_css)?; + write_file(destination, "favicon.png", &theme.favicon)?; +- 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, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.ttf", +- theme::FONT_AWESOME_TTF, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.woff", +- theme::FONT_AWESOME_WOFF, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/fontawesome-webfont.woff2", +- theme::FONT_AWESOME_WOFF2, +- )?; +- write_file( +- destination, +- "FontAwesome/fonts/FontAwesome.ttf", +- theme::FONT_AWESOME_TTF, +- )?; +- +- let playpen_config = &html_config.playpen; +- +- // Ace is a very large dependency, so only load it when requested +- if playpen_config.editable && playpen_config.copy_js { +- // Load the editor +- write_file(destination, "editor.js", playpen_editor::JS)?; +- write_file(destination, "ace.js", playpen_editor::ACE_JS)?; +- write_file(destination, "mode-rust.js", playpen_editor::MODE_RUST_JS)?; +- write_file(destination, "theme-dawn.js", playpen_editor::THEME_DAWN_JS)?; +- write_file( +- destination, +- "theme-tomorrow_night.js", +- playpen_editor::THEME_TOMORROW_NIGHT_JS, +- )?; +- } + + Ok(()) + } +--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs ++++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs +@@ -38,8 +38,6 @@ + format!("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 ✓"); + } + +--- a/vendor/mdbook/src/theme/index.hbs ++++ b/vendor/mdbook/src/theme/index.hbs +@@ -16,12 +16,10 @@ + + + +- +- +- ++ + + +- ++ + + + +@@ -32,7 +30,7 @@ + + {{#if mathjax_support}} + +- ++ + {{/if}} + + +@@ -42,43 +40,6 @@ + var default_theme = "{{ default_theme }}"; + + +- +- +- +- +- +- +- +- +- + +@@ -204,41 +165,7 @@ + + {{/if}} + +- {{#if google_analytics}} +- +- +- {{/if}} +- +- {{#if playpen_js}} +- +- +- +- +- +- {{/if}} +- +- {{#if search_js}} +- +- +- +- {{/if}} +- +- +- ++ + + + +--- a/vendor/mdbook/src/theme/mod.rs ++++ b/vendor/mdbook/src/theme/mod.rs +@@ -1,7 +1,5 @@ + #![allow(missing_docs)] + +-pub mod playpen_editor; +- + #[cfg(feature = "search")] + pub mod searcher; + +@@ -19,23 +17,8 @@ + pub static VARIABLES_CSS: &'static [u8] = include_bytes!("css/variables.css"); + pub static FAVICON: &'static [u8] = include_bytes!("favicon.png"); + pub static JS: &'static [u8] = include_bytes!("book.js"); +-pub static HIGHLIGHT_JS: &'static [u8] = include_bytes!("highlight.js"); + pub static TOMORROW_NIGHT_CSS: &'static [u8] = include_bytes!("tomorrow-night.css"); +-pub static HIGHLIGHT_CSS: &'static [u8] = include_bytes!("highlight.css"); + pub static AYU_HIGHLIGHT_CSS: &'static [u8] = include_bytes!("ayu-highlight.css"); +-pub static CLIPBOARD_JS: &'static [u8] = include_bytes!("clipboard.min.js"); +-pub static FONT_AWESOME: &'static [u8] = include_bytes!("FontAwesome/css/font-awesome.min.css"); +-pub static FONT_AWESOME_EOT: &'static [u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot"); +-pub static FONT_AWESOME_SVG: &'static [u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg"); +-pub static FONT_AWESOME_TTF: &'static [u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf"); +-pub static FONT_AWESOME_WOFF: &'static [u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff"); +-pub static FONT_AWESOME_WOFF2: &'static [u8] = +- include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2"); +-pub static FONT_AWESOME_OTF: &'static [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 +@@ -53,11 +36,8 @@ + pub variables_css: Vec, + pub favicon: Vec, + 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 { +@@ -86,9 +66,6 @@ + &mut theme.variables_css, + ), + (theme_dir.join("favicon.png"), &mut theme.favicon), +- (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, +@@ -125,11 +102,8 @@ + variables_css: VARIABLES_CSS.to_owned(), + favicon: FAVICON.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(), + } + } + } +@@ -179,11 +153,8 @@ + "css/print.css", + "css/variables.css", + "book.js", +- "highlight.js", + "tomorrow-night.css", +- "highlight.css", + "ayu-highlight.css", +- "clipboard.min.js", + ]; + + let temp = TempFileBuilder::new().prefix("mdbook-").tempdir().unwrap(); +@@ -205,11 +176,8 @@ + variables_css: Vec::new(), + favicon: 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); +--- 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: &'static [u8] = include_bytes!("searcher.js"); +-pub static MARK_JS: &'static [u8] = include_bytes!("mark.min.js"); +-pub static ELASTICLUNR_JS: &'static [u8] = include_bytes!("elasticlunr.min.js"); diff --git a/patches/d-0004-mdbook-2-1-compat.patch b/patches/d-0004-mdbook-2-1-compat.patch new file mode 100644 index 0000000000..b29cadef59 --- /dev/null +++ b/patches/d-0004-mdbook-2-1-compat.patch @@ -0,0 +1,140 @@ +--- a/src/tools/rustbook/src/main.rs ++++ b/src/tools/rustbook/src/main.rs +@@ -6,9 +6,6 @@ + + use clap::{App, ArgMatches, SubCommand, AppSettings}; + +-use mdbook_1::{MDBook as MDBook1}; +-use mdbook_1::errors::{Result as Result1}; +- + use mdbook_2::{MDBook as MDBook2}; + use mdbook_2::errors::{Result as Result2}; + +@@ -36,18 +33,11 @@ + match matches.subcommand() { + ("build", Some(sub_matches)) => { + match sub_matches.value_of("mdbook-vers") { +- None | Some("1") => { +- if let Err(e) = build_1(sub_matches) { +- eprintln!("Error: {}", e); +- +- for cause in e.iter().skip(1) { +- eprintln!("\tCaused By: {}", cause); +- } +- +- ::std::process::exit(101); ++ None | Some("1") | Some("2") => { ++ match sub_matches.value_of("mdbook-vers") { ++ Some("1") => env::set_var("DEB_MDBOOK_1_COMPAT", "1"), ++ _ => (), + } +- } +- Some("2") => { + if let Err(e) = build_2(sub_matches) { + eprintln!("Error: {}", e); + +@@ -68,23 +58,6 @@ + } + + // Build command implementation +-pub fn build_1(args: &ArgMatches) -> Result1<()> { +- let book_dir = get_book_dir(args); +- let mut book = MDBook1::load(&book_dir)?; +- +- // Set this to allow us to catch bugs in advance. +- book.config.build.create_missing = false; +- +- if let Some(dest_dir) = args.value_of("dest-dir") { +- book.config.build.build_dir = PathBuf::from(dest_dir); +- } +- +- book.build()?; +- +- Ok(()) +-} +- +-// Build command implementation + pub fn build_2(args: &ArgMatches) -> Result2<()> { + let book_dir = get_book_dir(args); + let mut book = MDBook2::load(&book_dir)?; +--- a/src/tools/rustbook/Cargo.toml ++++ b/src/tools/rustbook/Cargo.toml +@@ -13,9 +13,3 @@ + version = "0.2.3" + default-features = false + features = ["search"] +- +-[dependencies.mdbook_1] +-package = "mdbook" +-version = "0.1.7" +-default-features = false +-features = ["search"] +--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs ++++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +@@ -10,6 +10,7 @@ use std::collections::BTreeMap; + use std::collections::HashMap; + use std::fs; + use std::path::{Path, PathBuf}; ++use std::env; + + use handlebars::Handlebars; + use regex::{Captures, Regex}; +@@ -63,7 +64,7 @@ impl HtmlHandlebars { + } + + ctx.data.insert("path".to_owned(), json!(path)); +- ctx.data.insert("content".to_owned(), json!(content)); ++ ctx.data.insert("content".to_owned(), json!(if env::var("DEB_MDBOOK_1_COMPAT") == Ok("1".to_string()) { fixed_content } else { content })); + ctx.data.insert("chapter_title".to_owned(), json!(ch.name)); + ctx.data.insert("title".to_owned(), json!(title)); + ctx.data.insert( +--- a/vendor/mdbook/src/utils/mod.rs ++++ b/vendor/mdbook/src/utils/mod.rs +@@ -4,6 +4,8 @@ pub mod fs; + mod string; + use errors::Error; + use regex::Regex; ++use std::path::Path; ++use std::env; + + use pulldown_cmark::{ + html, Event, Options, Parser, Tag, OPTION_ENABLE_FOOTNOTES, OPTION_ENABLE_TABLES, +@@ -70,11 +72,13 @@ fn adjust_links<'a>(event: Event<'a>, with_base: &str) -> Event<'a> { + lazy_static! { + static ref HTTP_LINK: Regex = Regex::new("^https?://").unwrap(); + static ref MD_LINK: Regex = Regex::new(r"(?P.*)\.md(?P#.*)?").unwrap(); ++ static ref HTML_LINK: Regex = Regex::new(r"(?P.*)\.html(?P#.*)?").unwrap(); + } + + match event { + Event::Start(Tag::Link(dest, title)) => { + if !HTTP_LINK.is_match(&dest) { ++ let old_dest = &dest; + let dest = if !with_base.is_empty() { + format!("{}/{}", with_base, dest) + } else { +@@ -90,6 +94,24 @@ fn adjust_links<'a>(event: Event<'a>, with_base: &str) -> Event<'a> { + + return Event::Start(Tag::Link(Cow::from(html_link), title)); + } ++ // compatibility for mdbook 1 ++ if env::var("DEB_MDBOOK_1_COMPAT") == Ok("1".to_string()) { ++ if let Some(caps) = HTML_LINK.captures(&old_dest) { ++ let base = Path::new(with_base); ++ let mut path = Vec::new(); ++ for _ in base.components() { ++ path.push("../"); ++ } ++ path.extend(&[&caps["link"], ".html"]); ++ let mut html_link = path.concat(); ++ ++ if let Some(anchor) = caps.name("anchor") { ++ html_link.push_str(anchor.as_str().replace("#a--", "#--").as_str()); ++ } ++ ++ return Event::Start(Tag::Link(Cow::from(html_link), title)); ++ } ++ } + } + + Event::Start(Tag::Link(dest, title)) diff --git a/patches/d-add-soname.patch b/patches/d-add-soname.patch new file mode 100644 index 0000000000..8320063abe --- /dev/null +++ b/patches/d-add-soname.patch @@ -0,0 +1,36 @@ +Description: 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). +Author: Angus Lees +Forwarded: no + +--- a/src/librustc_codegen_llvm/back/link.rs ++++ b/src/librustc_codegen_llvm/back/link.rs +@@ -1034,6 +1034,13 @@ + cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); + } + ++ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) ++ && t.options.linker_is_gnu { ++ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); ++ let soname = [String::from("-Wl,-soname=") + &filename]; ++ cmd.args(&soname); ++ } ++ + // Finally add all the linker arguments provided on the command line along + // with any #[link_args] attributes found inside the crate + if let Some(ref args) = sess.opts.cg.link_args { diff --git a/patches/d-disable-cargo-vendor.patch b/patches/d-disable-cargo-vendor.patch new file mode 100644 index 0000000000..9a6352d053 --- /dev/null +++ b/patches/d-disable-cargo-vendor.patch @@ -0,0 +1,18 @@ +Description: Don't check for cargo-vendor when building from (Debian's) git +Author: Matthijs van Otterdijk +Forwarded: not-needed +--- +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -851,7 +851,10 @@ + } + + // If we're building from git sources, we need to vendor a complete distribution. +- if builder.rust_info.is_git() { ++ // ++ // Debian: disabling this block because the debian package is also in a git ++ // repository, but cargo-vendor should not be installed or run. ++ if false && builder.rust_info.is_git() { + // Get cargo-vendor installed, if it isn't already. + let mut has_cargo_vendor = false; + let mut cmd = Command::new(&builder.initial_cargo); diff --git a/patches/d-dont-download-stage0.patch b/patches/d-dont-download-stage0.patch new file mode 100644 index 0000000000..cc4dbe79b2 --- /dev/null +++ b/patches/d-dont-download-stage0.patch @@ -0,0 +1,49 @@ +Description: Don't download SHA256 if it's already available locally + In Debian we provide the stage0 tarballs as a separate component so that the + buildds don't need to access the network during the build. +Author: Ximin Luo +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -24,16 +24,18 @@ + from time import time + + +-def get(url, path, verbose=False): ++def get(url, path, verbose=False, use_local_hash_if_present=True): + suffix = '.sha256' + sha_url = url + suffix + with tempfile.NamedTemporaryFile(delete=False) as temp_file: + temp_path = temp_file.name +- with tempfile.NamedTemporaryFile(suffix=suffix, delete=False) as sha_file: +- sha_path = sha_file.name ++ sha_path = path + suffix + + try: +- download(sha_path, sha_url, False, verbose) ++ if use_local_hash_if_present and os.path.exists(sha_path): ++ print("using already-download file " + sha_path) ++ else: ++ download(sha_path, sha_url, False, verbose) + if os.path.exists(path): + if verify(path, sha_path, False): + if verbose: +@@ -51,7 +53,6 @@ + print("moving {} to {}".format(temp_path, path)) + shutil.move(temp_path, path) + finally: +- delete_if_present(sha_path, verbose) + delete_if_present(temp_path, verbose) + + +@@ -373,7 +374,7 @@ + + url = "{}/dist/{}".format(self._download_url, self.date) + tarball = os.path.join(rustc_cache, filename) +- if not os.path.exists(tarball): ++ if True: + get("{}/{}".format(url, filename), tarball, verbose=self.verbose) + unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose) + diff --git a/patches/d-fix-mips64el-bootstrap.patch b/patches/d-fix-mips64el-bootstrap.patch new file mode 100644 index 0000000000..3239d1a8ec --- /dev/null +++ b/patches/d-fix-mips64el-bootstrap.patch @@ -0,0 +1,12 @@ +Bug: https://github.com/rust-lang/rust/issues/52108 +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -620,6 +620,8 @@ + (os.pathsep + env["LIBRARY_PATH"]) \ + if "LIBRARY_PATH" in env else "" + env["RUSTFLAGS"] = "-Cdebuginfo=2 " ++ if self.build_triple().startswith('mips'): ++ env["RUSTFLAGS"] += "-Cllvm-args=-mxgot " + + build_section = "target.{}".format(self.build_triple()) + target_features = [] diff --git a/patches/d-host-duplicates.patch b/patches/d-host-duplicates.patch new file mode 100644 index 0000000000..d6b90627f9 --- /dev/null +++ b/patches/d-host-duplicates.patch @@ -0,0 +1,30 @@ +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/src/libstd/sys_common/net.rs ++++ b/src/libstd/sys_common/net.rs +@@ -609,21 +609,3 @@ + .finish() + } + } +- +-#[cfg(test)] +-mod tests { +- use super::*; +- use collections::HashMap; +- +- #[test] +- fn no_lookup_host_duplicates() { +- let mut addrs = HashMap::new(); +- let lh = match LookupHost::try_from(("localhost", 0)) { +- Ok(lh) => lh, +- Err(e) => panic!("couldn't resolve `localhost': {}", e) +- }; +- for sa in lh { *addrs.entry(sa).or_insert(0) += 1; }; +- assert_eq!(addrs.iter().filter(|&(_, &v)| v > 1).collect::>(), vec![], +- "There should be no duplicate localhost entries"); +- } +-} diff --git a/patches/d-i686-baseline.patch b/patches/d-i686-baseline.patch new file mode 100644 index 0000000000..2038344501 --- /dev/null +++ b/patches/d-i686-baseline.patch @@ -0,0 +1,13 @@ +diff --git a/src/librustc_target/spec/i686_unknown_linux_gnu.rs b/src/librustc_target/spec/i686_unknown_linux_gnu.rs +index c3ff34788..80b296980 100644 +--- a/src/librustc_target/spec/i686_unknown_linux_gnu.rs ++++ b/src/librustc_target/spec/i686_unknown_linux_gnu.rs +@@ -12,7 +12,7 @@ use spec::{LinkerFlavor, Target, TargetResult}; + + pub fn target() -> TargetResult { + let mut base = super::linux_base::opts(); +- base.cpu = "pentium4".to_string(); ++ base.cpu = "pentiumpro".to_string(); + base.max_atomic_width = Some(64); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); + base.stack_probes = true; diff --git a/patches/d-ignore-avx-44056.patch b/patches/d-ignore-avx-44056.patch new file mode 100644 index 0000000000..844cf9510d --- /dev/null +++ b/patches/d-ignore-avx-44056.patch @@ -0,0 +1,12 @@ +Bug: https://github.com/rust-lang/rust/pull/55667 +Index: rustc/src/test/ui/issues/issue-44056.rs +=================================================================== +--- rustc.orig/src/test/ui/issues/issue-44056.rs ++++ rustc/src/test/ui/issues/issue-44056.rs +@@ -1,5 +1,5 @@ + // compile-pass +-// only-x86_64 ++// ignore-test + // no-prefer-dynamic + // compile-flags: -Ctarget-feature=+avx -Clto + diff --git a/patches/d-ignore-error-detail-diff.patch b/patches/d-ignore-error-detail-diff.patch new file mode 100644 index 0000000000..93ad05aef4 --- /dev/null +++ b/patches/d-ignore-error-detail-diff.patch @@ -0,0 +1,34 @@ +Description: Ignore error details with $SRC_DIR + We build with --remap-path-prefix so it doesn't work, see bug below +Bug: https://github.com/rust-lang/rust/issues/53081 +Index: rustc/src/test/ui/impl-trait/impl-generic-mismatch.stderr +=================================================================== +--- rustc.orig/src/test/ui/impl-trait/impl-generic-mismatch.stderr ++++ rustc/src/test/ui/impl-trait/impl-generic-mismatch.stderr +@@ -29,11 +29,6 @@ error[E0643]: method `hash` has incompat + | + LL | fn hash(&self, hasher: &mut impl Hasher) {} + | ^^^^^^^^^^^ expected generic parameter, found `impl Trait` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - declaration in trait here + + error: aborting due to 3 previous errors + +Index: rustc/src/test/ui/consts/const-size_of-cycle.stderr +=================================================================== +--- rustc.orig/src/test/ui/consts/const-size_of-cycle.stderr ++++ rustc/src/test/ui/consts/const-size_of-cycle.stderr +@@ -5,10 +5,6 @@ LL | bytes: [u8; std::mem::size_of:: + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + note: ...which requires const-evaluating `Foo::bytes::{{constant}}`... +- --> $SRC_DIR/libcore/mem.rs:LL:COL +- | +-LL | intrinsics::size_of::() +- | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + = note: ...which requires computing layout of `Foo`... + = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... + note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}`... diff --git a/patches/d-no-jemalloc.patch b/patches/d-no-jemalloc.patch new file mode 100644 index 0000000000..fd84937774 --- /dev/null +++ b/patches/d-no-jemalloc.patch @@ -0,0 +1,16 @@ +Index: rustc/src/rustc/Cargo.toml +=================================================================== +--- rustc.orig/src/rustc/Cargo.toml ++++ rustc/src/rustc/Cargo.toml +@@ -15,11 +15,3 @@ rustc_driver = { path = "../librustc_dri + # Make sure rustc_codegen_ssa ends up in the sysroot, because this + # crate is intended to be used by codegen backends, which may not be in-tree. + rustc_codegen_ssa = { path = "../librustc_codegen_ssa" } +- +-[dependencies.jemalloc-sys] +-version = '0.1.8' +-optional = true +-features = ['unprefixed_malloc_on_supported_platforms'] +- +-[features] +-jemalloc = ['jemalloc-sys'] diff --git a/patches/d-prefer-dynamic.patch b/patches/d-prefer-dynamic.patch new file mode 100644 index 0000000000..13bb429220 --- /dev/null +++ b/patches/d-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/d-read-beta-version-from-file.patch b/patches/d-read-beta-version-from-file.patch new file mode 100644 index 0000000000..8ebe4852c4 --- /dev/null +++ b/patches/d-read-beta-version-from-file.patch @@ -0,0 +1,50 @@ +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -883,41 +883,13 @@ + return s + } + +- let beta = output( +- Command::new("git") +- .arg("ls-remote") +- .arg("origin") +- .arg("beta") +- .current_dir(&self.src) +- ); +- let beta = beta.trim().split_whitespace().next().unwrap(); +- let master = output( +- Command::new("git") +- .arg("ls-remote") +- .arg("origin") +- .arg("master") +- .current_dir(&self.src) +- ); +- let master = master.trim().split_whitespace().next().unwrap(); +- +- // Figure out where the current beta branch started. +- let base = output( +- Command::new("git") +- .arg("merge-base") +- .arg(beta) +- .arg(master) +- .current_dir(&self.src), +- ); +- let base = base.trim(); +- +- // Next figure out how many merge commits happened since we branched off +- // beta. That's our beta number! ++ // Debian: read beta number from "version" file, this is only available ++ // in the rustc upstream tarballs and not their git + let count = output( +- Command::new("git") +- .arg("rev-list") +- .arg("--count") +- .arg("--merges") +- .arg(format!("{}...HEAD", base)) ++ Command::new("sed") ++ .arg("-re") ++ .arg(r"s/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g") ++ .arg("version") + .current_dir(&self.src), + ); + let n = count.trim().parse().unwrap(); diff --git a/patches/d-rust-gdb-paths b/patches/d-rust-gdb-paths new file mode 100644 index 0000000000..d7045e3467 --- /dev/null +++ b/patches/d-rust-gdb-paths @@ -0,0 +1,21 @@ +Description: Hardcode GDB python module directory + Debian package installs python modules into a fixed directory, so + just hardcode path in wrapper script. +Author: Angus Lees +Forwarded: not-needed + +--- a/src/etc/rust-gdb ++++ b/src/etc/rust-gdb +@@ -13,8 +13,10 @@ + set -e + + # Find out where the pretty printer Python module is +-RUSTC_SYSROOT=`rustc --print=sysroot` +-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++#RUSTC_SYSROOT=`rustc --print=sysroot` ++#GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++# We can just hardcode this on Debian, and remove the rustc dependency ++GDB_PYTHON_MODULE_DIRECTORY="/usr/share/rust-gdb" + + # Run GDB with the additional arguments that load the pretty printers + # Set the environment variable `RUST_GDB` to overwrite the call to a diff --git a/patches/d-rust-lldb-paths b/patches/d-rust-lldb-paths new file mode 100644 index 0000000000..ce374a1210 --- /dev/null +++ b/patches/d-rust-lldb-paths @@ -0,0 +1,41 @@ +Description: Hardcode LLDB python module directory + Debian package installs python modules into a fixed directory, so + just hardcode path in wrapper script. +Author: Angus Lees +Forwarded: not-needed + +--- a/src/etc/rust-lldb ++++ b/src/etc/rust-lldb +@@ -12,30 +12,10 @@ + # Exit if anything fails + set -e + +-# Find out where to look for the pretty printer Python module +-RUSTC_SYSROOT=`rustc --print sysroot` +- +-# Find the host triple so we can find lldb in rustlib. +-host=`rustc -vV | sed -n -e 's/^host: //p'` +- +-lldb=lldb +-if [ -f "$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" ]; then +- lldb="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" +-else +- LLDB_VERSION=`"$lldb" --version 2>/dev/null | head -1 | cut -d. -f1` +- +- if [ "$LLDB_VERSION" = "lldb-350" ] +- then +- echo "***" +- echo \ +-"WARNING: This version of LLDB has known issues with Rust and cannot \ +-display the contents of local variables!" +- echo "***" +- fi +-fi ++lldb=lldb-7 + + # Prepare commands that will be loaded before any file on the command line has been loaded +-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" ++script_import="command script import \"/usr/share/rust-lldb/lldb_rust_formatters.py\"" + category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" + category_enable="type category enable Rust" + diff --git a/patches/gcc-4.8-aarch64-ice.diff b/patches/gcc-4.8-aarch64-ice.diff new file mode 100644 index 0000000000..aaa4d7b11f --- /dev/null +++ b/patches/gcc-4.8-aarch64-ice.diff @@ -0,0 +1,25 @@ +Index: rustc/vendor/compiler_builtins/compiler-rt/lib/builtins/trunctfdf2.c +=================================================================== +--- rustc.orig/vendor/compiler_builtins/compiler-rt/lib/builtins/trunctfdf2.c ++++ rustc/vendor/compiler_builtins/compiler-rt/lib/builtins/trunctfdf2.c +@@ -7,6 +7,12 @@ + // + //===----------------------------------------------------------------------===// + ++#if defined(__aarch64__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ <= 8) ++// work around https://launchpad.net/bugs/1667761 ++#pragma GCC push_options ++#pragma GCC optimize "O1" ++#endif ++ + #define QUAD_PRECISION + #include "fp_lib.h" + +@@ -20,3 +26,7 @@ COMPILER_RT_ABI double __trunctfdf2(long + } + + #endif ++#if defined(__aarch64__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ <= 8) ++#pragma GCC pop_options ++#endif ++ diff --git a/patches/series b/patches/series new file mode 100644 index 0000000000..f0ae927aa9 --- /dev/null +++ b/patches/series @@ -0,0 +1,41 @@ +# Patches for upstream + +# Fedora patches, thanks to them +u-0001-Limit-internalization-in-LLVM-8-ThinLTO.patch + +# pending, or forwarded +u-reproducible-build.patch +u-prefer-local-css.patch +u-make-tests-work-without-rpath.patch +u-mips-fixes.diff + +# not forwarded, or forwarded but unlikely to be merged +u-reproducible-dl-stage0.patch + +gcc-4.8-aarch64-ice.diff + +# Debian-specific patches, not suitable for upstream +# Patches needed by debian/prune-unused-deps +d-0000-ignore-removed-submodules.patch +d-0001-disable-miniz.patch +d-0002-pkg-config-no-special-snowflake.patch +d-0003-mdbook-strip-embedded-libs.patch +d-0004-mdbook-2-1-compat.patch +# Other patches needed by the full Debian build +d-ignore-error-detail-diff.patch +d-disable-cargo-vendor.patch +d-rust-gdb-paths +d-rust-lldb-paths +d-add-soname.patch +d-dont-download-stage0.patch +d-read-beta-version-from-file.patch +d-ignore-avx-44056.patch +d-i686-baseline.patch +d-no-jemalloc.patch + +# Porter fixes under discussion, not suitable for upstreaming +# as-is but a proper fix is being discussed +d-fix-mips64el-bootstrap.patch + +# Work around for some porterboxes, keep this commented +#d-host-duplicates.patch diff --git a/patches/u-0001-Limit-internalization-in-LLVM-8-ThinLTO.patch b/patches/u-0001-Limit-internalization-in-LLVM-8-ThinLTO.patch new file mode 100644 index 0000000000..3c099476ef --- /dev/null +++ b/patches/u-0001-Limit-internalization-in-LLVM-8-ThinLTO.patch @@ -0,0 +1,29 @@ +From b4131e297e18fde119f6f461b3e622218166b009 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Fri, 26 Apr 2019 08:58:14 -0700 +Subject: [PATCH] Limit internalization in LLVM 8 ThinLTO + +--- + src/rustllvm/PassWrapper.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp +index 319c66a21f17..0ebef82d3768 100644 +--- a/src/rustllvm/PassWrapper.cpp ++++ b/src/rustllvm/PassWrapper.cpp +@@ -873,8 +873,11 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, + return PrevailingType::Unknown; + }; + #if LLVM_VERSION_GE(8, 0) ++ // We don't have a complete picture in our use of ThinLTO, just our immediate ++ // crate, so we need `ImportEnabled = false` to limit internalization. ++ // Otherwise, we sometimes lose `static` values -- see #60184. + computeDeadSymbolsWithConstProp(Ret->Index, Ret->GUIDPreservedSymbols, +- deadIsPrevailing, /* ImportEnabled = */ true); ++ deadIsPrevailing, /* ImportEnabled = */ false); + #else + computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols, deadIsPrevailing); + #endif +-- +2.20.1 + diff --git a/patches/u-make-tests-work-without-rpath.patch b/patches/u-make-tests-work-without-rpath.patch new file mode 100644 index 0000000000..ce97f4689e --- /dev/null +++ b/patches/u-make-tests-work-without-rpath.patch @@ -0,0 +1,12 @@ +Author: Chris Coulson +Forwarded: TODO +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,6 @@ ++include ../tools.mk ++ ++RUSTC := $(RUSTC_ORIGINAL) ++ + all: +- python2.7 test.py ++ $(HOST_RPATH_ENV) python2.7 test.py diff --git a/patches/u-mips-fixes.diff b/patches/u-mips-fixes.diff new file mode 100644 index 0000000000..c80ca2060e --- /dev/null +++ b/patches/u-mips-fixes.diff @@ -0,0 +1,19 @@ +Description: Various fixes for Rust on MIPS +Author: Dragan Mladjenovic +Bug-Debian: https://bugs.debian.org/881845 +Last-Update: 2018-10-24 + +Index: rustc/src/librustc_codegen_llvm/llvm_util.rs +=================================================================== +--- rustc.orig/src/librustc_codegen_llvm/llvm_util.rs ++++ rustc/src/librustc_codegen_llvm/llvm_util.rs +@@ -68,6 +68,9 @@ unsafe fn configure_llvm(sess: &Session) + // during inlining. Unfortunately these may block other optimizations. + add("-preserve-alignment-assumptions-during-inlining=false"); + ++ if sess.target.target.arch == "mips" || ++ sess.target.target.arch == "mips64" { add("-fast-isel=0"); } ++ + for arg in &sess.opts.cg.llvm_args { + add(&(*arg)); + } diff --git a/patches/u-prefer-local-css.patch b/patches/u-prefer-local-css.patch new file mode 100644 index 0000000000..a8aa7be215 --- /dev/null +++ b/patches/u-prefer-local-css.patch @@ -0,0 +1,14 @@ +Description: Prefer local CSS to remote +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/pull/45331 +--- a/src/bootstrap/doc.rs ++++ b/src/bootstrap/doc.rs +@@ -411,7 +411,7 @@ + + if filename == "not_found.md" { + cmd.arg("--markdown-css") +- .arg("https://doc.rust-lang.org/rust.css"); ++ .arg("rust.css"); + } else { + cmd.arg("--markdown-css").arg("rust.css"); + } diff --git a/patches/u-reproducible-build.patch b/patches/u-reproducible-build.patch new file mode 100644 index 0000000000..4c46a94bf6 --- /dev/null +++ b/patches/u-reproducible-build.patch @@ -0,0 +1,18 @@ +Description: Don't split dwarf debug for a fully-reproducible build +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/34902 + +--- a/src/librustc_llvm/build.rs ++++ b/src/librustc_llvm/build.rs +@@ -140,6 +140,11 @@ + let mut cfg = cc::Build::new(); + cfg.warnings(false); + for flag in cxxflags.split_whitespace() { ++ // Split-dwarf gives unreproducible DW_AT_GNU_dwo_id so don't do it ++ if flag == "-gsplit-dwarf" { ++ continue; ++ } ++ + // Ignore flags like `-m64` when we're doing a cross build + if is_crossed && flag.starts_with("-m") { + continue; diff --git a/patches/u-reproducible-dl-stage0.patch b/patches/u-reproducible-dl-stage0.patch new file mode 100644 index 0000000000..db1ce50c07 --- /dev/null +++ b/patches/u-reproducible-dl-stage0.patch @@ -0,0 +1,11 @@ +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -88,7 +88,7 @@ + run(["curl", option, + "-y", "30", "-Y", "10", # timeout if speed is < 10 bytes/sec for > 30 seconds + "--connect-timeout", "30", # timeout if cannot connect within 30 seconds +- "--retry", "3", "-Sf", "-o", path, url], ++ "--retry", "3", "-Sf", "-o", path, "-R", url], + verbose=verbose, + exception=exception) + diff --git a/prune-checksums b/prune-checksums new file mode 100755 index 0000000000..fcd525a639 --- /dev/null +++ b/prune-checksums @@ -0,0 +1,47 @@ +#!/usr/bin/python +# 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..b1d6f6efa6 --- /dev/null +++ b/prune-unused-deps @@ -0,0 +1,54 @@ +#!/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 +./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap + +not_needed() { + diff -ru Cargo.lock.orig Cargo.lock | grep '^-"checksum' | 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 +} + +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/rules b/rules new file mode 100755 index 0000000000..5aedec810b --- /dev/null +++ b/rules @@ -0,0 +1,401 @@ +#!/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 +# TODO: more correct to use `[build] rustflags = []` list syntax in Cargo.toml +RUSTFLAGS = $(addprefix -C link-args=,$(LDFLAGS)) +export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS RUSTFLAGS +RUSTFLAGS += --remap-path-prefix=$(CURDIR)=/usr/src/rustc-$(RUST_LONG_VERSION) +ifneq (,$(filter $(DEB_BUILD_ARCH), sparc64)) +export CARGO_INCREMENTAL = 0 +endif + +# Defines DEB_*_RUST_TYPE triples +include debian/architecture.mk +export DEB_HOST_RUST_TYPE + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_DESTDIR := $(CURDIR)/debian/tmp + +# Use system LLVM (comment out to use vendored LLVM) +LLVM_VERSION = 7 +OLD_LLVM_VERSION = 6.0 +# 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 + +RUSTBUILD = RUST_BACKTRACE=1 ./x.py +RUSTBUILD_FLAGS = --config debian/config.toml -vvv --on-fail env +# TODO: This should simply be "$(RUSTBUILD) test" but unfortunately this causes +# an insane blow up in the time it takes to run tests. See upstream #37477 for +# details. Upstream worked around it in #38984 but in Debian we can't take +# advantage of that work-around, because we want as much debuginfo as possible +# (so we set debuginfo-lines = true, debuginfo-only-std = false) so we have to +# work around it instead by disabling backtrace when running tests. +RUSTBUILD_TEST = ./x.py test +# 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 = + +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 + +MAKE_OPTIMISATIONS := true +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + MAKE_OPTIMISATIONS := false +endif + +# Build products or non-source files in src/, that shouldn't go in rust-src +SRC_CLEAN = src/bootstrap/bootstrap.pyc \ + src/etc/__pycache__/ + +# Workaround for linux #865549 +ifeq (0,$(shell test $$(uname -s) = "Linux" -a $$(getconf PAGESIZE) -gt 4096; echo $$?)) + SYSTEM_WORKAROUNDS += ulimit -s $$(expr $$(getconf PAGESIZE) / 1024 '*' 256 + 8192); +endif + +%: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel + +.PHONY: build +build: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel + +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; echo $$channel; \ + 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)" \ + -DLLVM_DESTDIR="$(LLVM_DESTDIR)" \ + -DLLVM_VERSION="$(LLVM_VERSION)" \ + -DRUST_DESTDIR="$(RUST_DESTDIR)" \ + "$<" > "$@" + 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 +ifneq (,$(filter $(DEB_BUILD_ARCH), armhf armel mips mipsel powerpc powerpcspe)) + sed -i -e '/^debuginfo-only-std = /d' "$@" +endif + +debian/rust-src.%: debian/rust-src.%.in + m4 -DRUST_LONG_VERSION="$(RUST_LONG_VERSION)" \ + "$<" > "$@" + +debian/dh_auto_configure.stamp: debian/config.toml + # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog + ! grep --color=always -i 'll...\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude='*.patch' -R debian + # 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-host-duplicates.patch; fi + # 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 ./.cargo config.stamp config.mk Makefile + $(RM) -rf $(TEST_LOG) debian/config.toml debian/rust-src.install debian/rust-src.links debian/*.stamp + $(RM) -rf $(SRC_CLEAN) config.toml + +override_dh_auto_build-arch: + $(RUSTBUILD) build $(RUSTBUILD_FLAGS) + +# note: this is only for buildds that want to do a separate arch:all build; +# there is no point running this yourself "to save time" since it implicitly +# depends on build-arch anyways. +override_dh_auto_build-indep: +ifeq (true,$(BUILD_DOCS)) + $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) +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. +FAILURES_ALLOWED = 8 +ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64 arm64 mips64el i386)) + FAILURES_ALLOWED = 12 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), mips mipsel s390x)) + FAILURES_ALLOWED = 24 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), powerpc powerpcspe sparc64 x32)) + FAILURES_ALLOWED = 180 +endif +FAILED_TESTS = grep "FAILED\|^command did not execute successfully" $(TEST_LOG) | grep -v '^test result: FAILED' +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) --no-fail-fast $(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)" +endif +endif + +override_dh_auto_test-indep: +ifeq (true,$(BUILD_DOCS)) +ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES))) +ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) + # Run all rules that test the docs, i.e. in step.rs that depend on default:doc + $(RUSTBUILD_TEST) --no-fail-fast src/tools/linkchecker $(RUSTBUILD_FLAGS) +endif +endif +endif + +run_rustbuild: + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) $(X_CMD) $(RUSTBUILD_FLAGS) $(X_FLAGS) + +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 + + touch "$@" + +override_dh_auto_install-arch: debian/dh_auto_install.stamp +override_dh_auto_install-indep: debian/dh_auto_install.stamp +ifeq (true,$(BUILD_DOCS)) + # 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' "$$file"; \ + done + find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete; +endif + +override_dh_install-arch: + dh_install + dh_install -p$(LIBSTD_PKG) usr/lib/$(DEB_HOST_MULTIARCH)/ + dh_install -plibstd-rust-dev usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/ + dh_install -prustc usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/codegen-backends/ + +override_dh_install-indep: debian/rust-src.install debian/rust-src.links + dh_install + chmod -x \ + debian/rust-gdb/usr/share/rust-gdb/*.py \ + debian/rust-lldb/usr/share/rust-lldb/*.py + $(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*' \ + \) -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_missing: + dh_missing --list-missing + +override_dh_compress: + dh_compress -X.woff + +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_makeshlibs: + dh_makeshlibs -V + + # dh_makeshlibs doesn't support our "libfoo-version.so" naming + # structure, so we have to do this ourselves. + install -o 0 -g 0 -d 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 + chmod 644 debian/$(LIBSTD_PKG)/DEBIAN/shlibs + chown 0:0 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 + 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-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-doc.links b/rust-doc.links new file mode 100644 index 0000000000..499b8b6bcf --- /dev/null +++ b/rust-doc.links @@ -0,0 +1,10 @@ +# This should eventually become part of a dh_rustdoc program. +# Something that does e.g. +# find $(DESTDIR) -name jquery.js -execdir ln -sf -T \ +# /usr/share/doc/rust-doc/html/jquery.js '{}' \; +usr/share/javascript/jquery/jquery.min.js usr/share/doc/rust-doc/html/jquery.min.js +usr/share/javascript/mathjax usr/share/doc/rust-doc/html/mathjax +usr/share/javascript/highlight.js/styles/atelier-dune-light.css usr/share/doc/rust-doc/html/highlight.css +usr/share/javascript/highlight.js/highlight.js usr/share/doc/rust-doc/html/highlight.js +usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/doc/rust-doc/html/font-awesome.min.css +usr/share/fonts-font-awesome/fonts usr/share/doc/rust-doc/fonts diff --git a/rust-gdb.install b/rust-gdb.install new file mode 100644 index 0000000000..d274b0bf0d --- /dev/null +++ b/rust-gdb.install @@ -0,0 +1,3 @@ +src/etc/rust-gdb usr/bin/ +src/etc/gdb_*.py usr/share/rust-gdb/ +src/etc/debugger_pretty_printers_common.py usr/share/rust-gdb/ 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..a48bbb6846 --- /dev/null +++ b/rust-lldb.install @@ -0,0 +1,3 @@ +src/etc/rust-lldb usr/bin/ +src/etc/lldb_rust_formatters.py usr/share/rust-lldb/ +src/etc/debugger_pretty_printers_common.py usr/share/rust-lldb/ diff --git a/rust-lldb.links b/rust-lldb.links new file mode 100644 index 0000000000..e078115708 --- /dev/null +++ b/rust-lldb.links @@ -0,0 +1 @@ +usr/share/man/man1/lldb-7.1.gz usr/share/man/man1/rust-lldb.1.gz diff --git a/rust-src.install.in b/rust-src.install.in new file mode 100644 index 0000000000..ab77d40a0a --- /dev/null +++ b/rust-src.install.in @@ -0,0 +1,13 @@ +debian/patches usr/src/rustc-RUST_LONG_VERSION/debian +# from src/bootstrap/dist.rs:370 onwards +COPYRIGHT usr/src/rustc-RUST_LONG_VERSION +LICENSE-APACHE usr/src/rustc-RUST_LONG_VERSION +LICENSE-MIT usr/src/rustc-RUST_LONG_VERSION +CONTRIBUTING.md usr/src/rustc-RUST_LONG_VERSION +README.md usr/src/rustc-RUST_LONG_VERSION +RELEASES.md usr/src/rustc-RUST_LONG_VERSION +configure usr/src/rustc-RUST_LONG_VERSION +x.py usr/src/rustc-RUST_LONG_VERSION +config.toml.example usr/src/rustc-RUST_LONG_VERSION +Cargo.toml usr/src/rustc-RUST_LONG_VERSION +src usr/src/rustc-RUST_LONG_VERSION diff --git a/rust-src.links.in b/rust-src.links.in new file mode 100644 index 0000000000..d3239334e9 --- /dev/null +++ b/rust-src.links.in @@ -0,0 +1 @@ +usr/src/rustc-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..ecdd8366cb --- /dev/null +++ b/rust-src.lintian-overrides @@ -0,0 +1,4 @@ +# 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: privacy-breach-generic usr/src/rustc-*/* +rust-src binary: package-contains-eslint-config-file usr/src/rustc-*/src/librustdoc/html/static/.eslintrc.js diff --git a/rustc.install b/rustc.install new file mode 100644 index 0000000000..c289154d74 --- /dev/null +++ b/rustc.install @@ -0,0 +1,3 @@ +usr/bin/rustc +usr/bin/rustdoc +debian/architecture.mk usr/share/rustc/ 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/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..732a73a881 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1 @@ +rustc source: source-is-missing src/stdsimd/crates/stdsimd-verify/arm-intrinsics.html line length is * characters (>*) 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/update-version.sh b/update-version.sh new file mode 100755 index 0000000000..9cc46c38b3 --- /dev/null +++ b/update-version.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# Don't run this directly, use "debian/rules update-version" instead + +prev_stable() { +local V=$1 +python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]-=1; print ".".join(map(str,k))' "$V" +} + +cargo_new() { +local V=$1 +python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]+='"${2:-1}"'; k[0]-=1; print ".".join(map(str,k))' "$V" +} + +update() { +local ORIG=$1 NEW=$2 NEW_LONG=$3 +local CARGO_NEW=${4:-$(cargo_new $NEW)} +local CARGO_NEXT=${4:-$(cargo_new $NEW 2)} + +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) + +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\( *\)(>= [^)]*)|cargo\1(>= ${CARGO_NEW}.0~~)|g" \ + -e "s|cargo\( *\)(<< [^)]*)|cargo\1(<< ${CARGO_NEXT}.0~~)|g" \ + control + +if [ "$NEW" != "$ORIG" ]; then +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..ffad6fe54b --- /dev/null +++ b/upstream-tarball-unsuspicious.txt @@ -0,0 +1,174 @@ +## 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, very small so suspicious-source thinks "octet-stream" +src/test/run-pass/raw-str.rs + +# False-positive, "verylongtext" but OK +CONTRIBUTING.md +src/doc/book/first-edition/src/the-stack-and-the-heap.md +src/doc/book/*/tools/docx-to-md.xsl +src/doc/embedded-book/src/*/*.md +src/doc/rustc/src/lints/groups.md +src/doc/rustc-guide/.travis.yml +src/doc/rustc-guide/src/*.md +src/doc/rustc-guide/src/*/*.md +src/doc/*/CODE_OF_CONDUCT.md +src/doc/unstable-book/src/language-features/unsized-locals.md +src/etc/third-party/README.txt +src/librustc_codegen_ssa/README.md +src/libstd/sys/cloudabi/abi/cloudabi.rs +src/libstd/os/raw/*.md +vendor/*/.travis.yml +vendor/*/Cargo.toml +vendor/*/CHANGELOG.md +vendor/*/CODE_OF_CONDUCT.md +vendor/*/CONTRIBUTORS.md +vendor/*/README.md +vendor/*/README.tpl +vendor/*/LICENSE +vendor/*/*/LICENSE +vendor/*/*/*/LICENSE +vendor/ammonia/src/lib.rs +vendor/clap/.github/CONTRIBUTING.md +# ^ author likes to omit line breaks in their comments +vendor/failure/book/src/bail-and-ensure.md +# ^ same with this one +vendor/handlebars/src/lib.rs +vendor/maplit/README.rst +vendor/lazy_static/src/lib.rs +vendor/pulldown-cmark/tests/footnotes.rs +vendor/pulldown-cmark/specs/footnotes.txt +vendor/pulldown-cmark-*/tests/footnotes.rs +vendor/pulldown-cmark-*/specs/footnotes.txt +vendor/stable_deref_trait/src/lib.rs +vendor/winapi-*/src/winnt.rs +vendor/winapi/src/lib.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/etc/wasm32-shim.js +src/grammar/parser-lalr-main.c +src/librustdoc/html/static/*.js +src/librustdoc/html/static/.eslintrc.js +src/test/auxiliary/rust_test_helpers.c +src/test/run-make/wasm-*/*.js +src/test/run-make-fulldeps/*.c +src/test/run-make-fulldeps/*/*.c +src/test/rustdoc-js/*.js +src/test/rustdoc-js-std/*.js +src/tools/rustdoc-js/tester.js +src/tools/rustdoc-js-std/tester.js + +# Embedded libraries, justified in README.source +vendor/backtrace-sys/src/libbacktrace/configure +vendor/backtrace-sys/src/libbacktrace/config/libtool.m4 +vendor/backtrace-sys/src/libbacktrace/*.c +vendor/compiler_builtins/compiler-rt/lib/BlocksRuntime/*.c +vendor/compiler_builtins/compiler-rt/lib/builtins/*.c +vendor/compiler_builtins/compiler-rt/lib/builtins/*/*.c +vendor/compiler_builtins/compiler-rt/utils/generate_*.awk +vendor/dlmalloc/src/dlmalloc.c +vendor/mdbook/src/theme/book.js +vendor/mdbook/src/theme/searcher/searcher.js +vendor/walkdir/compare/nftw.c +vendor/walkdir-*/compare/nftw.c + +# False-positive, misc +src/stdsimd/.travis.yml +src/stdsimd/crates/core_arch/foo.wasm +src/test/run-make-fulldeps/target-specs/*.json +src/test/run-make-fulldeps/libtest-json/output.json +vendor/clap/.mention-bot +vendor/cloudabi/cloudabi.rs +vendor/elasticlunr-rs/src/lang/*.rs +vendor/markup5ever/data/entities.json +vendor/num/ci/deploy.enc + +# False-positive, hand-editable small image +src/etc/installer/gfx/ +src/doc/embedded-book/src/assets/*.svg +src/doc/embedded-book/src/assets/f3.jpg +src/doc/embedded-book/src/assets/nrf52-memory-map.png +src/doc/embedded-book/src/assets/nrf52-spi-frequency-register.png +src/doc/embedded-book/src/assets/verify.jpeg +src/doc/nomicon/src/img/safeandunsafe.svg +src/doc/book/second-edition/src/img/*.png +src/doc/book/second-edition/src/img/*.svg +src/doc/book/src/img/ferris/*.svg +src/doc/book/src/img/*.png +src/doc/book/src/img/*.svg +src/doc/book/2018-edition/src/img/ferris/*.svg +src/doc/book/2018-edition/src/img/*.svg +src/doc/book/2018-edition/src/img/*.png +src/doc/book/tools/docx-to-md.xsl +src/librustdoc/html/static/*.svg +src/librustdoc/html/static/rust-logo.png +src/librustdoc/html/static/favicon.ico +vendor/difference/assets/*.png +vendor/fortanix-sgx-abi/images/enclave-execution-lifecycle.png +vendor/heck/no_step_on_snek.png +vendor/mdbook/src/theme/favicon.png +vendor/num/doc/favicon.ico +vendor/num/doc/rust-logo-128x128-blk-v2.png +vendor/pest/pest-logo.svg +vendor/pretty_assertions/examples/*.png +vendor/termion/logo.svg + +# Example code +vendor/html5ever/examples/capi/tokenize.c + +# Test data +src/stdsimd/crates/stdsimd-verify/arm-intrinsics.html +src/stdsimd/crates/stdsimd-verify/x86-intel.xml +src/stdsimd/crates/std_detect/src/detect/test_data/*.auxv +src/test/compile-fail/not-utf8.bin +src/test/*/*.rs +src/test/*/issues/*.rs +src/test/*/*/issues/*.rs +src/test/*/*.stderr +src/test/*/*/*.stderr +src/test/*/*/*/*.stderr +src/tools/*/tests/*/*.stderr +vendor/cssparser/src/css-parsing-tests/*.json +vendor/cssparser/src/big-data-url.css +vendor/elasticlunr-rs/tests/data/tr.in.txt +vendor/flate2/tests/*.gz +vendor/idna/tests/IdnaTest.txt +vendor/idna/tests/punycode_tests.json +vendor/html5ever/data/bench/*.html +vendor/html5ever/html5lib-tests/*/*.dat +vendor/html5ever/html5lib-tests/*/*.test +vendor/libz-sys/src/smoke.c +vendor/minifier/tests/files/test.json +vendor/pest/benches/data.json +vendor/pretty_assertions/src/format_changeset.rs +vendor/regex/src/testdata/basic.dat +vendor/regex/tests/crates_regex.rs +vendor/regex/tests/fowler.rs +vendor/regex-0*/src/testdata/basic.dat +vendor/regex-0*/tests/fowler.rs +vendor/rustc-demangle/src/lib.rs +vendor/sha-1/tests/data/*.output.bin +vendor/tar/tests/archives/*.tar +vendor/toml/tests/*/*.toml +vendor/toml/tests/*/*.json +vendor/url/tests/*.json +vendor/yaml-rust/tests/specexamples.rs.inc + +# Compromise, ideally we'd autogenerate these +# Should already by documented in debian/copyright +src/librustdoc/html/static/normalize.css +vendor/pest_meta/src/grammar.rs +vendor/unicode-normalization/src/tables.rs +vendor/unicode-segmentation/src/tables.rs + +# Compromise, ideally we'd package these in their own package +src/librustdoc/html/static/*.woff 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/watch b/watch new file mode 100644 index 0000000000..d4423bb1d0 --- /dev/null +++ b/watch @@ -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/(\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/other-installation-methods.html \ + (?:.*/)rustc?-(\d[\d.]*(?:-[\w.]+)?)-src\.tar\.[gx]z diff --git a/watch-beta.in b/watch-beta.in new file mode 100644 index 0000000000..c492cee9b6 --- /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/other-installation-methods.html \ + (?:.*/)rustc?-(.*)-src\.tar\.[gx]z -- 2.30.2