New release.

(Portage version: 2.0.53_rc4)

5 files changed, 125 insertions, 17 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 347ec8f1dd68..45b58bf486ec 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.37 2005/09/20 19:47:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.38 2005/10/08 12:57:18 azarah Exp $
+
+*gnome-volume-manager-1.5.3 (08 Oct 2005)
+
+  08 Oct 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gnome-volume-manager-1.5.2-use-pmount.patch,
+  +gnome-volume-manager-1.5.3.ebuild:
+  New release.
 
   20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-volume-manager-1.5.1.ebuild:
diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest
index 736cd36dc5ed..9c0cd02a1443 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,19 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fd17f18f5c3f9bfa94e7cd75cef9d768 ChangeLog 5098
-MD5 bd900d52569c9f8a6e4d9018684310f1 gnome-volume-manager-1.5.1.ebuild 1539
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 72c1bae8ef38e67c06baafe764e34065 gnome-volume-manager-1.2.1.ebuild 1008
-MD5 c6349a883ff4a07cc8acbded5dd9bd3b gnome-volume-manager-1.2.2.ebuild 1032
-MD5 23333330820921c756db73277bd99084 files/gnome-volume-manager-1.5.1-use-pmount-2.patch 1805
-MD5 019e01caf376cfa12bd42566ab4d4f44 files/digest-gnome-volume-manager-1.5.1 173
 MD5 fcd04d3a6284a16bdffaddaf7311cfe8 files/digest-gnome-volume-manager-1.2.1 79
 MD5 16d8909214e29b02eb989b948601461c files/digest-gnome-volume-manager-1.2.2 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDMGdYKRy60XGEcJIRAiGeAJ9i4qosMRW/swjFK0m5n0Ny4mpGJwCgleih
-+3a4AaLH+PZIMSLoxvOJAAw=
-=m0jR
------END PGP SIGNATURE-----
+MD5 019e01caf376cfa12bd42566ab4d4f44 files/digest-gnome-volume-manager-1.5.1 173
+MD5 f513bbd936865f5abdb3238086f65c5e files/digest-gnome-volume-manager-1.5.2 174
+MD5 c6001791261a4a359cf9a82f2e59006f files/digest-gnome-volume-manager-1.5.3 174
+MD5 23333330820921c756db73277bd99084 files/gnome-volume-manager-1.5.1-use-pmount-2.patch 1805
+MD5 329acc9dbc95a443f2f5d9eeaaafedd2 files/gnome-volume-manager-1.5.2-use-pmount.patch 1776
+MD5 72c1bae8ef38e67c06baafe764e34065 gnome-volume-manager-1.2.1.ebuild 1008
+MD5 c6349a883ff4a07cc8acbded5dd9bd3b gnome-volume-manager-1.2.2.ebuild 1032
+MD5 bd900d52569c9f8a6e4d9018684310f1 gnome-volume-manager-1.5.1.ebuild 1539
+MD5 a1b20d5f3cafba112c76beb3dba949d5 gnome-volume-manager-1.5.2.ebuild 1498
+MD5 a1b20d5f3cafba112c76beb3dba949d5 gnome-volume-manager-1.5.3.ebuild 1498
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.3 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.3
new file mode 100644
index 000000000000..8c94fa6f6397
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.3
@@ -0,0 +1,2 @@
+MD5 3054a930a0eddef2be59d4a602719bb1 gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2 12026
+MD5 8734a665794f59ab75b6e6d495562a88 gnome-volume-manager-1.5.3.tar.bz2 262826
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.2-use-pmount.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.2-use-pmount.patch
new file mode 100644
index 000000000000..814a52d13198
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.2-use-pmount.patch
@@ -0,0 +1,51 @@
+--- gnome-volume-manager-1.5.2/src/manager.c.orig	2005-10-06 14:32:31.000000000 +0200
++++ gnome-volume-manager-1.5.2/src/manager.c	2005-10-06 14:35:39.000000000 +0200
+@@ -47,6 +47,11 @@
+ 
+ #define NAUTILUS_COMMAND	 BIN_NAUTILUS" -n --no-desktop %m"
+ 
++#define BIN_PMOUNT		 "/usr/bin/pmount-hal"
++#define PMOUNT_COMMAND		 BIN_PMOUNT" %h"
++#define BIN_PUNMOUNT		 "/usr/bin/pumount"
++#define PUNMOUNT_COMMAND	 BIN_PUNMOUNT" %d"
++
+ static struct gvm_configuration config;
+ static LibHalContext *hal_ctx = NULL;
+ static DBusConnection *dbus_connection = NULL;
+@@ -1205,6 +1210,7 @@
+ static gboolean
+ gvm_device_mount (const char *udi, const char *device, const char *mount_point, int apply_policy)
+ {
++	char *mount_command = MOUNT_COMMAND;
+ 	struct _MountPolicy *policy;
+ 	
+ 	policy = g_new (struct _MountPolicy, 1);
+@@ -1213,8 +1219,12 @@
+ 	
+ 	g_hash_table_insert (mount_table, policy->udi, policy);
+ 	
++	/* Only check executable, as suid binaries might not be readable */
++	if (g_file_test (BIN_PMOUNT, G_FILE_TEST_IS_EXECUTABLE))
++		mount_command = PMOUNT_COMMAND;
++	
+ 	dbg ("mounting %s...\n", udi);
+-	if (gvm_run_command (MOUNT_COMMAND, udi, device, mount_point))
++	if (gvm_run_command (mount_command, udi, device, mount_point))
+ 		return TRUE;
+ 	
+ 	dbg ("mount failed: %s\n", udi);
+@@ -1233,7 +1243,13 @@
+ static gboolean
+ gvm_device_unmount (const char *udi, const char *device, const char *mount_point)
+ {
+-	return gvm_run_command (UNMOUNT_COMMAND, udi, device, mount_point);
++	char *unmount_command = UNMOUNT_COMMAND;
++
++	/* Only check executable, as suid binaries might not be readable */
++	if (g_file_test (BIN_PUNMOUNT, G_FILE_TEST_IS_EXECUTABLE))
++		unmount_command = PUNMOUNT_COMMAND;
++	
++	return gvm_run_command (unmount_command, udi, device, mount_point);
+ }
+ 
+ /*
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.3.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.3.ebuild
new file mode 100644
index 000000000000..2710357534ec
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.3.ebuild,v 1.1 2005/10/08 12:57:18 azarah Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~cardoe/files/${PN}-1.3.3-reconnect_dbus.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc crypt"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=sys-apps/dbus-0.31
+	>=sys-apps/hal-0.5.0
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	sys-apps/pmount"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.27.2"
+
+DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="--with-eject-command=/usr/bin/eject"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#epatch ${FILESDIR}/gnome-volume-manager-1.3.2-set_defaults.patch
+	epatch ${DISTDIR}/gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2
+	# Doesn't apply to current cvs.  Must look at leater.
+	#epatch ${FILESDIR}/gnome-volume-manager-1.3.3-pmount_crypt.patch
+	epatch ${FILESDIR}/gnome-volume-manager-1.5.2-use-pmount.patch
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "To start the gnome-volume-manager daemon you need to configure"
+	einfo "it through it's preferences capplet. Also the HAL daemon (hald)"
+	einfo "needs to be running or it will shut down."
+}