From 72ac66629de08a7f9ee96d329ef3c98e0d0d0286 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 10 May 2018 11:32:50 -0700
Subject: [PATCH 01/14] Update to 1.26.0.

---
 .gitignore                                    |  8 +++
 ...ck-probes-tests-on-powerpc-s390x-too.patch | 54 -------------------
 pull-49959.patch                              | 54 +++++++++----------
 rust.spec                                     | 33 ++++++------
 sources                                       |  2 +-
 sources-bootstrap                             | 16 +++---
 6 files changed, 59 insertions(+), 108 deletions(-)
 delete mode 100644 0001-Ignore-stack-probes-tests-on-powerpc-s390x-too.patch

diff --git a/.gitignore b/.gitignore
index d39e79a..8e6f3fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,11 @@
 /rust-1.24.0-powerpc64-unknown-linux-gnu.tar.xz
 /rust-1.24.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.24.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.26.0-src.tar.xz
+/rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.25.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.25.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
diff --git a/0001-Ignore-stack-probes-tests-on-powerpc-s390x-too.patch b/0001-Ignore-stack-probes-tests-on-powerpc-s390x-too.patch
deleted file mode 100644
index c6d83cc..0000000
--- a/0001-Ignore-stack-probes-tests-on-powerpc-s390x-too.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b404ec4b4880db7f6aea23ebf778869dfd6ecf99 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Thu, 29 Mar 2018 10:25:32 -0700
-Subject: [PATCH] Ignore stack-probes tests on powerpc/s390x too
-
-We only support stack probes on x86 and x86_64.
-Other arches are already ignored.
----
- src/test/codegen/stack-probes.rs      | 1 +
- src/test/run-pass/stack-probes-lto.rs | 2 ++
- src/test/run-pass/stack-probes.rs     | 2 ++
- 3 files changed, 5 insertions(+)
-
-diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs
-index af400ff3bcbd..51ebc42a0dd6 100644
---- a/src/test/codegen/stack-probes.rs
-+++ b/src/test/codegen/stack-probes.rs
-@@ -11,6 +11,7 @@
- // ignore-arm
- // ignore-aarch64
- // ignore-powerpc
-+// ignore-s390x
- // ignore-aarch64
- // ignore-wasm
- // ignore-emscripten
-diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/run-pass/stack-probes-lto.rs
-index e7fa3bc0a75c..d1cb75909c15 100644
---- a/src/test/run-pass/stack-probes-lto.rs
-+++ b/src/test/run-pass/stack-probes-lto.rs
-@@ -10,6 +10,8 @@
- 
- // ignore-arm
- // ignore-aarch64
-+// ignore-powerpc
-+// ignore-s390x
- // ignore-wasm
- // ignore-cloudabi no processes
- // ignore-emscripten no processes
-diff --git a/src/test/run-pass/stack-probes.rs b/src/test/run-pass/stack-probes.rs
-index 67b3962ee5fb..78c5782be383 100644
---- a/src/test/run-pass/stack-probes.rs
-+++ b/src/test/run-pass/stack-probes.rs
-@@ -10,6 +10,8 @@
- 
- // ignore-arm
- // ignore-aarch64
-+// ignore-powerpc
-+// ignore-s390x
- // ignore-wasm
- // ignore-cloudabi no processes
- // ignore-emscripten no processes
--- 
-2.14.3
-
diff --git a/pull-49959.patch b/pull-49959.patch
index be2ed9f..b281425 100644
--- a/pull-49959.patch
+++ b/pull-49959.patch
@@ -1,4 +1,4 @@
-From f89f1b496c0c3b96aa8e41bef882131008dac6c3 Mon Sep 17 00:00:00 2001
+From cc2906cb26304301709557a88ac4a3334b88616b Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 13 Apr 2018 16:52:54 -0700
 Subject: [PATCH 1/3] rustbuild: allow building tools with debuginfo
@@ -19,7 +19,7 @@ a concern in regular use.
  5 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
-index 70376c120f..fcd995b703 100644
+index 7a62405f0596..73d4188d6954 100644
 --- a/CONTRIBUTING.md
 +++ b/CONTRIBUTING.md
 @@ -121,6 +121,7 @@ configuration used in the build process. Some options to note:
@@ -31,10 +31,10 @@ index 70376c120f..fcd995b703 100644
  - `optimize = false` - Disable optimizations to speed up compilation of stage1 rust, but makes the stage1 compiler x100 slower.
  
 diff --git a/config.toml.example b/config.toml.example
-index f153562a53..64e2f1b424 100644
+index 68bc7dfe720f..bd18a604a9c8 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -259,6 +259,10 @@
+@@ -262,6 +262,10 @@
  # standard library.
  #debuginfo-only-std = false
  
@@ -46,10 +46,10 @@ index f153562a53..64e2f1b424 100644
  #use-jemalloc = true
  
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index fcb78c479f..584c0cbe75 100644
+index 7ff64af91967..ae19c66d6070 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -603,10 +603,14 @@ impl<'a> Builder<'a> {
+@@ -622,10 +622,14 @@ impl<'a> Builder<'a> {
              cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
          }
  
@@ -69,10 +69,10 @@ index fcb78c479f..584c0cbe75 100644
              cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
              cargo.env("RUSTC_FORCE_UNSTABLE", "1");
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index f3810ac869..ac64e6e8e3 100644
+index 239316d45c49..95d138b9fab2 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -88,6 +88,7 @@ pub struct Config {
+@@ -94,6 +94,7 @@ pub struct Config {
      pub rust_debuginfo: bool,
      pub rust_debuginfo_lines: bool,
      pub rust_debuginfo_only_std: bool,
@@ -80,7 +80,7 @@ index f3810ac869..ac64e6e8e3 100644
      pub rust_rpath: bool,
      pub rustc_parallel_queries: bool,
      pub rustc_default_linker: Option<String>,
-@@ -271,6 +272,7 @@ struct Rust {
+@@ -282,6 +283,7 @@ struct Rust {
      debuginfo: Option<bool>,
      debuginfo_lines: Option<bool>,
      debuginfo_only_std: Option<bool>,
@@ -88,7 +88,7 @@ index f3810ac869..ac64e6e8e3 100644
      experimental_parallel_queries: Option<bool>,
      debug_jemalloc: Option<bool>,
      use_jemalloc: Option<bool>,
-@@ -425,6 +427,7 @@ impl Config {
+@@ -462,6 +464,7 @@ impl Config {
          let mut llvm_assertions = None;
          let mut debuginfo_lines = None;
          let mut debuginfo_only_std = None;
@@ -96,7 +96,7 @@ index f3810ac869..ac64e6e8e3 100644
          let mut debug = None;
          let mut debug_jemalloc = None;
          let mut debuginfo = None;
-@@ -462,6 +465,7 @@ impl Config {
+@@ -499,6 +502,7 @@ impl Config {
              debuginfo = rust.debuginfo;
              debuginfo_lines = rust.debuginfo_lines;
              debuginfo_only_std = rust.debuginfo_only_std;
@@ -104,8 +104,8 @@ index f3810ac869..ac64e6e8e3 100644
              optimize = rust.optimize;
              ignore_git = rust.ignore_git;
              debug_jemalloc = rust.debug_jemalloc;
-@@ -553,6 +557,7 @@ impl Config {
-         config.rust_thinlto = thinlto.unwrap_or(true);
+@@ -582,6 +586,7 @@ impl Config {
+         };
          config.rust_debuginfo_lines = debuginfo_lines.unwrap_or(default);
          config.rust_debuginfo_only_std = debuginfo_only_std.unwrap_or(default);
 +        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(default);
@@ -113,10 +113,10 @@ index f3810ac869..ac64e6e8e3 100644
          let default = debug == Some(true);
          config.debug_jemalloc = debug_jemalloc.unwrap_or(default);
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 99a3ee4e4c..689dd905fb 100755
+index b06968d313ba..a0123da6d8ff 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -78,6 +78,7 @@ def v(*args):
+@@ -79,6 +79,7 @@ o("llvm-release-debuginfo", "llvm.release-debuginfo", "build LLVM with debugger
  o("debuginfo", "rust.debuginfo", "build with debugger metadata")
  o("debuginfo-lines", "rust.debuginfo-lines", "build with line number debugger metadata")
  o("debuginfo-only-std", "rust.debuginfo-only-std", "build only libstd with debugging information")
@@ -125,10 +125,10 @@ index 99a3ee4e4c..689dd905fb 100755
  v("save-toolstates", "rust.save-toolstates", "save build and test status of external tools into this file")
  
 -- 
-2.14.3
+2.17.0
 
 
-From f0a43d3a9a4c28ea45d6bed430b1d9d561944e16 Mon Sep 17 00:00:00 2001
+From bc7403d067b3e2a154df1ef088377cb2a75f429c Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 13 Apr 2018 21:57:53 -0700
 Subject: [PATCH 2/3] Avoid specific claims about debuginfo size
@@ -139,10 +139,10 @@ Subject: [PATCH 2/3] Avoid specific claims about debuginfo size
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config.toml.example b/config.toml.example
-index 64e2f1b424..46be1ecab7 100644
+index bd18a604a9c8..effe00843810 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -260,7 +260,7 @@
+@@ -263,7 +263,7 @@
  #debuginfo-only-std = false
  
  # Enable debuginfo for the extended tools: cargo, rls, rustfmt
@@ -152,10 +152,10 @@ index 64e2f1b424..46be1ecab7 100644
  
  # Whether or not jemalloc is built and enabled
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 584c0cbe75..627a695884 100644
+index ae19c66d6070..6874efa5a4c7 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -605,7 +605,7 @@ impl<'a> Builder<'a> {
+@@ -624,7 +624,7 @@ impl<'a> Builder<'a> {
  
          if mode == Mode::Tool {
              // Tools like cargo and rls don't get debuginfo by default right now, but this can be
@@ -165,10 +165,10 @@ index 584c0cbe75..627a695884 100644
                  cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string());
                  cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
 -- 
-2.14.3
+2.17.0
 
 
-From 7ddb573a2ea41ad3c35f927b7b90fd545a6ab9da Mon Sep 17 00:00:00 2001
+From 93734e9c46e30acc9a51f19c56511ce8516b6855 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 13 Apr 2018 21:58:21 -0700
 Subject: [PATCH 3/3] Make debuginfo-tools always default false
@@ -178,11 +178,11 @@ Subject: [PATCH 3/3] Make debuginfo-tools always default false
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index ac64e6e8e3..06443ae6cd 100644
+index 95d138b9fab2..1b4b2c5fb2a5 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -557,7 +557,7 @@ impl Config {
-         config.rust_thinlto = thinlto.unwrap_or(true);
+@@ -586,7 +586,7 @@ impl Config {
+         };
          config.rust_debuginfo_lines = debuginfo_lines.unwrap_or(default);
          config.rust_debuginfo_only_std = debuginfo_only_std.unwrap_or(default);
 -        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(default);
@@ -191,5 +191,5 @@ index ac64e6e8e3..06443ae6cd 100644
          let default = debug == Some(true);
          config.debug_jemalloc = debug_jemalloc.unwrap_or(default);
 -- 
-2.14.3
+2.17.0
 
diff --git a/rust.spec b/rust.spec
index 0e827dd..8056f30 100644
--- a/rust.spec
+++ b/rust.spec
@@ -8,10 +8,10 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.24.0
-%global bootstrap_cargo 0.25.0
+%global bootstrap_rust 1.25.0
+%global bootstrap_cargo 0.26.0
 %global bootstrap_channel %{bootstrap_rust}
-%global bootstrap_date 2018-02-15
+%global bootstrap_date 2018-03-29
 
 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@@ -47,16 +47,16 @@
 %endif
 
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
-%global rustc_version 1.25.0
-%global cargo_version 0.26.0
-%global rustfmt_version 0.3.8
-%global rls_version 0.125.1
+%global rustc_version 1.26.0
+%global cargo_version %{rustc_version}
+%global rustfmt_version 0.4.1
+%global rls_version 0.126.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
-License:        (ASL 2.0 or MIT) and (BSD and ISC and MIT)
+License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
 URL:            https://www.rust-lang.org
 ExclusiveArch:  %{rust_arches}
@@ -68,11 +68,9 @@ ExclusiveArch:  %{rust_arches}
 %endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 
-# https://github.com/rust-lang/rust/pull/49484
-Patch1:         0001-Ignore-stack-probes-tests-on-powerpc-s390x-too.patch
-
+# rustbuild: allow building tools with debuginfo
 # https://github.com/rust-lang/rust/pull/49959
-Patch2:         pull-49959.patch
+Patch1:         pull-49959.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -172,7 +170,6 @@ BuildRequires:  procps-ng
 BuildRequires:  gdb
 
 # TODO: work on unbundling these!
-Provides:       bundled(hoedown) = 3.0.7
 Provides:       bundled(jquery) = 2.1.4
 Provides:       bundled(libbacktrace) = 6.1.0
 Provides:       bundled(miniz) = 1.16~beta+r1
@@ -374,8 +371,7 @@ test -f '%{local_rust_root}/bin/rustc'
 
 %setup -q -n %{rustc_package}
 
-%patch1 -p1 -b .ignore-ibm
-%patch2 -p1
+%patch1 -p1
 
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
@@ -392,7 +388,6 @@ rm -rf src/llvm/
 rm -rf src/llvm-emscripten/
 
 # extract bundled licenses for packaging
-cp src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown
 sed -e '/*\//q' src/libbacktrace/backtrace.h \
   >src/libbacktrace/LICENSE-libbacktrace
 
@@ -558,7 +553,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %files
 %license COPYRIGHT LICENSE-APACHE LICENSE-MIT
 %license src/libbacktrace/LICENSE-libbacktrace
-%license src/rt/hoedown/LICENSE-hoedown
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
@@ -648,6 +642,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
+- Update to 1.26.0.
+
 * Mon Apr 16 2018 Dan Callaghan <dcallagh@redhat.com> - 1.25.0-3
 - Add cargo, rls, and analysis
 
diff --git a/sources b/sources
index f314e88..122a20b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustc-1.25.0-src.tar.xz) = 45baaaa47d8b6433f61b1a6f2637d8f4fe013b534a8a94365025dfcf786815c95111b9bd3beb2544ba8587fb4c8b38431765c4d68bc9c19285da4ccf7c7eeda2
+SHA512 (rustc-1.26.0-src.tar.xz) = 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
diff --git a/sources-bootstrap b/sources-bootstrap
index 9c4838f..353015a 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,8 +1,8 @@
-SHA512 (rustc-1.25.0-src.tar.xz) = 45baaaa47d8b6433f61b1a6f2637d8f4fe013b534a8a94365025dfcf786815c95111b9bd3beb2544ba8587fb4c8b38431765c4d68bc9c19285da4ccf7c7eeda2
-SHA512 (rust-1.24.0-aarch64-unknown-linux-gnu.tar.xz) = c8be9bd2929d5a9ac96524bdbbc3b137c703a54d6bdf19a8abee69fcb2cf7d11693a79c520571da021fb0c059de5f759f6c0336d4e42f278584c0ec3783983ce
-SHA512 (rust-1.24.0-armv7-unknown-linux-gnueabihf.tar.xz) = 57383893b1015377857509f9d485629fc181408089c577b725e52577e5cc44a69f557c8311324473008d879e7917105077045591e72c7d09b4b57bcf020fd39d
-SHA512 (rust-1.24.0-i686-unknown-linux-gnu.tar.xz) = d7e4ae046bea9c8fd5709fc316965bd0422afc1b7cf2b35bebc8899524bb5e12c1e685dc395e96f43957ab9b6ab3039fa0c0306751b6f1771bd6550d559e66a8
-SHA512 (rust-1.24.0-powerpc64le-unknown-linux-gnu.tar.xz) = f1a6ad1b66ce4e928a7f7aed8476fedc9ef93ef8520aa34781a5e7e8e2ab2ac3b13fc325d37bd30bc9cc3dc709b2286436b6c68eae1748c434860b51643afa1b
-SHA512 (rust-1.24.0-powerpc64-unknown-linux-gnu.tar.xz) = 0a2fbe4017c2c69e5fc2b35591f40fa45cf03be93ed0c03c56fb10d76dd78f7a86c40552afb60e360aa05447faf278e2988a9a0056a21950ba05daad1bf070a1
-SHA512 (rust-1.24.0-s390x-unknown-linux-gnu.tar.xz) = 252342cad4d41f7f972aec7a96e2ed0c8044af9a8c02bfdb36e47b591fad33df4234c141b7532e62f33d7f57af2191cbfb88606e2c59e927b08e41d9f0f8d2a5
-SHA512 (rust-1.24.0-x86_64-unknown-linux-gnu.tar.xz) = 876e5d66b5531a5dd1c42b8b2f073bc463a6dead348d5857f43b0047a4f6b101d26c7b29d6bbe1c1ea64cb6ca8c36d0159ff4dc75418e4216e7e585b169276ff
+SHA512 (rustc-1.26.0-src.tar.xz) = 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
+SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
+SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
+SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
+SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee
+SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a
+SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632
+SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78

From 3212aa76cb0d2c0a16376e7fecdf0e54243518bc Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 16 May 2018 10:28:26 -0700
Subject: [PATCH 02/14] Add rust#50789 to fix same-version bootstrap

We don't need to rebuild for this patch now, but it will correct the
FTBFS that Koschei is currently reporting.
---
 ...-built-in-stage0-have-unique-metadat.patch | 40 +++++++++++++++++++
 rust.spec                                     |  4 ++
 2 files changed, 44 insertions(+)
 create mode 100644 0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch

diff --git a/0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch b/0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
new file mode 100644
index 0000000..38a4402
--- /dev/null
+++ b/0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
@@ -0,0 +1,40 @@
+From e8e5eb58c0d6890f73ea01354e18f51b1a6697f8 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 15 May 2018 17:48:02 -0700
+Subject: [PATCH] Ensure libraries built in stage0 have unique metadata
+
+Issue #50786 shows a case with local rebuild where the libraries built
+by stage0 had the same suffix as stage0's own, and were accidentally
+loaded by that stage0 rustc when compiling `librustc_trans`.
+
+Now we set `__CARGO_DEFAULT_LIB_METADATA` to "bootstrap" during stage0,
+rather than the release channel like usual, so the library suffix will
+always be completely distinct from the stage0 compiler.
+---
+ src/bootstrap/builder.rs | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 17f19222e6ea..e5824010ef2c 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -592,7 +592,15 @@ impl<'a> Builder<'a> {
+ 
+         // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
+         // Force cargo to output binaries with disambiguating hashes in the name
+-        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
++        let metadata = if compiler.stage == 0 {
++            // Treat stage0 like special channel, whether it's a normal prior-
++            // release rustc or a local rebuild with the same version, so we
++            // never mix these libraries by accident.
++            "bootstrap"
++        } else {
++            &self.config.channel
++        };
++        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
+ 
+         let stage;
+         if compiler.stage == 0 && self.local_rebuild {
+-- 
+2.17.0
+
diff --git a/rust.spec b/rust.spec
index 8056f30..dffd331 100644
--- a/rust.spec
+++ b/rust.spec
@@ -72,6 +72,9 @@ Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 # https://github.com/rust-lang/rust/pull/49959
 Patch1:         pull-49959.patch
 
+# https://github.com/rust-lang/rust/pull/50789/
+Patch2:         0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
+
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -372,6 +375,7 @@ test -f '%{local_rust_root}/bin/rustc'
 %setup -q -n %{rustc_package}
 
 %patch1 -p1
+%patch2 -p1
 
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure

From 225f76f4c73df96ded4ec35dc84b43335e6956c7 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 29 May 2018 11:39:30 -0700
Subject: [PATCH 03/14] Update to 1.26.1.

---
 .gitignore        |  1 +
 rust.spec         | 13 +++++++++----
 sources           |  2 +-
 sources-bootstrap |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e6f3fc..1572f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,4 @@
 /rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz
 /rust-1.25.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.26.1-src.tar.xz
diff --git a/rust.spec b/rust.spec
index dffd331..c397e96 100644
--- a/rust.spec
+++ b/rust.spec
@@ -47,14 +47,16 @@
 %endif
 
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
-%global rustc_version 1.26.0
-%global cargo_version %{rustc_version}
-%global rustfmt_version 0.4.1
+# Also beware that if any of these are not changed in a version bump, then the release
+# number should still increase, not be reset to 1!
+%global rustc_version 1.26.1
+%global cargo_version 1.26.0
+%global rustfmt_version 0.4.2
 %global rls_version 0.126.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -646,6 +648,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
+- Update to 1.26.1.
+
 * Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
 - Update to 1.26.0.
 
diff --git a/sources b/sources
index 122a20b..65f7575 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustc-1.26.0-src.tar.xz) = 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
+SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
diff --git a/sources-bootstrap b/sources-bootstrap
index 353015a..6ce4a13 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,4 +1,4 @@
-SHA512 (rustc-1.26.0-src.tar.xz) = 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
+SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
 SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
 SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
 SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f

From 59bda43d25bb73308ce8d3d591792aab1724fc83 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Jun 2018 10:43:45 -0700
Subject: [PATCH 04/14] Update to 1.26.2. Re-bootstrap to deal with LLVM symbol
 changes.

---
 rust.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/rust.spec b/rust.spec
index c397e96..7707ee4 100644
--- a/rust.spec
+++ b/rust.spec
@@ -14,7 +14,7 @@
 %global bootstrap_date 2018-03-29
 
 # Only the specified arches will use bootstrap binaries.
-#global bootstrap_arches %%{rust_arches}
+%global bootstrap_arches %%{rust_arches}
 
 # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
 %bcond_with llvm_static
@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.26.1
+%global rustc_version 1.26.2
 %global cargo_version 1.26.0
 %global rustfmt_version 0.4.2
 %global rls_version 0.126.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -648,6 +648,10 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
+- Update to 1.26.2.
+- Re-bootstrap to deal with LLVM symbol changes.
+
 * Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
 - Update to 1.26.1.
 

From b006a106003b36e9d805789a68c863c5d7d5e85c Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Jun 2018 10:46:32 -0700
Subject: [PATCH 05/14] new-sources

---
 .gitignore        | 1 +
 sources           | 9 ++++++++-
 sources-bootstrap | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1572f08..eed3814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@
 /rust-1.25.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.26.1-src.tar.xz
+/rustc-1.26.2-src.tar.xz
diff --git a/sources b/sources
index 65f7575..8cdeea7 100644
--- a/sources
+++ b/sources
@@ -1 +1,8 @@
-SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
+SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
+SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
+SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
+SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
+SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee
+SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a
+SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632
+SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
diff --git a/sources-bootstrap b/sources-bootstrap
index 6ce4a13..8cdeea7 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,4 +1,4 @@
-SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
+SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
 SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
 SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
 SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f

From 43909be7e9617b0e4324876efdba679f3d58ed4c Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Jun 2018 12:06:03 -0700
Subject: [PATCH 06/14] reduce debuginfo on i686 too (LLVM ERROR: out of
 memory)

---
 rust.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust.spec b/rust.spec
index 7707ee4..6c2adde 100644
--- a/rust.spec
+++ b/rust.spec
@@ -438,7 +438,7 @@ export LIBGIT2_SYS_USE_PKG_CONFIG=1
 %global common_libdir %{_prefix}/lib
 %global rustlibdir %{common_libdir}/rustlib
 
-%ifarch %{arm}
+%ifarch %{arm} %{ix86}
 # full debuginfo is exhausting memory; just do libstd for now
 # https://github.com/rust-lang/rust/issues/45854
 %define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines

From 44ab18b9a0c9259f50004947644d8de46e36b2e7 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Jun 2018 13:25:30 -0700
Subject: [PATCH 07/14] Temporarily disable debuginfo-gdb tests on rawhide

---
 rust.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rust.spec b/rust.spec
index 6c2adde..69c1e88 100644
--- a/rust.spec
+++ b/rust.spec
@@ -421,6 +421,13 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
 find src/vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
 
+%if 0%{?fedora} >= 29
+  # gdb-8.1.50 snapshots are hanging our debuginfo-gdb tests on 32-bit platforms,
+  # so just skip these tests for now...
+  sed -i.gdb-hang -e '/Skip debuginfo/a if mode == "debuginfo-gdb" { return; }' \
+    src/bootstrap/test.rs
+%endif
+
 
 %build
 

From 820f98e2ae62718f0e6ab5ddb16cd831db85beed Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Jun 2018 21:36:55 -0700
Subject: [PATCH 08/14] Rebuild without bootstrap binaries.

---
 rust.spec | 7 +++++--
 sources   | 7 -------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/rust.spec b/rust.spec
index 69c1e88..0bbbcb9 100644
--- a/rust.spec
+++ b/rust.spec
@@ -14,7 +14,7 @@
 %global bootstrap_date 2018-03-29
 
 # Only the specified arches will use bootstrap binaries.
-%global bootstrap_arches %%{rust_arches}
+#global bootstrap_arches %%{rust_arches}
 
 # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
 %bcond_with llvm_static
@@ -56,7 +56,7 @@
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -655,6 +655,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
+- Rebuild without bootstrap binaries.
+
 * Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
 - Update to 1.26.2.
 - Re-bootstrap to deal with LLVM symbol changes.
diff --git a/sources b/sources
index 8cdeea7..8d2168f 100644
--- a/sources
+++ b/sources
@@ -1,8 +1 @@
 SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
-SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
-SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
-SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
-SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee
-SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a
-SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632
-SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78

From 9552deab481aa29fc54b3168b6445ab54ee3a42e Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 12 Jun 2018 16:15:57 -0700
Subject: [PATCH 09/14] Remove the gdb workaround

---
 rust.spec | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rust.spec b/rust.spec
index 0bbbcb9..cf2838d 100644
--- a/rust.spec
+++ b/rust.spec
@@ -421,13 +421,6 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
 find src/vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
 
-%if 0%{?fedora} >= 29
-  # gdb-8.1.50 snapshots are hanging our debuginfo-gdb tests on 32-bit platforms,
-  # so just skip these tests for now...
-  sed -i.gdb-hang -e '/Skip debuginfo/a if mode == "debuginfo-gdb" { return; }' \
-    src/bootstrap/test.rs
-%endif
-
 
 %build
 

From 143aecadf1a1e4db6e89fa70bf5fabd9549bfba3 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 21 Jun 2018 16:49:11 -0700
Subject: [PATCH 10/14] Update to 1.27.0.

---
 .gitignore                                    |   8 +
 ...enamed_and_removed_lints-warning-247.patch |  70 +++++++
 pull-49959.patch                              | 195 ------------------
 rust.spec                                     |  51 ++---
 sources                                       |   2 +-
 sources-bootstrap                             |  16 +-
 6 files changed, 115 insertions(+), 227 deletions(-)
 create mode 100644 0001-Fix-new-renamed_and_removed_lints-warning-247.patch
 delete mode 100644 pull-49959.patch

diff --git a/.gitignore b/.gitignore
index eed3814..1c7e79e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,11 @@
 /rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.26.1-src.tar.xz
 /rustc-1.26.2-src.tar.xz
+/rustc-1.27.0-src.tar.xz
+/rust-1.26.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.26.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.26.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.26.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.26.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz
diff --git a/0001-Fix-new-renamed_and_removed_lints-warning-247.patch b/0001-Fix-new-renamed_and_removed_lints-warning-247.patch
new file mode 100644
index 0000000..3270fb0
--- /dev/null
+++ b/0001-Fix-new-renamed_and_removed_lints-warning-247.patch
@@ -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/error_chain.rs
++++ b/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/impl_error_chain_kind.rs
++++ b/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/lib.rs
++++ b/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/pull-49959.patch b/pull-49959.patch
deleted file mode 100644
index b281425..0000000
--- a/pull-49959.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From cc2906cb26304301709557a88ac4a3334b88616b Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 13 Apr 2018 16:52:54 -0700
-Subject: [PATCH 1/3] rustbuild: allow building tools with debuginfo
-
-Debugging information for the extended tools is currently disabled for
-concerns about the size.  This patch adds `--enable-debuginfo-tools` to
-let one opt into having that debuginfo.
-
-This is useful for debugging the tools in distro packages.  We always
-strip debuginfo into separate packages anyway, so the extra size is not
-a concern in regular use.
----
- CONTRIBUTING.md            |  1 +
- config.toml.example        |  4 ++++
- src/bootstrap/builder.rs   | 12 ++++++++----
- src/bootstrap/config.rs    |  5 +++++
- src/bootstrap/configure.py |  1 +
- 5 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
-index 7a62405f0596..73d4188d6954 100644
---- a/CONTRIBUTING.md
-+++ b/CONTRIBUTING.md
-@@ -121,6 +121,7 @@ configuration used in the build process. Some options to note:
- #### `[rust]`:
- - `debuginfo = true` - Build a compiler with debuginfo. Makes building rustc slower, but then you can use a debugger to debug `rustc`.
- - `debuginfo-lines = true` - An alternative to `debuginfo = true` that doesn't let you use a debugger, but doesn't make building rustc slower and still gives you line numbers in backtraces.
-+- `debuginfo-tools = true` - Build the extended tools with debuginfo.
- - `debug-assertions = true` - Makes the log output of `debug!` work.
- - `optimize = false` - Disable optimizations to speed up compilation of stage1 rust, but makes the stage1 compiler x100 slower.
- 
-diff --git a/config.toml.example b/config.toml.example
-index 68bc7dfe720f..bd18a604a9c8 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -262,6 +262,10 @@
- # standard library.
- #debuginfo-only-std = false
- 
-+# Enable debuginfo for the extended tools: cargo, rls, rustfmt
-+# Adding debuginfo increases their sizes by a factor of 3-4.
-+#debuginfo-tools = false
-+
- # Whether or not jemalloc is built and enabled
- #use-jemalloc = true
- 
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 7ff64af91967..ae19c66d6070 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -622,10 +622,14 @@ impl<'a> Builder<'a> {
-             cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
-         }
- 
--        if mode != Mode::Tool {
--            // Tools don't get debuginfo right now, e.g. cargo and rls don't
--            // get compiled with debuginfo.
--            // Adding debuginfo increases their sizes by a factor of 3-4.
-+        if mode == Mode::Tool {
-+            // Tools like cargo and rls don't get debuginfo by default right now, but this can be
-+            // enabled in the config.  Adding debuginfo increases their sizes by a factor of 3-4.
-+            if self.config.rust_debuginfo_tools {
-+                cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string());
-+                cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
-+            }
-+        } else {
-             cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string());
-             cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
-             cargo.env("RUSTC_FORCE_UNSTABLE", "1");
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 239316d45c49..95d138b9fab2 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -94,6 +94,7 @@ pub struct Config {
-     pub rust_debuginfo: bool,
-     pub rust_debuginfo_lines: bool,
-     pub rust_debuginfo_only_std: bool,
-+    pub rust_debuginfo_tools: bool,
-     pub rust_rpath: bool,
-     pub rustc_parallel_queries: bool,
-     pub rustc_default_linker: Option<String>,
-@@ -282,6 +283,7 @@ struct Rust {
-     debuginfo: Option<bool>,
-     debuginfo_lines: Option<bool>,
-     debuginfo_only_std: Option<bool>,
-+    debuginfo_tools: Option<bool>,
-     experimental_parallel_queries: Option<bool>,
-     debug_jemalloc: Option<bool>,
-     use_jemalloc: Option<bool>,
-@@ -462,6 +464,7 @@ impl Config {
-         let mut llvm_assertions = None;
-         let mut debuginfo_lines = None;
-         let mut debuginfo_only_std = None;
-+        let mut debuginfo_tools = None;
-         let mut debug = None;
-         let mut debug_jemalloc = None;
-         let mut debuginfo = None;
-@@ -499,6 +502,7 @@ impl Config {
-             debuginfo = rust.debuginfo;
-             debuginfo_lines = rust.debuginfo_lines;
-             debuginfo_only_std = rust.debuginfo_only_std;
-+            debuginfo_tools = rust.debuginfo_tools;
-             optimize = rust.optimize;
-             ignore_git = rust.ignore_git;
-             debug_jemalloc = rust.debug_jemalloc;
-@@ -582,6 +586,7 @@ impl Config {
-         };
-         config.rust_debuginfo_lines = debuginfo_lines.unwrap_or(default);
-         config.rust_debuginfo_only_std = debuginfo_only_std.unwrap_or(default);
-+        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(default);
- 
-         let default = debug == Some(true);
-         config.debug_jemalloc = debug_jemalloc.unwrap_or(default);
-diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index b06968d313ba..a0123da6d8ff 100755
---- a/src/bootstrap/configure.py
-+++ b/src/bootstrap/configure.py
-@@ -79,6 +79,7 @@ o("llvm-release-debuginfo", "llvm.release-debuginfo", "build LLVM with debugger
- o("debuginfo", "rust.debuginfo", "build with debugger metadata")
- o("debuginfo-lines", "rust.debuginfo-lines", "build with line number debugger metadata")
- o("debuginfo-only-std", "rust.debuginfo-only-std", "build only libstd with debugging information")
-+o("debuginfo-tools", "rust.debuginfo-tools", "build extended tools with debugging information")
- o("debug-jemalloc", "rust.debug-jemalloc", "build jemalloc with --enable-debug --enable-fill")
- v("save-toolstates", "rust.save-toolstates", "save build and test status of external tools into this file")
- 
--- 
-2.17.0
-
-
-From bc7403d067b3e2a154df1ef088377cb2a75f429c Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 13 Apr 2018 21:57:53 -0700
-Subject: [PATCH 2/3] Avoid specific claims about debuginfo size
-
----
- config.toml.example      | 2 +-
- src/bootstrap/builder.rs | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.toml.example b/config.toml.example
-index bd18a604a9c8..effe00843810 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -263,7 +263,7 @@
- #debuginfo-only-std = false
- 
- # Enable debuginfo for the extended tools: cargo, rls, rustfmt
--# Adding debuginfo increases their sizes by a factor of 3-4.
-+# Adding debuginfo makes them several times larger.
- #debuginfo-tools = false
- 
- # Whether or not jemalloc is built and enabled
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index ae19c66d6070..6874efa5a4c7 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -624,7 +624,7 @@ impl<'a> Builder<'a> {
- 
-         if mode == Mode::Tool {
-             // Tools like cargo and rls don't get debuginfo by default right now, but this can be
--            // enabled in the config.  Adding debuginfo increases their sizes by a factor of 3-4.
-+            // enabled in the config.  Adding debuginfo makes them several times larger.
-             if self.config.rust_debuginfo_tools {
-                 cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string());
-                 cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
--- 
-2.17.0
-
-
-From 93734e9c46e30acc9a51f19c56511ce8516b6855 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 13 Apr 2018 21:58:21 -0700
-Subject: [PATCH 3/3] Make debuginfo-tools always default false
-
----
- src/bootstrap/config.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 95d138b9fab2..1b4b2c5fb2a5 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -586,7 +586,7 @@ impl Config {
-         };
-         config.rust_debuginfo_lines = debuginfo_lines.unwrap_or(default);
-         config.rust_debuginfo_only_std = debuginfo_only_std.unwrap_or(default);
--        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(default);
-+        config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(false);
- 
-         let default = debug == Some(true);
-         config.debug_jemalloc = debug_jemalloc.unwrap_or(default);
--- 
-2.17.0
-
diff --git a/rust.spec b/rust.spec
index cf2838d..10d6467 100644
--- a/rust.spec
+++ b/rust.spec
@@ -8,10 +8,11 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.25.0
-%global bootstrap_cargo 0.26.0
+# Note that cargo matches the program version here, not its crate version.
+%global bootstrap_rust 1.26.0
+%global bootstrap_cargo 1.26.0
 %global bootstrap_channel %{bootstrap_rust}
-%global bootstrap_date 2018-03-29
+%global bootstrap_date 2018-05-10
 
 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@@ -27,12 +28,11 @@
 %bcond_with bundled_llvm
 %endif
 
-# Some targets don't have libgit2
-%if 0%{?rhel} && !0%{?epel}
+# libgit2-sys expects to use its bundled library, which is sometimes just a
+# snapshot of libgit2's master branch.  This can mean the FFI declarations
+# won't match our released libgit2.so, e.g. having changed struct fields.
+# So, tread carefully if you toggle this...
 %bcond_without bundled_libgit2
-%else
-%bcond_with bundled_libgit2
-%endif
 
 # LLDB only works on some architectures
 %ifarch %{arm} aarch64 %{ix86} x86_64
@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.26.2
-%global cargo_version 1.26.0
-%global rustfmt_version 0.4.2
-%global rls_version 0.126.0
+%global rustc_version 1.27.0
+%global cargo_version 1.27.0
+%global rustfmt_version 0.6.1
+%global rls_version 0.127.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -70,12 +70,12 @@ ExclusiveArch:  %{rust_arches}
 %endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 
-# rustbuild: allow building tools with debuginfo
-# https://github.com/rust-lang/rust/pull/49959
-Patch1:         pull-49959.patch
-
 # https://github.com/rust-lang/rust/pull/50789/
-Patch2:         0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
+Patch1:         0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
+
+# https://github.com/rust-lang/rust/issues/51650
+# https://github.com/rust-lang-nursery/error-chain/pull/247
+Patch2:         0001-Fix-new-renamed_and_removed_lints-warning-247.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -151,7 +151,7 @@ BuildRequires:  %{python}
 BuildRequires:  cmake3 >= 3.4.3
 Provides:       bundled(llvm) = 6.0
 %else
-BuildRequires:  cmake >= 2.8.7
+BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel}
 %global llvm llvm5.0
 %endif
@@ -175,7 +175,6 @@ BuildRequires:  procps-ng
 BuildRequires:  gdb
 
 # TODO: work on unbundling these!
-Provides:       bundled(jquery) = 2.1.4
 Provides:       bundled(libbacktrace) = 6.1.0
 Provides:       bundled(miniz) = 1.16~beta+r1
 
@@ -287,9 +286,9 @@ its standard library.
 Summary:        Rust's package manager and build tool
 Version:        %{cargo_version}
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = 0.26.0
+Provides:       bundled(libgit2) = 0.27
 %else
-BuildRequires:  pkgconfig(libgit2) >= 0.24
+BuildRequires:  pkgconfig(libgit2) >= 0.27
 %endif
 # For tests:
 BuildRequires:  git
@@ -332,7 +331,7 @@ Summary:        Rust Language Server for IDE integration
 Version:        %{rls_version}
 Provides:       rls = %{rls_version}
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = 0.26.0
+Provides:       bundled(libgit2) = 0.27
 %endif
 Requires:       rust-analysis
 # /usr/bin/rls is dynamically linked against internal rustc libs
@@ -377,7 +376,10 @@ test -f '%{local_rust_root}/bin/rustc'
 %setup -q -n %{rustc_package}
 
 %patch1 -p1
+
+pushd src/vendor/error-chain
 %patch2 -p1
+popd
 
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
@@ -648,6 +650,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
+- Update to 1.27.0.
+
 * Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
 - Rebuild without bootstrap binaries.
 
diff --git a/sources b/sources
index 8d2168f..145137d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
+SHA512 (rustc-1.27.0-src.tar.xz) = b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
diff --git a/sources-bootstrap b/sources-bootstrap
index 8cdeea7..bbd86ab 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,8 +1,8 @@
-SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
-SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
-SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
-SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
-SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee
-SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a
-SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632
-SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
+SHA512 (rustc-1.27.0-src.tar.xz) = b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
+SHA512 (rust-1.26.0-aarch64-unknown-linux-gnu.tar.xz) = 731e1db2e39d412997cee3d8d51a9d45a84e7092f1c66524f311f4967f7638964581a8c71a5937a7f80a8e0bae153298a6a806e56e525015ab7caf7b040b14b7
+SHA512 (rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz) = 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
+SHA512 (rust-1.26.0-i686-unknown-linux-gnu.tar.xz) = 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31
+SHA512 (rust-1.26.0-powerpc64le-unknown-linux-gnu.tar.xz) = 9b856967cb94e3d930877d9b28bd9ae2e223a15a15231315f02bfd9c47ad488461b1a55458a6e3f1c9c9a8367c0c3af5ff1dc19d29f3b3debe9baaf2e1b64701
+SHA512 (rust-1.26.0-powerpc64-unknown-linux-gnu.tar.xz) = 62e8acd65b9e56e3d3cc46c5d9984b9c80ef83d7204c3f87dbce9a1229ef19db39ed14154fda4416c1656103f82e106b19ba709943d94d408e11283470a94908
+SHA512 (rust-1.26.0-s390x-unknown-linux-gnu.tar.xz) = f78b8be5c7a2c1c07527959c4c57cfb0fc43ef79fa313eb8c1afd1fc024753fac17f0001f930b651035c1e704ee391d822ddf588a242dc75cc476b3f20dea682
+SHA512 (rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz) = 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e

From e5aa295daa46ec70d895aadae8261e545f903899 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 10 Jul 2018 14:50:37 -0700
Subject: [PATCH 11/14] Update to 1.27.1.

---
 .gitignore        | 1 +
 rust.spec         | 7 +++++--
 sources           | 2 +-
 sources-bootstrap | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c7e79e..1a3aed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,4 @@
 /rust-1.26.0-powerpc64-unknown-linux-gnu.tar.xz
 /rust-1.26.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.27.1-src.tar.xz
diff --git a/rust.spec b/rust.spec
index 10d6467..30402b0 100644
--- a/rust.spec
+++ b/rust.spec
@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.27.0
+%global rustc_version 1.27.1
 %global cargo_version 1.27.0
 %global rustfmt_version 0.6.1
 %global rls_version 0.127.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -650,6 +650,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
+- Update to 1.27.1.
+
 * Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
 - Update to 1.27.0.
 
diff --git a/sources b/sources
index 145137d..f1552cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustc-1.27.0-src.tar.xz) = b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
+SHA512 (rustc-1.27.1-src.tar.xz) = 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
diff --git a/sources-bootstrap b/sources-bootstrap
index bbd86ab..4b90075 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,4 +1,4 @@
-SHA512 (rustc-1.27.0-src.tar.xz) = b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
+SHA512 (rustc-1.27.1-src.tar.xz) = 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
 SHA512 (rust-1.26.0-aarch64-unknown-linux-gnu.tar.xz) = 731e1db2e39d412997cee3d8d51a9d45a84e7092f1c66524f311f4967f7638964581a8c71a5937a7f80a8e0bae153298a6a806e56e525015ab7caf7b040b14b7
 SHA512 (rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz) = 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
 SHA512 (rust-1.26.0-i686-unknown-linux-gnu.tar.xz) = 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31

From dcadfa5c90bfb4eede2068dbc1c1db4fffb1e7b9 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 10 Jul 2018 22:47:41 -0700
Subject: [PATCH 12/14] 1.27.1 fixed CVE-2018-1000622

---
 rust.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust.spec b/rust.spec
index 30402b0..bcd34ab 100644
--- a/rust.spec
+++ b/rust.spec
@@ -652,6 +652,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %changelog
 * Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
 - Update to 1.27.1.
+- Security fix for CVE-2018-1000622
 
 * Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
 - Update to 1.27.0.

From 507a2f126b04bf2d8cdd8d2acc31ba62a34258e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 04:58:56 +0000
Subject: [PATCH 13/14] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 rust.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rust.spec b/rust.spec
index bcd34ab..a2fd351 100644
--- a/rust.spec
+++ b/rust.spec
@@ -56,7 +56,7 @@
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -650,6 +650,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
 - Update to 1.27.1.
 - Security fix for CVE-2018-1000622

From 63599d0572724edeb6ab23c5e8452418f4438913 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 24 Jul 2018 10:58:00 -0700
Subject: [PATCH 14/14] Update to 1.27.2.

---
 .gitignore        | 1 +
 rust.spec         | 7 +++++--
 sources           | 2 +-
 sources-bootstrap | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a3aed8..7d871ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,4 @@
 /rust-1.26.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.27.1-src.tar.xz
+/rustc-1.27.2-src.tar.xz
diff --git a/rust.spec b/rust.spec
index a2fd351..4c1f55a 100644
--- a/rust.spec
+++ b/rust.spec
@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.27.1
+%global rustc_version 1.27.2
 %global cargo_version 1.27.0
 %global rustfmt_version 0.6.1
 %global rls_version 0.127.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -650,6 +650,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
+- Update to 1.27.2.
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index f1552cc..a832ad6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustc-1.27.1-src.tar.xz) = 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
+SHA512 (rustc-1.27.2-src.tar.xz) = 3a54d5d04512a454bb6ccc1e05e513ba36051555c4acfb3b99e072cd3a113f66533c5d39410eb3ababd6e79fb2f16b0e569a45597e82ec2158b585e8aec60407
diff --git a/sources-bootstrap b/sources-bootstrap
index 4b90075..8336a9d 100644
--- a/sources-bootstrap
+++ b/sources-bootstrap
@@ -1,4 +1,4 @@
-SHA512 (rustc-1.27.1-src.tar.xz) = 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
+SHA512 (rustc-1.27.2-src.tar.xz) = 3a54d5d04512a454bb6ccc1e05e513ba36051555c4acfb3b99e072cd3a113f66533c5d39410eb3ababd6e79fb2f16b0e569a45597e82ec2158b585e8aec60407
 SHA512 (rust-1.26.0-aarch64-unknown-linux-gnu.tar.xz) = 731e1db2e39d412997cee3d8d51a9d45a84e7092f1c66524f311f4967f7638964581a8c71a5937a7f80a8e0bae153298a6a806e56e525015ab7caf7b040b14b7
 SHA512 (rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz) = 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
 SHA512 (rust-1.26.0-i686-unknown-linux-gnu.tar.xz) = 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31