From mboxrd@z Thu Jan 1 00:00:00 1970 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0547407785618465541==" List-Id: --===============0547407785618465541== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - lfs and rootfile created - Patch created to remove requirement for winapi and related windows dependen= cies 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 =3D 0.1.43 + +THISAPP =3D time-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 =3D 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eada= b111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 + +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-m= etadata.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/ru= st-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 =3D true + [dev-dependencies.log] + version =3D "0.4" +- +-[dev-dependencies.winapi] +-version =3D "0.3.0" +-features =3D ["std", "processthreadsapi", "winbase"] +-[target."cfg(windows)".dependencies.winapi] +-version =3D "0.3.0" +-features =3D ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sys= infoapi", "timezoneapi"] --=20 2.36.1 --===============0547407785618465541==--