Version bump. Fix building with >=app-crypt/gpgme-1.2.0 (bug #278494).

Package-Manager: portage-14204-svn/cvs/Linux x86_64

4 files changed, 15 insertions, 119 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 86f69c7b0c75..8fdf7f64a8eb 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.25 2009/07/18 00:27:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.26 2009/09/06 00:30:56 arfrever Exp $
+
+*ecryptfs-utils-79 (06 Sep 2009)
+
+  06 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -ecryptfs-utils-75.ebuild, -files/ecryptfs-utils-75-fix_warnings.patch,
+  +ecryptfs-utils-79.ebuild:
+  Version bump. Fix building with >=app-crypt/gpgme-1.2.0 (bug #278494).
 
 *ecryptfs-utils-76 (18 Jul 2009)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 870a6171e90a..8b49387e602c 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,7 +1,6 @@
-AUX ecryptfs-utils-75-fix_warnings.patch 2514 RMD160 b17faba44c01afdfd66ef26cf567b41d902dd274 SHA1 80e936e26c6d63807c704c43f03b65379a55e2ec SHA256 c1e2f0dec38165111670f0cada53a8e2371cd7f48f3b36403e3a1f21b668a4a2
-DIST ecryptfs-utils_75.orig.tar.gz 510771 RMD160 ea6ad95d141a1f544bdb5e02d9847dfcee1b56b7 SHA1 c2d6baa36cb26bc3d96790331ddf75385ece06a0 SHA256 2e6806048eaae91bb8abd412445431f6cf24903b974599de8c879c4b92bb7d7e
 DIST ecryptfs-utils_76.orig.tar.gz 1432594 RMD160 cc5af2460b0fb6bc94a2ef2464c34e8a0380e13b SHA1 a263e720f687d3045f9ebb96ba3dbe161384b01b SHA256 1d862d4baf3509425f9d72cb4dffd8829aecde5ad78b7bb49c200900204174fe
-EBUILD ecryptfs-utils-75.ebuild 1771 RMD160 f5a7985e062941b170592feddee107ef67506da8 SHA1 8dde375a44640d0cc4d6b9dbd98f2e2fbdae30a7 SHA256 11f1c53f83616d20384259d2187a82a09d302659f2b6c6e0c1b060e57958edc1
+DIST ecryptfs-utils_79.orig.tar.gz 519934 RMD160 4f61b0fc4febaa1d00fcc7dcf3b608a583207664 SHA1 e76756f29784637813c2f468d64501a1306dc968 SHA256 adf4f2fb128fe4e1b2fd7707dcbec08d7852d29be749fe3d96f8065e7f555e53
 EBUILD ecryptfs-utils-76.ebuild 1774 RMD160 e91d1592e4ed66a9490f9f2b864ff041f85621ce SHA1 c963d2be3ea8f0951e361017844a4ee697a2dd8e SHA256 e565001a6318533f113dc69df9e5835e7dfee41f2c7f32b1c6430dba70e6116c
-MISC ChangeLog 4552 RMD160 a08b2d1da50d3afef9d9c573304d34a66bd75d99 SHA1 ed2edce116d75f33f86a4f3f19f9ea4b87bc0983 SHA256 0994a71db1e9de1d4a56895156e91490a2a56cc1a412ff62a0ee44f9d83884c6
+EBUILD ecryptfs-utils-79.ebuild 1766 RMD160 095421fa11d06f741ff71609ec80f2828c96d939 SHA1 2bacddf1250b5031a6cce01f553e588d2ef3dfcd SHA256 dc3696e4d39dbdcda3ef695a7d1fc6e775ae159fc9bb6489fd316c640b225e74
+MISC ChangeLog 4836 RMD160 4f9a41b4e75acb1512e03d8766a32ab475789612 SHA1 c1d33603b86925a27a63876bf61836241ad8c1c9 SHA256 5bfa1061d211b22c05a0c9ac8109002a1f3c52aee9c2797cd6db66bb95ea0479
 MISC metadata.xml 599 RMD160 d22b9f6ed4b1e207de5b3b032e1f30bc3a1f3aab SHA1 cd6d44b79acd6749c5ad7d220f0ff1657d44b59f SHA256 fcf1fab48a362024a1bce7fc47b5c364758fad7faadcda58cb54133b102b0edd
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-75.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-79.ebuild
index 43bf93a57a07..477bae836886 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-75.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-79.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-75.ebuild,v 1.1 2009/05/02 18:30:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-79.ebuild,v 1.1 2009/09/06 00:30:56 arfrever Exp $
 
 EAPI="2"
 
-inherit eutils pam
+inherit flag-o-matic pam
 
 DESCRIPTION="eCryptfs userspace utilities"
 HOMEPAGE="http://launchpad.net/ecryptfs"
@@ -32,8 +32,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	python? ( dev-lang/swig )"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_warnings.patch"
+pkg_setup() {
+	append-flags -D_FILE_OFFSET_BITS=64
 }
 
 src_configure() {
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch
deleted file mode 100644
index 0a143455ba4a..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/key_mod/ecryptfs_key_mod_gpg.c
-+++ src/key_mod/ecryptfs_key_mod_gpg.c
-@@ -131,7 +131,7 @@
- 
- int ecryptfs_gpg_encrypt(char *to, int size, char *from, unsigned char *blob)
- {
--	int rc;
-+	int rc = 0;
- 
- /*	gpg_op_encrypt(...); */
- out:
-@@ -251,7 +251,7 @@
- 			 struct val_node **head, void **foo)
- {
- 	struct key_mod_gpg *key_mod_gpg = (struct key_mod_gpg *)(*foo);
--	int i;
-+	int i = 0;
- 	gpgme_error_t err;
- 	int rc = 0;
- 	gpgme_key_t key;
-@@ -283,10 +283,7 @@
- 
- static int generate_name_val_list(struct ecryptfs_name_val_pair *head)
- {
--	struct stat buf;
--	int i = 0;
- 	uid_t id = getuid();
--	struct passwd *pw = getpwuid(id);
- 	int rc = 0;
- 
- 	head->next = NULL;
-@@ -304,6 +301,7 @@
- 		destroy_key_mod_gpg(key_mod_gpg);
- 		free(key_mod_gpg);
- 	}
-+	return 0;
- }
- 
- 
-@@ -312,7 +310,6 @@
- {
- 	struct key_mod_gpg *key_mod_gpg;
- 	gpgme_error_t err;
--	gpgme_keylist_result_t keylist_res;
- 	int rc = 0;
- 
- 	(*foo) = NULL;
-@@ -329,7 +326,7 @@
- 	if ((err = gpgme_op_keylist_start(key_mod_gpg->ctx, "", 0))) {
- 		printf("Error attempting to start keylist\n");
- 		rc = -EINVAL;
--		gpgme_release(ctx);
-+		gpgme_release(key_mod_gpg->ctx);
- 		free(key_mod_gpg);
- 		goto out;
- 	}
---- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-@@ -592,7 +592,6 @@
- 		char dn[1024] = {0};
- 		char serial[1024] = {0};
- 		char *ser = NULL;
--		char *ssh_key = NULL;
- 		size_t ser_len = 0;
- 		int n;
- 
-@@ -1538,7 +1537,6 @@
- 	struct ecryptfs_ctx *ctx = &_ctx;
- 	struct ecryptfs_name_val_pair nvp_head;
- 	struct val_node *dummy_mnt_params;
--	uid_t id;
- 	struct passwd *pw;
- 	char *rcfile_fullpath = NULL;
- 	int fd;
-@@ -1649,6 +1647,7 @@
- 	if (pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val)
- 		free(pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val);
- 	pkcs11h_terminate ();
-+	return 0;
- }
- 
- static struct ecryptfs_key_mod_ops ecryptfs_pkcs11h_ops = {
---- src/libecryptfs/key_management.c
-+++ src/libecryptfs/key_management.c
-@@ -18,6 +18,7 @@
-  * 02111-1307, USA.
-  */
- 
-+#include "config.h"
- #include <errno.h>
- #ifdef ENABLE_NSS
- #include <nss.h>
-@@ -39,7 +40,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pwd.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
- 
- #ifndef ENOKEY
---- src/utils/ecryptfs_unwrap_passphrase.c
-+++ src/utils/ecryptfs_unwrap_passphrase.c
-@@ -42,7 +42,6 @@
- 	char *wrapping_passphrase;
- 	char salt[ECRYPTFS_SALT_SIZE];
- 	char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
--	struct passwd *pwd;
- 	int rc = 0;
- 
- 	if (argc == 1) {