From patchwork Sat Dec 21 12:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8337 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 4YFkmX1Mstz3xDX for ; Sat, 21 Dec 2024 12:55:56 +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 4YFkmT59y7z5tC; Sat, 21 Dec 2024 12:55:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YFkmT4fBLz34LN; Sat, 21 Dec 2024 12:55:53 +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 4YFkmM3tQJz33cv for ; Sat, 21 Dec 2024 12:55:47 +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 4YFkmM2Q3xznL; Sat, 21 Dec 2024 12:55:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734785747; 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=PYA9DI+vfQAL/hP8dVf7JNtkNob5i97982iSRP14HqQ=; b=mKZYDTlar1OyhCnFwOLG63L/wb5QsKgcseQudF0+dzHB6s7B2Nl9/fct++V7hneSmp8qfM 8y+X+gfC7jdqQwDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734785747; 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=PYA9DI+vfQAL/hP8dVf7JNtkNob5i97982iSRP14HqQ=; b=l0J30rwF3+BHF0kar2NyNoRAf2jgHHF8CBnWpyMS+/z/gGjkyP5laKqWmAA6WWXgyJMLtb 2R68wOEcyl48a3WSpQLVnQkRpqMF6XcqjrYJdKxUGxg1xyXis/BamnEwnLFtSVgCr+bMEI wkYSxtSsxTQML99dbeqomvWSYwXuq5Hng/a2O2s9YQRetKnIhPjjD9nI2URzMjNSCwlaD5 zs3x2974iBK5ndISZWVyunG8ok674IyAYNk1ZEjfO1hnTY/M1GrUfb2+CgW0DYO3PmpAGa QQwDbC1Nq0MKPwPlltnmnfW7TuRU+AxMu/5i9zf5jLFMdCAJzRYk1R850Dpldg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 04/32] rust-inventory: Update to version 0.1.4 from 0.3.15 Date: Sat, 21 Dec 2024 13:55:11 +0100 Message-ID: <20241221125539.15309-4-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: ZBG5LSUDHYDD3V26UP4BBMCZ6HRIRVHO X-Message-ID-Hash: ZBG5LSUDHYDD3V26UP4BBMCZ6HRIRVHO 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-inventory | 38 ++++++++++++++++++-------- lfs/rust-inventory | 12 +++----- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/config/rootfiles/common/rust-inventory b/config/rootfiles/common/rust-inventory index 3ac172897..19d683d91 100644 --- a/config/rootfiles/common/rust-inventory +++ b/config/rootfiles/common/rust-inventory @@ -1,11 +1,27 @@ -#usr/share/cargo/registry/inventory-0.1.4 -#usr/share/cargo/registry/inventory-0.1.4/.cargo-checksum.json -#usr/share/cargo/registry/inventory-0.1.4/Cargo.toml -#usr/share/cargo/registry/inventory-0.1.4/Cargo.toml.deps -#usr/share/cargo/registry/inventory-0.1.4/LICENSE-APACHE -#usr/share/cargo/registry/inventory-0.1.4/LICENSE-MIT -#usr/share/cargo/registry/inventory-0.1.4/README.md -#usr/share/cargo/registry/inventory-0.1.4/examples -#usr/share/cargo/registry/inventory-0.1.4/examples/flags.rs -#usr/share/cargo/registry/inventory-0.1.4/src -#usr/share/cargo/registry/inventory-0.1.4/src/lib.rs +#usr/share/cargo/registry/inventory-0.3.15 +#usr/share/cargo/registry/inventory-0.3.15/.cargo-checksum.json +#usr/share/cargo/registry/inventory-0.3.15/Cargo.toml +#usr/share/cargo/registry/inventory-0.3.15/Cargo.toml.deps +#usr/share/cargo/registry/inventory-0.3.15/LICENSE-APACHE +#usr/share/cargo/registry/inventory-0.3.15/LICENSE-MIT +#usr/share/cargo/registry/inventory-0.3.15/README.md +#usr/share/cargo/registry/inventory-0.3.15/examples +#usr/share/cargo/registry/inventory-0.3.15/examples/flags.rs +#usr/share/cargo/registry/inventory-0.3.15/src +#usr/share/cargo/registry/inventory-0.3.15/src/lib.rs +#usr/share/cargo/registry/inventory-0.3.15/tests +#usr/share/cargo/registry/inventory-0.3.15/tests/compiletest.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/test.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/collect-unsized.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/collect-unsized.stderr +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/non-sync.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/non-sync.stderr +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/outer-attr.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/outer-attr.stderr +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/submit-nonconst.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/submit-nonconst.stderr +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/submit-unrecognized.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/submit-unrecognized.stderr +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/used-linker.rs +#usr/share/cargo/registry/inventory-0.3.15/tests/ui/used-linker.stderr diff --git a/lfs/rust-inventory b/lfs/rust-inventory index 177ff9453..bb64eac03 100644 --- a/lfs/rust-inventory +++ b/lfs/rust-inventory @@ -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.1.4 +VER = 0.3.15 THISAPP = inventory-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = cf8fdc1ae6972d58b8797d2b20ba1b75a92b3f33cf5cb9cd1b46c39efcbd3e6e5ba4107da1f35294b22aeedb2beef78e76ead1b6eed35e2d132cfc54b7aff8e7 +$(DL_FILE)_BLAKE2 = 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c1158958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1 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)