Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/rust-proc-macro2 | 49 ++++++++++++++---------- lfs/rust-proc-macro2 | 9 ++--- 2 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/config/rootfiles/common/rust-proc-macro2 b/config/rootfiles/common/rust-proc-macro2 index 1acfef7fe..3bfd11561 100644 --- a/config/rootfiles/common/rust-proc-macro2 +++ b/config/rootfiles/common/rust-proc-macro2 @@ -1,21 +1,28 @@ -#usr/share/cargo/registry/proc-macro2-1.0.36 -#usr/share/cargo/registry/proc-macro2-1.0.36/.cargo-checksum.json -#usr/share/cargo/registry/proc-macro2-1.0.36/Cargo.toml -#usr/share/cargo/registry/proc-macro2-1.0.36/Cargo.toml.deps -#usr/share/cargo/registry/proc-macro2-1.0.36/LICENSE-APACHE -#usr/share/cargo/registry/proc-macro2-1.0.36/LICENSE-MIT -#usr/share/cargo/registry/proc-macro2-1.0.36/README.md -#usr/share/cargo/registry/proc-macro2-1.0.36/build.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src -#usr/share/cargo/registry/proc-macro2-1.0.36/src/detection.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src/fallback.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src/lib.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src/marker.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src/parse.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/src/wrapper.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/tests -#usr/share/cargo/registry/proc-macro2-1.0.36/tests/comments.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/tests/features.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/tests/marker.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/tests/test.rs -#usr/share/cargo/registry/proc-macro2-1.0.36/tests/test_fmt.rs +#usr/share/cargo/registry/proc-macro2-1.0.92 +#usr/share/cargo/registry/proc-macro2-1.0.92/.cargo-checksum.json +#usr/share/cargo/registry/proc-macro2-1.0.92/Cargo.toml +#usr/share/cargo/registry/proc-macro2-1.0.92/Cargo.toml.deps +#usr/share/cargo/registry/proc-macro2-1.0.92/LICENSE-APACHE +#usr/share/cargo/registry/proc-macro2-1.0.92/LICENSE-MIT +#usr/share/cargo/registry/proc-macro2-1.0.92/README.md +#usr/share/cargo/registry/proc-macro2-1.0.92/build +#usr/share/cargo/registry/proc-macro2-1.0.92/build.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/build/probe.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/rust-toolchain.toml +#usr/share/cargo/registry/proc-macro2-1.0.92/src +#usr/share/cargo/registry/proc-macro2-1.0.92/src/detection.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/extra.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/fallback.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/lib.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/location.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/marker.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/parse.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/rcvec.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/src/wrapper.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/comments.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/features.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/marker.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/test.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/test_fmt.rs +#usr/share/cargo/registry/proc-macro2-1.0.92/tests/test_size.rs diff --git a/lfs/rust-proc-macro2 b/lfs/rust-proc-macro2 index d12a2207a..a28890e46 100644 --- a/lfs/rust-proc-macro2 +++ b/lfs/rust-proc-macro2 @@ -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 = 1.0.36 +VER = 1.0.92
THISAPP = proc-macro2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,8 +32,6 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
-CARGO_HAS_BIN = false - ############################################################################### # Top-level Rules ############################################################################### @@ -42,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 21c393e11a5cc2e0ad06c166e77176a1fd687f38beb608d1fe0ead2b78f14dd078851ee828643f98d42ac7c4adac6a6bd3d463c434535da2a57fa9f99343a164 +$(DL_FILE)_BLAKE2 = 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e
install : $(TARGET)
@@ -75,6 +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) && rm Cargo.toml.orig cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL)