From patchwork Sat Dec 21 12:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8348 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YFkmk4p5xz3x5g for ; Sat, 21 Dec 2024 12:56:06 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YFkmk0Dryz5VD; Sat, 21 Dec 2024 12:56:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YFkmj6rSDz34Kd; Sat, 21 Dec 2024 12:56:05 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YFkmP6Kgpz34Jy for ; Sat, 21 Dec 2024 12:55:49 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4YFkmP4rzyznL; Sat, 21 Dec 2024 12:55:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734785749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W1i/eFHqIyB/cuDzzT0HM7x/oqaXfUBEuZyMucBSl8Y=; b=OO6SCiXPJcEgjiI/5tGVJjMtv59jw7yB8CLYyTzVPGtincnpqkYC2kVyIwD8SUsALBiabW PzAudWKHGXLGr9DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734785749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W1i/eFHqIyB/cuDzzT0HM7x/oqaXfUBEuZyMucBSl8Y=; b=fB3AVTNCA54Nxfrmmw7IjMfpaLuUd0++8aDuXRCQs6zZHOQxIISQrcZj6QNC03+9k9+uoQ 1Q+VUToCBP4pLjTGghCeyvSlgUstZc+Qp4EpVm4JarayAW0THDnlZBccBUmNNrFDH7r68q AmXRMamvdcWILx3mj4BZKSkmzICnm//FzQ0rFQ559SSCjHN6a2TvUjpbKHn4+0T+DjubX6 BzFT6TnVpkQGt8b981QI+IwsEBTjT1jTq31p7tPt4pIsbXIhzq9NG/tp2U/XwZBlknwGY9 RAmXSDJXuaH8NIzhvjJaX1vxRrpgDz7E6XJ+jTZ5iK5YYjNADv5U2B8RxP1IMw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 15/32] rust-toml: Update to version 0.8.19 from 0.5.8 Date: Sat, 21 Dec 2024 13:55:22 +0100 Message-ID: <20241221125539.15309-15-adolf.belka@ipfire.org> In-Reply-To: <20241221125539.15309-1-adolf.belka@ipfire.org> References: <20241221125539.15309-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 2XEDRQGHGBH2NPXEMMHJ4RTAIEJ63KPR X-Message-ID-Hash: 2XEDRQGHGBH2NPXEMMHJ4RTAIEJ63KPR X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Adolf Belka --- config/rootfiles/common/rust-toml | 62 +++++++++++++++++++------------ lfs/rust-toml | 12 ++---- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/config/rootfiles/common/rust-toml b/config/rootfiles/common/rust-toml index 3c9379631..e94602ada 100644 --- a/config/rootfiles/common/rust-toml +++ b/config/rootfiles/common/rust-toml @@ -1,23 +1,39 @@ -#usr/share/cargo/registry/toml-0.5.8 -#usr/share/cargo/registry/toml-0.5.8/.cargo-checksum.json -#usr/share/cargo/registry/toml-0.5.8/Cargo.toml -#usr/share/cargo/registry/toml-0.5.8/Cargo.toml.deps -#usr/share/cargo/registry/toml-0.5.8/LICENSE-APACHE -#usr/share/cargo/registry/toml-0.5.8/LICENSE-MIT -#usr/share/cargo/registry/toml-0.5.8/README.md -#usr/share/cargo/registry/toml-0.5.8/examples -#usr/share/cargo/registry/toml-0.5.8/examples/decode.rs -#usr/share/cargo/registry/toml-0.5.8/examples/enum_external.rs -#usr/share/cargo/registry/toml-0.5.8/examples/toml2json.rs -#usr/share/cargo/registry/toml-0.5.8/src -#usr/share/cargo/registry/toml-0.5.8/src/datetime.rs -#usr/share/cargo/registry/toml-0.5.8/src/de.rs -#usr/share/cargo/registry/toml-0.5.8/src/lib.rs -#usr/share/cargo/registry/toml-0.5.8/src/macros.rs -#usr/share/cargo/registry/toml-0.5.8/src/map.rs -#usr/share/cargo/registry/toml-0.5.8/src/ser.rs -#usr/share/cargo/registry/toml-0.5.8/src/spanned.rs -#usr/share/cargo/registry/toml-0.5.8/src/tokens.rs -#usr/share/cargo/registry/toml-0.5.8/src/value.rs -#usr/share/cargo/registry/toml-0.5.8/tests -#usr/share/cargo/registry/toml-0.5.8/tests/enum_external_deserialize.rs +#usr/share/cargo/registry/toml-0.8.19 +#usr/share/cargo/registry/toml-0.8.19/.cargo-checksum.json +#usr/share/cargo/registry/toml-0.8.19/Cargo.toml +#usr/share/cargo/registry/toml-0.8.19/LICENSE-APACHE +#usr/share/cargo/registry/toml-0.8.19/LICENSE-MIT +#usr/share/cargo/registry/toml-0.8.19/README.md +#usr/share/cargo/registry/toml-0.8.19/examples +#usr/share/cargo/registry/toml-0.8.19/examples/decode.rs +#usr/share/cargo/registry/toml-0.8.19/examples/enum_external.rs +#usr/share/cargo/registry/toml-0.8.19/examples/toml2json.rs +#usr/share/cargo/registry/toml-0.8.19/src +#usr/share/cargo/registry/toml-0.8.19/src/de.rs +#usr/share/cargo/registry/toml-0.8.19/src/edit.rs +#usr/share/cargo/registry/toml-0.8.19/src/fmt.rs +#usr/share/cargo/registry/toml-0.8.19/src/lib.rs +#usr/share/cargo/registry/toml-0.8.19/src/macros.rs +#usr/share/cargo/registry/toml-0.8.19/src/map.rs +#usr/share/cargo/registry/toml-0.8.19/src/ser.rs +#usr/share/cargo/registry/toml-0.8.19/src/table.rs +#usr/share/cargo/registry/toml-0.8.19/src/value.rs +#usr/share/cargo/registry/toml-0.8.19/tests +#usr/share/cargo/registry/toml-0.8.19/tests/decoder.rs +#usr/share/cargo/registry/toml-0.8.19/tests/decoder_compliance.rs +#usr/share/cargo/registry/toml-0.8.19/tests/encoder.rs +#usr/share/cargo/registry/toml-0.8.19/tests/encoder_compliance.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/de_errors.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/display.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/display_tricky.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/enum_external_deserialize.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/float.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/formatting.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/macros.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/main.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/pretty.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/serde.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/spanned.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/spanned_impls.rs +#usr/share/cargo/registry/toml-0.8.19/tests/testsuite/tables_last.rs diff --git a/lfs/rust-toml b/lfs/rust-toml index 1ba546b8b..7865dd14d 100644 --- a/lfs/rust-toml +++ b/lfs/rust-toml @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2024 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,7 +24,7 @@ include Config -VER = 0.5.8 +VER = 0.8.19 THISAPP = toml-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 +$(DL_FILE)_BLAKE2 = f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c install : $(TARGET) @@ -73,11 +73,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ - rm -f Cargo.toml.orig; \ - fi; \ - + cd $(DIR_APP) && rm Cargo.toml.orig cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL)