From patchwork Fri Jun 17 09:42:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5677 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4LPZ0q1M6tz3xqn for ; Fri, 17 Jun 2022 09:45:47 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4LPZ0p4f4yz1Pk; Fri, 17 Jun 2022 09:45:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LPZ0p4XWjz2xyT; Fri, 17 Jun 2022 09:45:46 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4LPZ0n5Yrmz2xKb for ; Fri, 17 Jun 2022 09:45:45 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4LPZ0n3qztzS9; Fri, 17 Jun 2022 09:45:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1655459145; 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=Hd2rHuWSBW+WoBq8AuHc5E0WjzBP0F8clJZw7ub3NUo=; b=O9oaqKjcStjKESNwu5MvalQA1wGk0OfCSkdC1+GhsgSnOXqTrQ8Fj2/zTZvbrc1w5T5NtU YwAza4xih4NOQxCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1655459145; 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=Hd2rHuWSBW+WoBq8AuHc5E0WjzBP0F8clJZw7ub3NUo=; b=ZgUbyNL9VTBj+EUF8/YuTLEXAglJJvlSaivmRmTUVs7Bfa5Vbmo6nUc42A+64YdqlDCsn6 hFoUt92qZ3+WfSzW2odOo+kFIAI9+fV+16HU3YbX4XDTDmlwUY1iw1RhfIGouJhAmL28tA 9R+cr5jWmaLMVbCTeVZTc80HEaFWCYhDMLyUHcku+usIBhq7WOXstFHs5NULqqQiBcXBFF Eae1B9kb65UadDnqBZcgQF9rGcE6DQ/J5KPr3A7Gpa/eyQkbcLb3VlZe+jcqCwgwTm5JCD rzrk8o5OyqmHyUSyXIF1dNgyHL39p+HcnIlYa0wz8RLPQKgT6BORSiOcoV/NFg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 12/23] rust-indoc-0.3.6: Required for update of python3-cryptography Date: Fri, 17 Jun 2022 11:42:32 +0200 Message-Id: <20220617094243.6422-12-adolf.belka@ipfire.org> In-Reply-To: <20220617094243.6422-1-adolf.belka@ipfire.org> References: <20220617094243.6422-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - lfs and rootfile created - python3-cryptography build requires older version than was already installed. Therefore named version 0.3.6 created, leaving original rust-indoc in place Signed-off-by: Adolf Belka --- config/rootfiles/common/rust-indoc-0.3.6 | 30 +++++++++ lfs/rust-indoc-0.3.6 | 80 ++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 config/rootfiles/common/rust-indoc-0.3.6 create mode 100644 lfs/rust-indoc-0.3.6 diff --git a/config/rootfiles/common/rust-indoc-0.3.6 b/config/rootfiles/common/rust-indoc-0.3.6 new file mode 100644 index 000000000..b4ba2d7c6 --- /dev/null +++ b/config/rootfiles/common/rust-indoc-0.3.6 @@ -0,0 +1,30 @@ +#usr/share/cargo/registry/indoc-0.3.6-0.3.6 +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/.cargo-checksum.json +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/Cargo.toml +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/Cargo.toml.deps +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/LICENSE-APACHE +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/LICENSE-MIT +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/README.md +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/src +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/src/lib.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/compiletest.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/run-pass.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/no-arguments.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/no-arguments.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-lit.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-lit.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-string.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-string.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/two-arguments.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/two-arguments.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/no-arguments.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/no-arguments.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-lit.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-lit.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-string.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-string.stderr +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/two-arguments.rs +#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/two-arguments.stderr diff --git a/lfs/rust-indoc-0.3.6 b/lfs/rust-indoc-0.3.6 new file mode 100644 index 000000000..d8eff0bf4 --- /dev/null +++ b/lfs/rust-indoc-0.3.6 @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.3.6 + +THISAPP = indoc-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/indoc-0.3.6-$(VER) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && $(CARGO_PREPARE) + cd $(DIR_APP) && $(CARGO_BUILD) + cd $(DIR_APP) && $(CARGO_INSTALL) + @rm -rf $(DIR_APP) + @$(POSTBUILD)