From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 7 Aug 2013 21:58:52 +0000 (-0400)
Subject: Add ecryptfs-utils
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=cda598a3509f67ac63048c38869d6d20dbbd501a;p=hvlinux.git

Add ecryptfs-utils
---

diff --git a/config/dependencies b/config/dependencies
index 0a0b5a0..f84746c 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -21,9 +21,11 @@ ${GIMP}: ${BABL} ${INTTOOL} ${PYGTK}
 
 ${GSTREAMER}:
 
+${ECRYPTFS_UTILS}: ${KEYUTILS} ${NSPR} ${NSS}
+
 ${GNASH}: ${AGG} ${CAIRO} ${GSTREAMER} ${FFMPEG} ${SDL} ${FIREFOX}
 
-${FIREFOX}: ${SQLITE} ${LIBNOTIFY} ${YASM}
+${FIREFOX}: ${SQLITE} ${LIBNOTIFY} ${YASM} ${NSPR} ${NSS}
 
 ${FUSE}: ${UDEV}
 
diff --git a/config/packages-list b/config/packages-list
index 30e88c5..01f3735 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -76,6 +76,7 @@ DVDRWTOOLS="dvd+rw-tools-7.1"
 
 E2FSPROGS="e2fsprogs-1.42.5"
 EASYTAG="easytag-2.1.7"
+ECRYPTFS_UTILS="ecryptfs-utils_103"
 EGLIBC="eglibc-2.15-r17386"
 EGLIBC_PORTS="eglibc-ports-2.15-r17386"
 UCLIBC="uClibc-0.9.30.1"
@@ -189,6 +190,7 @@ JASPER="jasper-1.900.1"
 KBD="kbd-1.15.3"
 KERBEROS5="krb5-1.10.3"
 KERNEL="linux-3.9.4"
+KEYUTILS="keyutils-1.5.5"
 KMOD="kmod-13"
 KVM="kvm-88"
 
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 0b962a5..f8d90b6 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -173,6 +173,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
+    ipkg -m noac ${KEYUTILS}
+    ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS}
+
     ipkg -s qt ${QT}
     source /etc/profile
     ipkg -m noac ${LUA}
diff --git a/stage5/packages-update b/stage5/packages-update
index 59a0f32..f5571b7 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -136,10 +136,13 @@ fpkg ${MIDORI} "http://archive.xfce.org/src/apps/midori/$(get_pkg_ver2 ${MIDORI}
 
 fpkg -m hv ${NSPR}
 fpkg -m hv ${NSS}
-
 fpkg -f "${FIREFOX}.source" ${FIREFOX} \
     "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
 
+fpkg ${KEYUTILS} "http://people.redhat.com/~dhowells/keyutils"
+fpkg -f "${ECRYPTFS_UTILS}.orig" ${ECRYPTFS_UTILS} \
+    "https://launchpad.net/ecryptfs/trunk/$(get_pkg_ver_underscore ${ECRYPTFS_UTILS})/+download"
+
 fpkg -e "tar.gz" ${QT} "http://get.qt.nokia.com/qt/source"
 fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp"
 fpkg -e "tar.xz" -m sf ${VLC}
diff --git a/stage5/pkg/ecryptfs-utils b/stage5/pkg/ecryptfs-utils
new file mode 100644
index 0000000..bfd349b
--- /dev/null
+++ b/stage5/pkg/ecryptfs-utils
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    # Prevent the following error when running encryptfs-setup-private as a non root user:
+    #   setreuid: Operation not permitted
+    #   ERROR:  Could not mount private ecryptfs directory
+    chmod +s /sbin/mount.ecryptfs_private
+}