# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1547419639 -7200
# Node ID 71fcd9228827fe228a2f43ee4c98449b24e60148
# Parent  0efaf035ff765b9361a17522fa848cbe9d398024
keyutils, ecryptfs-utils, ecryptfs-simple

diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-simple/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-simple/receipt	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,30 @@
+# SliTaz package receipt v2.
+
+PACKAGE="ecryptfs-simple"
+VERSION="2017"
+CATEGORY="security"
+SHORT_DESC="A very simple utility for working with eCryptfs"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://xyne.archlinux.ca/projects/ecryptfs-simple/"
+
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="${WEB_SITE}src/$TARBALL"
+TARBALL_SHA1="1f94f21500ca870e3a5302a6fe8fe28544484da2"
+
+BUILD_DEPENDS="cmake libgcrypt-dev ecryptfs-utils-dev util-linux-mount-dev"
+DEPENDS="ecryptfs-utils keyutils libgcrypt util-linux-mount"
+
+TAGS="cryptography"
+
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make install || return 1
+
+	cook_pick_manpages $src/ecryptfs_src/ecryptfs.7
+}
diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-simple/stuff/overrides
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-simple/stuff/overrides	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,1 @@
+4755 /usr/bin/ecryptfs-simple
diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-utils/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-utils/receipt	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,30 @@
+# SliTaz package receipt v2.
+
+PACKAGE="ecryptfs-utils"
+VERSION="111"
+CATEGORY="security"
+SHORT_DESC="POSIX-compliant enterprise cryptographic filesystem tools"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="http://ecryptfs.org/"
+
+TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
+WGET_URL="https://launchpad.net/ecryptfs/trunk/$VERSION/+download/$TARBALL"
+TARBALL_SHA1="2a30db4fcb63b2a5d23c48eb96c9842ae597c778"
+
+BUILD_DEPENDS="keyutils-dev nss-dev python-dev perl swig gettext intltool"
+SPLIT="$PACKAGE-dev"
+
+DEPENDS_std="keyutils nss python"
+DEPENDS_dev="$PACKAGE keyutils-dev"
+
+TAGS="cryptography"
+
+compile_rules() {
+	./configure \
+		--disable-pam \
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
+}
diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-utils/stuff/patches/fix-build.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-utils/stuff/patches/fix-build.patch	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,11 @@
+--- ecryptfs-utils-111.orig/src/utils/mount.ecryptfs_private.c	2016-01-22 18:04:52.000000000 +0200
++++ ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c	2017-01-20 08:39:31.877975729 +0200
+@@ -235,7 +235,7 @@
+ 	 * deceive other programs with a crafted /proc/self/*. See
+ 	 * https://launchpad.net/bugs/1530566 for more details.
+ 	 */
+-	__SWORD_TYPE f_type_whitelist[] = {
++	static const uint32_t f_type_whitelist[] = {
+ 		0x61756673 /* AUFS_SUPER_MAGIC */,
+ 		0x9123683E /* BTRFS_SUPER_MAGIC */,
+ 		0x00C36400 /* CEPH_SUPER_MAGIC */,
diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-utils/stuff/patches/fix-stdout-flush.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-utils/stuff/patches/fix-stdout-flush.patch	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,30 @@
+diff -ru ecryptfs-utils-111.orig/src/libecryptfs/key_management.c ecryptfs-utils-111/src/libecryptfs/key_management.c
+--- ecryptfs-utils-111.orig/src/libecryptfs/key_management.c	2015-12-21 22:38:59.000000000 +0200
++++ ecryptfs-utils-111/src/libecryptfs/key_management.c	2017-01-31 11:11:55.190995428 +0200
+@@ -1245,6 +1245,7 @@
+ 	if (prompt != NULL) {
+ 		printf("%s: ", prompt);
+ 	}
++	fflush(stdout);
+ 	ecryptfs_disable_echo(&current_settings);
+ 	if (fgets(passphrase,
+ 		  ECRYPTFS_MAX_PASSWORD_LENGTH+2, stdin) == NULL) {
+diff -ru ecryptfs-utils-111.orig/src/utils/io.c ecryptfs-utils-111/src/utils/io.c
+--- ecryptfs-utils-111.orig/src/utils/io.c	2015-12-21 22:38:59.000000000 +0200
++++ ecryptfs-utils-111/src/utils/io.c	2017-01-31 11:11:34.127379788 +0200
+@@ -70,6 +70,7 @@
+ 	int c;
+ 
+ 	printf("%s: ", prompt);
++	fflush(stdout);
+ 	temp = malloc(length);
+ 	if (!temp) {
+ 		rc = -ENOMEM;
+@@ -122,6 +123,7 @@
+ 	int rc = 0;
+ 	int c;
+ 
++	fflush(stdout);
+ 	if (echo == ECRYPTFS_ECHO_OFF) {
+ 		rc = disable_echo(&saved_settings);
+ 		if (rc)
diff -r 0efaf035ff76 -r 71fcd9228827 ecryptfs-utils/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ecryptfs-utils/stuff/patches/series	Mon Jan 14 00:47:19 2019 +0200
@@ -0,0 +1,4 @@
+# from Alpine Linux
+# https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils?h=master
+fix-build.patch
+fix-stdout-flush.patch
diff -r 0efaf035ff76 -r 71fcd9228827 keyutils/receipt
--- a/keyutils/receipt	Mon Jan 14 00:27:10 2019 +0200
+++ b/keyutils/receipt	Mon Jan 14 00:47:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="keyutils"
-VERSION="1.5.11"
+VERSION="1.6"
 CATEGORY="system-tools"
 SHORT_DESC="Linux key management utilities"
 MAINTAINER="al.bobylev@gmail.com"
@@ -11,9 +11,14 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://people.redhat.com/~dhowells/keyutils/$TARBALL"
+TARBALL_SHA1="a1d276562c435d6976444f5dc1d1258b52cbf741"
 
 BUILD_DEPENDS="file krb5-dev"
 SPLIT="$PACKAGE-dev"
+
+DEPENDS_std="libcomerr3 libkrb5"
+CONFIG_FILES_std="/etc/request-key.conf /etc/request-key.d/"
+
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -22,16 +27,3 @@
 
 	fix symlinks
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		keyutils)
-			copy @std
-			DEPENDS="libcomerr3 libkrb5"
-			CONFIG_FILES="/etc/request-key.conf /etc/request-key.d/"
-			;;
-		*-dev)
-			copy @dev
-			;;
-	esac
-}