From 868bf6c9d0bd367e1fce8df2117f3bf717c3e2e8 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 8 Jun 2016 14:35:11 +0200
Subject: [PATCH] noux-pkg: port of diffutils 3.3

Fixes #2005
---
 repos/ports/ports/diffutils.hash             | 1 +
 repos/ports/ports/diffutils.port             | 9 +++++++++
 repos/ports/run/noux_bash.run                | 6 ++++--
 repos/ports/src/noux-pkg/diffutils/target.mk | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 repos/ports/ports/diffutils.hash
 create mode 100644 repos/ports/ports/diffutils.port
 create mode 100644 repos/ports/src/noux-pkg/diffutils/target.mk

diff --git a/repos/ports/ports/diffutils.hash b/repos/ports/ports/diffutils.hash
new file mode 100644
index 000000000..8abeec241
--- /dev/null
+++ b/repos/ports/ports/diffutils.hash
@@ -0,0 +1 @@
+641074581401c0513b33ebddf72ba7b946fd80f2
diff --git a/repos/ports/ports/diffutils.port b/repos/ports/ports/diffutils.port
new file mode 100644
index 000000000..4fbee8d64
--- /dev/null
+++ b/repos/ports/ports/diffutils.port
@@ -0,0 +1,9 @@
+LICENSE   := GPLv3
+VERSION   := 3.3
+DOWNLOADS := diffutils.archive
+
+URL(diffutils) := http://ftp.gnu.org/gnu/diffutils/diffutils-$(VERSION).tar.xz
+SHA(diffutils) := 6463cce7d3eb73489996baefd0e4425928ecd61e
+SIG(diffutils) := ${URL(diffutils)}.sig
+KEY(diffutils) := GNU
+DIR(diffutils) := src/noux-pkg/diffutils
diff --git a/repos/ports/run/noux_bash.run b/repos/ports/run/noux_bash.run
index 1e7877b4a..c6acbca9a 100644
--- a/repos/ports/run/noux_bash.run
+++ b/repos/ports/run/noux_bash.run
@@ -24,7 +24,7 @@ lappend_if [have_spec gpio] build_components drivers/gpio
 #
 # Build Noux packages only once
 #
-foreach pkg {bash coreutils vim} {
+foreach pkg {bash coreutils vim diffutils} {
 	lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg }
 
 source ${genode_dir}/repos/base/run/platform_drv.inc
@@ -49,6 +49,7 @@ exec sh -c "find bin/bash/ bin/vim/ bin/coreutils/ -type f | (xargs [cross_dev_p
 exec tar cfv bin/bash.tar      -h -C bin/bash .
 exec tar cfv bin/coreutils.tar -h -C bin/coreutils .
 exec tar cfv bin/vim.tar       -h -C bin/vim .
+exec tar cfv bin/diffutils.tar -h -C bin/diffutils .
 
 create_boot_directory
 
@@ -151,6 +152,7 @@ append config {
 			<fstab>
 				<tar name="coreutils.tar" />
 				<tar name="vim.tar" />
+				<tar name="diffutils.tar" />
 				<tar name="bash.tar" />
 
 				<!-- Example of how to impose policy onto a file system
@@ -187,7 +189,7 @@ install_config $config
 set boot_modules {
 	core init timer ld.lib.so noux terminal ram_fs
 	libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so
-	bash.tar coreutils.tar vim.tar
+	bash.tar coreutils.tar diffutils.tar vim.tar
 	rtc_drv
 }
 
diff --git a/repos/ports/src/noux-pkg/diffutils/target.mk b/repos/ports/src/noux-pkg/diffutils/target.mk
new file mode 100644
index 000000000..455752471
--- /dev/null
+++ b/repos/ports/src/noux-pkg/diffutils/target.mk
@@ -0,0 +1 @@
+include $(REP_DIR)/mk/noux.mk