]> git.proxmox.com Git - rustc.git/commitdiff
Update upstream source from tag 'upstream/1.30.0_beta.7+dfsg1'
authorXimin Luo <infinity0@debian.org>
Sun, 23 Sep 2018 17:36:46 +0000 (10:36 -0700)
committerXimin Luo <infinity0@debian.org>
Sun, 23 Sep 2018 17:36:46 +0000 (10:36 -0700)
Update to upstream version '1.30.0~beta.7+dfsg1'
with Debian dir e75de17e95e3d5172dfd3e52aa9aa2668ad73b80

78 files changed:
debian/.gitattributes [new file with mode: 0644]
debian/.gitignore [new file with mode: 0644]
debian/NEWS [new file with mode: 0644]
debian/README.Debian [new file with mode: 0644]
debian/README.source [new file with mode: 0644]
debian/TODO.Debian [new file with mode: 0644]
debian/architecture-test.mk [new file with mode: 0644]
debian/architecture.mk [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/check-orig-suspicious.sh [new file with mode: 0755]
debian/compat [new file with mode: 0644]
debian/config.toml.in [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/ensure-patch [new file with mode: 0755]
debian/gbp.conf [new file with mode: 0644]
debian/get-stage0.py [new file with mode: 0755]
debian/icons/rust-logo-32x32-blk.png [new file with mode: 0644]
debian/libstd-rust-1.29.lintian-overrides [new file with mode: 0644]
debian/libstd-rust-dev.lintian-overrides [new file with mode: 0644]
debian/lintian-to-copyright.sh [new file with mode: 0755]
debian/llvm-upstream-patch.sh [new file with mode: 0755]
debian/make_orig-stage0_tarball.sh [new file with mode: 0755]
debian/patches/d-add-soname.patch [new file with mode: 0644]
debian/patches/d-disable-cargo-vendor.patch [new file with mode: 0644]
debian/patches/d-dont-download-stage0.patch [new file with mode: 0644]
debian/patches/d-fix-mips64el-bootstrap.patch [new file with mode: 0644]
debian/patches/d-host-duplicates.patch [new file with mode: 0644]
debian/patches/d-i686-baseline.patch [new file with mode: 0644]
debian/patches/d-ignore-impl-generic-mismatch-diff.patch [new file with mode: 0644]
debian/patches/d-ignore-removed-submodules.patch [new file with mode: 0644]
debian/patches/d-no-web-dependencies-in-doc.patch [new file with mode: 0644]
debian/patches/d-prefer-dynamic.patch [new file with mode: 0644]
debian/patches/d-read-beta-version-from-file.patch [new file with mode: 0644]
debian/patches/d-rust-gdb-paths [new file with mode: 0644]
debian/patches/d-rust-lldb-paths [new file with mode: 0644]
debian/patches/d-sparc64-dont-pack-spans.patch [new file with mode: 0644]
debian/patches/gcc-4.8-aarch64-ice.diff [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch [new file with mode: 0644]
debian/patches/u-armel-atomics-nand.patch [new file with mode: 0644]
debian/patches/u-compiler-rt.patch [new file with mode: 0644]
debian/patches/u-fixtestignores-ppc64el.patch [new file with mode: 0644]
debian/patches/u-ignoretest-ppc64el_02.patch [new file with mode: 0644]
debian/patches/u-make-tests-work-without-rpath.patch [new file with mode: 0644]
debian/patches/u-prefer-local-css.patch [new file with mode: 0644]
debian/patches/u-reproducible-build.patch [new file with mode: 0644]
debian/patches/u-reproducible-dl-stage0.patch [new file with mode: 0644]
debian/patches/u-rust-52876-const-endianess.patch [new file with mode: 0644]
debian/patches/u-vendor-rand-fix-ppc-syscall.patch [new file with mode: 0644]
debian/prune-checksums [new file with mode: 0755]
debian/prune-unused-deps [new file with mode: 0755]
debian/rules [new file with mode: 0755]
debian/rust-doc.doc-base.book [new file with mode: 0644]
debian/rust-doc.doc-base.reference [new file with mode: 0644]
debian/rust-doc.docs [new file with mode: 0644]
debian/rust-doc.install [new file with mode: 0644]
debian/rust-doc.links [new file with mode: 0644]
debian/rust-gdb.install [new file with mode: 0644]
debian/rust-gdb.links [new file with mode: 0644]
debian/rust-lldb.install [new file with mode: 0644]
debian/rust-lldb.links [new file with mode: 0644]
debian/rust-src.install.in [new file with mode: 0644]
debian/rust-src.links.in [new file with mode: 0644]
debian/rust-src.lintian-overrides [new file with mode: 0644]
debian/rustc.install [new file with mode: 0644]
debian/rustc.manpages [new file with mode: 0644]
debian/source/format [new file with mode: 0644]
debian/source/include-binaries [new file with mode: 0644]
debian/source/lintian-overrides [new file with mode: 0644]
debian/source/local-options [new file with mode: 0644]
debian/source/options [new file with mode: 0644]
debian/update-version.sh [new file with mode: 0755]
debian/upstream-tarball-unsuspicious.txt [new file with mode: 0644]
debian/upstream/signing-key.asc [new file with mode: 0644]
debian/watch [new file with mode: 0644]
debian/watch-beta.in [new file with mode: 0644]

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644 (file)
index 0000000..6a03163
--- /dev/null
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..192592b
--- /dev/null
@@ -0,0 +1,18 @@
+/debhelper-build-stamp
+/*.debhelper.log
+/*.substvars
+/*.debhelper
+/config.toml
+/files
+/libstd-rust-*/
+/libstd-rust-dev/
+/rust-doc/
+/rust-gdb/
+/rust-lldb/
+/rust-src/
+/rust-src.install
+/rust-src.links
+/rustc/
+/tmp/
+/patches/*~
+/watch-beta
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..067259d
--- /dev/null
@@ -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 <infinity0@debian.org>  Mon, 16 Oct 2017 18:02:23 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..c2627de
--- /dev/null
@@ -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 <sylvestre@debian.org>, 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/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..33b008f
--- /dev/null
@@ -0,0 +1,242 @@
+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
+==================
+
+This source package embeds several external libraries (foeked and managed
+by rust upstream as git submodules).
+In early stages, many more libraries were forked/emebedded but we are steadily
+progressing in splitting them out.
+
+Here below the remaining ones, with the technical reasons.
+
+ * 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
+
+As a summary, we plan to:
+ * work with upstream to fix compiler-rt linkage soon.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 06 May 2017 13:26:08 +0200
+
+
+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
+--------------------------------
+
+# Make sure you apply the patch mentioned in #855464 to /usr/bin/mk-origtargz
+
+$ 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/ && ../debian/prune-unused-deps ) && rm -rf rustc-${ver/*~*/beta}-src/
+# ^ If this fails, you probably need to refresh patches 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/cgit/rpms/rust.git/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.
+
+Package metadata
+https://admin.fedoraproject.org/pkgdb/package/rpms/rust/
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
new file mode 100644 (file)
index 0000000..ed9f05b
--- /dev/null
@@ -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 <sylvestre@debian.org>  Tue, 20 Jan 2015 08:50:28 +0100
diff --git a/debian/architecture-test.mk b/debian/architecture-test.mk
new file mode 100644 (file)
index 0000000..e7aeaba
--- /dev/null
@@ -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/debian/architecture.mk b/debian/architecture.mk
new file mode 100644 (file)
index 0000000..9a71eb9
--- /dev/null
@@ -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/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..58d5788
--- /dev/null
@@ -0,0 +1,850 @@
+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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <jcristau@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Thu, 19 Jul 2018 08:52:03 -0700
+
+rustc (1.27.1+dfsg1-1~exp2) experimental; urgency=medium
+
+  * Fix some failing tests.
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 18 Jul 2018 09:06:44 -0700
+
+rustc (1.27.1+dfsg1-1~exp1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Wed, 30 May 2018 20:58:46 -0700
+
+rustc (1.26.1+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Fri, 18 May 2018 01:11:15 -0700
+
+rustc (1.25.0+dfsg1-1~exp2) experimental; urgency=medium
+
+  * Install missing codegen-backends.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Sat, 03 Mar 2018 14:23:29 +0100
+
+rustc (1.23.0+dfsg1-1) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Sat, 21 Oct 2017 14:20:17 +0200
+
+rustc (1.20.0+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Mon, 17 Jul 2017 23:04:03 +0200
+
+rustc (1.18.0+dfsg1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Wed, 21 Jun 2017 10:46:27 +0200
+
+rustc (1.17.0+dfsg2-6) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Ximin Luo <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <sylvestre@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <sylvestre@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <lucab@debian.org>  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 <sylvestre@debian.org>  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 <infinity0@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  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 <infinity0@debian.org>  Sun, 17 Jul 2016 03:40:49 +0200
+
+rustc (1.9.0+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #825752)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  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 <sylvestre@debian.org>  Fri, 15 Apr 2016 12:01:45 +0200
+
+rustc (1.7.0+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <gus@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <gus@debian.org>  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 <gus@debian.org>  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 <gus@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  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 <sylvestre@debian.org>  Fri, 23 Jan 2015 15:47:37 +0100
diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh
new file mode 100755 (executable)
index 0000000..146acac
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+ver="$1"
+test -n "$ver" || exit 2
+
+FILTER="Files-Excluded: in debian/copyright and run a repack."
+SUS_WHITELIST=$(find "${PWD}" -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/
+
+# Remove tiny files 4 bytes or less
+find . -size -4c -delete
+# Remove non-suspicious files, warning on patterns that match nothing
+echo "Excluding (i.e. removing) whitelisted files..."
+grep -v '^#' ${SUS_WHITELIST} | xargs  -I% sh -c 'rm -r ./% || true'
+echo "Checking for suspicious files..."
+
+# TODO: merge the -m stuff into suspicious-source(1).
+suspicious-source -v -m text/x-objective-c -m text/x-awk
+# The following shell snippet is a bit more strict than suspicious-source(1)
+find . -type f -and -not -name '.cargo-checksum.json' -exec file '{}' \; | \
+  sed -e 's/\btext\b\(.*\), with very long lines/verylongtext\1/g' | \
+  grep -v '\b\(text\|empty\)\b' || true
+
+# Most C and JS code should be in their own package
+find src/vendor/ -name '*.c' -o -name '*.js'
+
+echo "The above files (if any) seem suspicious, please audit them."
+echo "If good, add them to ${SUS_WHITELIST}."
+echo "If bad, add them to ${FILTER}."
+
+echo "Artifacts left in rustc-$ver-src, please remove them yourself."
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/config.toml.in b/debian/config.toml.in
new file mode 100644 (file)
index 0000000..557e2e2
--- /dev/null
@@ -0,0 +1,55 @@
+[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
+
+docs = BUILD_DOCS
+
+[install]
+prefix = "/usr"
+
+[target.DEB_BUILD_RUST_TYPE]
+llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
+
+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"
+
+)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"
+
+)dnl
+[llvm]
+link-shared = true
+
+[rust]
+use-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/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..ba962fd
--- /dev/null
@@ -0,0 +1,194 @@
+Source: rustc
+Section: devel
+Priority: optional
+Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Uploaders: Jordan Justen <jordan.l.justen@intel.com>,
+ Luca Bruno <lucab@debian.org>,
+ Sylvestre Ledru <sylvestre@debian.org>,
+ Angus Lees <gus@debian.org>,
+ Ximin Luo <infinity0@debian.org>
+# :native annotations are to support cross-compiling, see README.Debian
+Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.17.14),
+               python:native,
+               cargo:native (>= 0.19.0)      <!pkg.rustc.dlstage0>,
+               rustc:native (>= 1.28.0+dfsg) <!pkg.rustc.dlstage0>,
+               rustc:native (<= 1.29.0++)    <!pkg.rustc.dlstage0>,
+               llvm-6.0-dev:native,
+               llvm-6.0-tools:native,
+               libllvm6.0,
+               autotools-dev,
+               cmake (>= 3.0) | cmake3,
+# this is sometimes needed by rustc_llvm
+               zlib1g-dev:native,
+               zlib1g-dev,
+# used by rust-installer
+               liblzma-dev:native,
+# test dependencies:
+               binutils (>= 2.26) <!nocheck> | binutils-2.26 <!nocheck>,
+               git <!nocheck>,
+               procps <!nocheck>,
+# below are optional tools even for 'make check'
+               gdb (>= 7.12) <!nocheck>,
+# 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 <pkg.rustc.dlstage0>,
+               ca-certificates <pkg.rustc.dlstage0>,
+Build-Conflicts: gdb-minimal <!nocheck>
+# ^ 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.30.0~~), cargo (<< 0.31.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.29
+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.29 (= ${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-6.0, ${misc:Depends}, python-lldb-6.0
+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: <!nodoc>
+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/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..60d4c19
--- /dev/null
@@ -0,0 +1,1422 @@
+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/jemalloc
+ src/llvm
+ src/llvm-emscripten
+ src/vendor/mdbook/src/theme/_FontAwesome
+ src/vendor/mdbook/src/theme/highlight.js
+ src/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/clang
+ src/tools/clippy
+ src/tools/lldb
+ src/tools/rls
+ src/tools/remote-test-client
+ src/tools/remote-test-server
+ src/tools/rustfmt
+ src/tools/miri
+ src/tools/lld
+# Extraneous stuff from compiler-rt that's not needed by Rust
+ src/libcompiler_builtins/compiler-rt/cmake
+ src/libcompiler_builtins/compiler-rt/docs
+ src/libcompiler_builtins/compiler-rt/include
+ src/libcompiler_builtins/compiler-rt/lib/*san
+ src/libcompiler_builtins/compiler-rt/lib/fuzzer
+ src/libcompiler_builtins/compiler-rt/lib/interception
+ src/libcompiler_builtins/compiler-rt/lib/profile
+ src/libcompiler_builtins/compiler-rt/lib/sanitizer_common
+ src/libcompiler_builtins/compiler-rt/lib/scudo
+ src/libcompiler_builtins/compiler-rt/lib/xray
+ src/libcompiler_builtins/compiler-rt/test
+ src/libcompiler_builtins/compiler-rt/unittests
+ src/libcompiler_builtins/compiler-rt/www
+# Embedded C libraries
+ src/vendor/backtrace-sys*/src/libbacktrace
+ src/vendor/lzma-sys*/xz-*
+# Embedded binary blobs
+ src/vendor/winapi-*/*/*.a
+ src/vendor/mdbook/src/theme/playpen_editor
+# Accidental development files
+ src/vendor/shlex/*.swp
+ src/vendor/shlex/*/*.swp
+# Non-free-format documents already available in other formats
+ src/doc/book/second-edition/nostarch/odt
+# unused dependencies, generated by debian/prune-unused-deps
+# DO NOT EDIT below, AUTOGENERATED
+ src/vendor/assert_cli
+ src/vendor/bufstream
+ src/vendor/cargo_metadata
+ src/vendor/colored
+ src/vendor/commoncrypto
+ src/vendor/commoncrypto-sys
+ src/vendor/compiletest_rs
+ src/vendor/core-foundation
+ src/vendor/core-foundation-sys
+ src/vendor/crossbeam
+ src/vendor/crossbeam-channel
+ src/vendor/crossbeam-epoch
+ src/vendor/crossbeam-utils-0.4.1
+ src/vendor/crossbeam-utils
+ src/vendor/crypto-hash
+ src/vendor/curl
+ src/vendor/curl-sys
+ src/vendor/derive_more
+ src/vendor/derive-new
+ src/vendor/environment
+ src/vendor/fnv
+ src/vendor/foreign-types
+ src/vendor/foreign-types-shared
+ src/vendor/fs2
+ src/vendor/fst
+ src/vendor/futures
+ src/vendor/fwdansi
+ src/vendor/getset
+ src/vendor/git2
+ src/vendor/git2-curl
+ src/vendor/glob
+ src/vendor/globset
+ src/vendor/hex
+ src/vendor/home
+ src/vendor/if_chain
+ src/vendor/ignore
+ src/vendor/isatty
+ src/vendor/json
+ src/vendor/jsonrpc-core
+ src/vendor/kernel32-sys
+ src/vendor/languageserver-types
+ src/vendor/lazycell
+ src/vendor/libgit2-sys
+ src/vendor/libssh2-sys
+ src/vendor/libz-sys
+ src/vendor/log-0.3.9
+ src/vendor/num-derive
+ src/vendor/opener
+ src/vendor/openssl
+ src/vendor/openssl-probe
+ src/vendor/openssl-src
+ src/vendor/openssl-sys
+ src/vendor/ordslice
+ src/vendor/parking_lot-0.5.5
+ src/vendor/quine-mc_cluskey
+ src/vendor/racer
+ src/vendor/rls-analysis
+ src/vendor/rls-blacklist
+ src/vendor/rls-rustc
+ src/vendor/rls-vfs
+ src/vendor/rustc-ap-arena
+ src/vendor/rustc-ap-rustc_cratesio_shim
+ src/vendor/rustc-ap-rustc_data_structures
+ src/vendor/rustc-ap-rustc_errors
+ src/vendor/rustc-ap-rustc_target
+ src/vendor/rustc-ap-serialize
+ src/vendor/rustc-ap-syntax
+ src/vendor/rustc-ap-syntax_pos
+ src/vendor/rustc_version
+ src/vendor/schannel
+ src/vendor/semver
+ src/vendor/semver-parser
+ src/vendor/serde_ignored
+ src/vendor/shell-escape
+ src/vendor/term
+ src/vendor/termcolor-0.3.6
+ src/vendor/unicode-segmentation
+ src/vendor/url_serde
+ src/vendor/vcpkg
+ src/vendor/vergen
+ src/vendor/winapi-0.2.8
+ src/vendor/winapi-build
+ src/vendor/wincolor-0.1.6
+# DO NOT EDIT above, AUTOGENERATED
+
+Files: C*.md
+       R*.md
+       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: src/libcompiler_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: src/libcompiler_builtins/compiler-rt/lib/BlocksRuntime/*
+Copyright: 2008-2010 Apple, Inc.
+License: MIT
+
+Files: src/libbacktrace/*
+Copyright: 2012-2014 Free Software Foundation, Inc.
+           (written by Ian Lance Taylor, Google.)
+License: BSD-3-Clause
+
+Files:
+ src/libbacktrace/filenames.h
+ src/libbacktrace/ltmain.sh
+Copyright: 2000, 2001, 2007, 2010 Free Software Foundation, Inc.
+License: GPL-2+
+
+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: src/vendor/bitflags/*
+       src/vendor/bitflags-*
+       src/vendor/cc/*
+       src/vendor/cmake/*
+       src/vendor/env_logger/*
+       src/vendor/getopts/*
+       src/vendor/libc/*
+       src/vendor/log/*
+       src/vendor/rand-0*/*
+       src/vendor/regex/*
+       src/vendor/regex-0*/*
+       src/vendor/regex-syntax/*
+       src/vendor/regex-syntax-0*/*
+       src/vendor/rustc-hash/*
+       src/vendor/rustc-serialize/*
+       src/vendor/time/*
+Copyright: 2014-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: src/vendor/num-integer/*
+       src/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:
+ src/vendor/string_cache/*
+ src/vendor/string_cache_codegen/*
+ src/vendor/string_cache_shared/*
+ src/vendor/unicode-bidi/*
+Copyright: 2015-2017 Alex Crichton <alex@alexcrichton.com>
+           2015-2017 Keegan McAllister <kmcallister@mozilla.com>
+           2015-2017 Chris Morgan <me@chrismorgan.info>
+           2014-2017 The html5ever Project Developers
+           2014-2017 The Servo Project Developers
+           2013-2017 Simon Sapin <simon.sapin@exyr.org>
+License: MIT or Apache-2.0
+Comment: see https://github.com/servo/
+
+Files: src/dlmalloc/*
+       src/vendor/backtrace/*
+       src/vendor/backtrace-sys/*
+       src/vendor/cfg-if/*
+       src/vendor/filetime/*
+       src/vendor/flate2/*
+       src/vendor/jobserver/*
+       src/vendor/lzma-sys/*
+       src/vendor/miow/*
+       src/vendor/miniz-sys/*
+       src/vendor/pkg-config/*
+       src/vendor/proc-macro2/*
+       src/vendor/proc-macro2-0*/*
+       src/vendor/rustc-demangle/*
+       src/vendor/scoped-tls/*
+       src/vendor/socket2/*
+       src/vendor/tar/*
+       src/vendor/toml/*
+       src/vendor/xz2/*
+Copyright: 2014-2017 Alex Crichton <alex@alexcrichton.com>
+           2015-2017 The Rust Project Developers
+License: MIT or Apache-2.0
+Comment: see https://github.com/alexcrichton/
+
+Files: src/vendor/ammonia/*
+Copyright: 2015-2018 Michael Howell <michael@notriddle.com>
+License: MIT  or  Apache-2.0
+Comment: see https://github.com/notriddle/ammonia
+
+Files: src/vendor/ansi_term/*
+Copyright: 2014-2016 ogham@bsago.me
+           2014-2016 Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
+License: MIT
+Comment: see https://github.com/ogham/rust-ansi-term
+
+Files: src/vendor/aho-corasick/*
+       src/vendor/memchr/*
+       src/vendor/utf8-ranges/*
+Copyright: 2015 Andrew Gallant <jamslam@gmail.com>
+           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: src/vendor/atty/*
+Copyright: 2015-2017 softprops <d.tangren@gmail.com>
+License: MIT
+Comment: see https://github.com/softprops/atty
+
+Files: src/vendor/byteorder/*
+       src/vendor/same-file/*
+       src/vendor/termcolor-0*/*
+       src/vendor/walkdir/*
+       src/vendor/wincolor-0*/*
+Copyright: 2015-2018 Andrew Gallant <jamslam@gmail.com>
+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/ripgrep/tree/master/termcolor
+         see https://github.com/BurntSushi/ripgrep/tree/master/wincolor
+
+Files: src/vendor/log_settings/*
+Copyright: 2016-2018 Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
+License: MIT
+Comment: see https://github.com/oli-obk/log_settings
+
+Files:
+ src/vendor/chalk-engine/*
+ src/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: src/vendor/chrono/*
+Copyright: 2014-2018 Kang Seonghoon <public+rust@mearie.org>
+License: MIT or Apache-2.0
+Comment: see https://github.com/chronotope/chrono
+
+Files: src/vendor/clap/*
+Copyright: 2015-2017 Kevin K. <kbknapp@gmail.com>
+License: MIT
+Comment: see https://github.com/kbknapp/clap-rs.git
+
+Files: src/vendor/crossbeam-deque/*
+       src/vendor/crossbeam-epoch-0*/*
+       src/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: src/vendor/datafrog/*
+Copyright: 20XX-2018 Frank McSherry <fmcsherry@me.com>
+           20XX-2018 The Rust Project Developers
+           20XX-2018 Datafrog Developers
+License: Apache-2.0 or MIT
+Comment: see https://github.com/rust-lang-nursery/datafrog
+
+Files: src/vendor/diff/*
+Copyright: 2015-2017 Utkarsh Kukreti <utkarshkukreti@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/utkarshkukreti/diff.rs
+
+Files:
+ src/vendor/dtoa/*
+ src/vendor/itoa/*
+ src/vendor/quote/*
+ src/vendor/quote-0*/*
+ src/vendor/syn/*
+ src/vendor/syn-0*/*
+ src/vendor/synom/*
+Copyright: 2016-2018 David Tolnay <dtolnay@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ see https://github.com/dtolnay/dtoa
+ 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: src/vendor/arrayvec/*
+       src/vendor/either/*
+       src/vendor/fixedbitset/*
+       src/vendor/itertools/*
+       src/vendor/maplit/*
+       src/vendor/nodrop/*
+       src/vendor/ordermap/*
+       src/vendor/scopeguard/*
+Copyright: 2014-2018 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: src/vendor/difference/*
+Copyright: 2015-2018 Johann Hofmann <mail@johann-hofmann.com>
+License: MIT
+Comment: see https://github.com/johannhof/difference.rs
+
+Files: src/vendor/elasticlunr-rs/*
+Copyright: 2017-2018 Matt Ickstadt <mattico8@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/mattico/elasticlunr-rs
+
+Files: src/vendor/ena/*
+Copyright: 2015-2018 Niko Matsakis <niko@alum.mit.edu>
+License: MIT or Apache-2.0
+Comment: see https://github.com/nikomatsakis/ena
+
+Files: src/vendor/error-chain-0*/*
+Copyright: 2016-2017 Brian Anderson <banderson@mozilla.com>
+           2016-2017 Paul Colomiets <paul@colomiets.name>
+           2016-2017 Colin Kiegel <kiegel@gmx.de>
+           2016-2017 Yamakaky <yamakaky@yamaworld.fr>
+License: MIT or Apache-2.0
+Comment: see https://github.com/brson/error-chain
+
+Files:
+ src/vendor/failure/*
+ src/vendor/failure_derive/*
+Copyright: 2017-2018 Without Boats <boats@mozilla.com>
+License: MIT OR Apache-2.0
+Comment:
+ see https://github.com/withoutboats/failure
+ see https://github.com/withoutboats/failure_derive
+
+Files: src/vendor/fuchsia-zircon/*
+       src/vendor/fuchsia-zircon-sys/*
+Copyright: 2014-2018 Raph Levien <raph@google.com>
+License: BSD-3-Clause
+Comment: see https://fuchsia.googlesource.com/garnet/
+
+Files: src/vendor/futf/*
+Copyright: 2015-2018 Keegan McAllister <kmcallister@mozilla.com>
+License: MIT  or  Apache-2.0
+Comment: see https://github.com/servo/futf
+
+Files: src/vendor/handlebars/*
+Copyright: 2014-2017 Ning Sun <sunng@about.me>
+License: MIT
+Comment: see https://github.com/sunng87/handlebars-rust
+
+Files:
+ src/vendor/html5ever/*
+ src/vendor/markup5ever/*
+Copyright: 2014-2018 The html5ever Project Developers
+License: MIT  or  Apache-2.0
+Comment: see https://github.com/servo/html5ever
+
+Files: src/vendor/humantime/*
+Copyright: 2016-2018 Paul Colomiets <paul@colomiets.name>
+License: MIT or Apache-2.0
+Comment: see https://github.com/tailhook/humantime
+
+Files: src/vendor/idna/*
+       src/vendor/percent-encoding/*
+       src/vendor/url/*
+Copyright: 2013-2017 The rust-url developers
+License: MIT or Apache-2.0
+Comment: see https://github.com/servo/rust-url/
+
+Files: src/vendor/is-match/*
+       src/vendor/toml-query/*
+Copyright: 2017-2018 Matthias Beyer <mail@beyermatthias.de>
+License: MPL-2.0
+Comment: see https://github.com/matthiasbeyer/is-match
+         see https://github.com/matthiasbeyer/toml-query
+
+Files: src/vendor/matches/*
+Copyright: 2014-2017 Simon Sapin <simon.sapin@exyr.org>
+License: MIT
+Comment: see https://github.com/SimonSapin
+
+Files:
+ src/vendor/lazy_static/*
+ src/vendor/lazy_static-0*/*
+ src/vendor/owning_ref/*
+Copyright: 2014-2018 Marvin Löbel <loebel.marvin@gmail.com>
+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: src/vendor/mdbook/*
+Copyright: 2015-2017 Mathieu David <mathieudavid@mathieudavid.org>
+License: MPL-2.0
+Comment: see https://github.com/azerupi/mdBook
+
+Files: src/vendor/memoffset/*
+Copyright: 2017-2018 Gilad Naaman <gilad.naaman@gmail.com>
+License: MIT
+Comment: see https://github.com/Gilnaa/memoffset
+
+Files: src/vendor/minifier/*
+Copyright: 2017-2018 Guillaume Gomez <guillaume1.gomez@gmail.com>
+License: MIT
+Comment: see https://github.com/GuillaumeGomez/minifier-rs
+
+Files: src/vendor/miniz-sys/miniz.c
+Copyright: 1996-2012 Rich Geldreich
+License: Unlicense
+
+Files: src/vendor/new_debug_unreachable/*
+Copyright: 2014-2018 Matt Brubeck <mbrubeck@limpet.net>
+           2014-2018 Jonathan Reem <jonathan.reem@gmail.com>
+License: MIT
+Comment: see https://github.com/mbrubeck/rust-debug-unreachable
+
+Files: src/vendor/num_cpus/*
+Copyright: 2015 Sean McArthur <sean.monstar@gmail.com>
+License: MIT
+Comment: see https://github.com/seanmonstar/num_cpus
+
+Files: src/vendor/open/*
+Copyright: 2015-2017 Sebastian Thiel <byronimo@gmail.com>
+License: MIT
+Comment: see https://github.com/Byron/open-rs
+
+Files:
+ src/vendor/pest/*
+ src/vendor/pest_derive/*
+Copyright: 2016-2018 Dragoș Tiselice <dragostiselice@gmail.com>
+License: MPL-2.0
+Comment:
+ see https://github.com/dragostis/pest
+ see https://github.com/pest-parser/pest
+
+Files: src/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: src/vendor/pulldown-cmark/*
+Copyright: 2015-2017 Raph Levien <raph@google.com>
+License: MIT
+Comment: see https://github.com/google/pulldown-cmark
+
+Files: src/vendor/quick-error/*
+Copyright: 2015-2017 Paul Colomiets <paul@colomiets.name>
+           2015-2017 Colin Kiegel <kiegel@gmx.de>
+License: MIT or Apache-2.0
+Comment: see http://github.com/tailhook/quick-error
+
+Files:
+ src/vendor/rayon/*
+ src/vendor/rayon-core/*
+ src/vendor/rustc-rayon/*
+ src/vendor/rustc-rayon-core/*
+Copyright: 2014-2018 Niko Matsakis <niko@alum.mit.edu>
+           2014-2018 Josh Stone <cuviper@gmail.com>
+License: Apache-2.0 or MIT
+Comment:
+ see https://github.com/rayon-rs/rayon
+ see https://github.com/Zoxc/rayon/tree/rustc
+
+Files: src/vendor/redox_syscall/*
+       src/vendor/redox_termios/*
+Copyright: 2016-2017 Jeremy Soller <jackpot51@gmail.com>
+License: MIT
+Comment: see https://github.com/redox-os/syscall
+         see https://github.com/redox-os/termios
+
+Files: src/vendor/remove_dir_all/*
+Copyright: 2017-2018 Aaronepower <theaaronepower@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/Aaronepower/remove_dir_all.git
+
+Files: src/vendor/rls-data/*
+       src/vendor/rls-span/*
+Copyright: 2016-2017 Nick Cameron <ncameron@mozilla.com>
+License: Apache-2.0 or MIT
+Comment: see https://github.com/nrc/rls-span
+         see https://github.com/nrc/rls-data
+
+Files: src/vendor/rustfix/*
+Copyright: 2016-2018 Pascal Hertleif <killercup@gmail.com>
+           2016-2018 Oliver Schneider <oli-obk@users.noreply.github.com>
+License: Apache-2.0 or MIT
+Comment: see https://github.com/killercup/rustfix
+
+Files: src/vendor/serde/*
+       src/vendor/serde_json/*
+Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ see https://github.com/serde-rs/serde
+ see https://github.com/serde-rs/json
+
+Files: src/vendor/serde_derive/*
+Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com>
+           2016-2017 David Tolnay <dtolnay@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/serde-rs/serde
+
+Files: src/vendor/siphasher/*
+Copyright: 2016-2018 Frank Denis <github@pureftpd.org>
+License: MIT or Apache-2.0
+Comment: see https://github.com/jedisct1/rust-siphash
+
+Files: src/vendor/shlex/*
+Copyright: 2015-2015 comex <comexk@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/comex/rust-shlex
+
+Files: src/vendor/smallvec/*
+Copyright: 2015-2018 Simon Sapin <simon.sapin@exyr.org>
+License: MPL-2.0
+Comment: see https://github.com/servo/rust-smallvec
+
+Files: src/vendor/stable_deref_trait/*
+Copyright: 2017-2017 Robert Grosse <n210241048576@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/storyyeller/stable_deref_trait
+
+Files: src/vendor/strsim/*
+Copyright: 2015 Danny Guo <dannyguo91@gmail.com>
+License: MIT
+Comment: see https://github.com/dguo/strsim-rs
+
+Files:
+ src/vendor/strum/*
+ src/vendor/strum_macros/*
+Copyright: 2015-2018 Peter Glotfelty <peglotfe@microsoft.com>
+License: MIT
+
+Files: src/vendor/synstructure/*
+Copyright: 2016-2018 Michael Layzell <michael@thelayzells.com>
+License: MIT
+Comment: see https://github.com/mystor/synstructure
+
+Files: src/vendor/tempfile/*
+Copyright: 2015-2018 Steven Allen <steven@stebalien.com>
+           2015-2018 The Rust Project Developers
+           2015-2018 Ashley Mannix <ashleymannix@live.com.au>
+           2015-2018 Jason White <jasonaw0@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/Stebalien/tempfile
+
+Files: src/vendor/tendril/*
+Copyright: 2015-2017 Keegan McAllister <mcallister.keegan@gmail.com>
+           2015-2017 Simon Sapin <simon.sapin@exyr.org>
+           2015-2017 Chris Morgan <me@chrismorgan.info>
+License: MIT or Apache-2.0
+Comment: see https://github.com/servo/tendril
+
+Files: src/vendor/termion/*
+Copyright: 2016-2017 ticki <Ticki@users.noreply.github.com>
+           2016-2017 gycos <alexandre.bury@gmail.com>
+           2016-2017 IGI-111 <igi-111@protonmail.com>
+License: MIT
+Comment: see https://github.com/ticki/termion
+
+Files: src/vendor/textwrap/*
+Copyright: 2016-2017 Martin Geisler <martin@geisler.net>
+License: MIT
+Comment: see https://github.com/mgeisler/textwrap
+
+Files:
+ src/vendor/thread_local/*
+ src/vendor/parking_lot/*
+ src/vendor/parking_lot_core/*
+Copyright: 2016-2018 Amanieu d'Antras <amanieu@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ see https://github.com/Amanieu/thread_local-rs
+ see https://github.com/Amanieu/parking_lot
+
+Files: src/vendor/petgraph/*
+Copyright: 2014-2018 bluss
+           2014-2018 mitchmindtree
+License: MIT or Apache-2.0
+Comment: see https://github.com/bluss/petgraph
+
+Files:
+ src/vendor/phf/*
+ src/vendor/phf_codegen/*
+ src/vendor/phf_generator/*
+ src/vendor/phf_shared/*
+Copyright: 2014-2018 Steven Fackler <sfackler@gmail.com>
+License: MIT
+Comment: see https://github.com/sfackler/rust-phf
+
+Files: src/vendor/precomputed-hash/*
+Copyright: 2017-2017 Emilio Cobos Álvarez <emilio@crisal.io>
+License: MIT
+Comment: see https://github.com/emilio/precomputed-hash
+
+Files: src/vendor/pretty_assertions/*
+Copyright: 2017-2018 Colin Kiegel <kiegel@gmx.de>
+           2017-2018 Florent Fayolle <florent.fayolle69@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/colin-kiegel/rust-pretty-assertions
+
+Files: src/vendor/ucd-util/*
+Copyright: 2017-2018 Andrew Gallant <jamslam@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/BurntSushi/rucd
+
+Files: src/vendor/unicode-normalization/*
+       src/vendor/unicode-width/*
+Copyright: 2015-2017 kwantam <kwantam@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ see https://github.com/unicode-rs/unicode-segmentation
+ see https://github.com/unicode-rs/unicode-width
+ see https://github.com/unicode-rs/unicode-normalization
+
+Files:
+ src/vendor/unicode-xid/*
+ src/vendor/unicode-xid-0*/*
+Copyright: 2015-2017 erick.tryzelaar <erick.tryzelaar@gmail.com>
+           2015-2017 kwantam <kwantam@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/unicode-rs/unicode-xid
+
+Files: src/vendor/vec_map/*
+Copyright: 2015-2017 Alexis Beingessner <a.beingessner@gmail.com>
+           2015-2017 Andrew Paseltiner <apaseltiner@gmail.com>
+           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:
+ src/vendor/mac/*
+ src/vendor/unreachable/*
+ src/vendor/void/*
+Copyright: 2014-2017 Jonathan Reem <jonathan.reem@gmail.com>
+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: src/vendor/utf-8/*
+Copyright: 2015-2018 Simon Sapin <simon.sapin@exyr.org>
+License: MIT OR Apache-2.0
+Comment: see https://github.com/SimonSapin/rust-utf8
+
+Files: src/vendor/winapi/*
+Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
+           2014-2018 winapi-rs developers
+License: MIT
+Comment: see https://github.com/retep998/winapi-rs
+
+Files: src/vendor/winapi-*-pc-windows-gnu/*
+Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/retep998/winapi-rs
+
+Files: src/vendor/xattr/*
+Copyright: 2015-2017 Steven Allen <steven@stebalien.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/Stebalien/xattr
+
+Files: src/vendor/yaml-rust/*
+Copyright: 2015-2017 Yuheng Chen <yuhengchen@sensetime.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/chyh1990/yaml-rust
+
+Files: debian/*
+Copyright: 2013-2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+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: 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: 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 <http://unlicense.org/>
+
+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
+ <http://www.gnu.org/licenses/>.
+
+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/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..b43bf86
--- /dev/null
@@ -0,0 +1 @@
+README.md
diff --git a/debian/ensure-patch b/debian/ensure-patch
new file mode 100755 (executable)
index 0000000..b8562f2
--- /dev/null
@@ -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> <patch-file>"; 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/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..d568e69
--- /dev/null
@@ -0,0 +1,7 @@
+[DEFAULT]
+pristine-tar = True
+ignore-branch = True
+
+[import-orig]
+upstream-branch = upstream/experimental
+debian-branch = debian/experimental
diff --git a/debian/get-stage0.py b/debian/get-stage0.py
new file mode 100755 (executable)
index 0000000..ae7bef6
--- /dev/null
@@ -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/debian/icons/rust-logo-32x32-blk.png b/debian/icons/rust-logo-32x32-blk.png
new file mode 100644 (file)
index 0000000..9cc1452
Binary files /dev/null and b/debian/icons/rust-logo-32x32-blk.png differ
diff --git a/debian/libstd-rust-1.29.lintian-overrides b/debian/libstd-rust-1.29.lintian-overrides
new file mode 100644 (file)
index 0000000..3b533c3
--- /dev/null
@@ -0,0 +1,12 @@
+# "libstd" just seemed too generic
+libstd-rust-1.29 binary: package-name-doesnt-match-sonames
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.29 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.29 binary: shlib-without-versioned-soname
+libstd-rust-1.29 binary: unused-shlib-entry-in-control-file
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc.  Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.29 binary: library-not-linked-against-libc
diff --git a/debian/libstd-rust-dev.lintian-overrides b/debian/libstd-rust-dev.lintian-overrides
new file mode 100644 (file)
index 0000000..2e7ca28
--- /dev/null
@@ -0,0 +1,8 @@
+# I assure you, dear lintian, that "/usr/lib/rustlib/x86_64-unknown-linux-gnu/"
+# is indeed an arch-specific directory.
+libstd-rust-dev binary: arch-dependent-file-not-in-arch-specific-directory
+
+# See debhelper bug #875780. This override is commented out because it's not
+# always needed, but we want it here for documentation purposes. Basically,
+# if you see it then you probably don't need to worry about it.
+#libstd-rust-dev binary: unstripped-static-library usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/lib*.rlib(*)
diff --git a/debian/lintian-to-copyright.sh b/debian/lintian-to-copyright.sh
new file mode 100755 (executable)
index 0000000..676b8cc
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Pipe the output of lintian into this.
+sed -ne 's/.* file-without-copyright-information //p' | cut -d/ -f1-3 | sort -u | while read x; do
+       /usr/share/cargo/guess-crate-copyright "$x"
+done
diff --git a/debian/llvm-upstream-patch.sh b/debian/llvm-upstream-patch.sh
new file mode 100755 (executable)
index 0000000..fc87971
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Run this on https://github.com/llvm-mirror/llvm
+# Or another repo where the above is the "upstream" remote
+set -e
+head=$(git rev-parse --verify -q remotes/upstream/master || git rev-parse --verify -q remotes/origin/master)
+test -n "$head"
+for i in "$@"; do
+       git show $(git rev-list "$head" -n1 --grep='git-svn-id: .*@'"$i") > rL"$i".patch
+done
diff --git a/debian/make_orig-stage0_tarball.sh b/debian/make_orig-stage0_tarball.sh
new file mode 100755 (executable)
index 0000000..c6593f2
--- /dev/null
@@ -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 <<eof
+================================================================================
+orig-stage0 bootstrapping tarball created in ../rustc_${upstream_version}.orig-stage0.tar.xz
+containing the upstream compilers for $upstream_bootstrap_arch
+
+You *probably* now want to do the following steps:
+
+1. Add [$(echo $upstream_bootstrap_arch | sed -e 's/\S*/!\0/g')] to the rustc/cargo Build-Depends in d/control
+2. Update d/changelog
+3. Run \`dpkg-source -b .\` to generate a .dsc that includes this tarball.
+================================================================================
+eof
diff --git a/debian/patches/d-add-soname.patch b/debian/patches/d-add-soname.patch
new file mode 100644 (file)
index 0000000..6d8539b
--- /dev/null
@@ -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 <gus@debian.org>
+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::CrateTypeDylib || crate_type == config::CrateTypeCdylib)
++       && 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/debian/patches/d-disable-cargo-vendor.patch b/debian/patches/d-disable-cargo-vendor.patch
new file mode 100644 (file)
index 0000000..9a6352d
--- /dev/null
@@ -0,0 +1,18 @@
+Description: Don't check for cargo-vendor when building from (Debian's) git
+Author: Matthijs van Otterdijk <matthijs@wirevirt.net>
+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/debian/patches/d-dont-download-stage0.patch b/debian/patches/d-dont-download-stage0.patch
new file mode 100644 (file)
index 0000000..cc4dbe7
--- /dev/null
@@ -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 <infinity0@debian.org>
+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/debian/patches/d-fix-mips64el-bootstrap.patch b/debian/patches/d-fix-mips64el-bootstrap.patch
new file mode 100644 (file)
index 0000000..a9941d7
--- /dev/null
@@ -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/debian/patches/d-host-duplicates.patch b/debian/patches/d-host-duplicates.patch
new file mode 100644 (file)
index 0000000..6a73aa1
--- /dev/null
@@ -0,0 +1,29 @@
+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 <infinity0@debian.org>
+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
+@@ -616,20 +616,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 lookup_host("localhost") {
+-            Ok(lh) => lh,
+-            Err(e) => panic!("couldn't resolve `localhost': {}", e)
+-        };
+-        let _na = lh.map(|sa| *addrs.entry(sa).or_insert(0) += 1).count();
+-        assert!(addrs.values().filter(|&&v| v > 1).count() == 0);
+-    }
+-}
diff --git a/debian/patches/d-i686-baseline.patch b/debian/patches/d-i686-baseline.patch
new file mode 100644 (file)
index 0000000..2038344
--- /dev/null
@@ -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/debian/patches/d-ignore-impl-generic-mismatch-diff.patch b/debian/patches/d-ignore-impl-generic-mismatch-diff.patch
new file mode 100644 (file)
index 0000000..eb5f02e
--- /dev/null
@@ -0,0 +1,15 @@
+Bug: https://github.com/rust-lang/rust/issues/53081
+--- a/src/test/ui/impl-trait/impl-generic-mismatch.stderr
++++ b/src/test/ui/impl-trait/impl-generic-mismatch.stderr
+@@ -29,11 +29,6 @@
+    |
+ LL |     fn hash(&self, hasher: &mut impl Hasher) {}
+    |                                 ^^^^^^^^^^^ expected generic parameter, found `impl Trait`
+-   | 
+-  ::: $SRC_DIR/libcore/hash/mod.rs:185:13
+-   |
+-LL |     fn hash<H: Hasher>(&self, state: &mut H);
+-   |             - declaration in trait here
+ error: aborting due to 3 previous errors
diff --git a/debian/patches/d-ignore-removed-submodules.patch b/debian/patches/d-ignore-removed-submodules.patch
new file mode 100644 (file)
index 0000000..6d68529
--- /dev/null
@@ -0,0 +1,101 @@
+Description: Ignore submodules that we're not building
+Author: Ximin Luo <infinity0@debian.org>
+Forwarded: not-needed
+--- a/src/Cargo.toml
++++ b/src/Cargo.toml
+@@ -6,7 +6,6 @@
+   "libtest",
+   "librustc_codegen_llvm",
+   "tools/cargotest",
+-  "tools/clippy",
+   "tools/compiletest",
+   "tools/error_index_generator",
+   "tools/linkchecker",
+@@ -14,14 +13,8 @@
+   "tools/unstable-book-gen",
+   "tools/tidy",
+   "tools/build-manifest",
+-  "tools/remote-test-client",
+-  "tools/remote-test-server",
+   "tools/rust-installer",
+-  "tools/cargo",
+   "tools/rustdoc",
+-  "tools/rls",
+-  "tools/rustfmt",
+-  "tools/miri",
+   "tools/rustdoc-themes",
+ ]
+ exclude = [
+@@ -44,23 +37,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 = "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 = "tools/rustfmt" }
+-
+ # See comments in `tools/rustc-workspace-hack/README.md` for what's going on
+ # here
+ rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' }
+-
+-[patch."https://github.com/rust-lang-nursery/rust-clippy"]
+-clippy_lints = { path = "tools/clippy/clippy_lints" }
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -639,10 +639,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
+@@ -1058,10 +1058,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
+@@ -144,7 +144,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
+@@ -49,7 +49,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/debian/patches/d-no-web-dependencies-in-doc.patch b/debian/patches/d-no-web-dependencies-in-doc.patch
new file mode 100644 (file)
index 0000000..89ca66b
--- /dev/null
@@ -0,0 +1,456 @@
+Description: Use local web resources instead of remote ones
+Author: Matthijs van Otterdijk <matthijs@wirevirt.net>
+Author: Ximin Luo <infinity0@debian.org>
+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
+@@ -180,6 +180,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/src/doc/rust-by-example/theme/index.hbs
++++ b/src/doc/rust-by-example/theme/index.hbs
+@@ -10,15 +10,13 @@
+         <base href="{{ path_to_root }}">
+         <link rel="stylesheet" href="book.css">
+-        <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
+-        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500" rel="stylesheet" type="text/css">
+         <link rel="shortcut icon" href="{{ favicon }}">
+         <!-- Font Awesome -->
+-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
++        <link rel="stylesheet" href="../font-awesome.min.css">
+-        <link rel="stylesheet" href="highlight.css">
++        <link rel="stylesheet" href="../highlight.css">
+         <link rel="stylesheet" href="tomorrow-night.css">
+         <link rel="stylesheet" href="ayu-highlight.css">
+@@ -29,27 +27,10 @@
+         {{#if mathjax_support}}
+         <!-- MathJax -->
+-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
++        <script type="text/javascript" src="../mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+         {{/if}}
+-        <!-- Fetch Clipboard.js from CDN but have a local fallback -->
+-        <script src="https://cdn.jsdelivr.net/clipboard.js/1.6.1/clipboard.min.js"></script>
+-        <script>
+-            if (typeof Clipboard == 'undefined') {
+-                document.write(unescape("%3Cscript src='clipboard.min.js'%3E%3C/script%3E"));
+-            }
+-        </script>
+-
+-        <!-- Fetch JQuery from CDN but have a local fallback -->
+-        <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+-        <script>
+-            if (typeof jQuery == 'undefined') {
+-                document.write(unescape("%3Cscript src='jquery.js'%3E%3C/script%3E"));
+-            }
+-        </script>
+-
+-        <!-- Fetch store.js from local - TODO add CDN when 2.x.x is available on cdnjs -->
+-        <script src="store.js"></script>
++        <script src="../jquery.min.js"></script>
+         <!-- Custom JS script -->
+         {{#each additional_js}}
+@@ -58,20 +39,6 @@
+     </head>
+     <body class="light">
+-        <!-- Set the theme before any content is loaded, prevents flash -->
+-        <script type="text/javascript">
+-            var theme = store.get('theme');
+-            if (theme === null || theme === undefined) { theme = 'light'; }
+-            $('body').removeClass().addClass(theme);
+-        </script>
+-
+-        <!-- Hide / unhide sidebar before it is displayed -->
+-        <script type="text/javascript">
+-            var sidebar = store.get('sidebar');
+-            if (sidebar === "hidden") { $("html").addClass("sidebar-hidden") }
+-            else if (sidebar === "visible") { $("html").addClass("sidebar-visible") }
+-        </script>
+-
+         <div id="sidebar" class="sidebar">
+             {{#toc}}{{/toc}}
+         </div>
+@@ -134,42 +101,9 @@
+         </div>
+-        <!-- Local fallback for Font Awesome -->
+-        <script>
+-            if ($(".fa").css("font-family") !== "FontAwesome") {
+-                $('<link rel="stylesheet" type="text/css" href="_FontAwesome/css/font-awesome.css">').prependTo('head');
+-            }
+-             // START - Rust-By-Example customization
+-            $("#edit-button").click(function(){
+-                 var editWindow = window.open("https://github.com/rust-lang/rust-by-example/edit/master/src/{{ path }}");
+-             });
+-
+-            // END - Rust-By-Example customization
+-        </script>
+-
+         <!-- Livereload script (if served using the cli tool) -->
+         {{{livereload}}}
+-        {{#if google_analytics}}
+-        <script>
+-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-        ga('create', '{{google_analytics}}', 'auto');
+-        ga('send', 'pageview');
+-        </script>
+-        {{/if}}
+-
+-        {{#if playpens_editable}}
+-        <script src="{{ ace_js }}" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ editor_js }}" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ mode_rust_js }}" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ theme_dawn_js }}" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ theme_tomorrow_night_js }}" type="text/javascript" charset="utf-8"></script>
+-        {{/if}}
+-
+         {{#if is_print}}
+         <script>
+             $(document).ready(function() {
+@@ -178,7 +112,7 @@
+         </script>
+         {{/if}}
+-        <script src="highlight.js"></script>
++        <script src="../highlight.js"></script>
+         <script src="book.js"></script>
+     </body>
+ </html>
+--- a/src/vendor/mdbook/src/book/init.rs
++++ b/src/vendor/mdbook/src/book/init.rs
+@@ -136,12 +136,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/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
++++ b/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
+@@ -3,7 +3,7 @@
+ use errors::*;
+ use renderer::{RenderContext, Renderer};
+ use renderer::html_handlebars::helpers;
+-use theme::{self, Theme, playpen_editor};
++use theme::{self, Theme};
+ use utils;
+ use std::collections::BTreeMap;
+@@ -145,61 +145,8 @@
+         write_file(destination, "book.js", &theme.js)?;
+         write_file(destination, "book.css", &theme.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/src/vendor/mdbook/src/theme/index.hbs
++++ b/src/vendor/mdbook/src/theme/index.hbs
+@@ -12,15 +12,13 @@
+         <base href="{{ path_to_root }}">
+         <link rel="stylesheet" href="book.css">
+-        <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
+-        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500" rel="stylesheet" type="text/css">
+         <link rel="shortcut icon" href="{{ favicon }}">
+         <!-- Font Awesome -->
+-        <link rel="stylesheet" href="_FontAwesome/css/font-awesome.css">
++        <link rel="stylesheet" href="../font-awesome.min.css">
+-        <link rel="stylesheet" href="highlight.css">
++        <link rel="stylesheet" href="../highlight.css">
+         <link rel="stylesheet" href="tomorrow-night.css">
+         <link rel="stylesheet" href="ayu-highlight.css">
+@@ -31,47 +29,12 @@
+         {{#if mathjax_support}}
+         <!-- MathJax -->
+-        <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
++        <script async type="text/javascript" src="../mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+         {{/if}}
+     </head>
+     <body class="light">
+-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+-        <script type="text/javascript">
+-            try {
+-                var theme = localStorage.getItem('mdbook-theme');
+-                var sidebar = localStorage.getItem('mdbook-sidebar');
+-
+-                if (theme.startsWith('"') && theme.endsWith('"')) {
+-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+-                }
+-
+-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+-                }
+-            } catch (e) { }
+-        </script>
+-        <!-- Set the theme before any content is loaded, prevents flash -->
+-        <script type="text/javascript">
+-            var theme;
+-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { } 
+-            if (theme === null || theme === undefined) { theme = 'light'; }
+-            document.body.className = theme;
+-            document.querySelector('html').className = theme + ' js';
+-        </script>
+-
+-        <!-- Hide / unhide sidebar before it is displayed -->
+-        <script type="text/javascript">
+-            var html = document.querySelector('html');
+-            var sidebar = 'hidden';
+-            if (document.body.clientWidth >= 1080) {
+-                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+-                sidebar = sidebar || 'visible';
+-            }
+-            html.classList.remove('sidebar-visible');
+-            html.classList.add("sidebar-" + sidebar);
+-        </script>
+         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+             {{#toc}}{{/toc}}
+@@ -193,24 +156,7 @@
+         </script>
+         {{/if}}
+-        {{#if google_analytics}}
+-        <!-- Google Analytics Tag -->
+-        <script type="text/javascript">
+-            var localAddrs = ["localhost", "127.0.0.1", ""];
+-            // make sure we don't activate google analytics if the developer is
+-            // inspecting the book locally...
+-            if (localAddrs.indexOf(document.location.hostname) === -1) {
+-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-                ga('create', '{{google_analytics}}', 'auto');
+-                ga('send', 'pageview');
+-            }
+-        </script>
+-        {{/if}}
+         {{#if is_print}}
+         <script type="text/javascript">
+@@ -220,25 +166,11 @@
+         </script>
+         {{/if}}
+-        {{#if playpen_js}}
+-        <script src="ace.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="editor.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="mode-rust.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="theme-dawn.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
+-        {{/if}}
+-
+         {{#if search_enabled}}
+         <script src="searchindex.js" type="text/javascript" charset="utf-8"></script>
+         {{/if}}
+-        {{#if search_js}}
+-        <script src="elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="mark.min.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="searcher.js" type="text/javascript" charset="utf-8"></script>
+-        {{/if}}
+-        <script src="clipboard.min.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="highlight.js" type="text/javascript" charset="utf-8"></script>
++        <script src="../highlight.js" type="text/javascript" charset="utf-8"></script>
+         <script src="book.js" type="text/javascript" charset="utf-8"></script>
+         <!-- Custom JS scripts -->
+--- a/src/vendor/mdbook/src/theme/mod.rs
++++ b/src/vendor/mdbook/src/theme/mod.rs
+@@ -1,7 +1,5 @@
+ #![allow(missing_docs)]
+-pub mod playpen_editor;
+-
+ #[cfg(feature = "search")]
+ pub mod searcher;
+@@ -16,23 +14,8 @@
+ pub static CSS: &'static [u8] = include_bytes!("book.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
+@@ -48,11 +31,8 @@
+     pub css: Vec<u8>,
+     pub favicon: Vec<u8>,
+     pub js: Vec<u8>,
+-    pub highlight_css: Vec<u8>,
+     pub tomorrow_night_css: Vec<u8>,
+     pub ayu_highlight_css: Vec<u8>,
+-    pub highlight_js: Vec<u8>,
+-    pub clipboard_js: Vec<u8>,
+ }
+ impl Theme {
+@@ -75,9 +55,6 @@
+                 (theme_dir.join("book.js"), &mut theme.js),
+                 (theme_dir.join("book.css"), &mut theme.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),
+                 (theme_dir.join("ayu-highlight.css"), &mut theme.ayu_highlight_css),
+             ];
+@@ -105,11 +82,8 @@
+             css: 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(),
+         }
+     }
+ }
+@@ -175,11 +149,8 @@
+             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/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
++++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
+@@ -29,8 +29,6 @@
+     if search_config.copy_js {
+         utils::fs::write_file(destination, "searchindex.js", 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/src/vendor/mdbook/src/theme/searcher/mod.rs
++++ b/src/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/debian/patches/d-prefer-dynamic.patch b/debian/patches/d-prefer-dynamic.patch
new file mode 100644 (file)
index 0000000..13bb429
--- /dev/null
@@ -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 <infinity0@debian.org>
+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/debian/patches/d-read-beta-version-from-file.patch b/debian/patches/d-read-beta-version-from-file.patch
new file mode 100644 (file)
index 0000000..8ebe485
--- /dev/null
@@ -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/debian/patches/d-rust-gdb-paths b/debian/patches/d-rust-gdb-paths
new file mode 100644 (file)
index 0000000..d5a8a79
--- /dev/null
@@ -0,0 +1,28 @@
+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 <gus@debian.org>
+Forwarded: not-needed
+
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -13,14 +13,16 @@
+ 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
+ # different/specific command (defaults to `gdb`).
+ RUST_GDB="${RUST_GDB:-gdb}"
+-PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" ${RUST_GDB} \
++PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
+   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
+   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
+   "$@"
diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
new file mode 100644 (file)
index 0000000..fd56c6c
--- /dev/null
@@ -0,0 +1,33 @@
+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 <gus@debian.org>
+Forwarded: not-needed
+
+--- a/src/etc/rust-lldb
++++ b/src/etc/rust-lldb
+@@ -12,7 +12,7 @@
+ # Exit if anything fails
+ set -e
+-LLDB_VERSION=`lldb --version 2>/dev/null | head -1 | cut -d. -f1`
++LLDB_VERSION=`lldb-6.0 --version 2>/dev/null | head -1 | cut -d. -f1`
+ if [ "$LLDB_VERSION" = "lldb-350" ]
+ then
+@@ -29,13 +29,10 @@
+ # Make sure to delete the tempfile no matter what
+ trap "rm -f $TMPFILE; exit" INT TERM EXIT
+-# Find out where to look for the pretty printer Python module
+-RUSTC_SYSROOT=`rustc --print sysroot`
+-
+ # Write the LLDB script to the tempfile
+-echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE
++echo "command script import \"/usr/share/rust-lldb/lldb_rust_formatters.py\"" >> $TMPFILE
+ echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE
+ echo "type category enable Rust" >> $TMPFILE
+ # Call LLDB with the script added to the argument list
+-lldb --source-before-file="$TMPFILE" "$@"
++lldb-6.0 --source-before-file="$TMPFILE" "$@"
diff --git a/debian/patches/d-sparc64-dont-pack-spans.patch b/debian/patches/d-sparc64-dont-pack-spans.patch
new file mode 100644 (file)
index 0000000..117b302
--- /dev/null
@@ -0,0 +1,17 @@
+Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905795
+Bug: https://github.com/rust-lang/rust/issues/53181
+
+--- rustc-1.28.0+dfsg1.orig/src/libsyntax_pos/span_encoding.rs
++++ rustc-1.28.0+dfsg1/src/libsyntax_pos/span_encoding.rs
+@@ -26,7 +26,9 @@ use std::hash::{Hash, Hasher};
+ /// The primary goal of `Span` is to be as small as possible and fit into other structures
+ /// (that's why it uses `packed` as well). Decoding speed is the second priority.
+ /// See `SpanData` for the info on span fields in decoded representation.
+-#[repr(packed)]
++
++/// Workaround for compiler bug: https://github.com/rust-lang/rust/issues/53181
++#[cfg_attr(not(any(target_arch = "sparc64", target_arch = "sparcv9")), repr(packed))]
+ pub struct Span(u32);
+ impl Copy for Span {}
diff --git a/debian/patches/gcc-4.8-aarch64-ice.diff b/debian/patches/gcc-4.8-aarch64-ice.diff
new file mode 100644 (file)
index 0000000..55efa06
--- /dev/null
@@ -0,0 +1,23 @@
+--- a/src/libcompiler_builtins/compiler-rt/lib/builtins/trunctfdf2.c
++++ b/src/libcompiler_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 @@
+ }
+ #endif
++
++#if defined(__aarch64__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ <= 8)
++#pragma GCC pop_options
++#endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..b34749e
--- /dev/null
@@ -0,0 +1,42 @@
+# Patches for upstream
+
+# pending, or forwarded
+u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
+u-reproducible-build.patch
+u-fixtestignores-ppc64el.patch
+u-prefer-local-css.patch
+u-make-tests-work-without-rpath.patch
+u-rust-52876-const-endianess.patch
+
+# https://github.com/rust-lang/compiler-rt/pull/35/
+u-compiler-rt.patch
+u-armel-atomics-nand.patch
+
+# Extra ignored tests. We now instead raise FAILURES_ALLOWED in d/rules but
+# these patches are kept in case they are useful for derivatives.
+#u-ignoretest-ppc64el_02.patch
+
+# not forwarded, or forwarded but unlikely to be merged
+u-vendor-rand-fix-ppc-syscall.patch
+u-reproducible-dl-stage0.patch
+
+gcc-4.8-aarch64-ice.diff
+# Porter fixes under discussion, not suitable for upstreaming
+# as-is but a proper fix is being discussed
+d-fix-mips64el-bootstrap.patch
+d-sparc64-dont-pack-spans.patch
+
+# Debian-specific patches, not suitable for upstream
+d-disable-cargo-vendor.patch
+d-rust-gdb-paths
+d-rust-lldb-paths
+d-add-soname.patch
+d-dont-download-stage0.patch
+d-ignore-removed-submodules.patch
+d-read-beta-version-from-file.patch
+d-ignore-impl-generic-mismatch-diff.patch
+d-i686-baseline.patch
+
+d-no-web-dependencies-in-doc.patch
+# Work around for some porterboxes, keep this commented
+#d-host-duplicates.patch
diff --git a/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch b/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
new file mode 100644 (file)
index 0000000..913fe4a
--- /dev/null
@@ -0,0 +1,70 @@
+From ab80da4ea9ea88cdd802f80955e7382bd9368247 Mon Sep 17 00:00:00 2001
+From: Benjamin Gill <github@bgill.eu>
+Date: Sat, 16 Jun 2018 12:59:44 +0100
+Subject: [PATCH] Fix new renamed_and_removed_lints warning (#247)
+
+I've verified that this now produces no warnings with Rust 1.26.1 and
+1.28.0-nightly (c3b09c968 2018-05-27)
+---
+ src/error_chain.rs           | 4 ++--
+ src/impl_error_chain_kind.rs | 4 ++--
+ src/lib.rs                   | 1 -
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/error_chain.rs b/src/error_chain.rs
+index cbd42cd67eaf..0926c8889278 100644
+--- a/src/vendor/error-chain-0.11.0/src/error_chain.rs
++++ b/src/vendor/error-chain-0.11.0/src/error_chain.rs
+@@ -173,7 +173,7 @@ macro_rules! impl_error_chain_processed {
+                 self.0.description()
+             }
+-            #[allow(unknown_lints, unused_doc_comment)]
++            #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
+             fn cause(&self) -> Option<&::std::error::Error> {
+                 match self.1.next_error {
+                     Some(ref c) => Some(&**c),
+@@ -424,7 +424,7 @@ macro_rules! impl_extract_backtrace {
+     ($error_name: ident
+      $error_kind_name: ident
+      $([$link_error_path: path, $(#[$meta_links: meta])*])*) => {
+-        #[allow(unknown_lints, unused_doc_comment)]
++        #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
+         fn extract_backtrace(e: &(::std::error::Error + Send + 'static))
+             -> Option<::std::sync::Arc<$crate::Backtrace>> {
+             if let Some(e) = e.downcast_ref::<$error_name>() {
+diff --git a/src/impl_error_chain_kind.rs b/src/impl_error_chain_kind.rs
+index d6c05c8a882b..d5e266389cd6 100644
+--- a/src/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
++++ b/src/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
+@@ -264,7 +264,7 @@ macro_rules! impl_error_chain_kind {
+             $item:ident: $imode:tt [$(#[$imeta:meta])*] [$( $var:ident: $typ:ty ),*] {$( $funcs:tt )*}
+         )*}
+     ) => {
+-        #[allow(unknown_lints, unused, unused_doc_comment)]
++        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
+         impl ::std::fmt::Display for $name {
+             fn fmt(&self, fmt: &mut ::std::fmt::Formatter)
+                 -> ::std::fmt::Result
+@@ -316,7 +316,7 @@ macro_rules! impl_error_chain_kind {
+                 }
+             }
+         }*/
+-        #[allow(unknown_lints, unused, unused_doc_comment)]
++        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
+         impl $name {
+             /// A string describing the error kind.
+             pub fn description(&self) -> &str {
+diff --git a/src/lib.rs b/src/lib.rs
+index d0881fcef1c1..6421194f8ca8 100644
+--- a/src/vendor/error-chain-0.11.0/src/lib.rs
++++ b/src/vendor/error-chain-0.11.0/src/lib.rs
+@@ -1,5 +1,4 @@
+ #![deny(missing_docs)]
+-#![allow(unknown_lints)] // to be removed when unused_doc_comments lints is merged
+ #![doc(html_root_url = "https://docs.rs/error-chain/0.11.0")]
+ //! A library for consistent and reliable error handling
+-- 
+2.17.1
+
diff --git a/debian/patches/u-armel-atomics-nand.patch b/debian/patches/u-armel-atomics-nand.patch
new file mode 100644 (file)
index 0000000..5af14b0
--- /dev/null
@@ -0,0 +1,20 @@
+Description: Fix __sync_fetch_and_nand_* for pre-v6 ARM
+ gcc changed semantics for __sync_fetch_and_nand_* in gcc 4.4,
+ update to the new semantics as expected by the testsuite.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- rustc-1.28.0+dfsg1.orig/src/libcompiler_builtins/src/arm_linux.rs
++++ rustc-1.28.0+dfsg1/src/libcompiler_builtins/src/arm_linux.rs
+@@ -125,9 +125,9 @@ atomic_rmw!(__sync_fetch_and_xor_1, u8,
+ atomic_rmw!(__sync_fetch_and_xor_2, u16, |a: u16, b: u16| a ^ b);
+ atomic_rmw!(__sync_fetch_and_xor_4, u32, |a: u32, b: u32| a ^ b);
+-atomic_rmw!(__sync_fetch_and_nand_1, u8, |a: u8, b: u8| !a & b);
+-atomic_rmw!(__sync_fetch_and_nand_2, u16, |a: u16, b: u16| !a & b);
+-atomic_rmw!(__sync_fetch_and_nand_4, u32, |a: u32, b: u32| !a & b);
++atomic_rmw!(__sync_fetch_and_nand_1, u8, |a: u8, b: u8| !(a & b));
++atomic_rmw!(__sync_fetch_and_nand_2, u16, |a: u16, b: u16| !(a & b));
++atomic_rmw!(__sync_fetch_and_nand_4, u32, |a: u32, b: u32| !(a & b));
+ atomic_rmw!(__sync_fetch_and_max_1, i8, |a: i8, b: i8| if a > b { a } else { b });
+ atomic_rmw!(__sync_fetch_and_max_2, i16, |a: i16, b: i16| if a > b { a } else { b });
diff --git a/debian/patches/u-compiler-rt.patch b/debian/patches/u-compiler-rt.patch
new file mode 100644 (file)
index 0000000..6b1c440
--- /dev/null
@@ -0,0 +1,40 @@
+From 7e62cd4e886a0e3f08e710e0625a7bed9ccbdf51 Mon Sep 17 00:00:00 2001
+From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Date: Tue, 30 Jan 2018 03:00:16 +0100
+Subject: [PATCH] Re-add workaround for LLVM bug 11663
+
+---
+ lib/builtins/int_lib.h | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- a/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h
++++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h
+@@ -99,6 +99,28 @@
+ #define       __builtin_ctz __ctzsi2
+ #endif /* sparc64 || mips_n64 || mips_o64 || riscv */
++/*
++ * Workaround for LLVM bug 11663.  Prevent endless recursion in
++ * __c?zdi2(), where calls to __builtin_c?z() are expanded to
++ * __c?zdi2() instead of __c?zsi2().
++ *
++ * Instead of placing this workaround in c?zdi2.c, put it in this
++ * global header to prevent other C files from making the detour
++ * through __c?zdi2() as well.
++ *
++ * This problem has been observed on FreeBSD for sparc64 and
++ * mips64 with GCC 4.2.1, and for riscv with GCC 5.2.0.
++ * Presumably it's any version of GCC, and targeting an arch that
++ * does not have dedicated bit counting instructions.
++ */
++#if ((defined(__sparc__) && defined(__arch64__)) || defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__) \
++              || (defined(_MIPS_SIM) && ((_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIO64))))
++si_int __clzsi2(si_int);
++si_int __ctzsi2(si_int);
++#define       __builtin_clz __clzsi2
++#define       __builtin_ctz __ctzsi2
++#endif /* sparc64 || mips_n64 || mips_o64 || riscv */
++
+ COMPILER_RT_ABI si_int __paritysi2(si_int a);
+ COMPILER_RT_ABI si_int __paritydi2(di_int a);
diff --git a/debian/patches/u-fixtestignores-ppc64el.patch b/debian/patches/u-fixtestignores-ppc64el.patch
new file mode 100644 (file)
index 0000000..3d580c5
--- /dev/null
@@ -0,0 +1,22 @@
+Bug: https://github.com/rust-lang/rust/issues/52494
+
+--- a/src/test/ui/target-feature-gate.rs
++++ b/src/test/ui/target-feature-gate.rs
+@@ -12,6 +12,8 @@
+ // ignore-aarch64
+ // ignore-wasm
+ // ignore-emscripten
++// ignore-powerpc64
++// ignore-powerpc64le
+ // gate-test-sse4a_target_feature
+ // gate-test-powerpc_target_feature
+ // gate-test-avx512_target_feature
+--- a/src/test/ui/target-feature-gate.stderr
++++ b/src/test/ui/target-feature-gate.stderr
+@@ -1,5 +1,5 @@
+ error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839)
+-  --> $DIR/target-feature-gate.rs:26:18
++  --> $DIR/target-feature-gate.rs:28:18
+    |
+ LL | #[target_feature(enable = "avx512bw")]
+    |                  ^^^^^^^^^^^^^^^^^^^
diff --git a/debian/patches/u-ignoretest-ppc64el_02.patch b/debian/patches/u-ignoretest-ppc64el_02.patch
new file mode 100644 (file)
index 0000000..2883294
--- /dev/null
@@ -0,0 +1,16 @@
+Description: Ignore failing tests on ppc64el
+Author: Ximin Luo <infinity0@debian.org>
+Bug: https://github.com/rust-lang/rust/issues/44670
+--- a/src/test/run-pass/simd-intrinsic-generic-cast.rs
++++ b/src/test/run-pass/simd-intrinsic-generic-cast.rs
+@@ -71,6 +71,10 @@
+     fn in_range(_: i32) -> bool { true }
+ }
++#[cfg(target_arch = "powerpc64")]
++fn main() {}
++
++#[cfg(not(target_arch = "powerpc64"))]
+ fn main() {
+     macro_rules! test {
+         ($from: ident, $to: ident) => {{
diff --git a/debian/patches/u-make-tests-work-without-rpath.patch b/debian/patches/u-make-tests-work-without-rpath.patch
new file mode 100644 (file)
index 0000000..ce97f46
--- /dev/null
@@ -0,0 +1,12 @@
+Author: Chris Coulson <chris.coulson@canonical.com>
+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/debian/patches/u-prefer-local-css.patch b/debian/patches/u-prefer-local-css.patch
new file mode 100644 (file)
index 0000000..79217fa
--- /dev/null
@@ -0,0 +1,14 @@
+Description: Prefer local CSS to remote
+Author: Ximin Luo <infinity0@debian.org>
+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-no-toc")
+                    .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/debian/patches/u-reproducible-build.patch b/debian/patches/u-reproducible-build.patch
new file mode 100644 (file)
index 0000000..4c46a94
--- /dev/null
@@ -0,0 +1,18 @@
+Description: Don't split dwarf debug for a fully-reproducible build
+Author: Ximin Luo <infinity0@debian.org>
+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/debian/patches/u-reproducible-dl-stage0.patch b/debian/patches/u-reproducible-dl-stage0.patch
new file mode 100644 (file)
index 0000000..2eba6f3
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -88,7 +88,7 @@
+             option = "-#"
+         else:
+             option = "-s"
+-        run(["curl", option, "--retry", "3", "-Sf", "-o", path, url],
++        run(["curl", option, "-R", "--retry", "3", "-Sf", "-o", path, url],
+             verbose=verbose,
+             exception=exception)
diff --git a/debian/patches/u-rust-52876-const-endianess.patch b/debian/patches/u-rust-52876-const-endianess.patch
new file mode 100644 (file)
index 0000000..1e844e8
--- /dev/null
@@ -0,0 +1,26 @@
+From 1ea2765918d1212a07e1359537470c477d82a681 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Mon, 30 Jul 2018 13:08:56 -0700
+Subject: [PATCH] run-pass/const-endianness: negate before to_le()
+
+`const LE_I128` needs parentheses to negate the value *before* calling
+`to_le()`, otherwise it doesn't match the operations performed in the
+black-boxed part of the test.  This only makes a tangible difference on
+big-endian targets.
+---
+ src/test/run-pass/const-endianess.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/run-pass/const-endianess.rs b/src/test/run-pass/const-endianess.rs
+index fa34b49210a6..95c738d3ec49 100644
+--- a/src/test/run-pass/const-endianess.rs
++++ b/src/test/run-pass/const-endianess.rs
+@@ -25,7 +25,7 @@ fn main() {
+     #[cfg(not(target_arch = "asmjs"))]
+     {
+         const BE_U128: u128 = 999999u128.to_be();
+-        const LE_I128: i128 = -999999i128.to_le();
++        const LE_I128: i128 = (-999999i128).to_le();
+         assert_eq!(BE_U128, b(999999u128).to_be());
+         assert_eq!(LE_I128, b(-999999i128).to_le());
+     }
diff --git a/debian/patches/u-vendor-rand-fix-ppc-syscall.patch b/debian/patches/u-vendor-rand-fix-ppc-syscall.patch
new file mode 100644 (file)
index 0000000..1bcfc2a
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/src/vendor/rand-0.4.2/src/os.rs
++++ b/src/vendor/rand-0.4.2/src/os.rs
+@@ -102,7 +102,7 @@
+         #[cfg(target_arch = "aarch64")]
+         const NR_GETRANDOM: libc::c_long = 278;
+         #[cfg(target_arch = "powerpc")]
+-        const NR_GETRANDOM: libc::c_long = 384;
++        const NR_GETRANDOM: libc::c_long = 359;
+         unsafe {
+             syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0)
diff --git a/debian/prune-checksums b/debian/prune-checksums
new file mode 100755 (executable)
index 0000000..fcd525a
--- /dev/null
@@ -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/debian/prune-unused-deps b/debian/prune-unused-deps
new file mode 100755 (executable)
index 0000000..a9728cd
--- /dev/null
@@ -0,0 +1,52 @@
+#!/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
+"$scriptdir/debian/ensure-patch" -N "$scriptdir/debian/patches/d-ignore-removed-submodules.patch"
+test -f src/Cargo.lock.orig || cp src/Cargo.lock src/Cargo.lock.orig
+./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap
+
+not_needed() {
+       diff -ru src/Cargo.lock.orig src/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 src/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/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..9d19a3a
--- /dev/null
@@ -0,0 +1,393 @@
+#!/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 = 6.0
+OLD_LLVM_VERSION = 4.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 -vv --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  -DDEB_BUILD_RUST_TYPE="$(DEB_BUILD_RUST_TYPE)" \
+               -DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \
+               -DDEB_TARGET_RUST_TYPE="$(DEB_TARGET_RUST_TYPE)" \
+               -DRELEASE_CHANNEL="$$channel" \
+               -DBUILD_DOCS="$(BUILD_DOCS)" \
+               -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 armhf issue: https://github.com/rust-lang/rust/issues/45854
+       [ $(DEB_BUILD_ARCH) != armhf -a \
+         $(DEB_BUILD_ARCH) != armel ] || sed -i -e '/^debuginfo-only-std = /d' "$@"
+
+debian/rust-src.%: debian/rust-src.%.in
+       m4  -DRUST_LONG_VERSION="$(RUST_LONG_VERSION)" \
+               "$<" > "$@"
+
+override_dh_auto_configure: 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 -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 src/vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" ";"
+       # Unfortunately upstream uses a duplicate copy of libbacktrace and wants to
+       # compile it again for rust-installer, see #43449
+       ln -rsf src/libbacktrace -t src/vendor/backtrace-sys/src/
+       # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16
+       echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' > src/vendor/lzma-sys/build.rs
+       # We don't run ./configure because we use debian/config.toml directly
+       ln -sf debian/config.toml config.toml
+
+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
+       $(RM) -rf $(SRC_CLEAN) config.toml src/vendor/backtrace-sys/src/libbacktrace
+
+# upstream bundles this in the source, but in Debian we rebuild everything yo
+generate-sources:
+       true
+
+override_dh_auto_build-arch: generate-sources
+       $(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: generate-sources
+ifeq (true,$(BUILD_DOCS))
+# Rust has a weird way of configuring whether to build docs or not
+       sed -i -e 's/^docs = false/docs = true/' debian/config.toml
+       $(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), armel))
+  FAILURES_ALLOWED = 36
+endif
+ifneq (,$(filter $(DEB_BUILD_ARCH), s390x))
+  FAILURES_ALLOWED = 25
+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 -f $(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 is a bug in the Debian packaging, please file a report. "; \
+         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)
+
+override_dh_auto_install:
+       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
+
+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/rust/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.rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," \
+              -e "s,https://www.rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," "$$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-*/src/tools/clippy/util/gh-pages/*
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/cssparser/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/kuchiki/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/url/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/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) --verbose --watchfile "$<"
+       set -e; $(get_beta_version); \
+       tar xf ../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 ../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"
diff --git a/debian/rust-doc.doc-base.book b/debian/rust-doc.doc-base.book
new file mode 100644 (file)
index 0000000..80c3e08
--- /dev/null
@@ -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/debian/rust-doc.doc-base.reference b/debian/rust-doc.doc-base.reference
new file mode 100644 (file)
index 0000000..a538f8b
--- /dev/null
@@ -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/debian/rust-doc.docs b/debian/rust-doc.docs
new file mode 100644 (file)
index 0000000..5a0e189
--- /dev/null
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/rust/html
diff --git a/debian/rust-doc.install b/debian/rust-doc.install
new file mode 100644 (file)
index 0000000..de6024b
--- /dev/null
@@ -0,0 +1 @@
+debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff --git a/debian/rust-doc.links b/debian/rust-doc.links
new file mode 100644 (file)
index 0000000..499b8b6
--- /dev/null
@@ -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/debian/rust-gdb.install b/debian/rust-gdb.install
new file mode 100644 (file)
index 0000000..d274b0b
--- /dev/null
@@ -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/debian/rust-gdb.links b/debian/rust-gdb.links
new file mode 100644 (file)
index 0000000..51b82a4
--- /dev/null
@@ -0,0 +1 @@
+usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff --git a/debian/rust-lldb.install b/debian/rust-lldb.install
new file mode 100644 (file)
index 0000000..a48bbb6
--- /dev/null
@@ -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/debian/rust-lldb.links b/debian/rust-lldb.links
new file mode 100644 (file)
index 0000000..cb4807d
--- /dev/null
@@ -0,0 +1 @@
+usr/share/man/man1/lldb-6.0.1.gz usr/share/man/man1/rust-lldb.1.gz
diff --git a/debian/rust-src.install.in b/debian/rust-src.install.in
new file mode 100644 (file)
index 0000000..63f0b59
--- /dev/null
@@ -0,0 +1,12 @@
+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
+config.toml.example    usr/src/rustc-RUST_LONG_VERSION
+configure       usr/src/rustc-RUST_LONG_VERSION
+x.py            usr/src/rustc-RUST_LONG_VERSION
+src             usr/src/rustc-RUST_LONG_VERSION
diff --git a/debian/rust-src.links.in b/debian/rust-src.links.in
new file mode 100644 (file)
index 0000000..d323933
--- /dev/null
@@ -0,0 +1 @@
+usr/src/rustc-RUST_LONG_VERSION usr/lib/rustlib/src/rust
diff --git a/debian/rust-src.lintian-overrides b/debian/rust-src.lintian-overrides
new file mode 100644 (file)
index 0000000..4a96fb7
--- /dev/null
@@ -0,0 +1,2 @@
+# False positives that change quite often, so just override with a wildcard
+rust-src binary: executable-not-elf-or-script usr/src/rustc-*/*
diff --git a/debian/rustc.install b/debian/rustc.install
new file mode 100644 (file)
index 0000000..c289154
--- /dev/null
@@ -0,0 +1,3 @@
+usr/bin/rustc
+usr/bin/rustdoc
+debian/architecture.mk usr/share/rustc/
diff --git a/debian/rustc.manpages b/debian/rustc.manpages
new file mode 100644 (file)
index 0000000..f153792
--- /dev/null
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/rustc.1
+debian/tmp/usr/share/man/man1/rustdoc.1
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644 (file)
index 0000000..33bec95
--- /dev/null
@@ -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/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644 (file)
index 0000000..72c62c7
--- /dev/null
@@ -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
+abort-on-upstream-changes
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..8a8c93f
--- /dev/null
@@ -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/debian/update-version.sh b/debian/update-version.sh
new file mode 100755 (executable)
index 0000000..9cc46c3
--- /dev/null
@@ -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/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
new file mode 100644 (file)
index 0000000..7915756
--- /dev/null
@@ -0,0 +1,118 @@
+# 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/rustc/src/lints/groups.md
+src/doc/rust-by-example/CODE_OF_CONDUCT.md
+src/doc/unstable-book/src/language-features/unsized-locals.md
+src/etc/third-party/README.txt
+src/libcompiler_builtins/compiler-rt/lib/BlocksRuntime/runtime.c
+src/libbacktrace/configure
+src/libbacktrace/config/libtool.m4
+src/libstd/sys/cloudabi/abi/cloudabi.rs
+src/libstd/os/raw/*.md
+src/rustc/*/Cargo.toml
+src/tools/clippy/CONTRIBUTING.md
+src/vendor/*/.travis.yml
+src/vendor/*/Cargo.toml
+src/vendor/*/CHANGELOG.md
+src/vendor/*/CODE_OF_CONDUCT.md
+src/vendor/*/CONTRIBUTORS.md
+src/vendor/*/README.md
+src/vendor/*/README.tpl
+src/vendor/*/LICENSE
+src/vendor/*/*/LICENSE
+src/vendor/*/*/*/LICENSE
+src/vendor/ammonia/src/lib.rs
+src/vendor/clap/.github/CONTRIBUTING.md
+# ^ author likes to omit line breaks in their comments
+src/vendor/failure/book/src/bail-and-ensure.md
+# ^ same with this one
+src/vendor/handlebars/src/lib.rs
+src/vendor/maplit/README.rst
+src/vendor/lazy_static/src/lib.rs
+src/vendor/pulldown-cmark/tests/footnotes.rs
+src/vendor/pulldown-cmark/specs/footnotes.txt
+src/vendor/pulldown-cmark-*/tests/footnotes.rs
+src/vendor/pulldown-cmark-*/specs/footnotes.txt
+src/vendor/stable_deref_trait/src/lib.rs
+src/vendor/winapi-*/src/winnt.rs
+src/vendor/winapi/src/lib.rs
+
+# Embedded libraries, justified in README.source
+# None atm
+
+# False-positive, misc
+src/stdsimd/.travis.yml
+src/tools/clippy/.github/deploy_key.enc
+src/vendor/num/ci/deploy.enc
+src/vendor/elasticlunr-rs/src/lang/*.rs
+src/vendor/cloudabi/cloudabi.rs
+
+# False-positive, hand-editable small image
+src/etc/installer/gfx/
+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/2018-edition/src/img/*.svg
+src/doc/book/2018-edition/src/img/*.png
+src/librustdoc/html/static/*.svg
+src/vendor/difference/assets/*.png
+src/vendor/mdbook/src/theme/favicon.png
+src/vendor/num/doc/favicon.ico
+src/vendor/num/doc/rust-logo-128x128-blk-v2.png
+src/vendor/pest/pest-logo.svg
+src/vendor/pretty_assertions/examples/*.png
+src/vendor/termion/logo.svg
+
+# Example code
+src/vendor/html5ever/examples/capi/tokenize.c
+
+# Test data
+src/stdsimd/crates/stdsimd-verify/x86-intel.xml
+src/stdsimd/stdsimd/arch/detect/test_data
+src/test/compile-fail/not-utf8.bin
+src/test/*/*.rs
+src/test/*/*/issues/*.rs
+src/test/*/*.stderr
+src/test/*/*/*.stderr
+src/test/*/*/*/*.stderr
+src/tools/*/tests/*/*.stderr
+src/vendor/cssparser/src/css-parsing-tests/*.json
+src/vendor/cssparser/src/big-data-url.css
+src/vendor/elasticlunr-rs/tests/data/tr.in.txt
+src/vendor/flate2/tests/*.gz
+src/vendor/idna/tests/IdnaTest.txt
+src/vendor/html5ever/data/bench/*.html
+src/vendor/html5ever/html5lib-tests/*/*.dat
+src/vendor/html5ever/html5lib-tests/*/*.test
+src/vendor/pretty_assertions/src/format_changeset.rs
+src/vendor/regex/src/testdata/basic.dat
+src/vendor/regex/tests/crates_regex.rs
+src/vendor/regex/tests/fowler.rs
+src/vendor/regex-0*/src/testdata/basic.dat
+src/vendor/regex-0*/tests/fowler.rs
+src/vendor/rustc-demangle/src/lib.rs
+src/vendor/tar/tests/archives/*.tar
+src/vendor/toml/tests/*/*.toml
+src/vendor/toml/tests/*/*.json
+src/vendor/pest/benches/data.json
+src/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
+src/vendor/unicode-normalization/src/tables.rs
+
+# Compromise, ideally we'd package these in their own package
+src/librustdoc/html/static/*.woff
+
+# C and JS files not part of an external library
+src/vendor/mdbook/src/theme/book.js
+src/vendor/mdbook/src/theme/searcher/searcher.js
+src/vendor/miniz-sys/miniz.c
+src/vendor/walkdir/compare/nftw.c
+src/vendor/walkdir-*/compare/nftw.c
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644 (file)
index 0000000..93e2282
--- /dev/null
@@ -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/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..1317a4c
--- /dev/null
@@ -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://www.rust-lang.org/en-US/other-installers.html \
+ (?:.*/)rustc?-(\d[\d.]*(?:-[\w.]+)?)-src\.tar\.[gx]z
diff --git a/debian/watch-beta.in b/debian/watch-beta.in
new file mode 100644 (file)
index 0000000..b0ca924
--- /dev/null
@@ -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://www.rust-lang.org/en-US/other-installers.html \
+ (?:.*/)rustc?-(.*)-src\.tar\.[gx]z