wok-next rev 21118

keyutils, ecryptfs-utils, ecryptfs-simple
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jan 14 00:47:19 2019 +0200 (2019-01-14)
parents 0efaf035ff76
children 7abe998c632a
files ecryptfs-simple/receipt ecryptfs-simple/stuff/overrides ecryptfs-utils/receipt ecryptfs-utils/stuff/patches/fix-build.patch ecryptfs-utils/stuff/patches/fix-stdout-flush.patch ecryptfs-utils/stuff/patches/series keyutils/receipt
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ecryptfs-simple/receipt	Mon Jan 14 00:47:19 2019 +0200
     1.3 @@ -0,0 +1,30 @@
     1.4 +# SliTaz package receipt v2.
     1.5 +
     1.6 +PACKAGE="ecryptfs-simple"
     1.7 +VERSION="2017"
     1.8 +CATEGORY="security"
     1.9 +SHORT_DESC="A very simple utility for working with eCryptfs"
    1.10 +MAINTAINER="pascal.bellard@slitaz.org"
    1.11 +LICENSE="GPL2"
    1.12 +WEB_SITE="https://xyne.archlinux.ca/projects/ecryptfs-simple/"
    1.13 +
    1.14 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.15 +WGET_URL="${WEB_SITE}src/$TARBALL"
    1.16 +TARBALL_SHA1="1f94f21500ca870e3a5302a6fe8fe28544484da2"
    1.17 +
    1.18 +BUILD_DEPENDS="cmake libgcrypt-dev ecryptfs-utils-dev util-linux-mount-dev"
    1.19 +DEPENDS="ecryptfs-utils keyutils libgcrypt util-linux-mount"
    1.20 +
    1.21 +TAGS="cryptography"
    1.22 +
    1.23 +compile_rules() {
    1.24 +	mkdir build
    1.25 +	cd    build
    1.26 +	cmake \
    1.27 +		-DCMAKE_INSTALL_PREFIX=/usr \
    1.28 +		.. &&
    1.29 +	make &&
    1.30 +	make install || return 1
    1.31 +
    1.32 +	cook_pick_manpages $src/ecryptfs_src/ecryptfs.7
    1.33 +}
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/ecryptfs-simple/stuff/overrides	Mon Jan 14 00:47:19 2019 +0200
     2.3 @@ -0,0 +1,1 @@
     2.4 +4755 /usr/bin/ecryptfs-simple
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/ecryptfs-utils/receipt	Mon Jan 14 00:47:19 2019 +0200
     3.3 @@ -0,0 +1,30 @@
     3.4 +# SliTaz package receipt v2.
     3.5 +
     3.6 +PACKAGE="ecryptfs-utils"
     3.7 +VERSION="111"
     3.8 +CATEGORY="security"
     3.9 +SHORT_DESC="POSIX-compliant enterprise cryptographic filesystem tools"
    3.10 +MAINTAINER="pascal.bellard@slitaz.org"
    3.11 +LICENSE="GPL2"
    3.12 +WEB_SITE="http://ecryptfs.org/"
    3.13 +
    3.14 +TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
    3.15 +WGET_URL="https://launchpad.net/ecryptfs/trunk/$VERSION/+download/$TARBALL"
    3.16 +TARBALL_SHA1="2a30db4fcb63b2a5d23c48eb96c9842ae597c778"
    3.17 +
    3.18 +BUILD_DEPENDS="keyutils-dev nss-dev python-dev perl swig gettext intltool"
    3.19 +SPLIT="$PACKAGE-dev"
    3.20 +
    3.21 +DEPENDS_std="keyutils nss python"
    3.22 +DEPENDS_dev="$PACKAGE keyutils-dev"
    3.23 +
    3.24 +TAGS="cryptography"
    3.25 +
    3.26 +compile_rules() {
    3.27 +	./configure \
    3.28 +		--disable-pam \
    3.29 +		$CONFIGURE_ARGS &&
    3.30 +	fix libtool &&
    3.31 +	make &&
    3.32 +	make install
    3.33 +}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/ecryptfs-utils/stuff/patches/fix-build.patch	Mon Jan 14 00:47:19 2019 +0200
     4.3 @@ -0,0 +1,11 @@
     4.4 +--- ecryptfs-utils-111.orig/src/utils/mount.ecryptfs_private.c	2016-01-22 18:04:52.000000000 +0200
     4.5 ++++ ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c	2017-01-20 08:39:31.877975729 +0200
     4.6 +@@ -235,7 +235,7 @@
     4.7 + 	 * deceive other programs with a crafted /proc/self/*. See
     4.8 + 	 * https://launchpad.net/bugs/1530566 for more details.
     4.9 + 	 */
    4.10 +-	__SWORD_TYPE f_type_whitelist[] = {
    4.11 ++	static const uint32_t f_type_whitelist[] = {
    4.12 + 		0x61756673 /* AUFS_SUPER_MAGIC */,
    4.13 + 		0x9123683E /* BTRFS_SUPER_MAGIC */,
    4.14 + 		0x00C36400 /* CEPH_SUPER_MAGIC */,
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/ecryptfs-utils/stuff/patches/fix-stdout-flush.patch	Mon Jan 14 00:47:19 2019 +0200
     5.3 @@ -0,0 +1,30 @@
     5.4 +diff -ru ecryptfs-utils-111.orig/src/libecryptfs/key_management.c ecryptfs-utils-111/src/libecryptfs/key_management.c
     5.5 +--- ecryptfs-utils-111.orig/src/libecryptfs/key_management.c	2015-12-21 22:38:59.000000000 +0200
     5.6 ++++ ecryptfs-utils-111/src/libecryptfs/key_management.c	2017-01-31 11:11:55.190995428 +0200
     5.7 +@@ -1245,6 +1245,7 @@
     5.8 + 	if (prompt != NULL) {
     5.9 + 		printf("%s: ", prompt);
    5.10 + 	}
    5.11 ++	fflush(stdout);
    5.12 + 	ecryptfs_disable_echo(&current_settings);
    5.13 + 	if (fgets(passphrase,
    5.14 + 		  ECRYPTFS_MAX_PASSWORD_LENGTH+2, stdin) == NULL) {
    5.15 +diff -ru ecryptfs-utils-111.orig/src/utils/io.c ecryptfs-utils-111/src/utils/io.c
    5.16 +--- ecryptfs-utils-111.orig/src/utils/io.c	2015-12-21 22:38:59.000000000 +0200
    5.17 ++++ ecryptfs-utils-111/src/utils/io.c	2017-01-31 11:11:34.127379788 +0200
    5.18 +@@ -70,6 +70,7 @@
    5.19 + 	int c;
    5.20 + 
    5.21 + 	printf("%s: ", prompt);
    5.22 ++	fflush(stdout);
    5.23 + 	temp = malloc(length);
    5.24 + 	if (!temp) {
    5.25 + 		rc = -ENOMEM;
    5.26 +@@ -122,6 +123,7 @@
    5.27 + 	int rc = 0;
    5.28 + 	int c;
    5.29 + 
    5.30 ++	fflush(stdout);
    5.31 + 	if (echo == ECRYPTFS_ECHO_OFF) {
    5.32 + 		rc = disable_echo(&saved_settings);
    5.33 + 		if (rc)
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/ecryptfs-utils/stuff/patches/series	Mon Jan 14 00:47:19 2019 +0200
     6.3 @@ -0,0 +1,4 @@
     6.4 +# from Alpine Linux
     6.5 +# https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils?h=master
     6.6 +fix-build.patch
     6.7 +fix-stdout-flush.patch
     7.1 --- a/keyutils/receipt	Mon Jan 14 00:27:10 2019 +0200
     7.2 +++ b/keyutils/receipt	Mon Jan 14 00:47:19 2019 +0200
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt v2.
     7.5  
     7.6  PACKAGE="keyutils"
     7.7 -VERSION="1.5.11"
     7.8 +VERSION="1.6"
     7.9  CATEGORY="system-tools"
    7.10  SHORT_DESC="Linux key management utilities"
    7.11  MAINTAINER="al.bobylev@gmail.com"
    7.12 @@ -11,9 +11,14 @@
    7.13  
    7.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    7.15  WGET_URL="http://people.redhat.com/~dhowells/keyutils/$TARBALL"
    7.16 +TARBALL_SHA1="a1d276562c435d6976444f5dc1d1258b52cbf741"
    7.17  
    7.18  BUILD_DEPENDS="file krb5-dev"
    7.19  SPLIT="$PACKAGE-dev"
    7.20 +
    7.21 +DEPENDS_std="libcomerr3 libkrb5"
    7.22 +CONFIG_FILES_std="/etc/request-key.conf /etc/request-key.d/"
    7.23 +
    7.24  COOKOPTS="skip-log-errors"
    7.25  
    7.26  compile_rules() {
    7.27 @@ -22,16 +27,3 @@
    7.28  
    7.29  	fix symlinks
    7.30  }
    7.31 -
    7.32 -genpkg_rules() {
    7.33 -	case $PACKAGE in
    7.34 -		keyutils)
    7.35 -			copy @std
    7.36 -			DEPENDS="libcomerr3 libkrb5"
    7.37 -			CONFIG_FILES="/etc/request-key.conf /etc/request-key.d/"
    7.38 -			;;
    7.39 -		*-dev)
    7.40 -			copy @dev
    7.41 -			;;
    7.42 -	esac
    7.43 -}