Version bump. Update to EAPI 4 and apply patch by Arfrever to fix python issue (bug #391065 by Patrick).

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 182 insertions, 9 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 7ce092a7592c..64bf81a7ec59 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.37 2011/09/03 00:26:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.38 2011/11/23 22:42:14 radhermit Exp $
+
+*ecryptfs-utils-93 (23 Nov 2011)
+
+  23 Nov 2011; Tim Harder <radhermit@gentoo.org> +ecryptfs-utils-93.ebuild,
+  +files/ecryptfs-utils-93-python.patch:
+  Version bump. Update to EAPI 4 and apply patch by Arfrever to fix python
+  issue (bug #391065 by Patrick).
 
 *ecryptfs-utils-92 (03 Sep 2011)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index f75614233d47..7fecd196550e 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX ecryptfs-utils-93-python.patch 617 RMD160 8be23d29a6303b27e65ded8715be99dc5ab0a179 SHA1 9854cf6e1360e764cf41c4b812e87b5cf8c05201 SHA256 4d5facc32529d5c3601e43d2a4e617609c0b47f4675abda667d69fe459d958ab
 DIST ecryptfs-utils_91.orig.tar.gz 569475 RMD160 561a13e55d64f09d365d465cbfb94207f918deee SHA1 b6c8d7301159ef8807cbdc000cb7243cfda108a3 SHA256 7f92d3ac4937d473c53267c393ff863f74689b89b31a155448dbcbbcc9a7b198
 DIST ecryptfs-utils_92.orig.tar.gz 569433 RMD160 ff6c52704ad7b7494e0b35693aa5185dfa26c56d SHA1 1119a39cfa18bc855c53493476a4b0976d361edd SHA256 a1d425ab81362c4ba4e020b397bafd0cae1368cb82011d042a13ed65ec12428d
+DIST ecryptfs-utils_93.orig.tar.gz 558464 RMD160 f4fc2e16d1b87367fc19d7cc267aade3c598c96c SHA1 bed4f45db665a3f4c126cabf0502912a4fa8dcfa SHA256 cb393c2ae61c74dea57298cba0c8ba40d039d797817604494bfa34ceb105e9b7
 EBUILD ecryptfs-utils-91.ebuild 3609 RMD160 e5568ef3d414ce70dda6b8407fc4af7a36b418e9 SHA1 87dc828e3868daa21a9abd7ab5e85863573b971e SHA256 07aef3d38d88cfab7989f61b475b7160fc37a5ad6d842f31952343609b6e4d59
 EBUILD ecryptfs-utils-92.ebuild 3609 RMD160 86e8dbfb496a51b81c33e270deedfa04041e06fa SHA1 a5c2a79543af5bbd098e838f7346bd44c01b6090 SHA256 cf5329962e0b486b486af8bd5173a518c2cdcaa7ff871ac8891f0f5ea402265e
-MISC ChangeLog 6930 RMD160 1ea78ec8c1f857776859095abea35fa38d8a64d1 SHA1 727d69e6a981d797bac2d95ee9a74fd703da4268 SHA256 95e80b9c34726f47a52d569682b0b74b67e2601a7dd5a47966a0487b8e299e99
+EBUILD ecryptfs-utils-93.ebuild 3572 RMD160 0d0461ba320d6df28d3573508e2b1e1f95be0022 SHA1 b754eb778eaff37ae1c5430dc29da679409e6261 SHA256 13fbb54704aab238e285bba835a77111f2fcce556b9a31a802a3cd130d1fc704
+MISC ChangeLog 7191 RMD160 cfb87f1b77a4e1dfc83d75b430041cdddeff2a05 SHA1 16c84c0ca5e6d011347cdf519553c6b3bf2b6d8b SHA256 35bfcca2f1b07385b0973fb227bde1e84cf1c4acf300f69bb64fc2c693c80385
 MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOYXQhAAoJEEqz6FtPBkyj1RUIAI1Q9geLDrufK3E8JeXJ2z/M
-N+/ahU6Bmi9HjhRZurIkIWYNnEimuTRY9Yz8oaUfKL2GTCMD/Gpt+BGvC+KXgany
-RpvDPKVLr7k3HtZQpdcpxHbBy9Z9jby5lpQSakhNQZDX5qNEeD0pOc5TGq+EhzdB
-aY95heMalh1i8XnV6Dj7JgASQyktQ7cGyimkr/Vu25MdQlFf2nWn/EsW0+z1xCYw
-W6bDRx2nKusgGuwCoeM+kIVaHp8b5gUwZsOJ1EIYnlDQQr0YaBP+IQwEhB4Zre2s
-rsuOe1ytkaeqCUCmv2789vbLBDkMHu5D37F/kx6A+jjvnZyHOs0soPQNVIpVP7U=
-=lfFo
+iQEcBAEBCgAGBQJOzXbVAAoJEEqz6FtPBkyjLEMH/iEvo0s5CgSjAO9oDjBIr1Be
+Sc6Gb9+QEVB8GUAOr/qt+eg7YhMYu70yasT46K3Z//oEygq26qUESj12f+Fz3lcd
+JYp0sjyiLpN0m8QsZzoNZMpx5PO/wN+NSOT8a/zsSFyloeudGJQUxDbMYJfQcsbk
+zm2G80yrApUH9SILZpoaROfYA+Kw+6db04YDKhMGFpNYrYlao8iKzONuErYQJcaX
+4dIbMLF6hOy2WjqXZYwab4WJgBoUAovI+PtkS4jxSVQwoEDACvN9AGr5+86fFFYZ
+tUbO207/NwOE0ong0yCTcJyHnE8/WadDTy675/+JzaOkVZnDUUN4oB0IbhT07BY=
+=BA6C
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-93.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-93.ebuild
new file mode 100644
index 000000000000..cc6b2a297d04
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-93.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-93.ebuild,v 1.1 2011/11/23 22:42:14 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+
+inherit flag-o-matic pam python linux-info autotools-utils
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="https://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 openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.0
+	>=dev-libs/libgcrypt-1.2.0
+	dev-libs/nss
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+:2 )
+	openssl? ( >=dev-libs/openssl-0.9.7 )
+	pam? ( sys-libs/pam )
+	pkcs11? (
+		>=dev-libs/openssl-0.9.7
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	sys-devel/gettext
+	>=dev-util/intltool-0.41.0
+	python? ( dev-lang/swig )"
+
+pkg_setup() {
+	use python && python_pkg_setup
+
+	CONFIG_CHECK="~ECRYPT_FS"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	echo "#!/bin/sh" > py-compile
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-python.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -D_FILE_OFFSET_BITS=64
+
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--enable-nss \
+		--with-pamdir=$(getpam_mod_dir) \
+		$(use_enable doc docs) \
+		$(use_enable gpg) \
+		$(use_enable gtk gui) \
+		$(use_enable openssl) \
+		$(use_enable pam) \
+		$(use_enable pkcs11 pkcs11-helper) \
+		$(use_enable python pywrap) \
+		$(use_enable tpm tspi)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources src/libecryptfs-swig
+		building() {
+			emake \
+				PYTHON="$(PYTHON)" \
+				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
+				PYTHON_SITE_PKG="$(python_get_sitedir)" \
+				PYTHON_VERSION="$(python_get_version)" \
+				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir src/libecryptfs-swig building
+	fi
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				PYTHON="$(PYTHON)" \
+				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
+				PYTHON_SITE_PKG="$(python_get_sitedir)" \
+				PYTHON_VERSION="$(python_get_version)" \
+				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install || return 1
+			echo "ecryptfs-utils" > "${ED}$(python_get_sitedir)/ecryptfs-utils.pth"
+		}
+		python_execute_function -s --source-dir src/libecryptfs-swig installation
+
+		python_clean_installation_image
+	fi
+
+	use suid && fperms u+s /sbin/mount.ecryptfs_private
+
+	remove_libtool_files all
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ecryptfs-utils
+
+	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
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ecryptfs-utils
+}
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-93-python.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-93-python.patch
new file mode 100644
index 000000000000..2767b582ef8d
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-93-python.patch
@@ -0,0 +1,27 @@
+https://bugs.launchpad.net/ecryptfs/+bug/893327
+
+--- configure.ac
++++ configure.ac
+@@ -19,9 +19,6 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_DISABLE_STATIC
+-AM_PATH_PYTHON(2.5, [have_python="yes"], [have_python="no"])
+-AC_PROG_SWIG(1.3.31)
+-SWIG_PYTHON
+ 
+ LIBECRYPTFS_LT_CURRENT="0"
+ LIBECRYPTFS_LT_REVISION="0"
+@@ -248,6 +245,12 @@
+ AC_CHECK_HEADER([openssl/rsa.h],, [have_openssl="no"])
+ CFLAGS="${OLD_CFLAGS}"
+ 
++if test "${enable_pywrap}" != "no" ; then
++	AM_PATH_PYTHON(2.5, [have_python="yes"], [have_python="no"])
++	AC_PROG_SWIG(1.3.31)
++	SWIG_PYTHON
++fi
++
+ if test "x${SWIG}" != "x" ; then
+    have_swig="yes"
+ else