Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 152 insertions, 17 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 4555b0ba7403..924097e56544 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.54 2013/06/05 00:36:41 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.55 2014/01/25 08:34:52 radhermit Exp $
+
+*ecryptfs-utils-104 (25 Jan 2014)
+
+  25 Jan 2014; Tim Harder <radhermit@gentoo.org> +ecryptfs-utils-104.ebuild:
+  Version bump.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 96dc9821177e..fa68f85a7f06 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -3,24 +3,20 @@ Hash: SHA256
 
 DIST ecryptfs-utils_101.orig.tar.gz 619606 SHA256 f8ddd2be2e208fb2f11aeca1721135c3c31465f78f2318981df682741ac72c55 SHA512 6245749e0f11f203d37023a42f0ac15642aab9e193dc248882ce2ebfdd41faa5e56eac7ea43f651944a55a010595a42eb40c7f64a34b57ae4d65aebe8a176e68 WHIRLPOOL 82a7d941289c543982e384f8490d45fef05c286ef85230218438e27d33047f69ec201eca38d7d789b2874d3cfdbdbcf96cb21d194022b63b68e50f55f2982f50
 DIST ecryptfs-utils_103.orig.tar.gz 623902 SHA256 646c1f031497d513a96d5442381b3c3993b977fcccdf54c444428475a0c73d91 SHA512 1e57d4eeb3a1f34a6001f969e53ee1d3aa2379a16de8caf9d3a92809459ebafb692fb7b85e8196c42c7dede09524e2e71a36eb458eef4c991f157249240cb6c7 WHIRLPOOL 1d8737f502caea717ab6095de1d613496c06d850c2f605da5bc864517ab688d8c5076f7ca41140714b8f3ebd05f2fd163309852a9a07cb8cd21dfd35c0f09d0a
+DIST ecryptfs-utils_104.orig.tar.gz 649268 SHA256 4a200176542d46439c5297021f2c7fd7343b871c20c6f73f6e6c9fc4e5fd7438 SHA512 1d093df406c731e6a44bcfc647d5e84a4110fc8d55c8a6aee7e056b0cac8f826b16fbde3dcccd0cf64fcd981a7666b71b1697951ed614ad510c4a6e403f5efd8 WHIRLPOOL e483161d9268583dd596a62299e46c9e37d2e5ceb1f0e197115a9d4b489167abe40e3fd9ff4ed411f7b97543b26c0793411d815bdba9cef211dbe69f3c7bf54c
 EBUILD ecryptfs-utils-101.ebuild 3553 SHA256 8f0d9e12d7f30fbb42ec4295db64b1b4769dec8f0201b409763bc31e61a799ac SHA512 f133d93c7cbada1a03fb64088da9fd21c702d3c9910599757abf8b7526ade9a633e34aab85cf36e9e0fb2cf35046d93d7c726e87a4d08afce8f7c12fff234562 WHIRLPOOL 3f4adf5d6ba075d680f4fa806f344fbec79921f183eed4100cfc38b695f5a5bedd8cc922e1dd7deed83eedf392551c6e91dc67dcd53e4d69b21c2e62cfd285da
 EBUILD ecryptfs-utils-103.ebuild 3556 SHA256 eb648073d4626ce2c5acdf3681330ce6a6e0d91ecf040bdc16e6603728515ab9 SHA512 845ea6ade8e102d2d9c0a9004ece3a938382bd4f8a431abf2c9d3049285e639a21899c68e3c8e4d078d22923ee02517f35bcd73d3ef92e0f6c5c2bfd9516401c WHIRLPOOL 1311094a53d1468f9cd321a835e8fcc527e81a20dec082ddf1ef2345b8c68f868106867100386707f5b7edfb826da56985db71423c88cdbe08f2a9147da09dc7
-MISC ChangeLog 9602 SHA256 fecf38f27009ec6f8366fc82ea4f57af0b0875bc96909e2e816a6fb5e20f43da SHA512 524daf113bb1e05f57b22ebf7719c4ed89353a6d39b0b2de2dbdc74356ea0af8a33fa9228e3763ee5ffbc4e18b3b3d34dd31d41fc5dcf5244fecf9a33580ac3a WHIRLPOOL 8a7ed967dc83ab4ce0696c2d8f2e0364863a3214413868c4aa27edf4863314ce3d4f0f54752c5af1774a2dd755b06bf532f863ffb3a547dc39d198b4e0402caf
+EBUILD ecryptfs-utils-104.ebuild 3556 SHA256 572d7c535c4fe952f783db3250f3df7fd27fc4f9176197f331a86061dee715e1 SHA512 a7839f0fcedf6e31461c6866f822c33bc834572b0ec66b612acebad391674125cdbf80c2f648ca63a5505088ba39c275c13eaf61f6b6f23fb0ba75828c7241b5 WHIRLPOOL 7bfa49caa545be2f07a614212162a864d574d4f8c4ae76e5b82d251a3d020a2534c0077ca95a32cf69d692d59152b1b84d4fec4fb9973653ddd60da916e85fca
+MISC ChangeLog 9734 SHA256 a785ed1f60ef8a4ef5e77af3ff13a11644d7bba3e92613f5e87daace0501bd51 SHA512 d00e2585b825abd4954d94fd606a036ab4e943bb80907a09549301df99f2703be33a375556fd4684a81a8de612a84d2112acbde9beaa2db9bcca0d169af4612e WHIRLPOOL e169d91ba926b8230568a1af3d6059ca75f416e30ad6f53afe3e13fc85cc49154f07fe5f5f99b9b5fe01024841129c3fa342edac5a3dfd25ea08163f1d97c640
 MISC metadata.xml 622 SHA256 613a6474dd2e1be8eb7cae2d27d67d2e3d6b9a5c6a80ffc73051e105f5c51b10 SHA512 c3672415da6efad44340a6f922c552f7d898320bde7b8cedcdb0aa4958e95be1c50b068cafdad80038ae32a389c9d1774c9b836eb80a3f01b66c1071a37a4278 WHIRLPOOL a9d77eb2ff0137f26f5f7403724e8a7b59a96fe305bdac75a81732f61ee4be57437c31748ec6d0dd999997086e882e9c6cc407a74e4d89c69fcd15f045ba9fe8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrogfAAoJELEHsLL7fEFWbwYP/RmopLuBAv49IkhufZoUZHwK
-jxBsslrEuNP66Awb/NdrmHE1jc+4dqeyKaO9msWOhdtWYnqsWEEn18bFhSd7LJX3
-1SGr/6opbxSK8+xd5tB7DS2cW4pcGwrnQjMQf4HK4q1bTtlPmqRi2jGxG5wJdUCu
-wGq3ldJUHd0MJHj+4ktPy1FY8a1QDeLD4nKMKsFduNJATUV4c68/JaFMzu10LSMF
-obKoOxkZW6esA4x3959aTQXd6UUu1+0XdowShWcKVXGaprERFey1uFGm1mKJK5G9
-kh47DZxiqnUOs5IuHhZZkRrblTlLnNBi1HyWi+OqcQ3ofgD/osIoNslgQMvckkHS
-SQu1j5fwkBKurAXFVuAhhEpiuHfVzhf5UHwMWc4jqRsbuh81I881STqWzT5GcifP
-OD1kDxpDGTGd2UKIXaPv9kAhriw1c8mPFdmcJj5pqCSzaij7ky5Po0bD46c+/8ZE
-upCuCUu+7M17QyZUWw8hSspX3gOKl5cY0F2LPLudWRWfwzgDWNLbnf8XkmTJYkP4
-LzAcw7IIoPt/axgSkhTqHdqZtwnZYn8RMc3GMJO4jHM0GaQuSB7k6ArYBiefGwWD
-7VhVzWvChAWWKYm7ysaiHvvNmmciUXTPF0lWMcdsIT13qIcQEhriTcli1dfi4EnT
-RlsyyhKKeIvUWgaG6zK0
-=nUQ1
+iQEcBAEBCAAGBQJS43cuAAoJEEqz6FtPBkyjsjgH/i9ruiHAsbdyUqDvNcQUF6Su
+IDKGlqMmsnHncQAm+FfhouC/6F01hnde59Y146bpRxxuuoqXMtD4QTiIaFXMVypO
+kiNX0KrBBfNvEtOK+cp84wAHJGlkb/OWee0SZmZNcRtIu3Mo/7l/dPaUS2wIHTXy
+hAc6bF/Ica5t30VXjcUx4tR7GIxYTsQf2CAU5AJRJ6GICP7wqQQZpKPRxvqpyZEg
+pS2SiHEmnZnHlxz0/FlssYLr3jhAO03JxPkIcqZ3/0m6QhPLxRR38jqMNFm0CeAu
+/rh6UbRH1bM4Njo2r2XC1rwqsw7KZLtu81JmuddkRGOPJ7+zlSUCJ9SgkjTzf8Y=
+=Hsqo
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-104.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-104.ebuild
new file mode 100644
index 000000000000..b53406f3ac24
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-104.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-104.ebuild,v 1.1 2014/01/25 08:34:52 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
+
+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 ~arm ~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}
+	virtual/pkgconfig
+	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-cppflags -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
+}