From patchwork Sat Dec 21 12:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8335 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 4YFkmV197zz3x5g for ; Sat, 21 Dec 2024 12:55:54 +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 4YFkmS1sLpz1f6; Sat, 21 Dec 2024 12:55:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YFkmS1MTcz34Jv; Sat, 21 Dec 2024 12:55:52 +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 4YFkmM2GSZz33cv 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 4YFkmL6ZX4z1lV; Sat, 21 Dec 2024 12:55:46 +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=zDJneeEorkeMHqy5RPIbIz51v1R6bKuiOMrPtMqphoY=; b=HlNoEDTjSa3VY3SR4uN3YcXHoYEFIFdvj+CUaC8CYK9Y9/C1q46LoWKEJezjzFie74imu2 HllkkLVwHDZjy3Dg== 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=zDJneeEorkeMHqy5RPIbIz51v1R6bKuiOMrPtMqphoY=; b=SbgJ3vSyig8Y8hEJT1thapyDOLNa1lEhaRsl8FaGFxbYBPLlk7pxm/lnP7hYqeZiPkm5W1 f7oGjCiqga6ZQFG3gceqM59iKROe4JdP8y+GytdjnXLSLOJ4ytE6fQhX9Jfp8Ya6mCTsqz 1yPYUMkujnoWirwXcFSF3MRWLA8mJU1jgBRXYa2W1oUoZfSrMe0l/7rN3LYK2zt7xQCdFI Kuhey3QtSefV65ZMnb9K/mRs9dDD99gSnlaLv/uqPuMRCcU1RX++7hyPb9azlr6+bI/k8A ohOBw2p+mjqQNSLVO3v55Po4u/jWEU11flNQ7oJeqxZ7GspA5F0L2XAfi35I1g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 02/32] rust-ctor: Update to version 0.2.9 from 0.1.21 Date: Sat, 21 Dec 2024 13:55:09 +0100 Message-ID: <20241221125539.15309-2-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: KODXRX6IZLVH7GZL5RQZYXPWC5GDIVUV X-Message-ID-Hash: KODXRX6IZLVH7GZL5RQZYXPWC5GDIVUV 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-ctor | 19 ++++++++++--------- lfs/rust-ctor | 12 ++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/common/rust-ctor b/config/rootfiles/common/rust-ctor index b0ba395cb..5669f3fcf 100644 --- a/config/rootfiles/common/rust-ctor +++ b/config/rootfiles/common/rust-ctor @@ -1,9 +1,10 @@ -#usr/share/cargo/registry/ctor-0.1.21 -#usr/share/cargo/registry/ctor-0.1.21/.cargo-checksum.json -#usr/share/cargo/registry/ctor-0.1.21/Cargo.toml -#usr/share/cargo/registry/ctor-0.1.21/Cargo.toml.deps -#usr/share/cargo/registry/ctor-0.1.21/LICENSE-APACHE -#usr/share/cargo/registry/ctor-0.1.21/LICENSE-MIT -#usr/share/cargo/registry/ctor-0.1.21/src -#usr/share/cargo/registry/ctor-0.1.21/src/example.rs -#usr/share/cargo/registry/ctor-0.1.21/src/lib.rs +#usr/share/cargo/registry/ctor-0.2.9 +#usr/share/cargo/registry/ctor-0.2.9/.cargo-checksum.json +#usr/share/cargo/registry/ctor-0.2.9/Cargo.toml +#usr/share/cargo/registry/ctor-0.2.9/Cargo.toml.deps +#usr/share/cargo/registry/ctor-0.2.9/LICENSE-APACHE +#usr/share/cargo/registry/ctor-0.2.9/LICENSE-MIT +#usr/share/cargo/registry/ctor-0.2.9/README.md +#usr/share/cargo/registry/ctor-0.2.9/src +#usr/share/cargo/registry/ctor-0.2.9/src/example.rs +#usr/share/cargo/registry/ctor-0.2.9/src/lib.rs diff --git a/lfs/rust-ctor b/lfs/rust-ctor index ede27e32e..ad3d3eb62 100644 --- a/lfs/rust-ctor +++ b/lfs/rust-ctor @@ -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.21 +VER = 0.2.9 THISAPP = ctor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 +$(DL_FILE)_BLAKE2 = 3dd71580df939114cbaa0555410c721c66eef82628aa5be34a51365217944d3880d9b51ffbe3d734349cf87e4341237bed9093cc59e281ab8fc5cd49b9e73ee0 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)