From patchwork Thu Dec 1 15:29:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 6234 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNKks0gBjz3whh for ; Thu, 1 Dec 2022 15:29:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNKkq5phyz2PK; Thu, 1 Dec 2022 15:29:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNKkq4ZBGz2yNV; Thu, 1 Dec 2022 15:29:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNKkp6Br3z2xbM for ; Thu, 1 Dec 2022 15:29:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNKkp1sthz2NB for ; Thu, 1 Dec 2022 15:29:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669908594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UbJrObYlN5wEoppQH1BkEAU0Ll3JOKBo2E16Dk4z1pc=; b=qGvmq1pSVe4RCydqUAEgPYCuzUv/BMDuWcrGnhe5Mj+l2Ydkz4D7lcIf7hG5dS8PFtyY7v cDFW7yDAtINWDUCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669908594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UbJrObYlN5wEoppQH1BkEAU0Ll3JOKBo2E16Dk4z1pc=; b=A5riP6Ao5BHub8t5oQgD9HP4ijUSkc1FWxz7YWy2+pX0Flk+y3V5xziAOCM10REAEq5o32 a1frd9IXl/qdMTfLka/Oh3gfdfGqNcY3GxO9gOo1VBMzgG/a6BtoXWWF/CPcmphtHhtpix FoFs/ym4z6FIA5yvfMwW3s7B60t71UVM/AxSglopRjc9Pj8smCjawKphhDPlWRfNnncWh+ Le7NGzp9PtOIk6CpThkRDxV6aqij1NxrWI4rOK2oPNdVwwO6z+EfWOPxETvdTc0ndsCh7F p5McJmYyGh+13k6+waCIYopD841QOlNFXiGxRop+CYSkt02iWVmmNnFeuGjW4g== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] rust: Update to 1.65 Date: Thu, 1 Dec 2022 16:29:49 +0100 Message-Id: <20221201152949.2933622-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1650-2022-11-03 I started updating rust to 1.65 mainly because 'clamav 0.105.1-3' and the shortly thereafter released version 'clamav 1.0.0' need at least 'rust 1.56': "Building ClamAV requires, at a minimum, Rust compiler version 1.56, as it relies on features introduced in the Rust 2021 Edition." At this point we were still on 'nightly 2022-01-27'. Ok then... But it was a bit more tricky than I thought, because this update wouldn't build without patching most of the existing rust-crate-lfs files in a way I didn't expect. Please note the patch series following this update... Nevertheless, the update to 1.65 and ALL testbuilds completed without any errors. Unfortunately, I can only provide the rootfile for x86_64 - I don't have the appropriate hardware for anything else. Signed-off-by: Matthias Fischer --- config/rootfiles/common/x86_64/rust | 80 +++++++++++++++-------------- lfs/rust | 22 ++++---- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 019a89d13..44703b54c 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -6,10 +6,10 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-13-rust-1.60.0-nightly.so -#usr/lib/librustc_driver-aa47d0f7d4285ece.so -#usr/lib/libstd-516357af627e1a7d.so -#usr/lib/libtest-99495cca8bccf19c.so +#usr/lib/libLLVM-15-rust-1.65.0-stable.so +#usr/lib/librustc_driver-a21dfa8672cc0cdd.so +#usr/lib/libstd-05737cf45bd30456.so +#usr/lib/libtest-b8b77fa76430964e.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -29,42 +29,45 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld -#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld -#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld64 +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld.lld +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld64.lld +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/lld-link +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/wasm-ld #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-02ebc04a72bd9433.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-5a532766d1e80b5b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-ffaac76756e3f83b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-b3d84848ab790cf7.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-f98cce041f593917.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-0e3656b1fda5fd7b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-77187b6b5d97d3f9.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-5cbc32ae14534ca9.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-c79b77d9c2e73c7a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f48e57d6d73020ee.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-d995c6cafdb3d253.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-c94e3d0069d19330.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-d08f0c83526179dc.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-f2a00a4b18a6afb5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9cb5ef8235cf10de.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-275d566364a3bbaa.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-04b3e9d05bd6d948.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.asan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.lsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.msan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.tsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-7f98f837d3579544.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-c7b2792f3bc0d0eb.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-2a6a2797f7a73818.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-79fa9b4a33efec6c.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-516357af627e1a7d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-516357af627e1a7d.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-969ebc8623abfcc9.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-99495cca8bccf19c.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-99495cca8bccf19c.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-726cf7a6ceb83d9a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-7558dde8464d46ce.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-f14b73d282b0245e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-f156b880fc73e7f0.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-3fb6d8496dc7d6a6.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-a0d9b33b5161957b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-272ca28f0b8538d5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-a1f7b8b60464cc57.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-04ef34c95006bbea.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2c5b4433ebc1d822.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-b08a86c6880b47a8.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-04cec55a79224c36.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-098633b847612f3b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-58adeee671f9ba8e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-7f13930fcac1846f.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-92361fe3d1d86e03.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9f873b61fdec9b03.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-1cece883813579b0.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3395ed33f8a00dbe.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-59591a7b405fe395.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4458c5022988e1ab.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-7d46c016841a97d4.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-4be5790574aecaaa.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-384947c6d5f697ff.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-1c81e618a18568a4.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-02e61e5ec4aa9e8b.rlib #usr/libexec/cargo-credential-1password +#usr/libexec/rust-analyzer-proc-macro-srv #usr/share/cargo #usr/share/cargo/registry #usr/share/doc/cargo @@ -77,6 +80,7 @@ #usr/share/doc/rust/LICENSE-APACHE #usr/share/doc/rust/LICENSE-MIT #usr/share/doc/rust/README.md +#usr/share/man/man1/cargo-add.1 #usr/share/man/man1/cargo-bench.1 #usr/share/man/man1/cargo-build.1 #usr/share/man/man1/cargo-check.1 diff --git a/lfs/rust b/lfs/rust index 9cfa81ee3..f14648208 100644 --- a/lfs/rust +++ b/lfs/rust @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,14 +24,14 @@ include Config -VER = 2022-01-27 +VER = 1.65.0 -# From https://static.rust-lang.org/dist/2022-01-27/ +# From https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers -THISAPP = rust-nightly-$(VER) -DL_FILE = $(THISAPP)-$(RUST_PLATFORM).tar.xz +THISAPP = rust-$(VER) +DL_FILE = $(THISAPP)-$(RUST_PLATFORM).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/rust-nightly-$(RUST_PLATFORM) +DIR_APP = $(DIR_SRC)/$(THISAPP)-$(RUST_PLATFORM) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -42,10 +42,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-x86_64-unknown-linux-gnu.tar.xz_BLAKE2 = 9d721887ed1a41ef06ce7e75197b8c7df03aa238818a15e93263c5c32580ae526baa3eb6fe17fa9344da17e2401f81a9b9109445629ed90c93d773bfa57da425 -$(THISAPP)-aarch64-unknown-linux-gnu.tar.xz_BLAKE2 = ebbd07ccc3d0c6a7f009d7eed161c1be528f8ced31ae1c3234e5c088fdb5d7de6e3638c44c26ccfaa81d1ba60c321fa82cf26f67e20dd3b97c75d2639d30dff2 -$(THISAPP)-arm-unknown-linux-gnueabi.tar.xz_BLAKE2 = 2b8f3c43fb3aa90cd9218282d0821ef40a787ba73d393302284b8cf3c8bbac9f37cda748462ffa3909c1ded999e1ce3f7e89761355c44176e7326218b7a06135 -$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.xz_BLAKE2 = 52ccb010f9f557798bf8962225f002b73a16334daf6ff08c81064fdfe06f47fed3f57bdf8bc2ae7f5e157732619de8e1ed9852630e4621510c8d98bf9be415ab +$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = db2dd8518571c5d054502820a0f49483a6cf743ac74747cdb6bb2f3d681b2132de0ed2eb2a5228eaaf7fe737e415cb477764d04d29f565e2bf6cecf6109a468b +$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 73c0c4d995cf6e81b584b078528035d1fedb12e3c0d0435025945e2ba396850676f7f581ad1e627769122bbba5424591fac734520186b704bff7f7a8ca241385 +$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = 9038b158b2590a8a0a25f72f17ff38d88aff1cb210818a150f24d34dbdff9195f156f21ddccaadf9a3ecd3901161e183b5cb0e15e012f4a26be937a9782e0c6c +$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = 76874cfd1e8235eb6d99f75bd9affafa50d1b824664b2edd35c1a5276f51eabaf3f5d5c408070580bbfbdab862e6fe4186f552427e72ac3afa245b2c41c275ae install : $(TARGET) @@ -74,7 +74,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./install.sh \ --components=cargo,rustc,rust-std-$(RUST_PLATFORM) \