From patchwork Wed Nov 9 18:56:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6088 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 4N6vPS5HLkz3whc for ; Wed, 9 Nov 2022 18:58:20 +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 4N6vPD6DrCz2s3; Wed, 9 Nov 2022 18:58:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4N6vPC6t4Dz30Bh; Wed, 9 Nov 2022 18:58:07 +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 4N6vP86DqXz2ytv for ; Wed, 9 Nov 2022 18:58:04 +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 4N6vP84P4zz2HW; Wed, 9 Nov 2022 18:58:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1668020284; 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=TCKXnXi1xEt5seMHeScstZ//wb+saHjw4XJYCU9PPnk=; b=GtI1SpWCvLRRcUiBo+5Y6yUSXVSnfetLkzKfM1qL4jx3oEVpyk+xy1aUW7LTZ8lCLwHM8U oLR5rFfWv4Qv83Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1668020284; 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=TCKXnXi1xEt5seMHeScstZ//wb+saHjw4XJYCU9PPnk=; b=gmTaToAG/Oiytfmh/95OgwldIVPW7Hsdk5MW66He/xy3e3x9APl9OVv+xS3iOAYSqe2Y6y HNtrn2wGwyQLn0Z4bjxS3fxS8dyTr26RfLHDhyqntzNUhcsepDyo1leVgbWFq/O8JDcDxE CB+iQvce4CkXaE2LaP+6HfgfYm/Hlq+6D5rShqAJLQQOWULK1Z0BgnKbVehtK/IN8RmueX Ls4joJfecNnQKMeTt+XfaEFWj0ElOuXgafBZN68ZMjcpDALHHaThCXGGv35NHX4KmL8Bt2 HQrr/iLi6D3sJgyzJTastfkz3JTVJAuH5WiLOJuC7bWv9wHFPIGCfImZQnZOuQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 11/48] rust-iana-time-zone: Required by updated rust-chrono Date: Wed, 9 Nov 2022 19:56:57 +0100 Message-Id: <20221109185734.3920-11-adolf.belka@ipfire.org> In-Reply-To: <20221109185734.3920-1-adolf.belka@ipfire.org> References: <20221109185734.3920-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" - Install of version 0.1.51 - Definition of rootfile - Creation of metadata patch to eliminate windows options Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/rust-iana-time-zone | 24 ++++++ lfs/rust-iana-time-zone | 81 +++++++++++++++++++ ...t-iana-time-zone-0.1.51-fix-metadata.patch | 34 ++++++++ 3 files changed, 139 insertions(+) create mode 100644 config/rootfiles/common/rust-iana-time-zone create mode 100644 lfs/rust-iana-time-zone create mode 100644 src/patches/rust-iana-time-zone-0.1.51-fix-metadata.patch diff --git a/config/rootfiles/common/rust-iana-time-zone b/config/rootfiles/common/rust-iana-time-zone new file mode 100644 index 000000000..1571519ee --- /dev/null +++ b/config/rootfiles/common/rust-iana-time-zone @@ -0,0 +1,24 @@ +#usr/share/cargo/registry/iana-time-zone-0.1.51 +#usr/share/cargo/registry/iana-time-zone-0.1.51/.cargo-checksum.json +#usr/share/cargo/registry/iana-time-zone-0.1.51/CHANGELOG.md +#usr/share/cargo/registry/iana-time-zone-0.1.51/Cargo.toml +#usr/share/cargo/registry/iana-time-zone-0.1.51/Cargo.toml.deps +#usr/share/cargo/registry/iana-time-zone-0.1.51/LICENSE-APACHE +#usr/share/cargo/registry/iana-time-zone-0.1.51/LICENSE-MIT +#usr/share/cargo/registry/iana-time-zone-0.1.51/README.md +#usr/share/cargo/registry/iana-time-zone-0.1.51/examples +#usr/share/cargo/registry/iana-time-zone-0.1.51/examples/get_timezone.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/examples/stress-test.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/ffi_utils.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/lib.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/platform.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_android.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_freebsd.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_haiku.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_illumos.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_linux.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_macos.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_netbsd.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_wasm32.rs +#usr/share/cargo/registry/iana-time-zone-0.1.51/src/tz_windows.rs diff --git a/lfs/rust-iana-time-zone b/lfs/rust-iana-time-zone new file mode 100644 index 000000000..8c7be37b0 --- /dev/null +++ b/lfs/rust-iana-time-zone @@ -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.51 + +THISAPP = iana-time-zone-$(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 = 9e29f255039c03361f9d0e1be83c71b984c4a3e980110ddae770381cb9a78f0ed6f90cccc2f8bd9553bc68e5f65d4d9194c8766fdd9da46c68172c78ddbcad8f + +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-iana-time-zone-0.1.51-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-iana-time-zone-0.1.51-fix-metadata.patch b/src/patches/rust-iana-time-zone-0.1.51-fix-metadata.patch new file mode 100644 index 000000000..790f6bdb4 --- /dev/null +++ b/src/patches/rust-iana-time-zone-0.1.51-fix-metadata.patch @@ -0,0 +1,34 @@ +--- iana-time-zone-0.1.51/Cargo.toml.original 1970-01-01 01:00:01.000000000 +0100 ++++ iana-time-zone-0.1.51/Cargo.toml 2022-10-13 23:51:27.954816115 +0200 +@@ -31,31 +31,3 @@ + [features] + fallback = [] + +-[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.core-foundation-sys] +-version = "0.8.3" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.js-sys] +-version = "0.3.50" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] +-version = "0.2.70" +- +-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] +-version = "0.3" +- +-[target."cfg(target_os = \"android\")".dependencies.android_system_properties] +-version = "0.1.5" +- +-[target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] +-version = "0.1.0" +- +-[target."cfg(target_os = \"windows\")".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "activation", +- "combaseapi", +- "objbase", +- "roapi", +- "winerror", +- "winstring", +-]