rust-same-file: 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-same-file b/config/rootfiles/common/rust-same-file
new file mode 100644 (file)
index 0000000..43cc861
--- /dev/null
+++ b/config/rootfiles/common/rust-same-file
@@ -0,0 +1,17 @@
+#usr/share/cargo/registry/same-file-1.0.6
+#usr/share/cargo/registry/same-file-1.0.6/.cargo-checksum.json
+#usr/share/cargo/registry/same-file-1.0.6/COPYING
+#usr/share/cargo/registry/same-file-1.0.6/Cargo.toml
+#usr/share/cargo/registry/same-file-1.0.6/Cargo.toml.deps
+#usr/share/cargo/registry/same-file-1.0.6/LICENSE-MIT
+#usr/share/cargo/registry/same-file-1.0.6/README.md
+#usr/share/cargo/registry/same-file-1.0.6/UNLICENSE
+#usr/share/cargo/registry/same-file-1.0.6/examples
+#usr/share/cargo/registry/same-file-1.0.6/examples/is_same_file.rs
+#usr/share/cargo/registry/same-file-1.0.6/examples/is_stderr.rs
+#usr/share/cargo/registry/same-file-1.0.6/rustfmt.toml
+#usr/share/cargo/registry/same-file-1.0.6/src
+#usr/share/cargo/registry/same-file-1.0.6/src/lib.rs
+#usr/share/cargo/registry/same-file-1.0.6/src/unix.rs
+#usr/share/cargo/registry/same-file-1.0.6/src/unknown.rs
+#usr/share/cargo/registry/same-file-1.0.6/src/win.rs

diff --git a/lfs/rust-same-file b/lfs/rust-same-file
new file mode 100644 (file)
index 0000000..1d758de
--- /dev/null
+++ b/lfs/rust-same-file
@@ -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.0.6
+
+THISAPP    = same-file-$(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 = 2d8d8b377d144f5e32b4f65a69eb0b24
+
+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-same-file-1.0.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 15c6f5738c194e7e181d4d1a7240f3813cf40488..c32dc56f6c4ffda7c9ed354d65a6f38a24778cd6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1239,6 +1239,7 @@ buildipfire() {
   lfsmake2 rust-pest
   lfsmake2 rust-semver-parser
   lfsmake2 rust-semver
+  lfsmake2 rust-same-file
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar

diff --git a/src/patches/rust-same-file-1.0.6-fix-metadata.patch b/src/patches/rust-same-file-1.0.6-fix-metadata.patch
new file mode 100644 (file)
index 0000000..4c5d061
--- /dev/null
+++ b/src/patches/rust-same-file-1.0.6-fix-metadata.patch
@@ -0,0 +1,8 @@
+--- same-file-1.0.6/Cargo.toml.orig    2022-01-28 10:46:49.087608618 +0000
++++ same-file-1.0.6/Cargo.toml 2022-01-28 10:47:01.307598832 +0000
+@@ -25,5 +25,3 @@
+ repository = "https://github.com/BurntSushi/same-file"
+ [dev-dependencies.doc-comment]
+ version = "0.3"
+-[target."cfg(windows)".dependencies.winapi-util]
+-version = "0.1.1"