Version bump.

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

3 files changed, 150 insertions, 9 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 4bce54716dc9..a24949cef6ce 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.40 2011/11/28 05:52:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.41 2011/12/16 05:15:27 radhermit Exp $
+
+*ecryptfs-utils-95 (16 Dec 2011)
+
+  16 Dec 2011; Tim Harder <radhermit@gentoo.org> +ecryptfs-utils-95.ebuild:
+  Version bump.
 
   28 Nov 2011; Tim Harder <radhermit@gentoo.org> ecryptfs-utils-93.ebuild:
   Revert to autotools eclass (fixes bug #392127).
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index cfc3a7a9e99a..13171f625314 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -5,19 +5,21 @@ AUX ecryptfs-utils-93-python.patch 617 RMD160 8be23d29a6303b27e65ded8715be99dc5a
 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
+DIST ecryptfs-utils_95.orig.tar.gz 567623 RMD160 e6d06270658cee36d463d3e0cd0595e788c103b0 SHA1 1fc476fb7338ff2b41cf9fc60b78ce6153503a3d SHA256 b10805cde2453511e2b046ad0323ca9bcd9cc3fac1ba3718da9aa36557acbc49
 EBUILD ecryptfs-utils-91.ebuild 3609 RMD160 e5568ef3d414ce70dda6b8407fc4af7a36b418e9 SHA1 87dc828e3868daa21a9abd7ab5e85863573b971e SHA256 07aef3d38d88cfab7989f61b475b7160fc37a5ad6d842f31952343609b6e4d59
 EBUILD ecryptfs-utils-92.ebuild 3609 RMD160 86e8dbfb496a51b81c33e270deedfa04041e06fa SHA1 a5c2a79543af5bbd098e838f7346bd44c01b6090 SHA256 cf5329962e0b486b486af8bd5173a518c2cdcaa7ff871ac8891f0f5ea402265e
 EBUILD ecryptfs-utils-93.ebuild 3584 RMD160 da8ae2f1c5fa3005a27a7df616248bf21b9075a0 SHA1 e4ffe800a0b6e75c27dd900a35c4e4462d06fffc SHA256 120242b6a16ce51584796e72adf45e968877863cc11cb0acbdcf39dc929a1c01
-MISC ChangeLog 7421 RMD160 b2fc325cb79a56e4e6406e7467766f10db899f8a SHA1 75f098629570271754645c0cf3f07dd9af1fce47 SHA256 935cc4db7ce61a0ed05a8031f38760240c819327b0d7d5e209cbb6a40c29a867
+EBUILD ecryptfs-utils-95.ebuild 3545 RMD160 e6188b846c36f4c5c1fc68649c534a26ececdb18 SHA1 e9dfba443078f429d3a4a1fcd6a2e1862e81c35f SHA256 4cbc85f0cade20798a919d6fe9ced5191a2ade5b8ab19d0609d2d0dcbbb037be
+MISC ChangeLog 7548 RMD160 13570d60d5f57608c23f88ada5b8f9134d9e1385 SHA1 d6136a86f2e5a3ffdf9dd6deb91a76c0cd941f41 SHA256 7322f59f0a58e2e8d50eb57d81bf06c05c73ddc96f23f63d4eb22188e914b1b4
 MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0yGyAAoJEEqz6FtPBkyjaQEIAK5ZWE0NuL96ZPYLXOYhBUQZ
-GlMYoECRXz1FbdVflAuN5hqAkNvhRGldQlTmp93GZdOL85dmkzabPZvmPLzdt1hu
-ljEqNpytFUBkh2dwDWhrcd+IvO2Qx/Xf6OwYRodrIoy0i3zFqbauRaLhn6IIZgA4
-4Wkj6kD2ZznfLr+3keMidbUSyhmkqFmO1Xa6djQk3tWHtERMAdsVypJtiT22UeqQ
-bYV2J8IpowhnQRVep05vY3DZoEyF5VxyJdqUipmtsLjzVuxqb9Wx1fL2XFf9+VYg
-SU/ACCJ851Nv0UBkixUd7dyrGvz+KSo1pqobxxpzAJn6V14+f20r1yo4AbLQRY0=
-=TQ0I
+iQEcBAEBCgAGBQJO6tP5AAoJEEqz6FtPBkyjoWYH/3SQhgRagQjYSl19XknqAZRv
+Q5iwHhgHQtFn4w3ALdVyLO1DD41K+i4Fiv2ZATWgmMhkyV2UdLgCVnkHotRS7MwA
+kmxZ8ck6GdwnAgQbFshaOg4q6djvd71WYcNitNtcL3l1yhcwksfzvEQ48AKYQXz1
+egFcTvbIzvmQ6hfA9RcGqrm3Zu8UFE9Yn0G6dtZJiRdtpQlN4tCvLwVyY23OWOWO
+7ubcGobIMZ7RrxJNVMwlXdRiuzkTzf22Xe7cL5uIHs212Tns+9d7Opuc5sWXpE/4
+ygRy68GuaBduVuoWBxYBLhtjl023v+npL0c3F9G2oJPMQ1Xm5+zm8TsfHrei3xk=
+=cdfX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-95.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-95.ebuild
new file mode 100644
index 000000000000..39c1acf69108
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-95.ebuild
@@ -0,0 +1,134 @@
+# 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-95.ebuild,v 1.1 2011/12/16 05:15:27 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
+
+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"
+
+	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
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+}
+
+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
+}