Version bump

(Portage version: 2.1.4_rc9)

6 files changed, 24 insertions, 88 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 8fb212f8e206..ac357bc90063 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.12 2007/12/04 11:09:37 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.13 2007/12/13 18:45:03 alonbl Exp $
+
+*ecryptfs-utils-32 (13 Dec 2007)
+
+  13 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/ecryptfs-utils-30-gpgme.patch, -files/ecryptfs-utils-30-gtk.patch,
+  -ecryptfs-utils-30.ebuild, +ecryptfs-utils-32.ebuild:
+  Version bump
 
   04 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
   +files/ecryptfs-utils-30-gtk.patch, ecryptfs-utils-30.ebuild:
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild
index 2d0379bb666f..0892a31458b8 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.4 2007/12/04 11:09:37 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-32.ebuild,v 1.1 2007/12/13 18:45:03 alonbl Exp $
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="pam gtk openssl pkcs11 gpg doc"
+IUSE="suid pam gtk openssl pkcs11 gpg doc"
 
 RDEPEND="sys-apps/keyutils
 	dev-libs/libgcrypt
@@ -28,15 +28,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/perl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gpgme.patch"
-	epatch "${FILESDIR}/${P}-gtk.patch"
-	# Until upstream move to autoconf-2.60
-	eautoreconf
-}
-
 src_compile() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
@@ -52,5 +43,15 @@ src_compile() {
 
 src_install(){
 	emake DESTDIR="${D}" install || die
-	fperms u+s /sbin/mount.ecryptfs
+	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/files/digest-ecryptfs-utils-30 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-30
deleted file mode 100644
index 3d0fe921e295..000000000000
--- a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b4c343e17652f84c6615c6db6b286d9 ecryptfs-utils-30.tar.bz2 956890
-RMD160 7d25d59692f883eb6e2bd730c901423370117a38 ecryptfs-utils-30.tar.bz2 956890
-SHA256 a2bd95ae5b3887ef6114e51f2d073d47335194fd3afee0da5c33b57473073314 ecryptfs-utils-30.tar.bz2 956890
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32
new file mode 100644
index 000000000000..e62979f4d669
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-32
@@ -0,0 +1,3 @@
+MD5 a8c8f4bc699fb19fcacaef15e64a0f92 ecryptfs-utils-32.tar.bz2 962484
+RMD160 53447dc84de69407e702af54ddcb45ec3c0f5f2a ecryptfs-utils-32.tar.bz2 962484
+SHA256 6b9d3e8c76df4406a2940479dd3acf43d15b6171dbf1b68126360f05511eea37 ecryptfs-utils-32.tar.bz2 962484
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch
deleted file mode 100644
index 3b351a124dab..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6778105..ba6484d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,6 +93,13 @@ AC_ARG_ENABLE(
- )
- 
- AC_ARG_WITH(
-+	[gpgme-prefix],
-+	[AC_HELP_STRING([--with-gpgme-prefix=PATH], [Specify the directory where gpgme install, default /usr])],
-+	,
-+	[with_gpgme_prefix="/usr"]
-+)
-+
-+AC_ARG_WITH(
- 	[pamdir],
- 	[AC_HELP_STRING([--with-pamdir=PATH], [Specify the directory where PAM modules are stored])],
- 	[pamdir="${withval}"],
-@@ -233,15 +240,13 @@ if test "${enable_tspi}" = "yes" ; then
- fi
- 
- if test "${enable_gpg}" = "yes" ; then
--	if test -z "${GPGME_LIBS}"; then
--		AC_ARG_VAR([GPGME_CFLAGS], [C compiler flags for gpg])
--		AC_ARG_VAR([GPGME_LIBS], [linker flags for gpg])
--		AC_CHECK_LIB(
--			[gpgme],
--			[gpgme_new],
--			[GPGME_LIBS="-lgpgme"],
--			[AC_MSG_ERROR([Cannot find gpgme])]
--		)
-+	AC_MSG_CHECKING([for gpgme])
-+	if ! test -x "${with_gpgme_prefix}/bin/gpgme-config"; then
-+		AC_MSG_ERROR([Cannot locate gpgme])
-+	else
-+		AC_MSG_RESULT([found])
-+		GPGME_CFLAGS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --cflags`"
-+		GPGME_LIBS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --libs`"
- 	fi
- fi
- 
-@@ -280,6 +285,8 @@ AC_SUBST([pamlibdir])
- AC_SUBST([pkgconfigdir])
- AC_SUBST([rootsbindir])
- AC_SUBST([ecryptfskeymoddir])
-+AC_SUBST([GPGME_CFLAGS])
-+AC_SUBST([GPGME_LIBS])
- AM_CONDITIONAL([BUILD_OPENSSL], [test "${enable_openssl}" = "yes"])
- AM_CONDITIONAL([BUILD_PKCS11_HELPER], [test "${enable_pkcs11_helper}" = "yes"])
- AM_CONDITIONAL([BUILD_TSPI], [test "${enable_tspi}" = "yes"])
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch
deleted file mode 100644
index 52162e518947..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6778105..2cef444 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -265,7 +265,16 @@ if test "${enable_pam}" = "yes" ; then
- fi
- 
- if test "${enable_gui}" = "yes"; then
--	PKG_CHECK_MODULES([GTK], [gtk+ >= 1.0],, AC_MSG_ERROR([Cannot locate gtk+]))
-+	PKG_CHECK_MODULES(
-+		[GTK],
-+		[gtk+-2.0 >= 2.0],
-+		,
-+		PKG_CHECK_MODULES(
-+			[GTK],
-+			[gtk+ >= 1.0],,
-+			AC_MSG_ERROR([Cannot locate gtk+])
-+		)
-+	)
- fi
- 
- pkgconfigdir="\$(libdir)/pkgconfig"