Version bump (fixes bugs #373901 and #378807). Add check for kernel ECRYPT_FS support...

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

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 0d4b8856f8574e87662a2bf2b5b312b7f2d68a9a..43753efa20d07df3c682170d0a7726f202a5c9f0 100644 (file)
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2011/03/29 07:57:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.33 2011/08/24 18:01:53 radhermit Exp $
+
+*ecryptfs-utils-90 (24 Aug 2011)
+
+  24 Aug 2011; Tim Harder <radhermit@gentoo.org> +ecryptfs-utils-90.ebuild:
+  Version bump (fixes bugs #373901 and #378807). Add check for kernel ECRYPT_FS
+  support (bug #376663 by Łukasz Stelmach).
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> ecryptfs-utils-83.ebuild,
   ecryptfs-utils-85.ebuild:

diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index e8bd70cdb65d7e7053e9d999b33a72c2f791099b..44dbf1d1ea290c032bb56a0717693cef4683c7a0 100644 (file)
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ecryptfs-utils_83.orig.tar.gz 548235 RMD160 898d755a5218283f444be0e296d33fcccaa0974b SHA1 ab82032679c60bfc702dc339b2c9d506ace0dc34 SHA256 ede721fa2dba9cb3dadf89e5a21c555be35fa031abd841073fcc6f92e3b29dee
 DIST ecryptfs-utils_85.orig.tar.gz 542835 RMD160 6d425b853f001c9a30b8c27b7999373e91ba08fe SHA1 d5ec70bbfccdf42ac0a44eda25bb0953391a4ff3 SHA256 4ca6c0a186d7bd5a37124cefb4aa15e321f11972a697db958fae76e8effa0afa
+DIST ecryptfs-utils_90.orig.tar.gz 569148 RMD160 210aa21c2fb43491c76fced9a8c684c0f393f9ef SHA1 6fbc83fa3d17e4e5d141040bac92b2139c134b78 SHA256 1cdce5ab1f46b58926826dd2f733b98a5b0449d36d43d40147da96fb749cac7e
 EBUILD ecryptfs-utils-83.ebuild 3463 RMD160 bbf5e5f11293320556f2d5858b677a78cf7dcf3c SHA1 8d6240149aadfde22f477246a7b4192c29bd55e5 SHA256 08ee191f9c9abdd8500ebc1fe76fafe845bba64b972f1cefe12065936f766bfe
 EBUILD ecryptfs-utils-85.ebuild 3472 RMD160 b0972a9d3904762059b62c95032499aafa58fcce SHA1 0c57516ee5396961fc56a3289fe8eaed4d8aba13 SHA256 ad73ee843032a0f575d41d76d717591ec03b38b872c2acdf1766223ba1357726
-MISC ChangeLog 5880 RMD160 1db5b43b855baa9711a739b1f475ba5ef16d8665 SHA1 8d0d0708010b22fb827dee86afdd9c0ba03b1329 SHA256 a1a67925d29379083f1c68b2776660d5af0ccaf6026bde6a5f462e7092e04e89
+EBUILD ecryptfs-utils-90.ebuild 3581 RMD160 a6bd7b82d9e46802c69f1639c88aa13b47ff9eda SHA1 9e3833aa3dede3693702157dc73a3cf836e64f04 SHA256 29249bea80ea32425f8cd7a28ee308c0cdddf65b2fde1bdd74aaa239c69efcdd
+MISC ChangeLog 6118 RMD160 d8b2ec7d610abbaa843518f68d6a4f521056a1d3 SHA1 3b13590bcfd387194c64b19a0101f0ce611a3c49 SHA256 2f0491cc1ec2e638765662e0de022910df86985ba02fbd3123961d952ccf51c3
 MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2RkQQACgkQmWq1bYTyC0O4RQEAv9E2aQk6ZeU2NyerrwYCgagl
-JWYRNQAo18ex1J0tnbwBAKlHKGkhcSwLUX23ZvZtLM+HH3mBodSXhaw4nP/YBa55
-=VPIK
+iQEcBAEBCgAGBQJOVTyYAAoJEEqz6FtPBkyj5ZkH/2DtUlTwnea1xNWkn9ePPQIq
+rl7Tn9+tSd6vEBsN4MMu+f8B4OuUAwKCtdItgps5P9icDirtXAXwT+xbU5eDHNM6
+0CVtaH5u8J820y2TKSgzD6pgMbLY94Y9rLCNi+GCEMndpKN24/K200poivrFthPy
+fyTS2ygyVY7e7JMbB2SQRw1WTeCsiVAfoouk9hS38iC9PrcjHO2zVqtBOfCmYiQ6
+hk4AvUXB8/PxMyYdf+SD+9gGTHvz+8eA3MK3TZMb0C+0WtL+y/SKJNcLHT+F6rlQ
+mmju8AUqNwfZX1LeKfHq5uVg7VCgK5u7XnBpzUN6PIVEOdbu4cY0/jC+rMLUj0s=
+=HI+A
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
new file mode 100644 (file)
index 0000000..30bc41d
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
@@ -0,0 +1,138 @@
+# 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-90.ebuild,v 1.1 2011/08/24 18:01:54 radhermit Exp $
+
+EAPI="3"
+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
+
+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 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
+       python? ( dev-lang/swig )"
+
+pkg_setup() {
+       if use python; then
+               python_pkg_setup
+       fi
+
+       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,in} || die "sed failed"
+}
+
+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 || die "emake install failed"
+
+       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 "${D}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+       if use python; then
+               python_mod_optimize ecryptfs-utils
+       fi
+
+       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() {
+       if use python; then
+               python_mod_cleanup ecryptfs-utils
+       fi
+}