* [Buildroot] [PATCH 0/3] Bump rust to 1.29.2
@ 2018-10-18 20:58 Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 1/3] rust-bin: bump version " Eric Le Bihan
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Eric Le Bihan @ 2018-10-18 20:58 UTC (permalink / raw)
To: buildroot
This tiny series bumps rust and rust-bin to 1.29.2 as well as cargo-bin to
0.30.
The cargo package is not bumped, as the source code is now included in the
rust tarball and should be built from it. So this will be added in a future
patch.
Eric Le Bihan (3):
rust-bin: bump version to 1.29.2
rust: bump version to 1.29.2
cargo-bin: bump version to 0.30.0
package/cargo-bin/cargo-bin.hash | 12 ++---
package/cargo-bin/cargo-bin.mk | 2 +-
package/rust-bin/rust-bin.hash | 60 +++++++++++-----------
package/rust-bin/rust-bin.mk | 2 +-
...-Fix-warnings-in-library-from-error-chain.patch | 25 ---------
...mit-warnings-inside-error-chain-expansion.patch | 25 ---------
package/rust/rust.hash | 4 +-
package/rust/rust.mk | 2 +-
8 files changed, 41 insertions(+), 91 deletions(-)
delete mode 100644 package/rust/0001-Fix-warnings-in-library-from-error-chain.patch
delete mode 100644 package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch
--
2.14.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/3] rust-bin: bump version to 1.29.2
2018-10-18 20:58 [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Eric Le Bihan
@ 2018-10-18 20:58 ` Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 2/3] rust: " Eric Le Bihan
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Eric Le Bihan @ 2018-10-18 20:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
package/rust-bin/rust-bin.hash | 60 +++++++++++++++++++++---------------------
package/rust-bin/rust-bin.mk | 2 +-
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash
index 4ad5069486..36f959f257 100644
--- a/package/rust-bin/rust-bin.hash
+++ b/package/rust-bin/rust-bin.hash
@@ -1,33 +1,33 @@
-# From https://static.rust-lang.org/dist/rustc-1.27.2-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 6d4e19c69231096d81acb9380b37613eab0af8779c70c1e8f76d526ae4b43c3d rustc-1.27.2-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rustc-1.27.2-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 927f88b5362e4b601caf619f64d609a88c03852fa505991c08c5f661fe71d7ac rustc-1.27.2-x86_64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-aarch64-unknown-linux-gnu.tar.xz.sha256
-sha256 1538eff6a3ecb62c362cf463686c28103bb162ea1274705e23116b5534f06c56 rust-std-1.27.2-aarch64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-arm-unknown-linux-gnueabi.tar.xz.sha256
-sha256 ab17f722883767bce847b4edb15e9ede8ca95b9d0844f6c210a907fbed9ecb0d rust-std-1.27.2-arm-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-arm-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 15715678f8c993f86174b588c7c026c7208e46ea0a1023753a473397b61b0cb7 rust-std-1.27.2-arm-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 8390920c9b01c0f0eb08028033862e56062caf751b1aed658fbe3a78a1c5d0bf rust-std-1.27.2-armv7-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 9467f43d225238f327047f5ce206f2138391c478f6212f0719c040daf298f81a rust-std-1.27.2-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips-unknown-linux-gnu.tar.xz.sha256
-sha256 73b6097147bb6af5d46cbf2369712fa6faae2b12a42d30d264ab8267492021d5 rust-std-1.27.2-mips-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 352032f8d05c27f4bf5f1073f96dee576324ea8d96eecf823ca07319578b448e rust-std-1.27.2-mips64-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 add721a331a520a4fac0689b82eefe3fe15a0330baca7ef5ad761b731ddfafdd rust-std-1.27.2-mips64el-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-mipsel-unknown-linux-gnu.tar.xz.sha256
-sha256 54cc4af92445491127109bab1249d815f8bcbc26dcba46d8e1fe361dddc870f5 rust-std-1.27.2-mipsel-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc-unknown-linux-gnu.tar.xz.sha256
-sha256 30a638c82e3508685e1d9bec86ac7581b998425b0e76162fcef4e0eba4713dad rust-std-1.27.2-powerpc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc64-unknown-linux-gnu.tar.xz.sha256
-sha256 7dc7a54cb8c567ab8061055533213bc4f491d042b5a61dc0645339ce2453d611 rust-std-1.27.2-powerpc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-sha256 6a0e27d22059b1aeb9fcd2b6d3683156f48002a9a0d2f1e2fedb60af589586d6 rust-std-1.27.2-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 d25e00b8a86956bdf0efe0b20d700081c3f279a1e92f86ccc15fb4deefa42e14 rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 d251b3ade6a66856ff62ea86ed8d34f8cc2a9cd683bf42c3b0c0345f0d955b7c rustc-1.29.2-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 b0ea41cd20caf9af62394601b09d2c8b12814293f3cc1247a8c61fb672477499 rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz.sha256
+sha256 df62bdb6839e313f8f9c3a92b4de63ba2c37b9c7b534449a392db1ede0f6a741 rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz.sha256
+sha256 7729765dab2945c688d0f10faf313c14aed22f6cfdc96a0a07292292662f260a rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 5e4f02edccd013b19b6d03c2a28bff4f81b9cdf7475882e1480aeb21378f93cf rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 d7e6ba57e790fc4e5d02c0b4b0471178b05341cf932bfc349b90ced9b939209e rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 4e8c54a54b3060cde9e24d0c32585360098cc75a120543429ccf498d8b83b5d0 rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz.sha256
+sha256 556596ac7e2dc462573e8379fd1596dc59394044b3a11f0c50f54642439cf8ab rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 8dac2dfc4db7932e6214e98494824453a7be8bb42cf29d5395cc2363fc2fb0c2 rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 361d70abfc27b7fdbe8642bc7413f9b55463e90350465de96183ff048fcf149f rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz.sha256
+sha256 8005463e56932bdf272a047281cc20087db68d8fef4cbcf8cf4edf9a2260f8cc rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz.sha256
+sha256 6cda45f5ee39dbfef95d516a1e0e25744b11d1a8147188b71c21f85f65bca9a9 rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz.sha256
+sha256 612f175c895a495e401205025805a9e8dffa53b2f105a55f92894b159a87fe28 rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+sha256 16034975bd09b57eb1579b659010f83b869733c9c018c2a189a385fa77923875 rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 be16e9db4e39e5e1af0621eea715d13e0fdc56f7b14c3d7310905dc34dfa618a rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz
# Locally generated
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE
sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT
diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk
index 7011e188bd..624ec94b40 100644
--- a/package/rust-bin/rust-bin.mk
+++ b/package/rust-bin/rust-bin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUST_BIN_VERSION = 1.27.2
+RUST_BIN_VERSION = 1.29.2
RUST_BIN_SITE = https://static.rust-lang.org/dist
RUST_BIN_LICENSE = Apache-2.0 or MIT
RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
--
2.14.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/3] rust: bump version to 1.29.2
2018-10-18 20:58 [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 1/3] rust-bin: bump version " Eric Le Bihan
@ 2018-10-18 20:58 ` Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0 Eric Le Bihan
2018-10-20 17:29 ` [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Eric Le Bihan @ 2018-10-18 20:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
...-Fix-warnings-in-library-from-error-chain.patch | 25 ----------------------
...mit-warnings-inside-error-chain-expansion.patch | 25 ----------------------
package/rust/rust.hash | 4 ++--
package/rust/rust.mk | 2 +-
4 files changed, 3 insertions(+), 53 deletions(-)
delete mode 100644 package/rust/0001-Fix-warnings-in-library-from-error-chain.patch
delete mode 100644 package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch
diff --git a/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch b/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch
deleted file mode 100644
index be9d2a87c7..0000000000
--- a/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ac3ffd15e1cf16059b4ccd90b7c816b078a621a5 Mon Sep 17 00:00:00 2001
-From: Mark Simulacrum <mark.simulacrum@gmail.com>
-Date: Wed, 20 Jun 2018 19:47:00 -0600
-Subject: [PATCH] Fix warnings in library from error-chain
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- src/lib.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git rust-1.27.1.orig/src/tools/rust-installer/src/lib.rs rust-1.27.1/src/tools/rust-installer/src/lib.rs
-index ff0495b..cc5e740 100644
---- rust-1.27.1.orig/src/tools/rust-installer/src/lib.rs
-+++ rust-1.27.1/src/tools/rust-installer/src/lib.rs
-@@ -22,6 +22,7 @@ extern crate winapi;
- #[macro_use]
- extern crate lazy_static;
-
-+#[allow(warnings)]
- mod errors {
- error_chain!{
- foreign_links {
---
-2.11.0
-
diff --git a/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch b/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch
deleted file mode 100644
index 6c332bc0ba..0000000000
--- a/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d90cef58439bcd14426d64b16599e060cd6464f9 Mon Sep 17 00:00:00 2001
-From: Mark Simulacrum <mark.simulacrum@gmail.com>
-Date: Wed, 20 Jun 2018 16:54:40 -0600
-Subject: [PATCH] Permit warnings inside error-chain expansion
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- src/main.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git rust-1.27.1.orig/src/tools/rust-installer/src/main.rs rust-1.27.1/src/tools/rust-installer/src/main.rs
-index cabffb8..007ed71 100644
---- rust-1.27.1.orig/src/tools/rust-installer/src/main.rs
-+++ rust-1.27.1/src/tools/rust-installer/src/main.rs
-@@ -7,6 +7,7 @@ extern crate installer;
- use errors::*;
- use clap::{App, ArgMatches};
-
-+#[allow(warnings)]
- mod errors {
- error_chain!{
- links {
---
-2.11.0
-
diff --git a/package/rust/rust.hash b/package/rust/rust.hash
index 51b736be6d..1caab5a4ca 100644
--- a/package/rust/rust.hash
+++ b/package/rust/rust.hash
@@ -1,5 +1,5 @@
-# From https://static.rust-lang.org/dist/rustc-1.27.2-src.tar.xz.sha256
-sha256 bf0228072ad60abd89dd81c8e25ae1e7b4b31e00e73612e7f4985e3144ad5bda rustc-1.27.2-src.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz.sha256
+sha256 bc7b9d4c041fe8454892a4211a116a4d5243cb04583a18c5292914fc829cb2f6 rustc-1.29.2-src.tar.xz
# Locally generated
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE
sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT
diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index 541e49d43d..bf110f8ade 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUST_VERSION = 1.27.2
+RUST_VERSION = 1.29.2
RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
RUST_SITE = https://static.rust-lang.org/dist
RUST_LICENSE = Apache-2.0 or MIT
--
2.14.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0
2018-10-18 20:58 [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 1/3] rust-bin: bump version " Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 2/3] rust: " Eric Le Bihan
@ 2018-10-18 20:58 ` Eric Le Bihan
2018-10-20 22:02 ` Thomas Petazzoni
2018-10-20 17:29 ` [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Thomas Petazzoni
3 siblings, 1 reply; 8+ messages in thread
From: Eric Le Bihan @ 2018-10-18 20:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
package/cargo-bin/cargo-bin.hash | 12 ++++++------
package/cargo-bin/cargo-bin.mk | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash
index ad2da2bc00..96e90c6603 100644
--- a/package/cargo-bin/cargo-bin.hash
+++ b/package/cargo-bin/cargo-bin.hash
@@ -1,9 +1,9 @@
-# From https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 64c2262c0577ef1824d3d885753362d68c04f36ea85a195894894c37e2445ef5 cargo-0.27.0-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-sha256 3688bea3d971615d9c4b33612c20783bd9a385539aa7f754e6543c196e1bcec2 cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 d09c061daaafd735742e0b18a4da6eb656f61d4c57504d100a6ca9f766b38c71 cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+sha256 3718a63fa744d9cd856d72a4fe3ac3b84ff34575a77da72667474c4726d56155 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 9524db722356307669c9068bb7df8dbd57e153717e62071b62560eb22ce2f3cd cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
# Locally generated
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE
sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT
diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk
index 82b020a43a..7fb4508a52 100644
--- a/package/cargo-bin/cargo-bin.mk
+++ b/package/cargo-bin/cargo-bin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CARGO_BIN_VERSION = 0.27.0
+CARGO_BIN_VERSION = 0.30.0
CARGO_BIN_SITE = https://static.rust-lang.org/dist
CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
CARGO_BIN_LICENSE = Apache-2.0 or MIT
--
2.14.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 0/3] Bump rust to 1.29.2
2018-10-18 20:58 [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Eric Le Bihan
` (2 preceding siblings ...)
2018-10-18 20:58 ` [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0 Eric Le Bihan
@ 2018-10-20 17:29 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2018-10-20 17:29 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 18 Oct 2018 22:58:32 +0200, Eric Le Bihan wrote:
> Eric Le Bihan (3):
> rust-bin: bump version to 1.29.2
> rust: bump version to 1.29.2
> cargo-bin: bump version to 0.30.0
Series applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0
2018-10-18 20:58 ` [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0 Eric Le Bihan
@ 2018-10-20 22:02 ` Thomas Petazzoni
2018-10-21 17:41 ` Eric Le Bihan
0 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2018-10-20 22:02 UTC (permalink / raw)
To: buildroot
Hello Eric,
On Thu, 18 Oct 2018 22:58:35 +0200, Eric Le Bihan wrote:
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
I had to revert this patch, it was causing build failures due to the
hashes. See below.
> diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash
> index ad2da2bc00..96e90c6603 100644
> --- a/package/cargo-bin/cargo-bin.hash
> +++ b/package/cargo-bin/cargo-bin.hash
> @@ -1,9 +1,9 @@
> -# From https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz.sha256
> -sha256 64c2262c0577ef1824d3d885753362d68c04f36ea85a195894894c37e2445ef5 cargo-0.27.0-i686-unknown-linux-gnu.tar.xz
> -# From https://static.rust-lang.org/dist/cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
> -sha256 3688bea3d971615d9c4b33612c20783bd9a385539aa7f754e6543c196e1bcec2 cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz
> -# From https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz.sha256
> -sha256 d09c061daaafd735742e0b18a4da6eb656f61d4c57504d100a6ca9f766b38c71 cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz
> +# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
> +sha256 4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
> +# From https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
> +sha256 3718a63fa744d9cd856d72a4fe3ac3b84ff34575a77da72667474c4726d56155 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
> +# From https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.sha256
> +sha256 9524db722356307669c9068bb7df8dbd57e153717e62071b62560eb22ce2f3cd cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
So you updated all those hashes, but they are all wrong. They not match
the tarballs, they do not match the .sha256 files provided on the
upstream site. The upstream site tarballs do match the .sha256 file
that they provide, but they are different hashes than yours.
This looks weird and suspicious. Has upstreaming modified their tarball
after releasing them ? Has their server been hacked, and the tarballs
replaced with some bad thing inside ?
Could you check if you still have a copy of those tarballs locally on
your machine ? Do they have the hash that you wrote in the .hash file ?
If so, could you carefully keep such tarballs, and compare their
contents with the tarballs currently provided by the upstream site ?
Note: we really don't want to blindly update those hashes so that they
patch upstream. We need to understand why the hashes that they provide
now don't match the ones that you provided in this patch.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0
2018-10-20 22:02 ` Thomas Petazzoni
@ 2018-10-21 17:41 ` Eric Le Bihan
2018-10-21 21:24 ` Peter Korsgaard
0 siblings, 1 reply; 8+ messages in thread
From: Eric Le Bihan @ 2018-10-21 17:41 UTC (permalink / raw)
To: buildroot
Hi!
On 2018-10-21 00:02, Thomas Petazzoni wrote:
> Hello Eric,
>
> On Thu, 18 Oct 2018 22:58:35 +0200, Eric Le Bihan wrote:
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>
> I had to revert this patch, it was causing build failures due to the
> hashes. See below.
>
> > diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash
> > index ad2da2bc00..96e90c6603 100644
> > --- a/package/cargo-bin/cargo-bin.hash
> > +++ b/package/cargo-bin/cargo-bin.hash
> > @@ -1,9 +1,9 @@
> > -# From https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz.sha256
> > -sha256 64c2262c0577ef1824d3d885753362d68c04f36ea85a195894894c37e2445ef5 cargo-0.27.0-i686-unknown-linux-gnu.tar.xz
> > -# From https://static.rust-lang.org/dist/cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
> > -sha256 3688bea3d971615d9c4b33612c20783bd9a385539aa7f754e6543c196e1bcec2 cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz
> > -# From https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz.sha256
> > -sha256 d09c061daaafd735742e0b18a4da6eb656f61d4c57504d100a6ca9f766b38c71 cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz
> > +# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
> > +sha256 4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
> > +# From https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
> > +sha256 3718a63fa744d9cd856d72a4fe3ac3b84ff34575a77da72667474c4726d56155 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
> > +# From https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.sha256
> > +sha256 9524db722356307669c9068bb7df8dbd57e153717e62071b62560eb22ce2f3cd cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
>
> So you updated all those hashes, but they are all wrong. They not match
> the tarballs, they do not match the .sha256 files provided on the
> upstream site. The upstream site tarballs do match the .sha256 file
> that they provide, but they are different hashes than yours.
Looking at the official archive web page [1], we can see that all the
cargo-0.30.0.*.xz files have been generated on 2018-10-12T16:33, i.e.
the same day as rust-1.29.2 was released.
But my initial patch series was for rust-1.29.1 and cargo-0.30.0,
generated on 2018-10-08 [2] and cargo-0.30.0 was tagged on 2018-09-18.
So it looks like upstream did regenerate the cargo-0.30.0 tarballs for
rust-1.29.2 release.
> This looks weird and suspicious. Has upstreaming modified their tarball
> after releasing them ? Has their server been hacked, and the tarballs
> replaced with some bad thing inside ?
Void Linux seems to have the same issue [4]. They reverted a commit
where the initial hash for cargo-0.30.0-i686 was
4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a (just
like in my patch) to
43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d (the
new one). Sames goes for x86_64.
> Could you check if you still have a copy of those tarballs locally on
> your machine ? Do they have the hash that you wrote in the .hash file ?
> If so, could you carefully keep such tarballs, and compare their
> contents with the tarballs currently provided by the upstream site ?
I'll have a look.
> Note: we really don't want to blindly update those hashes so that they
> patch upstream. We need to understand why the hashes that they provide
> now don't match the ones that you provided in this patch.
Upstream offers GPG signatures so I checked the contents of the *.sha256
files to the values locally generated after checking the signatures:
```
$ gpg --keyserver-options auto-key-retrieve --verify cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.asc cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
gpg: Signature made Fri Oct 12 18:13:36 2018 CEST using RSA key ID 7B3B09DC
gpg: requesting key 7B3B09DC from hkp server keys.gnupg.net
gpg: key FA1BE5FE: public key "Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>" imported
gpg: key C46ACCF5: public key "Shukhrat Mukimov <mukimov@gmail.com>" imported
gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
gpg: depth: 0 valid: 1 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 1u
gpg: next trustdb check due at 2034-07-25
gpg: Total number processed: 2
gpg: imported: 2 (RSA: 2)
gpg: Good signature from "Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>"
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 108F 6620 5EAE B0AA A8DD 5E1C 85AB 96E6 FA1B E5FE
Subkey fingerprint: C134 66B7 E169 A085 1886 3216 5CB4 A934 7B3B 09DC
$ gpg --verify cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.asc cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
gpg: Signature made Fri Oct 12 18:16:33 2018 CEST using RSA key ID 7B3B09DC
gpg: Good signature from "Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>"
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 108F 6620 5EAE B0AA A8DD 5E1C 85AB 96E6 FA1B E5FE
Subkey fingerprint: C134 66B7 E169 A085 1886 3216 5CB4 A934 7B3B 09DC
$ gpg --verify cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.asc cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
gpg: Signature made Fri Oct 12 18:14:44 2018 CEST using RSA key ID 7B3B09DC
gpg: Good signature from "Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>"
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 108F 6620 5EAE B0AA A8DD 5E1C 85AB 96E6 FA1B E5FE
Subkey fingerprint: C134 66B7 E169 A085 1886 3216 5CB4 A934 7B3B 09DC
```
```
$ cat *.sha256
43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
f8d7c27a40bba6343ee7dd39a324fe772b77824921adf3e9514a44d4e49059c8 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
cb7c63c166baa42ab0be08429e29fa59fc7108efd17ca512462b2645b1655a7f cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
$ sha256sum *.xz
43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
f8d7c27a40bba6343ee7dd39a324fe772b77824921adf3e9514a44d4e49059c8 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
cb7c63c166baa42ab0be08429e29fa59fc7108efd17ca512462b2645b1655a7f cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
```
The key is listed among the official ones [5,6].
Should the new patch with proper hashes mentions something like this?
```
# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.asc
sha256 43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
```
[1] https://static.rust-lang.org/dist/index.html
[2] https://github.com/elebihan/buildroot/commit/607827d362f8e5b073df2dc0fb5deb50fc213aaf
[3] https://github.com/rust-lang/cargo/releases/tag/0.30.0
[4] https://github.com/void-linux/void-packages/commit/65eb57a59a878483bb1678b7058f0065c42e19cd
[5] https://github.com/rust-lang-deprecated/rustup.sh/issues/65#issuecomment-242205887
[6] http://pgp.mit.edu/pks/lookup?op=vindex&search=0x85AB96E6FA1BE5FE
Regards,
--
ELB
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0
2018-10-21 17:41 ` Eric Le Bihan
@ 2018-10-21 21:24 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2018-10-21 21:24 UTC (permalink / raw)
To: buildroot
>>>>> "Eric" == Eric Le Bihan <eric.le.bihan.dev@free.fr> writes:
Hi,
>> This looks weird and suspicious. Has upstreaming modified their tarball
>> after releasing them ? Has their server been hacked, and the tarballs
>> replaced with some bad thing inside ?
> Void Linux seems to have the same issue [4]. They reverted a commit
> where the initial hash for cargo-0.30.0-i686 was
> 4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a (just
> like in my patch) to
> 43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d (the
> new one). Sames goes for x86_64.
Ahh, ok.
> The key is listed among the official ones [5,6].
Thanks!
> Should the new patch with proper hashes mentions something like this?
> ```
> # From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
> # Verified using https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.asc
> sha256
> 43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d
> cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
Looks good to me, please send a patch with that.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-10-21 21:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-18 20:58 [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 1/3] rust-bin: bump version " Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 2/3] rust: " Eric Le Bihan
2018-10-18 20:58 ` [Buildroot] [PATCH 3/3] cargo-bin: bump version to 0.30.0 Eric Le Bihan
2018-10-20 22:02 ` Thomas Petazzoni
2018-10-21 17:41 ` Eric Le Bihan
2018-10-21 21:24 ` Peter Korsgaard
2018-10-20 17:29 ` [Buildroot] [PATCH 0/3] Bump rust to 1.29.2 Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox