Version bump

Package-Manager: portage-2.1.4_rc10

6 files changed, 157 insertions, 18 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index ac357bc90063..2efc743a0d41 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.13 2007/12/13 18:45:03 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.14 2007/12/14 18:14:21 alonbl Exp $
+
+*ecryptfs-utils-33 (14 Dec 2007)
+
+  14 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/ecryptfs-utils-33-mkdir.patch, -ecryptfs-utils-32.ebuild,
+  +ecryptfs-utils-33.ebuild:
+  Version bump
 
 *ecryptfs-utils-32 (13 Dec 2007)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 62c16ebf65d9..b556746a8548 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,16 +1,20 @@
-DIST ecryptfs-utils-32.tar.bz2 962484 RMD160 53447dc84de69407e702af54ddcb45ec3c0f5f2a SHA1 d1d7167072a3b3162b01e09446c6a298a6d94527 SHA256 6b9d3e8c76df4406a2940479dd3acf43d15b6171dbf1b68126360f05511eea37
-EBUILD ecryptfs-utils-32.ebuild 1409 RMD160 aa70613d073486bdf8df6f671908e0f0c98f7cd9 SHA1 ee09fe72d220a98cb0fa3a19716c0d38a09654ed SHA256 f70b0a480b6589e5a0b5e892c78980b79830c2cc096ccee02ab369aed1327a07
-MD5 b891a36d8eddc7ce2383968fda9fbd51 ecryptfs-utils-32.ebuild 1409
-RMD160 aa70613d073486bdf8df6f671908e0f0c98f7cd9 ecryptfs-utils-32.ebuild 1409
-SHA256 f70b0a480b6589e5a0b5e892c78980b79830c2cc096ccee02ab369aed1327a07 ecryptfs-utils-32.ebuild 1409
-MISC ChangeLog 2377 RMD160 2dc1c438417588ebd547496233f671bd2e1c5840 SHA1 03addf112ce70c9bebde5dcfa9c70076a8ff9c53 SHA256 abb15ffb9fde8e88a05fa075a395531d187f299418b5f512c404df0025eced29
-MD5 fdfd6ab7d274f5093510bd70b1ba752a ChangeLog 2377
-RMD160 2dc1c438417588ebd547496233f671bd2e1c5840 ChangeLog 2377
-SHA256 abb15ffb9fde8e88a05fa075a395531d187f299418b5f512c404df0025eced29 ChangeLog 2377
+AUX ecryptfs-utils-33-mkdir.patch 2919 RMD160 2e82755e4e62a0f4a4a91b53a43d938eff9abc07 SHA1 05c747baccfcef3132fa5127c557ffd14a2a02f8 SHA256 8b080a005b3846b30abf179c76d2f453c65f8c8f86cd6afb0b00c0439b705a5d
+MD5 5ff08167280ced8b0e3774e401ca74eb files/ecryptfs-utils-33-mkdir.patch 2919
+RMD160 2e82755e4e62a0f4a4a91b53a43d938eff9abc07 files/ecryptfs-utils-33-mkdir.patch 2919
+SHA256 8b080a005b3846b30abf179c76d2f453c65f8c8f86cd6afb0b00c0439b705a5d files/ecryptfs-utils-33-mkdir.patch 2919
+DIST ecryptfs-utils-33.tar.bz2 963259 RMD160 6756752a5a4ce397a9f4f418b8a45d978d464a91 SHA1 c4b5da9e0fa9d22e38c63d65b976bd226cd67e2e SHA256 2e16fb9f25cac32e720aa18386ab041325f20b46283afa3f46b25f33713d046a
+EBUILD ecryptfs-utils-33.ebuild 1487 RMD160 14a8506453006442b7bcde14082b0355318d8847 SHA1 2174d6f24f441d6a538a7696c3386414f5398c7c SHA256 da4c4ec8cde19fd73558f6545049d1a7264ae2bfe45d02c16de9173d853be10f
+MD5 743f18ac96e82be5ae09461a92cbaf24 ecryptfs-utils-33.ebuild 1487
+RMD160 14a8506453006442b7bcde14082b0355318d8847 ecryptfs-utils-33.ebuild 1487
+SHA256 da4c4ec8cde19fd73558f6545049d1a7264ae2bfe45d02c16de9173d853be10f ecryptfs-utils-33.ebuild 1487
+MISC ChangeLog 2571 RMD160 292e9cfd051996780a15a816bc15f92e15cacf39 SHA1 081af3c48b4dcdaf88eefdf6b3d57092ef4165e9 SHA256 05ce36a1363fb2bf49b9691f7f1f05ff5aa7635cbb12b45d12c2d4b99e262f84
+MD5 996ecaaf85178e6e69be57c60d435beb ChangeLog 2571
+RMD160 292e9cfd051996780a15a816bc15f92e15cacf39 ChangeLog 2571
+SHA256 05ce36a1363fb2bf49b9691f7f1f05ff5aa7635cbb12b45d12c2d4b99e262f84 ChangeLog 2571
 MISC metadata.xml 355 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf SHA1 ffba9e7b0465df8b8ca111de7ee3b3f763c1b45e SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee
 MD5 1c8677910988959bdc24fbca34b9f94a metadata.xml 355
 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf metadata.xml 355
 SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee metadata.xml 355
-MD5 eceb656dfd64ec481bade7a437014b88 files/digest-ecryptfs-utils-32 256
-RMD160 25b07815f82055f14748b12ebdf1f07b954ac7c0 files/digest-ecryptfs-utils-32 256
-SHA256 609221e3c5ad905b6e690dfd098ed68a6b872ea6b6c1206fc2564f4c056a2fca files/digest-ecryptfs-utils-32 256
+MD5 24f563f5d3354487d22250cb982d54cc files/digest-ecryptfs-utils-33 256
+RMD160 f5f4358d11e243c72033af0b17d9cbf7caf94228 files/digest-ecryptfs-utils-33 256
+SHA256 9dd028cd698b0e1ad5b2512d5026c83a6a288b12f8f14113dd8cd5269cfd4cd8 files/digest-ecryptfs-utils-33 256
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
index 0892a31458b8..dad91491d2c5 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild,v 1.1 2007/12/13 18:45:03 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild,v 1.1 2007/12/14 18:14:21 alonbl Exp $
 
-inherit autotools
+inherit eutils
 
 DESCRIPTION="eCryptfs userspace utilities"
 HOMEPAGE="http://www.ecryptfs.org"
@@ -28,6 +28,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-mkdir.patch"
+}
+
 src_compile() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32
deleted file mode 100644
index e62979f4d669..000000000000
--- a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8c8f4bc699fb19fcacaef15e64a0f92 ecryptfs-utils-32.tar.bz2 962484
-RMD160 53447dc84de69407e702af54ddcb45ec3c0f5f2a ecryptfs-utils-32.tar.bz2 962484
-SHA256 6b9d3e8c76df4406a2940479dd3acf43d15b6171dbf1b68126360f05511eea37 ecryptfs-utils-32.tar.bz2 962484
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33
new file mode 100644
index 000000000000..1686e7c59168
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33
@@ -0,0 +1,3 @@
+MD5 21fbaf2f4401715ffc29dd1696c2d46e ecryptfs-utils-33.tar.bz2 963259
+RMD160 6756752a5a4ce397a9f4f418b8a45d978d464a91 ecryptfs-utils-33.tar.bz2 963259
+SHA256 2e16fb9f25cac32e720aa18386ab041325f20b46283afa3f46b25f33713d046a ecryptfs-utils-33.tar.bz2 963259
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch
new file mode 100644
index 000000000000..12070ea46b1b
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch
@@ -0,0 +1,122 @@
+diff --git a/src/key_mod/ecryptfs_key_mod_openssl.c b/src/key_mod/ecryptfs_key_mod_openssl.c
+index e0cc4ed..941e6c0 100644
+--- a/src/key_mod/ecryptfs_key_mod_openssl.c
++++ b/src/key_mod/ecryptfs_key_mod_openssl.c
+@@ -27,6 +27,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <libgen.h>
+ #include <openssl/pem.h>
+ #include <openssl/rsa.h>
+ #include <openssl/err.h>
+@@ -182,56 +183,58 @@ out:
+ }
+ 
+ static int
++ecryptfs_openssl_mkdir_recursive(char *dir, mode_t mode)
++{
++	char *temp = NULL;
++	char *parent = NULL;
++	int rc;
++
++	if (!strcmp(dir, ".") || !strcmp(dir, "/"))
++		return 0;
++
++	temp = strdup(dir);
++	if (temp == NULL) {
++		rc = -ENOMEM;
++		goto out;
++	}
++
++	parent = dirname(temp);
++
++	rc = ecryptfs_openssl_mkdir_recursive(parent, mode);
++	if (rc)
++		goto out;
++
++	if (mkdir(dir, mode) == -1) {
++		if (errno != EEXIST) {
++			rc = -errno;
++			goto out;
++		}
++	}
++
++	rc = 0;
++
++out:
++	free(temp);
++	return rc;
++}
++
++static int
+ ecryptfs_openssl_write_key_to_file(RSA *rsa, char *filename, char *passphrase)
+ {
+-	uid_t id;
+-	struct passwd *pw;
+-	char *ecryptfs_dir = NULL;
+-	char *pki_dir = NULL;
+-	char *openssl_dir = NULL;
++	char *dir = NULL;
+ 	BIO *out;
+ 	const EVP_CIPHER *enc = EVP_aes_256_cbc();
+ 	int rc = 0;
+ 
+-	id = getuid();
+-	pw = getpwuid(id);
+-	if (!pw) {
+-		syslog(LOG_ERR, "%s: Unable to get the current directory from "
+-		       "the passwd file on this system\n", __FUNCTION__);
+-		rc = -EIO;
+-		goto out_free_paths;
+-	}
+-	rc = asprintf(&ecryptfs_dir, "%s/.ecryptfs", pw->pw_dir);
+-	if (rc == -1) {
++	dir = strdup(filename);
++	if (dir == NULL) {
+ 		rc = -ENOMEM;
+ 		goto out_free_paths;
+ 	}
+-	rc = asprintf(&pki_dir, "%s/.ecryptfs/pki", pw->pw_dir);
+-	if (rc == -1) {
+-		rc = -ENOMEM;
+-		goto out_free_paths;
+-	}
+-	rc = asprintf(&openssl_dir, "%s/.ecryptfs/pki/openssl", pw->pw_dir);
+-	if (rc == -1) {
+-		rc = -ENOMEM;
+-		goto out_free_paths;
+-	}
+-	rc = mkdir(ecryptfs_dir, 0700);
+-	if (rc && rc != EEXIST) {
+-		syslog(LOG_ERR, "%s: Error attempting to mkdir [%s]; "
+-		       "rc = [%d]\n", __FUNCTION__, ecryptfs_dir, rc);
+-		goto out_free_paths;
+-	}
+-	rc = mkdir(pki_dir, 0700);
+-	if (rc && rc != EEXIST) {
+-		syslog(LOG_ERR, "%s: Error attempting to mkdir [%s]; "
+-		       "rc = [%d]\n", __FUNCTION__, pki_dir, rc);
+-		goto out_free_paths;
+-	}
+-	rc = mkdir(openssl_dir, 0700);
+-	if (rc && rc != EEXIST) {
++	rc = ecryptfs_openssl_mkdir_recursive(dirname(dir), 0700);
++	if (rc) {
+ 		syslog(LOG_ERR, "%s: Error attempting to mkdir [%s]; "
+-		       "rc = [%d]\n", __FUNCTION__, openssl_dir, rc);
++		       "rc = [%d]\n", __FUNCTION__, dir, rc);
+ 		goto out_free_paths;
+ 	}
+ 	if ((out = BIO_new(BIO_s_file())) == NULL) {
+@@ -253,9 +256,7 @@ ecryptfs_openssl_write_key_to_file(RSA *rsa, char *filename, char *passphrase)
+ out_free_bio:
+ 	BIO_free_all(out);
+ out_free_paths:
+-	free(ecryptfs_dir);
+-	free(pki_dir);
+-	free(openssl_dir);
++	free(dir);
+ 	return rc;
+ }
+