Version bump

(Portage version: 2.1.4_rc10)

6 files changed, 12 insertions, 158 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index b8244f86e345..73c3717760a3 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.15 2007/12/14 19:12:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.16 2007/12/19 21:09:26 alonbl Exp $
+
+*ecryptfs-utils-36 (19 Dec 2007)
+
+  19 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/ecryptfs-utils-33-mkdir.patch, -files/ecryptfs-utils-33-suid.patch,
+  -ecryptfs-utils-33.ebuild, +ecryptfs-utils-36.ebuild:
+  Version bump
 
   14 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
   +files/ecryptfs-utils-33-suid.patch, ecryptfs-utils-33.ebuild:
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-36.ebuild
index 4a5275412ee5..93b1f0ce54b8 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-36.ebuild
@@ -1,6 +1,6 @@
 # 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-33.ebuild,v 1.2 2007/12/14 19:12:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-36.ebuild,v 1.1 2007/12/19 21:09:26 alonbl Exp $
 
 inherit eutils
 
@@ -28,13 +28,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/perl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-mkdir.patch"
-	epatch "${FILESDIR}/${P}-suid.patch"
-}
-
 src_compile() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33
deleted file mode 100644
index 1686e7c59168..000000000000
--- a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-33
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-ecryptfs-utils-36 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-36
new file mode 100644
index 000000000000..a2305cc6a94c
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-36
@@ -0,0 +1,3 @@
+MD5 5f39f0434da4bde892e58df49cd5be4e ecryptfs-utils-36.tar.bz2 560496
+RMD160 5af8a0af304b39723c137f73ee2b7b6cc3a2c8d1 ecryptfs-utils-36.tar.bz2 560496
+SHA256 178d17c20f858c7d56fd6a3faffd7969e9ab3efed7466e30af4db774ee64b8ca ecryptfs-utils-36.tar.bz2 560496
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch
deleted file mode 100644
index 12070ea46b1b..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-mkdir.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-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;
- }
- 
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch
deleted file mode 100644
index 979d5d04b240..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/libecryptfs/key_management.c b/src/libecryptfs/key_management.c
-index acedc26..2c88357 100644
---- a/src/libecryptfs/key_management.c
-+++ b/src/libecryptfs/key_management.c
-@@ -486,6 +486,7 @@ int ecryptfs_append_sig(char *auth_tok_sig, char *sig_cache_filename)
- 		rc = -EIO;
- 		goto out;
- 	}
-+	fchown(fd, getuid(), getgid());
- 	lseek(fd, 0, SEEK_END);
- 	memcpy(tmp, auth_tok_sig, ECRYPTFS_SIG_SIZE_HEX);
- 	tmp[ECRYPTFS_SIG_SIZE_HEX] = '\n';
-diff --git a/src/utils/mount.ecryptfs.c b/src/utils/mount.ecryptfs.c
-index 4e14795..86d15ac 100644
---- a/src/utils/mount.ecryptfs.c
-+++ b/src/utils/mount.ecryptfs.c
-@@ -310,6 +310,7 @@ static int process_sig(char *auth_tok_sig)
- 		goto out;
- 	}
- 	mkdir(dot_ecryptfs_dir, S_IRWXU);
-+	chown(dot_ecryptfs_dir, getuid(), getgid());
- 	free(dot_ecryptfs_dir);
- 	rc = asprintf(&sig_cache_filename, "%s/.ecryptfs/sig-cache.txt",
- 		      home);