rust-termcolor: New package.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/rust-termcolor b/config/rootfiles/common/rust-termcolor
new file mode 100644 (file)
index 0000000..bc71d7f
--- /dev/null
+++ b/config/rootfiles/common/rust-termcolor
@@ -0,0 +1,11 @@
+#usr/share/cargo/registry/termcolor-1.1.2
+#usr/share/cargo/registry/termcolor-1.1.2/.cargo-checksum.json
+#usr/share/cargo/registry/termcolor-1.1.2/COPYING
+#usr/share/cargo/registry/termcolor-1.1.2/Cargo.toml
+#usr/share/cargo/registry/termcolor-1.1.2/Cargo.toml.deps
+#usr/share/cargo/registry/termcolor-1.1.2/LICENSE-MIT
+#usr/share/cargo/registry/termcolor-1.1.2/README.md
+#usr/share/cargo/registry/termcolor-1.1.2/UNLICENSE
+#usr/share/cargo/registry/termcolor-1.1.2/rustfmt.toml
+#usr/share/cargo/registry/termcolor-1.1.2/src
+#usr/share/cargo/registry/termcolor-1.1.2/src/lib.rs

diff --git a/lfs/rust-termcolor b/lfs/rust-termcolor
new file mode 100644 (file)
index 0000000..68fd6ba
--- /dev/null
+++ b/lfs/rust-termcolor
@@ -0,0 +1,81 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.1.2
+
+THISAPP    = termcolor-$(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 = ebdff467249aa3dca005a441dc824236
+
+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-termcolor-1.1.2-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 108ab768fd13eb114a43c8b4bd88c12bca0b3efd..07276f4ce6889ba67ff6d9786eb31591a6d6665a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1276,6 +1276,7 @@ buildipfire() {
   lfsmake2 rust-tempdir
   lfsmake2 rust-glob
   lfsmake2 rust-once_cell
+  lfsmake2 rust-termcolor
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar

diff --git a/src/patches/rust-termcolor-1.1.2-fix-metadata.patch b/src/patches/rust-termcolor-1.1.2-fix-metadata.patch
new file mode 100644 (file)
index 0000000..0193d74
--- /dev/null
+++ b/src/patches/rust-termcolor-1.1.2-fix-metadata.patch
@@ -0,0 +1,10 @@
+--- termcolor-1.1.2/Cargo.toml.orig    2022-01-28 14:51:30.895317372 +0000
++++ termcolor-1.1.2/Cargo.toml 2022-01-28 14:51:36.466706492 +0000
+@@ -27,7 +27,3 @@
+ [lib]
+ name = "termcolor"
+ bench = false
+-
+-[dev-dependencies]
+-[target."cfg(windows)".dependencies.winapi-util]
+-version = "0.1.3"