Version bump (bug #246762).

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

5 files changed, 126 insertions, 14 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 2b9340fa59a8..ffac5d68ee1e 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.22 2008/08/22 21:24:33 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.23 2009/03/29 17:08:28 arfrever Exp $
+
+*ecryptfs-utils-73 (29 Mar 2009)
+
+  29 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +files/ecryptfs-utils-73-fix_implicit_declarations.patch,
+  +ecryptfs-utils-73.ebuild:
+  Version bump (bug #246762).
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index f837ec32610c..29564837d24d 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ecryptfs-utils-73-fix_implicit_declarations.patch 965 RMD160 630c1a837f02928feb2c76d223b77eb63b8bbea6 SHA1 c0f3c98b8a93d771f8ec4e6a233e0e249c779367 SHA256 f59f35bea41d2b6573eaa82bd5cad9c9febb49b21da1d80e77b98ccf037250f6
 DIST ecryptfs-utils-40.tar.bz2 550380 RMD160 1e3f72e660af5b7f3ac7747270e113f808d549a4 SHA1 4ae039471105c34d9021a51dc29b90dddf00c09f SHA256 976d0c543b37eb93b096558b803e38e983aedd89aea8b696bb209eef3b18f29c
 DIST ecryptfs-utils-42.tar.bz2 552939 RMD160 ce0338637c2048423cf56105cc99134de9be0c37 SHA1 607fc91fc91cdb92e19bdd96daf117826f6abcdd SHA256 05fe1a8362c95b7b9f1c872907b37423929d84560514a1331a5b8d49b44a0769
+DIST ecryptfs-utils_73.orig.tar.gz 504042 RMD160 339f506b9ada01818d64c3f54b102c4783fef8dd SHA1 d4f0576bbe3c0201bccb06d3b1319f905ee47e01 SHA256 548db19e9c579bc09d4a300d176023656cab72da7f945e1e3f1d827d0aa9ea92
 EBUILD ecryptfs-utils-40.ebuild 1485 RMD160 42c86f4da626905e5b7d11b2c08ccd98c8aa68b9 SHA1 51e81fe0feeaba8270282b398df0735016b2ebf1 SHA256 9ed6cf2f645181b101711f42c8138c15ebabc9b62ecd865365d26351f9adf128
 EBUILD ecryptfs-utils-42.ebuild 1485 RMD160 0928c310bb3d8102eb174a233cf2f12cec4dadeb SHA1 07020bfe4eaeedfc5fff6dce657a4377d9f38dc5 SHA256 d047e15f378b912a158c3dc5f73aed8aa74021dd1e771c7a1407ece664542238
-MISC ChangeLog 3827 RMD160 39ec21fe24e84b326ddda335ab87ab0c6b2977f4 SHA1 0e4e1a179e43ab40d721f3ef4b307244165fa770 SHA256 5d93d5a59b0c6b7bfc1083da19bcb5fbf86b19c1202620b1f70f3fb159b2637d
-MISC metadata.xml 419 RMD160 40749514fd6aa40affb27c8e2d2b89332636ffca SHA1 c2e4513a7dd47c635abcc7246908d90049797d26 SHA256 00915a8089ccd6a5a8c2b9b7a82324b37c40e5f750d3ee2a9f055d55d4cf239f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivLpsACgkQoeSe8B0zEfy8YACghy8wbeMX9iIcDqwiVyRIoOgz
-zVoAniRHRKBiddmjEJogNNQU5ocnqz6Z
-=SV1d
------END PGP SIGNATURE-----
+EBUILD ecryptfs-utils-73.ebuild 1824 RMD160 87b0d4adde256fea6cfa707f5857ecf752b854e9 SHA1 59a7782f2edf28c4f007fdcb21d1662804f264cd SHA256 84796850202313cf2400c17770d3cb0af350ad85abc93aea769aed14e8334cd4
+MISC ChangeLog 4056 RMD160 b01d2e23c99f76f36b613872bae907d5dc7ff39c SHA1 7a87b984cfb6e504e6a5fd394a4f9db10fd096a4 SHA256 049e1cb213c97b69092ff7b7037e7886f64db3a6dc154568fb498a92cdaf0bf1
+MISC metadata.xml 599 RMD160 d22b9f6ed4b1e207de5b3b032e1f30bc3a1f3aab SHA1 cd6d44b79acd6749c5ad7d220f0ff1657d44b59f SHA256 fcf1fab48a362024a1bce7fc47b5c364758fad7faadcda58cb54133b102b0edd
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild
new file mode 100644
index 000000000000..a740088baaf9
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild
@@ -0,0 +1,68 @@
+# 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-73.ebuild,v 1.1 2009/03/29 17:08:28 arfrever Exp $
+
+inherit eutils pam
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="http://launchpad.net/ecryptfs"
+SRC_URI="http://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gpg gtk nss openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.0
+	>=dev-libs/libgcrypt-1.2.0
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+ )
+	nss? ( dev-libs/nss )
+	openssl? ( >=dev-libs/openssl-0.9.7 )
+	pam? ( sys-libs/pam )
+	pkcs11? (
+		>=dev-libs/openssl-0.9.7
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	python? ( >=dev-lang/python-2.5 )
+	tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	python? ( dev-lang/swig )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch"
+}
+
+src_compile() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--with-pamdir=$(getpam_mod_dir) \
+		$(use_enable doc docs) \
+		$(use_enable gpg) \
+		$(use_enable gtk gui) \
+		$(use_enable nss) \
+		$(use_enable openssl) \
+		$(use_enable pam) \
+		$(use_enable pkcs11 pkcs11-helper) \
+		$(use_enable python pywrap) \
+		$(use_enable tpm tspi)
+	emake || die "emake failed"
+}
+
+src_install(){
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use suid && fperms u+s /sbin/mount.ecryptfs
+}
+
+pkg_postinst() {
+	if use suid; then
+		ewarn
+		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
+		ewarn "means that if there are any undetected vulnerabilities in the binary,"
+		ewarn "then local users may be able to gain root access on your machine."
+		ewarn
+	fi
+}
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
new file mode 100644
index 000000000000..ed8ddbcdfded
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
@@ -0,0 +1,42 @@
+--- src/key_mod/ecryptfs_key_mod_gpg.c
++++ src/key_mod/ecryptfs_key_mod_gpg.c
+@@ -18,6 +18,7 @@
+  * 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -29,7 +30,6 @@
+ #include <gpgme.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include "config.h"
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
+--- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
++++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
+@@ -20,6 +20,7 @@
+  * 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -28,11 +29,12 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <openssl/err.h>
++#include <openssl/pem.h>
+ #include <openssl/x509.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
+-#include "config.h"
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
diff --git a/sys-fs/ecryptfs-utils/metadata.xml b/sys-fs/ecryptfs-utils/metadata.xml
index a868f7a6214c..39ce26f33cdc 100644
--- a/sys-fs/ecryptfs-utils/metadata.xml
+++ b/sys-fs/ecryptfs-utils/metadata.xml
@@ -5,8 +5,10 @@
 	<herd>crypto</herd>
 	<use>
 		<flag name='gpg'>Enable <pkg>app-crypt/gnupg</pkg> key module</flag>
+		<flag name='nss'>Enable support for <pkg>dev-libs/nss</pkg></flag>
 		<flag name='openssl'>Enable <pkg>dev-libs/openssl</pkg> key
 			module</flag>
 		<flag name='pkcs11'>Enable PKCS#11 (Smartcards) key module</flag>
+		<flag name='tpm'>Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg></flag>
 	</use>
 </pkgmetadata>