From 90b6ebe8f8e0bb1cecf9fa3ffaff0dfd6cfdaead Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 31 Jan 2022 12:58:01 +0100 Subject: [PATCH] rust-rand-0.4: New package. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- config/rootfiles/common/rust-rand-0.4 | 41 ++++++++++ lfs/rust-rand-0.4 | 81 +++++++++++++++++++ make.sh | 1 + .../rust-rand-0.4.6-fix-metadata.patch | 18 +++++ 4 files changed, 141 insertions(+) create mode 100644 config/rootfiles/common/rust-rand-0.4 create mode 100644 lfs/rust-rand-0.4 create mode 100644 src/patches/rust-rand-0.4.6-fix-metadata.patch diff --git a/config/rootfiles/common/rust-rand-0.4 b/config/rootfiles/common/rust-rand-0.4 new file mode 100644 index 0000000000..ecdb3c7b99 --- /dev/null +++ b/config/rootfiles/common/rust-rand-0.4 @@ -0,0 +1,41 @@ +#usr/share/cargo/registry/rand-0.4-0.4.6 +#usr/share/cargo/registry/rand-0.4-0.4.6/.cargo-checksum.json +#usr/share/cargo/registry/rand-0.4-0.4.6/CHANGELOG.md +#usr/share/cargo/registry/rand-0.4-0.4.6/Cargo.toml +#usr/share/cargo/registry/rand-0.4-0.4.6/Cargo.toml.deps +#usr/share/cargo/registry/rand-0.4-0.4.6/LICENSE-APACHE +#usr/share/cargo/registry/rand-0.4-0.4.6/LICENSE-MIT +#usr/share/cargo/registry/rand-0.4-0.4.6/README.md +#usr/share/cargo/registry/rand-0.4-0.4.6/appveyor.yml +#usr/share/cargo/registry/rand-0.4-0.4.6/benches +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/bench.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/distributions +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/distributions/exponential.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/distributions/gamma.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/distributions/mod.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/distributions/normal.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/generators.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/benches/misc.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/exponential.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/gamma.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/mod.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/normal.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/range.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/distributions/ziggurat_tables.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/jitter.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/lib.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/os.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng/chacha.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng/isaac.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng/isaac64.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng/mod.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/prng/xorshift.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/rand_impls.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/read.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/reseeding.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/src/seq.rs +#usr/share/cargo/registry/rand-0.4-0.4.6/utils +#usr/share/cargo/registry/rand-0.4-0.4.6/utils/ziggurat_tables.py diff --git a/lfs/rust-rand-0.4 b/lfs/rust-rand-0.4 new file mode 100644 index 0000000000..f6c96c7519 --- /dev/null +++ b/lfs/rust-rand-0.4 @@ -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.4.6 + +THISAPP = rand-$(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)_MD5 = 6b3b72771c6fd35ab18abd6182c80da2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# 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-rand-0.4.6-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/make.sh b/make.sh index bc61122896..915d50c8f4 100755 --- a/make.sh +++ b/make.sh @@ -1259,6 +1259,7 @@ buildipfire() { lfsmake2 rust-rand_hc lfsmake2 rust-rand lfsmake2 rust-rdrand + lfsmake2 rust-rand-0.4 lfsmake2 gdb lfsmake2 grub lfsmake2 efivar diff --git a/src/patches/rust-rand-0.4.6-fix-metadata.patch b/src/patches/rust-rand-0.4.6-fix-metadata.patch new file mode 100644 index 0000000000..09aa60c4d8 --- /dev/null +++ b/src/patches/rust-rand-0.4.6-fix-metadata.patch @@ -0,0 +1,18 @@ +--- rand-0.4.6/Cargo.toml.orig 2022-01-28 14:06:03.486357507 +0000 ++++ rand-0.4.6/Cargo.toml 2022-01-28 14:06:19.606044332 +0000 +@@ -25,15 +25,5 @@ + [target.'cfg(unix)'.dependencies] + libc = { version = "0.2", optional = true } + +-[target.'cfg(windows)'.dependencies] +-winapi = { version = "0.3", features = ["minwindef", "ntsecapi", "profileapi", "winnt"] } +- + [workspace] + members = ["rand-derive"] +- +-[target.'cfg(target_os = "fuchsia")'.dependencies] +-fuchsia-cprng = "0.1.0" +- +-[target.'cfg(target_env = "sgx")'.dependencies] +-rdrand = "0.4.0" +-rand_core = { version = "0.3", default-features = false } -- 2.39.5