Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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 info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@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 @@
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)