From patchwork Fri Jun 17 09:42:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5688 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 4LPZ402RFwz3xqn for ; Fri, 17 Jun 2022 09:48:32 +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 4LPZ3z5RMtz1Rs; Fri, 17 Jun 2022 09:48:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LPZ3z5RPtz2ymJ; Fri, 17 Jun 2022 09:48:31 +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 4LPZ3y5gwtz2xPS for ; Fri, 17 Jun 2022 09:48:30 +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 4LPZ3y3gtDz1Rn; Fri, 17 Jun 2022 09:48:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1655459310; 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=P2kblxrOTujBHbwJCSnrBPo7fywMXsqowKaXBQWZPnc=; b=XqFOnnhKg2+cqduxNsSbMkz2/JzGXCdR5CoZETr3aczQLlC+suCA4vGNf64CwNY4JgtHP5 KUrYkP0YOAU/l2AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1655459310; 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=P2kblxrOTujBHbwJCSnrBPo7fywMXsqowKaXBQWZPnc=; b=dZvaGd9KvqMEwZACp6I+9/m2y0tW808CxKzZwtsZkYlpDmqrg3SD7KD9MQJ1Vo6qetS0xT s9wWZZ4uQ+pk4aZ9vOI/uOsoqVk67QzfKd0G84pAOsOR80wdk4YAD7v6WSKIF8z38/tvAU w/DWfQzVk3FIoWFwbAn9TaaUjVe8m0e4l0mPW5zV3vNgXfLEbVPYBsVxTYY3qSgcjDokdN 8tNVhGWnpKBX40hAkVhC/5f3czLxTCElNWGRevkQdkeyuQQ7FiTCOxXVNIHCtyGDotl8/9 ZwykhD685ETyaVwNql5MGjbwZgYu8qGvFdrZzoGT7khL9ktUoCPF87ySUGYmGw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 23/23] rust-time: Required for update of python3-cryptography Date: Fri, 17 Jun 2022 11:42:43 +0200 Message-Id: <20220617094243.6422-23-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 - Patch created to remove requirement for winapi and related windows dependencies Signed-off-by: Adolf Belka --- config/rootfiles/common/rust-time | 13 +++ lfs/rust-time | 81 +++++++++++++++++++ .../rust-time-0.1.43-fix-metadata.patch | 13 +++ 3 files changed, 107 insertions(+) create mode 100644 config/rootfiles/common/rust-time create mode 100644 lfs/rust-time create mode 100644 src/patches/rust-time-0.1.43-fix-metadata.patch diff --git a/config/rootfiles/common/rust-time b/config/rootfiles/common/rust-time new file mode 100644 index 000000000..08aaa8980 --- /dev/null +++ b/config/rootfiles/common/rust-time @@ -0,0 +1,13 @@ +#usr/share/cargo/registry/time-0.1.43 +#usr/share/cargo/registry/time-0.1.43/.cargo-checksum.json +#usr/share/cargo/registry/time-0.1.43/Cargo.toml +#usr/share/cargo/registry/time-0.1.43/Cargo.toml.deps +#usr/share/cargo/registry/time-0.1.43/LICENSE-APACHE +#usr/share/cargo/registry/time-0.1.43/LICENSE-MIT +#usr/share/cargo/registry/time-0.1.43/README.md +#usr/share/cargo/registry/time-0.1.43/src +#usr/share/cargo/registry/time-0.1.43/src/display.rs +#usr/share/cargo/registry/time-0.1.43/src/duration.rs +#usr/share/cargo/registry/time-0.1.43/src/lib.rs +#usr/share/cargo/registry/time-0.1.43/src/parse.rs +#usr/share/cargo/registry/time-0.1.43/src/sys.rs diff --git a/lfs/rust-time b/lfs/rust-time new file mode 100644 index 000000000..2ea396c79 --- /dev/null +++ b/lfs/rust-time @@ -0,0 +1,81 @@ +############################################################################### +# # +# 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.1.43 + +THISAPP = time-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 + +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) && patch -Np1 < $(DIR_SRC)/src/patches/rust-time-0.1.43-fix-metadata.patch + cd $(DIR_APP) && $(CARGO_PREPARE) + cd $(DIR_APP) && $(CARGO_BUILD) + cd $(DIR_APP) && $(CARGO_INSTALL) + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/patches/rust-time-0.1.43-fix-metadata.patch b/src/patches/rust-time-0.1.43-fix-metadata.patch new file mode 100644 index 000000000..342281750 --- /dev/null +++ b/src/patches/rust-time-0.1.43-fix-metadata.patch @@ -0,0 +1,13 @@ +--- time-0.1.43/Cargo.toml.original 2020-04-20 00:31:10.000000000 +0200 ++++ time-0.1.43/Cargo.toml 2022-06-16 15:21:19.210090045 +0200 +@@ -29,10 +29,3 @@ + optional = true + [dev-dependencies.log] + version = "0.4" +- +-[dev-dependencies.winapi] +-version = "0.3.0" +-features = ["std", "processthreadsapi", "winbase"] +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.0" +-features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"]