Version bump

Package-Manager: portage-2.1.4_rc9

7 files changed, 36 insertions, 108 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/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 10d76f48e2f5..62c16ebf65d9 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,24 +1,16 @@
-AUX ecryptfs-utils-30-gpgme.patch 1545 RMD160 04490c451e735e39871e3f18d47aabf7d8aa0aca SHA1 962fee3565823593e855b7fc65af4e661f2bbc58 SHA256 68768f43401fe5d3925bdebb2ff397111c3159bfb6b42e8e92b480251e335738
-MD5 d6b584867e67d9d7b8fd7922ebbe30a6 files/ecryptfs-utils-30-gpgme.patch 1545
-RMD160 04490c451e735e39871e3f18d47aabf7d8aa0aca files/ecryptfs-utils-30-gpgme.patch 1545
-SHA256 68768f43401fe5d3925bdebb2ff397111c3159bfb6b42e8e92b480251e335738 files/ecryptfs-utils-30-gpgme.patch 1545
-AUX ecryptfs-utils-30-gtk.patch 495 RMD160 1a02e2c68a0922e9ea8769316b1b1410454e6a84 SHA1 b96e27649bcc941736ae4b9824f71914e617d9c5 SHA256 41dd812f445019c9dff443f19f287a2d4c477650cf92e7e65c6e1773efd0d679
-MD5 464817f69c53be537586933679d5450a files/ecryptfs-utils-30-gtk.patch 495
-RMD160 1a02e2c68a0922e9ea8769316b1b1410454e6a84 files/ecryptfs-utils-30-gtk.patch 495
-SHA256 41dd812f445019c9dff443f19f287a2d4c477650cf92e7e65c6e1773efd0d679 files/ecryptfs-utils-30-gtk.patch 495
-DIST ecryptfs-utils-30.tar.bz2 956890 RMD160 7d25d59692f883eb6e2bd730c901423370117a38 SHA1 685c7ab17fddbd1a4d96317fe91ea0f6d6483014 SHA256 a2bd95ae5b3887ef6114e51f2d073d47335194fd3afee0da5c33b57473073314
-EBUILD ecryptfs-utils-30.ebuild 1275 RMD160 caa1f126aa16445ca18af9f0560d75ebec630329 SHA1 1346f4d88c93620988497f873d131ace8a02a62f SHA256 f2e5bcc1364b2674acfdc9a1b07b94ee6824b82f3fbe186920bed5c974efd800
-MD5 92c8b25ef2a2293a50551d1751cdf2d8 ecryptfs-utils-30.ebuild 1275
-RMD160 caa1f126aa16445ca18af9f0560d75ebec630329 ecryptfs-utils-30.ebuild 1275
-SHA256 f2e5bcc1364b2674acfdc9a1b07b94ee6824b82f3fbe186920bed5c974efd800 ecryptfs-utils-30.ebuild 1275
-MISC ChangeLog 2147 RMD160 8e6d65f5a4356709d2ab02c807fc246fe12edaa1 SHA1 e122b0a1e13d123782247e3b1df74a58fc70f689 SHA256 eb87da8ce81d791a3c61bca72c0751edd843e0656087cb0f10c126e61e941714
-MD5 902e24f02714cae974871b02c139139f ChangeLog 2147
-RMD160 8e6d65f5a4356709d2ab02c807fc246fe12edaa1 ChangeLog 2147
-SHA256 eb87da8ce81d791a3c61bca72c0751edd843e0656087cb0f10c126e61e941714 ChangeLog 2147
+DIST ecryptfs-utils-32.tar.bz2 962484 RMD160 53447dc84de69407e702af54ddcb45ec3c0f5f2a SHA1 d1d7167072a3b3162b01e09446c6a298a6d94527 SHA256 6b9d3e8c76df4406a2940479dd3acf43d15b6171dbf1b68126360f05511eea37
+EBUILD ecryptfs-utils-32.ebuild 1409 RMD160 aa70613d073486bdf8df6f671908e0f0c98f7cd9 SHA1 ee09fe72d220a98cb0fa3a19716c0d38a09654ed SHA256 f70b0a480b6589e5a0b5e892c78980b79830c2cc096ccee02ab369aed1327a07
+MD5 b891a36d8eddc7ce2383968fda9fbd51 ecryptfs-utils-32.ebuild 1409
+RMD160 aa70613d073486bdf8df6f671908e0f0c98f7cd9 ecryptfs-utils-32.ebuild 1409
+SHA256 f70b0a480b6589e5a0b5e892c78980b79830c2cc096ccee02ab369aed1327a07 ecryptfs-utils-32.ebuild 1409
+MISC ChangeLog 2377 RMD160 2dc1c438417588ebd547496233f671bd2e1c5840 SHA1 03addf112ce70c9bebde5dcfa9c70076a8ff9c53 SHA256 abb15ffb9fde8e88a05fa075a395531d187f299418b5f512c404df0025eced29
+MD5 fdfd6ab7d274f5093510bd70b1ba752a ChangeLog 2377
+RMD160 2dc1c438417588ebd547496233f671bd2e1c5840 ChangeLog 2377
+SHA256 abb15ffb9fde8e88a05fa075a395531d187f299418b5f512c404df0025eced29 ChangeLog 2377
 MISC metadata.xml 355 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf SHA1 ffba9e7b0465df8b8ca111de7ee3b3f763c1b45e SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee
 MD5 1c8677910988959bdc24fbca34b9f94a metadata.xml 355
 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf metadata.xml 355
 SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee metadata.xml 355
-MD5 44e171c505e9754862264ccba7c3260c files/digest-ecryptfs-utils-30 256
-RMD160 bb11ffc375732dc7394a9c9603d075036e8697d0 files/digest-ecryptfs-utils-30 256
-SHA256 31d0630c35b9b0aed2a28c9ab0aa2ffcbf52585dd2e5a4cd1b864d273dc5579c files/digest-ecryptfs-utils-30 256
+MD5 eceb656dfd64ec481bade7a437014b88 files/digest-ecryptfs-utils-32 256
+RMD160 25b07815f82055f14748b12ebdf1f07b954ac7c0 files/digest-ecryptfs-utils-32 256
+SHA256 609221e3c5ad905b6e690dfd098ed68a6b872ea6b6c1206fc2564f4c056a2fca files/digest-ecryptfs-utils-32 256
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"