From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6279192163885311251=="
List-Id: <development.lists.ipfire.org>

--===============6279192163885311251==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 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.stde=
rr
+#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  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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 @@
=20
 include Config
=20
-VER        =3D 0.1.4
+VER        =3D 0.3.15
=20
 THISAPP    =3D inventory-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D cf8fdc1ae6972d58b8797d2b20ba1b75a92b3f33cf5cb9cd1b46c3=
9efcbd3e6e5ba4107da1f35294b22aeedb2beef78e76ead1b6eed35e2d132cfc54b7aff8e7
+$(DL_FILE)_BLAKE2 =3D 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c11=
58958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1
=20
 install : $(TARGET)
=20
@@ -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)
--=20
2.47.1


--===============6279192163885311251==--