summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-18 00:27:27 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-18 00:27:27 +0000
commitf9da7f0de6acfe4232a0e71b748956388adef983 (patch)
treefc84ff072131339a120f338b2503fbb853d6e8fa /sys-fs
parentVersion bump. Fix building with GCC 4.4 (bug #278154). (diff)
downloadgentoo-2-f9da7f0de6acfe4232a0e71b748956388adef983.tar.gz
gentoo-2-f9da7f0de6acfe4232a0e71b748956388adef983.tar.bz2
gentoo-2-f9da7f0de6acfe4232a0e71b748956388adef983.zip
Version bump.
(Portage version: 13833-svn/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/ecryptfs-utils/ChangeLog11
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild58
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild58
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild (renamed from sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild)17
-rw-r--r--sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch42
5 files changed, 19 insertions, 167 deletions
diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index fd82b06e1220..86f69c7b0c75 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.24 2009/05/02 18:30:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.25 2009/07/18 00:27:21 arfrever Exp $
+
+*ecryptfs-utils-76 (18 Jul 2009)
+
+ 18 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -ecryptfs-utils-40.ebuild, -ecryptfs-utils-42.ebuild,
+ -ecryptfs-utils-73.ebuild,
+ -files/ecryptfs-utils-73-fix_implicit_declarations.patch,
+ +ecryptfs-utils-76.ebuild:
+ Version bump.
*ecryptfs-utils-75 (02 May 2009)
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild
deleted file mode 100644
index 1a4f531e3e4a..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild,v 1.1 2008/02/29 20:57:40 alonbl Exp $
-
-inherit pam
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org/"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="suid pam gtk openssl pkcs11 gpg doc"
-
-RDEPEND=">=sys-apps/keyutils-1.0
- >=dev-libs/libgcrypt-1.2.0
- pam? ( sys-libs/pam )
- openssl? ( >=dev-libs/openssl-0.9.7 )
- pkcs11? (
- >=dev-libs/openssl-0.9.7
- >=dev-libs/pkcs11-helper-1.04
- )
- gpg? ( app-crypt/gpgme )
- gtk? ( x11-libs/gtk+ )"
-# perl required for man generation
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9.0
- dev-lang/perl"
-
-src_compile() {
- econf \
- --docdir="/usr/share/doc/${PF}" \
- --with-pamdir=$(getpam_mod_dir) \
- $(use_enable pam) \
- $(use_enable openssl) \
- $(use_enable pkcs11 pkcs11-helper) \
- $(use_enable gpg) \
- $(use_enable gtk gui) \
- $(use_enable doc docs) \
- || die
- emake || die
-}
-
-src_install(){
- emake DESTDIR="${D}" install || die
- use suid && fperms u+s /sbin/mount.ecryptfs
-}
-
-pkg_postinst() {
- if use suid; then
- ewarn
- ewarn "You have chosen to install ${PN} with the binary setuid root. This"
- ewarn "means that if there any undetected vulnerabilities in the binary,"
- ewarn "then local users may be able to gain root access on your machine."
- ewarn
- fi
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild
deleted file mode 100644
index 985e9516fc1e..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild,v 1.1 2008/04/08 17:28:28 alonbl Exp $
-
-inherit pam
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org/"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="suid pam gtk openssl pkcs11 gpg doc"
-
-RDEPEND=">=sys-apps/keyutils-1.0
- >=dev-libs/libgcrypt-1.2.0
- pam? ( sys-libs/pam )
- openssl? ( >=dev-libs/openssl-0.9.7 )
- pkcs11? (
- >=dev-libs/openssl-0.9.7
- >=dev-libs/pkcs11-helper-1.04
- )
- gpg? ( app-crypt/gpgme )
- gtk? ( x11-libs/gtk+ )"
-# perl required for man generation
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9.0
- dev-lang/perl"
-
-src_compile() {
- econf \
- --docdir="/usr/share/doc/${PF}" \
- --with-pamdir=$(getpam_mod_dir) \
- $(use_enable pam) \
- $(use_enable openssl) \
- $(use_enable pkcs11 pkcs11-helper) \
- $(use_enable gpg) \
- $(use_enable gtk gui) \
- $(use_enable doc docs) \
- || die
- emake || die
-}
-
-src_install(){
- emake DESTDIR="${D}" install || die
- use suid && fperms u+s /sbin/mount.ecryptfs
-}
-
-pkg_postinst() {
- if use suid; then
- ewarn
- ewarn "You have chosen to install ${PN} with the binary setuid root. This"
- ewarn "means that if there any undetected vulnerabilities in the binary,"
- ewarn "then local users may be able to gain root access on your machine."
- ewarn
- fi
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
index a740088baaf9..0e460479f168 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild,v 1.1 2009/03/29 17:08:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild,v 1.1 2009/07/18 00:27:21 arfrever Exp $
-inherit eutils pam
+EAPI="2"
+
+inherit autotools pam
DESCRIPTION="eCryptfs userspace utilities"
HOMEPAGE="http://launchpad.net/ecryptfs"
@@ -30,13 +32,13 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9.0
python? ( dev-lang/swig )"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch"
+S="${WORKDIR}/${PN}_${PV}.orig"
+
+src_prepare() {
+ eautoreconf
}
-src_compile() {
+src_configure() {
econf \
--docdir="/usr/share/doc/${PF}" \
--with-pamdir=$(getpam_mod_dir) \
@@ -49,7 +51,6 @@ src_compile() {
$(use_enable pkcs11 pkcs11-helper) \
$(use_enable python pywrap) \
$(use_enable tpm tspi)
- emake || die "emake failed"
}
src_install(){
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
deleted file mode 100644
index ed8ddbcdfded..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/key_mod/ecryptfs_key_mod_gpg.c
-+++ src/key_mod/ecryptfs_key_mod_gpg.c
-@@ -18,6 +18,7 @@
- * 02111-1307, USA.
- */
-
-+#include "config.h"
- #include <fcntl.h>
- #include <pwd.h>
- #include <stdio.h>
-@@ -29,7 +30,6 @@
- #include <gpgme.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
- #include "../include/decision_graph.h"
-
---- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-@@ -20,6 +20,7 @@
- * 02111-1307, USA.
- */
-
-+#include "config.h"
- #include <fcntl.h>
- #include <pwd.h>
- #include <stdio.h>
-@@ -28,11 +29,12 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <openssl/err.h>
-+#include <openssl/pem.h>
- #include <openssl/x509.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
- #include "../include/decision_graph.h"
-