Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-fs/ecryptfs-utils/ChangeLog11
-rw-r--r--sys-fs/ecryptfs-utils/Manifest17
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-83.ebuild133
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-85.ebuild133
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-91.ebuild (renamed from sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild)5
-rw-r--r--sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch27
6 files changed, 18 insertions, 308 deletions
diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 57039f28c188..d2accd1dd0d4 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,15 @@
# 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.35 2011/08/31 01:33:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.36 2011/09/01 11:19:06 flameeyes Exp $
+
+*ecryptfs-utils-91 (01 Sep 2011)
+
+ 01 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ -ecryptfs-utils-83.ebuild, -ecryptfs-utils-85.ebuild,
+ -ecryptfs-utils-90.ebuild, -files/ecryptfs-utils-90-nss-pkgconfig.patch,
+ +ecryptfs-utils-91.ebuild:
+ Version bump to release 91: includes my changes and a couple of
+ security-sensitive fixes.
31 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
ecryptfs-utils-90.ebuild:
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index e75532046c08..20ecb25a550e 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,19 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX ecryptfs-utils-90-nss-pkgconfig.patch 749 RMD160 4ee1813a7be3136797b30136ae1d563ad71aa5d5 SHA1 2424dd9593fc235197f147b9253c3d1363c46199 SHA256 3b53374add6a03e70f1d42f886f05aff26a10e56d6abf5f11fa943f329bcdfc6
-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
-EBUILD ecryptfs-utils-90.ebuild 3661 RMD160 2795aaa7dbb6485e999ec9070da911e0deeccced SHA1 ea30d8ab1d8e9e7943f2a9d100df57cd8db05134 SHA256 d5b27f85a964e3496bffb45655d9c589cea03262f5229cfcc349097d317cc997
-MISC ChangeLog 6458 RMD160 475d13356b5c53af2b8ef8ba403cefa72d174921 SHA1 374c7b6e98d79582377fd4540cafdfbbd9b6be36 SHA256 552c5837c5d1696f20fbdf10e92bbaba85b4d0cd07afff95b45f742d96d6638f
+DIST ecryptfs-utils_91.orig.tar.gz 569475 RMD160 561a13e55d64f09d365d465cbfb94207f918deee SHA1 b6c8d7301159ef8807cbdc000cb7243cfda108a3 SHA256 7f92d3ac4937d473c53267c393ff863f74689b89b31a155448dbcbbcc9a7b198
+EBUILD ecryptfs-utils-91.ebuild 3609 RMD160 e5568ef3d414ce70dda6b8407fc4af7a36b418e9 SHA1 87dc828e3868daa21a9abd7ab5e85863573b971e SHA256 07aef3d38d88cfab7989f61b475b7160fc37a5ad6d842f31952343609b6e4d59
+MISC ChangeLog 6803 RMD160 ee8f778d5e019a153f3b965175e4ca0cf668434f SHA1 7555f935805de6b79fd8ac4c63a2fdd334ef715a SHA256 225189a31dd03b701ec2603c1f752b03d26e43f084e2a618bfd99fb27e2afff8
MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk5dj0wACgkQAiZjviIA2XhMxACeIOXXmwefhbePp8bvQy1jOXXQ
-8QoAnjeZmI5EK/PzrSprypV+iP3CfHcl
-=ZK9V
+iEYEARECAAYFAk5fahkACgkQAiZjviIA2XhO1wCfdl34h36DwVYHUlImyYxeRDDx
+hYcAoJArrFlx+8B1Dc7n7RcmFd/S6Rn+
+=l+uV
-----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-83.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-83.ebuild
deleted file mode 100644
index 366276317369..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-83.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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-83.ebuild,v 1.3 2011/03/29 07:57:50 angelos Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit flag-o-matic pam python
-
-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
-}
-
-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
-}
-
-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
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-85.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-85.ebuild
deleted file mode 100644
index 3901bffe8c56..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-85.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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-85.ebuild,v 1.2 2011/03/29 07:57:50 angelos 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
-
-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
-}
-
-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
-}
-
-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
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-91.ebuild
index ca345c1a4f3b..9f204c573213 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-91.ebuild
@@ -1,6 +1,6 @@
# 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.3 2011/08/31 01:33:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-91.ebuild,v 1.1 2011/09/01 11:19:06 flameeyes Exp $
EAPI="3"
PYTHON_DEPEND="python? 2:2.5"
@@ -49,9 +49,8 @@ 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"
+ sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die "sed failed"
- epatch "${FILESDIR}"/${P}-nss-pkgconfig.patch
eautoreconf
}
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch
deleted file mode 100644
index b132729ff616..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: ecryptfs-utils-90/configure.ac
-===================================================================
---- ecryptfs-utils-90.orig/configure.ac
-+++ ecryptfs-utils-90/configure.ac
-@@ -228,16 +228,12 @@ else
- fi
-
- #Verify nss
--NSS_LIBS=`nss-config --libs`
--if test "x${NSS_LIBS}" != "x" ; then
-- NSS_CFLAGS=`nss-config --cflags`
-- NSPR_CFLAGS=`nspr-config --cflags`
-- NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS ${NSPR_CFLAGS}"
-- have_nss="yes"
--else
-- NSS_CFLAGS=""
-- have_nss="no"
--fi
-+PKG_CHECK_MODULES(
-+ [NSS],
-+ [nss],
-+ [have_nss="yes"
-+ NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS"],
-+ [have_nss="no"])
-
- if test "${enable_nss}" = "detect" ; then
- if test "$have_nss" == "yes" ; then